From c04776f6e7b8361bb8a815dfe9a9568b749d1cef Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 1 Jun 2023 05:44:08 +0000 Subject: [PATCH 1/3] Rebuild for CUDA 12 --- .ci_support/migrations/cuda120.yaml | 72 +++++++++++++++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/cuda120.yaml diff --git a/.ci_support/migrations/cuda120.yaml b/.ci_support/migrations/cuda120.yaml new file mode 100644 index 0000000..25f0f88 --- /dev/null +++ b/.ci_support/migrations/cuda120.yaml @@ -0,0 +1,72 @@ +migrator_ts: 1682985063 +__migrator: + kind: + version + migration_number: + 1 + build_number: + 1 + paused: false + override_cbc_keys: + - cuda_compiler_stub + operation: key_add + check_solvable: false + primary_key: cuda_compiler_version + ordering: + cxx_compiler_version: + - 9 + - 8 + - 7 + c_compiler_version: + - 9 + - 8 + - 7 + fortran_compiler_version: + - 9 + - 8 + - 7 + docker_image: + - quay.io/condaforge/linux-anvil-comp7 # [os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-aarch64 # [os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] + - quay.io/condaforge/linux-anvil-ppc64le # [os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] + - quay.io/condaforge/linux-anvil-armv7l # [os.environ.get("BUILD_PLATFORM") == "linux-armv7l"] + - quay.io/condaforge/linux-anvil-cuda:9.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:10.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:10.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:10.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + cuda_compiler_version: + - None + - 10.2 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.0 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.1 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.2 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12.0 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + commit_message: "Rebuild for CUDA 12" + +cuda_compiler: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - cuda-nvcc # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +cuda_compiler_version: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12.0 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +c_compiler_version: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +cxx_compiler_version: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +fortran_compiler_version: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +cudnn: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 8 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +cdt_name: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - cos7 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux-") and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 250f714..9c91f99 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,7 @@ source: - fix_ppc64le.patch # [ppc64le] build: - number: 5 + number: 6 string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} skip: true # [win or cuda_compiler_version == "10.2"] track_features: {{ "[librealsense-cuda]" if cuda_enabled else "" }} From 61dcf60415812d67efd5285523815663cbf62981 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 1 Jun 2023 05:44:43 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.05.31.22.15.24 --- .azure-pipelines/azure-pipelines-linux.yml | 20 ++++++++----- ...ler_version11.1cxx_compiler_version10.yaml | 1 + ...ler_version11.2cxx_compiler_version10.yaml | 1 + ...er_versionNonecxx_compiler_version12.yaml} | 7 +++-- ...ler_version12.0cxx_compiler_version12.yaml | 29 +++++++++++++++++++ ...iler_version11.0cxx_compiler_version9.yaml | 1 + ...er_version11.2cxx_compiler_version10.yaml} | 1 + ...er_versionNonecxx_compiler_version12.yaml} | 7 +++-- ...ler_version11.2cxx_compiler_version10.yaml | 1 + ...er_versionNonecxx_compiler_version12.yaml} | 7 +++-- .ci_support/osx_64_.yaml | 4 +-- .ci_support/osx_arm64_.yaml | 4 +-- README.md | 23 ++++++++++----- 13 files changed, 77 insertions(+), 29 deletions(-) rename .ci_support/{linux_64_c_compiler_version11cdt_namecos6cuda_compiler_versionNonecxx_compiler_version11.yaml => linux_64_c_compiler_version12cdt_namecos6cuda_compiler_versionNonecxx_compiler_version12.yaml} (91%) create mode 100644 .ci_support/linux_64_c_compiler_version12cdt_namecos7cuda_compiler_version12.0cxx_compiler_version12.yaml rename .ci_support/{linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml => linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml} (96%) rename .ci_support/{linux_aarch64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11.yaml => linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml} (92%) rename .ci_support/{linux_ppc64le_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11.yaml => linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml} (91%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index bd36830..004dab6 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -16,28 +16,32 @@ jobs: CONFIG: linux_64_c_compiler_version10cdt_namecos7cuda_compiler_version11.2cxx_compiler_version10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_c_compiler_version11cdt_namecos6cuda_compiler_versionNonecxx_compiler_version11: - CONFIG: linux_64_c_compiler_version11cdt_namecos6cuda_compiler_versionNonecxx_compiler_version11 + linux_64_c_compiler_version12cdt_namecos6cuda_compiler_versionNonecxx_compiler_version12: + CONFIG: linux_64_c_compiler_version12cdt_namecos6cuda_compiler_versionNonecxx_compiler_version12 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_c_compiler_version12cdt_namecos7cuda_compiler_version12.0cxx_compiler_version12: + CONFIG: linux_64_c_compiler_version12cdt_namecos7cuda_compiler_version12.0cxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_c_compiler_version9cdt_namecos7cuda_compiler_version11.0cxx_compiler_version9: CONFIG: linux_64_c_compiler_version9cdt_namecos7cuda_compiler_version11.0cxx_compiler_version9 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 - linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10: - CONFIG: linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10 + linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10: + CONFIG: linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 - linux_aarch64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11: - CONFIG: linux_aarch64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11 + linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12: + CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10: CONFIG: linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 - linux_ppc64le_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11: - CONFIG: linux_ppc64le_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11 + linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12: + CONFIG: linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le timeoutInMinutes: 360 diff --git a/.ci_support/linux_64_c_compiler_version10cdt_namecos7cuda_compiler_version11.1cxx_compiler_version10.yaml b/.ci_support/linux_64_c_compiler_version10cdt_namecos7cuda_compiler_version11.1cxx_compiler_version10.yaml index 3231c2f..89b0a4c 100644 --- a/.ci_support/linux_64_c_compiler_version10cdt_namecos7cuda_compiler_version11.1cxx_compiler_version10.yaml +++ b/.ci_support/linux_64_c_compiler_version10cdt_namecos7cuda_compiler_version11.1cxx_compiler_version10.yaml @@ -23,6 +23,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_64_c_compiler_version10cdt_namecos7cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_64_c_compiler_version10cdt_namecos7cuda_compiler_version11.2cxx_compiler_version10.yaml index 841450d..c076ea2 100644 --- a/.ci_support/linux_64_c_compiler_version10cdt_namecos7cuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_64_c_compiler_version10cdt_namecos7cuda_compiler_version11.2cxx_compiler_version10.yaml @@ -23,6 +23,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_64_c_compiler_version11cdt_namecos6cuda_compiler_versionNonecxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version12cdt_namecos6cuda_compiler_versionNonecxx_compiler_version12.yaml similarity index 91% rename from .ci_support/linux_64_c_compiler_version11cdt_namecos6cuda_compiler_versionNonecxx_compiler_version11.yaml rename to .ci_support/linux_64_c_compiler_version12cdt_namecos6cuda_compiler_versionNonecxx_compiler_version12.yaml index 8f6be5f..e332ee2 100644 --- a/.ci_support/linux_64_c_compiler_version11cdt_namecos6cuda_compiler_versionNonecxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version12cdt_namecos6cuda_compiler_versionNonecxx_compiler_version12.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos6 channel_sources: @@ -9,13 +9,13 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- nvcc +- None cuda_compiler_version: - None cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 target_platform: @@ -23,6 +23,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_64_c_compiler_version12cdt_namecos7cuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cdt_namecos7cuda_compiler_version12.0cxx_compiler_version12.yaml new file mode 100644 index 0000000..28c8a6b --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version12cdt_namecos7cuda_compiler_version12.0cxx_compiler_version12.yaml @@ -0,0 +1,29 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler + - cuda_compiler_version + - cdt_name + - docker_image diff --git a/.ci_support/linux_64_c_compiler_version9cdt_namecos7cuda_compiler_version11.0cxx_compiler_version9.yaml b/.ci_support/linux_64_c_compiler_version9cdt_namecos7cuda_compiler_version11.0cxx_compiler_version9.yaml index 4f2be01..5adaf7a 100644 --- a/.ci_support/linux_64_c_compiler_version9cdt_namecos7cuda_compiler_version11.0cxx_compiler_version9.yaml +++ b/.ci_support/linux_64_c_compiler_version9cdt_namecos7cuda_compiler_version11.0cxx_compiler_version9.yaml @@ -23,6 +23,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml similarity index 96% rename from .ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml rename to .ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml index c217765..d7b1dda 100644 --- a/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml @@ -27,6 +27,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml similarity index 92% rename from .ci_support/linux_aarch64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11.yaml rename to .ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index 339c9b0..c79853d 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_arch: - aarch64 cdt_name: @@ -13,13 +13,13 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- nvcc +- None cuda_compiler_version: - None cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-aarch64 target_platform: @@ -27,6 +27,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml index ed8418a..433782c 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml @@ -23,6 +23,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml similarity index 91% rename from .ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11.yaml rename to .ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml index b33ed7a..5df602d 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos7 channel_sources: @@ -9,13 +9,13 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- nvcc +- None cuda_compiler_version: - None cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-ppc64le target_platform: @@ -23,6 +23,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 2b46356..43d5a55 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 target_platform: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 327f5b1..26178f2 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - arm64-apple-darwin20.0.0 target_platform: diff --git a/README.md b/README.md index d6f584b..4cb523a 100644 --- a/README.md +++ b/README.md @@ -41,10 +41,17 @@ Current build status - linux_64_c_compiler_version11cdt_namecos6cuda_compiler_versionNonecxx_compiler_version11 + linux_64_c_compiler_version12cdt_namecos6cuda_compiler_versionNonecxx_compiler_version12 - variant + variant + + + + linux_64_c_compiler_version12cdt_namecos7cuda_compiler_version12.0cxx_compiler_version12 + + + variant @@ -55,17 +62,17 @@ Current build status - linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10 + linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 - variant + variant - linux_aarch64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11 + linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 - variant + variant @@ -76,10 +83,10 @@ Current build status - linux_ppc64le_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11 + linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12 - variant + variant From aaaa351d5f081539f509af169b0111c500c7b7fe Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 4 Jun 2023 17:11:16 +0200 Subject: [PATCH 3/3] Update build.sh --- recipe/build.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index f5cf2c8..cc67adb 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -8,11 +8,11 @@ if [[ "${target_platform}" == "osx-arm64" || "${target_platform}" == "linux-ppc6 fi # Enable CUDA support -if [[ ! -z "${cuda_compiler_version+x}" && "${cuda_compiler_version}" != "None" ]] +if [[ ! -z "${cuda_compiler_version+x}" && "${cuda_compiler_version}" == "11.*" ]] then if [[ -z "${CUDA_HOME+x}" ]] then - echo "cuda_compiler_version=${cuda_compiler_version} CUDA_HOME=$CUDA_HOME" + echo "==> cuda_compiler_version=${cuda_compiler_version}, extract manually CUDA_HOME variable" CUDA_GDB_EXECUTABLE=$(which cuda-gdb || exit 0) if [[ -n "$CUDA_GDB_EXECUTABLE" ]] then @@ -23,7 +23,12 @@ then fi fi CMAKE_ARGS="${CMAKE_ARGS} -DBUILD_WITH_CUDA=ON -DCUDA_TOOLKIT_ROOT_DIR=${CUDA_HOME} -DCMAKE_LIBRARY_PATH=${CUDA_HOME}/lib64/stubs" +elif [[ ! -z "${cuda_compiler_version+x}" && "${cuda_compiler_version}" != "None" ]] +then + echo "==> cuda_compiler_version=${cuda_compiler_version}, use CMake's CUDA support" + CMAKE_ARGS="${CMAKE_ARGS} -DBUILD_WITH_CUDA=ON" else + echo "==> cuda_compiler_version=${cuda_compiler_version}, disable CUDA support" CMAKE_ARGS="${CMAKE_ARGS} -DBUILD_WITH_CUDA=OFF" fi