From 965c1cdec482e01293ab26ce59adb742180d4f4c Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 12 Mar 2024 21:01:21 -0700 Subject: [PATCH 1/3] Align with global `zlib` pinning --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 73d3b0f..e52ec8f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -61,8 +61,8 @@ requirements: - cuda-version 12.0 # [(cuda_compiler_version or "").startswith("12")] - patchelf >=0.12 # [linux] # to suppress ".so not found" errors - - libzlib # [linux] - - libzlib-wapi # [win64] + - libzlib {{ zlib }} # [linux] + - libzlib-wapi {{ zlib }} # [win64] run: - {{ pin_compatible("cuda-version", max_pin="x") }} - cudatoolkit 11.* # [(cuda_compiler_version or "").startswith("11")] From 74214e9d75e909f17f64aab5a886f71c0e8509ea Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 12 Mar 2024 21:01:55 -0700 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and conda-forge-pinning 2024.03.13.03.14.31 --- ...ilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml | 2 ++ ...uda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml | 2 ++ ...ilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml | 2 ++ ...uda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml | 2 ++ ...ilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml | 2 ++ ...uda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml | 2 ++ .../win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml | 2 ++ .../win_64_cuda_compilernvcccuda_compiler_version11.8.yaml | 2 ++ 8 files changed, 16 insertions(+) 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 f0857d0..df642e6 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 @@ -27,3 +27,5 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image +zlib: +- '1.2' 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 4731d37..d84a1dd 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 @@ -27,3 +27,5 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image +zlib: +- '1.2' 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 c7b34b1..8f20dbe 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 @@ -33,3 +33,5 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image +zlib: +- '1.2' 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 3d50436..96a5c66 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 @@ -33,3 +33,5 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image +zlib: +- '1.2' 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 48f1bcd..f556f84 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 @@ -27,3 +27,5 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image +zlib: +- '1.2' 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 ee7d391..60ba211 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 @@ -27,3 +27,5 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image +zlib: +- '1.2' diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml index 67e5a06..98231d7 100644 --- a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml @@ -15,3 +15,5 @@ target_platform: zip_keys: - - cuda_compiler - cuda_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml index dbb62f3..661fe0a 100644 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml @@ -15,3 +15,5 @@ target_platform: zip_keys: - - cuda_compiler - cuda_compiler_version +zlib: +- '1.2' From e029c8d63f4b5cbbd270f4342a33d8565df751ec Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 12 Mar 2024 21:02:22 -0700 Subject: [PATCH 3/3] Bump `build/number` to `3` Rebuild with corrected `zlib` pinning. --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e52ec8f..b8c4f69 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,7 +23,7 @@ source: sha256: 94fc17af8e83a26cc5d231ed23981b28c29c3fc2e87b1844ea3f46486f481df5 # [win and (cuda_compiler_version or "").startswith("12")] build: - number: 2 + number: 3 skip: True # [osx] skip: True # [cuda_compiler_version == "11.2"] # Disable binary relocation to workaround patchelf issue