From 5aec0bda3f8c26b5c078bff3113430aed6e14d25 Mon Sep 17 00:00:00 2001 From: Daniel Petry Date: Thu, 16 May 2024 17:55:57 -0500 Subject: [PATCH 01/13] Various fixes to the build scripts - CUDARTLIB is cudart_static by default, so this isn't needed - nvcc is /bin/nvcc by default, so no need for patch or setting it explicitly - Handing CUDA_HOME to make via an environment variable works; using eval and make args doesn't. - other environment variables need to be tested for effectiveness having been changed from args. --- recipe/build.sh | 13 +++++-------- recipe/meta.yaml | 4 ++-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index ce8df31..8c1aa68 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -1,26 +1,23 @@ #!/bin/bash -EXTRA_ARGS="CUDARTLIB=\"cudart_static\"" - if [[ "${cuda_compiler_version}" =~ 12.* ]]; then - EXTRA_ARGS="${EXTRA_ARGS} CUDA_HOME=\"${PREFIX}\" NVCC=\"${BUILD_PREFIX}/bin/nvcc\"" + export CUDA_HOME=${BUILD_PREFIX} elif [[ "${cuda_compiler_version}" != "None" ]]; then - EXTRA_ARGS="${EXTRA_ARGS} CUDA_HOME=\"${CUDA_PATH}\"" + export CUDA_HOME=${CUDA_PATH} fi if [[ $CONDA_BUILD_CROSS_COMPILATION == "1" ]]; then if [[ $target_platform == linux-aarch64 ]]; then - EXTRA_ARGS="${EXTRA_ARGS} CUDA_LIB=\"${CUDA_HOME}/targets/sbsa-linux/lib/\"" + export CUDA_LIB=${CUDA_HOME}/targets/sbsa-linux/lib/ elif [[ $target_platform == linux-ppc64le ]]; then - EXTRA_ARGS="${EXTRA_ARGS} CUDA_LIB=\"${CUDA_HOME}/targets/ppc64le-linux/lib/\"" + export CUDA_LIB=${CUDA_HOME}/targets/ppc64le-linux/lib/ else echo "not supported" exit -1 fi fi -# `eval` is needed here for proper `${...}` expansion -eval make -j${CPU_COUNT} src.lib ${EXTRA_ARGS} +make -j${CPU_COUNT} src.lib make install PREFIX="${PREFIX}" diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 963a697..9210aa5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,8 +9,8 @@ source: url: https://github.com/NVIDIA/nccl/archive/v{{ version }}.tar.gz sha256: 1923596984d85e310b5b6c52b2c72a1b93da57218f2bc5a5c7ac3d59297a3303 patches: - # Upstreaming w/PR: https://github.com/NVIDIA/nccl/pull/854 - - 0001-Allow-custom-NVCC-path.patch + # This isn't needed; setting CUDA_HOME sets NVCC correctly + #- 0001-Allow-custom-NVCC-path.patch build: number: 0 From 0a62c2dc3c87d2425a8fd4e393bdc37f7f742216 Mon Sep 17 00:00:00 2001 From: Daniel Petry Date: Thu, 16 May 2024 17:56:48 -0500 Subject: [PATCH 02/13] Use conda ar rather than system one --- recipe/0002-use-conda-ar-not-system.patch | 16 ++++++++++++++++ recipe/meta.yaml | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 recipe/0002-use-conda-ar-not-system.patch diff --git a/recipe/0002-use-conda-ar-not-system.patch b/recipe/0002-use-conda-ar-not-system.patch new file mode 100644 index 0000000..0399e15 --- /dev/null +++ b/recipe/0002-use-conda-ar-not-system.patch @@ -0,0 +1,16 @@ +This fixes an issue where the build fails on linux-aarch64, because a system ar +can't be found. Presumably it's using the system ar on other platforms, too, +which isn't ideal. +Index: nccl/src/Makefile +=================================================================== +--- nccl.orig/src/Makefile 2024-05-16 16:58:16.522514975 -0500 ++++ nccl/src/Makefile 2024-05-16 17:47:45.959416166 -0500 +@@ -83,7 +83,7 @@ + $(LIBDIR)/$(STATICLIBTARGET): $(LIBOBJ) $(DEVMANIFEST) + @printf "Archiving %-35s > %s\n" $(STATICLIBTARGET) $@ + mkdir -p $(LIBDIR) +- ar cr $@ $(LIBOBJ) $$(cat $(DEVMANIFEST)) ++ $(AR) cr $@ $(LIBOBJ) $$(cat $(DEVMANIFEST)) + + $(PKGDIR)/nccl.pc : nccl.pc.in + mkdir -p $(PKGDIR) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9210aa5..c512689 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,6 +11,7 @@ source: patches: # This isn't needed; setting CUDA_HOME sets NVCC correctly #- 0001-Allow-custom-NVCC-path.patch + - 0002-use-conda-ar-not-system.patch build: number: 0 @@ -28,6 +29,7 @@ requirements: - {{ compiler("cxx") }} - {{ compiler("cuda") }} - make + - patch host: - cuda-version ={{ cuda_compiler_version }} # [(cuda_compiler_version or "").startswith("11")] run: From 9ababe771fbd7559ca02a634bfea98a7c121c690 Mon Sep 17 00:00:00 2001 From: Daniel Petry Date: Tue, 21 May 2024 15:54:29 -0500 Subject: [PATCH 03/13] Bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c512689..b94b6f7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,7 +14,7 @@ source: - 0002-use-conda-ar-not-system.patch build: - number: 0 + number: 1 skip: true # [(not linux) or cuda_compiler_version in (undefined, "None", "10.2")] ignore_run_exports_from: # Ignore `cudatoolkit` dependency in CUDA 11 builds From a3bb1a192701fd7fcb169d13f236eb0ee0e604d1 Mon Sep 17 00:00:00 2001 From: Daniel Petry Date: Tue, 21 May 2024 15:54:58 -0500 Subject: [PATCH 04/13] Add stdlib('c') --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b94b6f7..faff520 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -28,6 +28,7 @@ requirements: - {{ compiler("c") }} - {{ compiler("cxx") }} - {{ compiler("cuda") }} + - {{ stdlib("c") }} - make - patch host: From 2f088a50e51064fae89bbb605fb2e4b89b39b7e5 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 20:56:42 +0000 Subject: [PATCH 05/13] MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.36.0, and conda-forge-pinning 2024.05.21.18.33.22 --- .azure-pipelines/azure-pipelines-linux.yml | 20 ++-------- ...ler_version11.2cxx_compiler_version10.yaml | 34 ----------------- ...er_version11.8cxx_compiler_version11.yaml} | 0 ...er_version12.0cxx_compiler_version12.yaml} | 0 ...ler_version11.2cxx_compiler_version10.yaml | 38 ------------------- ...ler_version11.2cxx_compiler_version10.yaml | 34 ----------------- .gitattributes | 4 +- README.md | 29 ++------------ 8 files changed, 10 insertions(+), 149 deletions(-) delete mode 100644 .ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml rename .ci_support/{linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml => linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml => linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml} (100%) delete mode 100644 .ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml delete mode 100644 .ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 231cb7e..dc1f598 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,22 +8,14 @@ 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 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11: - CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 + linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11: + CONFIG: linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - 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_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12: + CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - 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-cuda:11.2 linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11: CONFIG: linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 UPLOAD_PACKAGES: 'True' @@ -32,10 +24,6 @@ jobs: CONFIG: linux_aarch64_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_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-cuda:11.2 linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11: CONFIG: linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 UPLOAD_PACKAGES: 'True' 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_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml deleted file mode 100644 index c4410ed..0000000 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml +++ /dev/null @@ -1,34 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.2' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - c_stdlib_version - - cdt_name - - cuda_compiler - - cuda_compiler_version - - docker_image diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml rename to .ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.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_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_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_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml diff --git a/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml deleted file mode 100644 index c9a1b5e..0000000 --- a/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml +++ /dev/null @@ -1,38 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '10' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.2' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - c_stdlib_version - - cdt_name - - cuda_compiler - - cuda_compiler_version - - docker_image 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_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml deleted file mode 100644 index 0e97de3..0000000 --- a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml +++ /dev/null @@ -1,34 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.2' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - c_stdlib_version - - cdt_name - - cuda_compiler - - cuda_compiler_version - - docker_image diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/README.md b/README.md index 27e0b8a..7e845b9 100644 --- a/README.md +++ b/README.md @@ -38,31 +38,17 @@ Current build status - + - + - - - - - - @@ -79,13 +65,6 @@ Current build status variant - - -
VariantStatus
linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 - variant + variant
linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 - variant - -
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 - - variant - -
linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 - - variant + variant
linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 - - variant - -
linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 From fcbc1078bca9f3e6b28caea9fcd7df17ef52b6c4 Mon Sep 17 00:00:00 2001 From: danpetry Date: Thu, 23 May 2024 17:00:10 -0500 Subject: [PATCH 06/13] Remove unused/unneeded patch Co-authored-by: jakirkham --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index faff520..6b1d20d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -30,7 +30,6 @@ requirements: - {{ compiler("cuda") }} - {{ stdlib("c") }} - make - - patch host: - cuda-version ={{ cuda_compiler_version }} # [(cuda_compiler_version or "").startswith("11")] run: From 82fe24357328db8a3d613f57a7557b313e710128 Mon Sep 17 00:00:00 2001 From: Daniel Petry Date: Thu, 23 May 2024 17:13:55 -0500 Subject: [PATCH 07/13] Print make variables to verify NVCC is being set correctly --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 8c1aa68..1103120 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -17,7 +17,7 @@ if [[ $CONDA_BUILD_CROSS_COMPILATION == "1" ]]; then fi fi -make -j${CPU_COUNT} src.lib +make -j${CPU_COUNT} src.lib --print-data-base make install PREFIX="${PREFIX}" From fc3f39164d04273965f32988d19dbd48514a36dc Mon Sep 17 00:00:00 2001 From: Daniel Petry Date: Thu, 30 May 2024 19:11:38 -0500 Subject: [PATCH 08/13] Revert "Print make variables to verify NVCC is being set correctly" This reverts commit 82fe24357328db8a3d613f57a7557b313e710128. --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 1103120..8c1aa68 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -17,7 +17,7 @@ if [[ $CONDA_BUILD_CROSS_COMPILATION == "1" ]]; then fi fi -make -j${CPU_COUNT} src.lib --print-data-base +make -j${CPU_COUNT} src.lib make install PREFIX="${PREFIX}" From 4b2b6562d904e6804b0236b29bbb9d46cebf0a96 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 02:43:38 +0000 Subject: [PATCH 09/13] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.40.1, and conda-forge-pinning 2024.09.18.19.43.35 --- .azure-pipelines/azure-pipelines-linux.yml | 8 +- ...er_version11.8cxx_compiler_version11.yaml} | 0 ...er_version12.0cxx_compiler_version12.yaml} | 0 .ci_support/migrations/cuda120.yaml | 90 ------------------- .scripts/build_steps.sh | 8 ++ README.md | 8 +- build-locally.py | 9 +- 7 files changed, 22 insertions(+), 101 deletions(-) rename .ci_support/{linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml => linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml => linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml} (100%) delete mode 100644 .ci_support/migrations/cuda120.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index dc1f598..ce91b0f 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_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11: - CONFIG: linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 + linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11: + CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12: - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_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_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11: diff --git a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml rename to .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml diff --git a/.ci_support/migrations/cuda120.yaml b/.ci_support/migrations/cuda120.yaml deleted file mode 100644 index abfb9cb..0000000 --- a/.ci_support/migrations/cuda120.yaml +++ /dev/null @@ -1,90 +0,0 @@ -migrator_ts: 1682985063 -__migrator: - kind: - version - migration_number: - 3 - 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"] - # case: native compilation (build == target) - - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - - quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - # case: cross-compilation (build != target) - - quay.io/condaforge/linux-anvil-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - # case: non-CUDA builds - - 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 win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.0 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.1 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.2 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12.0 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - commit_message: | - Rebuild for CUDA 12 w/arch + Windows support - - The transition to CUDA 12 SDK includes new packages for all CUDA libraries and - build tools. Notably, the cudatoolkit package no longer exists, and packages - should depend directly on the specific CUDA libraries (libcublas, libcusolver, - etc) as needed. For an in-depth overview of the changes and to report problems - [see this issue]( https://github.com/conda-forge/conda-forge.github.io/issues/1963 ). - Please feel free to raise any issues encountered there. Thank you! :pray: - -cuda_compiler: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - cuda-nvcc # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cuda_compiler_version: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12.0 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -c_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cxx_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -fortran_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cdt_name: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - cos7 # [linux 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"] - # case: native compilation (build == target) - - quay.io/condaforge/linux-anvil-ppc64le # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - - quay.io/condaforge/linux-anvil-aarch64 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - # case: cross-compilation (build != target) - - quay.io/condaforge/linux-anvil-cos7-x86_64 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cos7-x86_64 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 899ba03..856f469 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,6 +43,8 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -72,6 +74,12 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/README.md b/README.md index 7e845b9..7fae35c 100644 --- a/README.md +++ b/README.md @@ -38,17 +38,17 @@ Current build status - + - + diff --git a/build-locally.py b/build-locally.py index e0d408d..6788aea 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,13 +1,16 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): From 8b492b32350fcca1baef52e03f989e416d2daf8e Mon Sep 17 00:00:00 2001 From: Daniel Petry Date: Tue, 15 Oct 2024 15:12:48 -0500 Subject: [PATCH 10/13] Drop patch; isn't needed as setting CUDA_HOME sets NVCC correctly --- recipe/0001-Allow-custom-NVCC-path.patch | 25 ------------------------ recipe/meta.yaml | 2 -- 2 files changed, 27 deletions(-) delete mode 100644 recipe/0001-Allow-custom-NVCC-path.patch diff --git a/recipe/0001-Allow-custom-NVCC-path.patch b/recipe/0001-Allow-custom-NVCC-path.patch deleted file mode 100644 index 95fc842..0000000 --- a/recipe/0001-Allow-custom-NVCC-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bb149b1811ad60c5426f533f2eaaa3805c364255 Mon Sep 17 00:00:00 2001 -From: Peter Andreas Entschev -Date: Fri, 26 May 2023 13:25:10 -0700 -Subject: [PATCH] Allow custom NVCC path - ---- - makefiles/common.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/makefiles/common.mk b/makefiles/common.mk -index 35d1826..abdc773 100644 ---- a/makefiles/common.mk -+++ b/makefiles/common.mk -@@ -13,7 +13,7 @@ TRACE ?= 0 - PROFAPI ?= 1 - NVTX ?= 1 - --NVCC = $(CUDA_HOME)/bin/nvcc -+NVCC ?= $(CUDA_HOME)/bin/nvcc - - CUDA_LIB ?= $(CUDA_HOME)/lib64 - CUDA_INC ?= $(CUDA_HOME)/include --- -2.40.1 - diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6b1d20d..25ea983 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,8 +9,6 @@ source: url: https://github.com/NVIDIA/nccl/archive/v{{ version }}.tar.gz sha256: 1923596984d85e310b5b6c52b2c72a1b93da57218f2bc5a5c7ac3d59297a3303 patches: - # This isn't needed; setting CUDA_HOME sets NVCC correctly - #- 0001-Allow-custom-NVCC-path.patch - 0002-use-conda-ar-not-system.patch build: From 56d2e1667b8ccefc30ae2cadb2bbfa6a2231ed10 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 20:16:10 +0000 Subject: [PATCH 11/13] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.42.2, and conda-forge-pinning 2024.10.15.19.09.52 --- ...ler_version11.8cxx_compiler_version11.yaml | 2 ++ ...ler_version12.0cxx_compiler_version12.yaml | 2 ++ ...ler_version11.8cxx_compiler_version11.yaml | 2 ++ ...ler_version12.0cxx_compiler_version12.yaml | 2 ++ ...ler_version11.8cxx_compiler_version11.yaml | 2 ++ ...ler_version12.0cxx_compiler_version12.yaml | 2 ++ .scripts/build_steps.sh | 4 +-- azure-pipelines.yml | 29 +++++++++++++++++-- 8 files changed, 41 insertions(+), 4 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index 262591b..a34cf84 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -22,6 +22,8 @@ cxx_compiler_version: - '11' docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 +nccl: +- '2' target_platform: - linux-64 zip_keys: 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_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index 5a47d08..b76a637 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -22,6 +22,8 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +nccl: +- '2' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index 613debf..8be59f7 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -26,6 +26,8 @@ cxx_compiler_version: - '11' docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 +nccl: +- '2' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index 159daa4..a09cc7e 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -26,6 +26,8 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +nccl: +- '2' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index 5ce94c5..0d8c72f 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -22,6 +22,8 @@ cxx_compiler_version: - '11' docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 +nccl: +- '2' target_platform: - linux-ppc64le zip_keys: 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_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index 17ce2da..c3ecc0b 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_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -22,6 +22,8 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +nccl: +- '2' target_platform: - linux-ppc64le zip_keys: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 856f469..12647a5 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -76,8 +76,8 @@ else --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ad85a2c..95d88f6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,5 +2,30 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml \ No newline at end of file +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + echo "##vso[task.setvariable variable=log]$git_log" + displayName: Obtain commit message + - bash: echo "##vso[task.setvariable variable=RET]false" + condition: or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]')) + displayName: Skip build? + - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" + name: result + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml \ No newline at end of file From f42daf8baaa1b7c92660b7dd944f0c33e3ade24a Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 21:33:09 +0000 Subject: [PATCH 12/13] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.42.2, and conda-forge-pinning 2024.10.15.19.09.52 --- .scripts/build_steps.sh | 6 +++--- README.md | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 59fe535..12647a5 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -76,8 +76,8 @@ else --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null @@ -97,4 +97,4 @@ fi ( startgroup "Final checks" ) 2> /dev/null -touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" +touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file diff --git a/README.md b/README.md index 7fae35c..8fcad59 100644 --- a/README.md +++ b/README.md @@ -208,6 +208,7 @@ In order to produce a uniquely identifiable distribution: Feedstock Maintainers ===================== +* [@conda-forge/cuda](https://github.com/orgs/conda-forge/teams/cuda/) * [@jakirkham](https://github.com/jakirkham/) * [@leofang](https://github.com/leofang/) From 5dd7aa5f833958a6969bf0eff315a08cf624cc5d Mon Sep 17 00:00:00 2001 From: Daniel Petry Date: Wed, 16 Oct 2024 08:16:11 -0500 Subject: [PATCH 13/13] Address review comments --- ...-ar-not-system.patch => 0001-use-conda-ar-not-system.patch} | 0 recipe/meta.yaml | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) rename recipe/{0002-use-conda-ar-not-system.patch => 0001-use-conda-ar-not-system.patch} (100%) diff --git a/recipe/0002-use-conda-ar-not-system.patch b/recipe/0001-use-conda-ar-not-system.patch similarity index 100% rename from recipe/0002-use-conda-ar-not-system.patch rename to recipe/0001-use-conda-ar-not-system.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9e6e120..975b65e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,7 @@ source: url: https://github.com/NVIDIA/nccl/archive/v{{ version }}.tar.gz sha256: 6b946b70a9d2d01871842cbd15ec56488d358abe9a0f3767e372fddc3e241ba7 patches: - - 0002-use-conda-ar-not-system.patch + - 0001-use-conda-ar-not-system.patch build: number: 1 @@ -27,7 +27,6 @@ requirements: - {{ stdlib("c") }} - {{ compiler("cxx") }} - {{ compiler("cuda") }} - - {{ stdlib("c") }} - make host: - cuda-version ={{ cuda_compiler_version }} # [(cuda_compiler_version or "").startswith("11")]
VariantStatus
linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 - variant + variant