From 1bb1a1ef4eb724b16e54b317d218527aad24ce4c Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <121827174+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 1 Jun 2023 00:01:50 +0000 Subject: [PATCH 1/9] dummy commit for rerendering --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index b4571de..26ed741 100644 --- a/README.md +++ b/README.md @@ -230,3 +230,6 @@ Feedstock Maintainers * [@jakirkham](https://github.com/jakirkham/) * [@vyasr](https://github.com/vyasr/) + + + From e6be85f017d02a0640f685b915eb72e54011a18c Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 31 May 2023 17:17:40 -0700 Subject: [PATCH 2/9] Extend `cuda_compiler` to be zippable As `cuda_compiler` is in `zip_keys` with `cuda_compiler_version`, extend it to have an equal number of entries to match the other keys it is zipped with. --- recipe/conda_build_config.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 92f62f3..19f2beb 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -35,7 +35,13 @@ cuda_compiler_version: - 11.2 # [win] cuda_compiler: - - nvcc + - cuda-nvcc # [linux and aarch64] + - cuda-nvcc # [linux and ppc64le] + - cuda-nvcc # [linux and x86_64] + - nvcc # [linux and aarch64] + - nvcc # [linux and ppc64le] + - nvcc # [linux and x86_64] + - nvcc # [win] cudnn: - undefined # [linux and aarch64] From 77ab4e46e1186a1d022ce81fa10d39cb3025510b Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 1 Jun 2023 00:19:46 +0000 Subject: [PATCH 3/9] 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 | 8 ++++---- ...a_compiler_version11.2cxx_compiler_version10.yaml} | 1 + ...a_compiler_version12.0cxx_compiler_version12.yaml} | 3 ++- ...da_compiler_version11.2cxx_compiler_version10.yaml | 1 + ...da_compiler_version12.0cxx_compiler_version12.yaml | 3 ++- ...da_compiler_version11.2cxx_compiler_version10.yaml | 1 + ...da_compiler_version12.0cxx_compiler_version12.yaml | 3 ++- .ci_support/win_64_.yaml | 3 +++ README.md | 11 ++++------- 9 files changed, 20 insertions(+), 14 deletions(-) rename .ci_support/{linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml => linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml} (95%) rename .ci_support/{linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml => linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml} (93%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index aec1057..b3069ac 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,12 +8,12 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10: - CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10 + linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10: + CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12: - CONFIG: linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12 + linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12: + CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml similarity index 95% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml rename to .ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml index 841450d..c076ea2 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_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_version12cuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml similarity index 93% rename from .ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index 5b487a7..28c8a6b 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- nvcc +- cuda-nvcc cuda_compiler_version: - '12.0' cxx_compiler: @@ -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_compiler_version11.2cxx_compiler_version10.yaml index fa52260..c3a4ba7 100644 --- a/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml @@ -29,6 +29,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_version12cuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml index 6aa0a5e..9223623 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml @@ -15,7 +15,7 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- nvcc +- cuda-nvcc cuda_compiler_version: - '12.0' cxx_compiler: @@ -29,6 +29,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_version12cuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml index 7b369b7..30983dd 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- nvcc +- cuda-nvcc cuda_compiler_version: - '12.0' cxx_compiler: @@ -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/win_64_.yaml b/.ci_support/win_64_.yaml index c21aa04..68d27bb 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -12,3 +12,6 @@ cxx_compiler: - vs2019 target_platform: - win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version diff --git a/README.md b/README.md index 26ed741..fedb84c 100644 --- a/README.md +++ b/README.md @@ -48,17 +48,17 @@ Current build status - + - + @@ -230,6 +230,3 @@ Feedstock Maintainers * [@jakirkham](https://github.com/jakirkham/) * [@vyasr](https://github.com/vyasr/) - - - From fed95ddef2f23a26e1f1e463993692600057d4af Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 31 May 2023 17:21:36 -0700 Subject: [PATCH 4/9] Add `cuda120` migrator manually --- .ci_support/migrations/cuda120.yaml | 72 +++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) 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"] From ca7329663f25c15662d4582cd298a91995683096 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 1 Jun 2023 00:23:59 +0000 Subject: [PATCH 5/9] 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 | 16 ++++++++-------- ...piler_version11.2cxx_compiler_version10.yaml} | 0 ...piler_version12.0cxx_compiler_version12.yaml} | 0 ...piler_version11.2cxx_compiler_version10.yaml} | 0 ...piler_version12.0cxx_compiler_version12.yaml} | 0 README.md | 16 ++++++++-------- 6 files changed, 16 insertions(+), 16 deletions(-) rename .ci_support/{linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml => linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml => linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml} (100%) rename .ci_support/{linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml => linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml} (100%) rename .ci_support/{linux_ppc64le_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml => linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml} (100%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index b3069ac..7e8c0b0 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,20 +8,20 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10: - CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 + linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10: + CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12: - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 + linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12: + CONFIG: linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10: - CONFIG: linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10 + linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10: + CONFIG: linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 - linux_ppc64le_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12: - CONFIG: linux_ppc64le_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12 + linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12: + CONFIG: linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le timeoutInMinutes: 360 diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml rename to .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml diff --git a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml similarity index 100% rename from .ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml rename to .ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml similarity index 100% rename from .ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml rename to .ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml diff --git a/README.md b/README.md index fedb84c..ab551db 100644 --- a/README.md +++ b/README.md @@ -48,17 +48,17 @@ Current build status
VariantStatus
linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 - variant + variant
linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 - variant + variant
- + - + @@ -76,17 +76,17 @@ Current build status - + - + From 4bc0290519d99d638c5292a3b45caa4878eca5bc Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 31 May 2023 17:27:02 -0700 Subject: [PATCH 6/9] Bump `build/number` to `1` --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7dba471..654116c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,7 +23,7 @@ source: sha256: e362e1fbf6b101ad71aa5314f21d00a4353b90efbe5cdedc5fcfb0f3b68cd791 # [win and cuda_major == "12"] build: - number: 0 + number: 1 # TODO: Enable Windows with CUDA 12 when it is supported in CI skip: True # [win32 or osx or (win and cuda_major == "12")] script: From 69eaadc61dc8bc0d37a2778d93fdb930f8b2564d Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 31 May 2023 17:53:42 -0700 Subject: [PATCH 7/9] Always use `nvcc` in `conda_build_config.yaml` --- recipe/conda_build_config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 19f2beb..786eddd 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -35,9 +35,9 @@ cuda_compiler_version: - 11.2 # [win] cuda_compiler: - - cuda-nvcc # [linux and aarch64] - - cuda-nvcc # [linux and ppc64le] - - cuda-nvcc # [linux and x86_64] + - nvcc # [linux and aarch64] + - nvcc # [linux and ppc64le] + - nvcc # [linux and x86_64] - nvcc # [linux and aarch64] - nvcc # [linux and ppc64le] - nvcc # [linux and x86_64] From 69b724d9272f94ed8f9f1056a19b9258aab4ae2a Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 1 Jun 2023 00:55:42 +0000 Subject: [PATCH 8/9] 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 | 8 ++++---- ...12cuda_compiler_version12.0cxx_compiler_version12.yaml | 2 +- ...12cuda_compiler_version12.0cxx_compiler_version12.yaml | 2 +- ...0cuda_compiler_version11.2cxx_compiler_version10.yaml} | 0 ...2cuda_compiler_version12.0cxx_compiler_version12.yaml} | 2 +- README.md | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) rename .ci_support/{linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml => linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml} (100%) rename .ci_support/{linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml => linux_ppc64le_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml} (97%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 7e8c0b0..aec1057 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -16,12 +16,12 @@ jobs: CONFIG: linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10: - CONFIG: linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 + 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_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12: - CONFIG: linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 + linux_ppc64le_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12: + CONFIG: linux_ppc64le_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le timeoutInMinutes: 360 diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml index 28c8a6b..c2a79a6 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- cuda-nvcc +- nvcc cuda_compiler_version: - '12.0' cxx_compiler: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml index 9223623..9b0ffa5 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml @@ -15,7 +15,7 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- cuda-nvcc +- nvcc cuda_compiler_version: - '12.0' cxx_compiler: diff --git a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml similarity index 100% rename from .ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml rename to .ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml similarity index 97% rename from .ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml rename to .ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml index 30983dd..7a24289 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- cuda-nvcc +- nvcc cuda_compiler_version: - '12.0' cxx_compiler: diff --git a/README.md b/README.md index ab551db..b4571de 100644 --- a/README.md +++ b/README.md @@ -76,17 +76,17 @@ Current build status - + - + From 8404440b86314a3f4f3ede31ff9db7d09b1f8612 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 1 Jun 2023 00:27:12 -0700 Subject: [PATCH 9/9] Disable `binary_relocation` due to `patchelf` bug --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 654116c..a64bf02 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,6 +26,9 @@ build: number: 1 # TODO: Enable Windows with CUDA 12 when it is supported in CI skip: True # [win32 or osx or (win and cuda_major == "12")] + # Disable binary relocation to workaround patchelf issue + # xref: https://github.com/NixOS/patchelf/issues/492 + binary_relocation: false script: - mkdir -p $PREFIX/include # [linux] - cp include/cudnn*.h $PREFIX/include/ # [linux]
VariantStatus
linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10 - variant + variant
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12 - variant + variant
linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 - variant + variant
linux_ppc64le_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 - variant + variant
linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10 - variant + variant
linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12linux_ppc64le_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12 - variant + variant