checkin for v9.2.1 build.

- remove ppc arch as it is no longer supported in 9.2.1 - hardcode zlib version 1.2 because global pinning for zlib has become 1 recently - drop sysroot, migrate to {{ stdlib('c') }} per conda-forge/conda-forge.github.io#2102 - fix up tests as a lot of filenames got changed since 8.9.7.29 - use glibc 2.28 for cuda12 for aarch64
conda-forge · Aug 1, 2024 · aefdc97 · aefdc97
1 parent 523ec11
commit aefdc97
Show file tree

Hide file tree

Showing 18 changed files with 74 additions and 159 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/...c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/...c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml
@@ -2,6 +2,10 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '11'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_name:
 - cos7
 channel_sources:
@@ -23,9 +27,8 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - c_stdlib_version
   - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
-zlib:
-- '1.2'
diff --git a/...piler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/...piler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml
@@ -2,6 +2,10 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '12'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_name:
 - cos7
 channel_sources:
@@ -23,9 +27,8 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - c_stdlib_version
   - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
-zlib:
-- '1.2'
diff --git a/...er_version11.8cxx_compiler_version11.yaml → ...er_version11.8cxx_compiler_version11.yaml b/...er_version11.8cxx_compiler_version11.yaml → ...er_version11.8cxx_compiler_version11.yaml
@@ -6,6 +6,10 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '11'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -29,9 +33,8 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - c_stdlib_version
   - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
-zlib:
-- '1.2'
diff --git a/...er_version12.0cxx_compiler_version12.yaml → ...er_version12.0cxx_compiler_version12.yaml b/...er_version12.0cxx_compiler_version12.yaml → ...er_version12.0cxx_compiler_version12.yaml
@@ -6,6 +6,10 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '12'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.28'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -29,9 +33,8 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - c_stdlib_version
   - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
-zlib:
-- '1.2'
diff --git a/...c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/...c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml
diff --git a/...piler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/...piler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml
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
@@ -1,5 +1,7 @@
 c_compiler:
 - vs2019
+c_stdlib:
+- vs
 channel_sources:
 - conda-forge
 channel_targets:
@@ -15,5 +17,3 @@ 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
@@ -1,5 +1,7 @@
 c_compiler:
 - vs2019
+c_stdlib:
+- vs
 channel_sources:
 - conda-forge
 channel_targets:
@@ -15,5 +17,3 @@ target_platform:
 zip_keys:
 - - cuda_compiler
   - cuda_compiler_version
-zlib:
-- '1.2'
diff --git a/.gitattributes b/.gitattributes
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -1,6 +1,5 @@
 conda_forge_output_validation: true
 provider:
-  linux_ppc64le: azure
   linux_aarch64: default
 os_version:
   linux_64: cos7

diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -1,70 +1,54 @@
-c_compiler_version:
+c_compiler_version: # works in conjunction with c_stdlib_version
   - 12          # [linux and aarch64]
-  - 12          # [linux and ppc64le]
   - 12          # [linux and x86_64]
   - 11          # [linux and aarch64]
-  - 11          # [linux and ppc64le]
   - 11          # [linux and x86_64]
 
 cxx_compiler_version:
   - 12          # [linux and aarch64]
-  - 12          # [linux and ppc64le]
   - 12          # [linux and x86_64]
   - 11          # [linux and aarch64]
-  - 11          # [linux and ppc64le]
   - 11          # [linux and x86_64]
 
 c_stdlib_version:
-  - 2.17        # [linux and aarch64]
-  - 2.17        # [linux and ppc64le]
+  - 2.28        # [linux and aarch64]
   - 2.17        # [linux and x86_64]
   - 2.17        # [linux and aarch64]
-  - 2.17        # [linux and ppc64le]
   - 2.17        # [linux and x86_64]
 
 fortran_compiler_version:
   - 12          # [linux and aarch64]
-  - 12          # [linux and ppc64le]
   - 12          # [linux and x86_64]
   - 11          # [linux and aarch64]
-  - 11          # [linux and ppc64le]
   - 11          # [linux and x86_64]
 
 cuda_compiler_version:
   - 12.0        # [linux and aarch64]
-  - 12.0        # [linux and ppc64le]
   - 12.0        # [linux and x86_64]
   - 12.0        # [win]
   - 11.8        # [linux and aarch64]
-  - 11.8        # [linux and ppc64le]
   - 11.8        # [linux and x86_64]
   - 11.8        # [win]
 
 cuda_compiler:
   - cuda-nvcc   # [linux and aarch64]
-  - cuda-nvcc   # [linux and ppc64le]
   - cuda-nvcc   # [linux and x86_64]
   - cuda-nvcc   # [win]
   - nvcc        # [linux and aarch64]
-  - nvcc        # [linux and ppc64le]
   - nvcc        # [linux and x86_64]
   - nvcc        # [win]
 
 cdt_name:
   - cos7        # [linux and aarch64]
-  - cos7        # [linux and ppc64le]
   - cos7        # [linux and x86_64]
   - cos7        # [linux and aarch64]
-  - cos7        # [linux and ppc64le]
   - cos7        # [linux and x86_64]
 
 docker_image:
   # TODO: We're using the aarch64-cuda:11.8 image, based on ubi8, only to get a
   # newer glibc for the CUDA 12 builds. For some reason, aarch64 + CUDA 12 is
   # expecting GLIBC_2.27.
-  - quay.io/condaforge/linux-anvil-aarch64-cuda:11.8  # [linux and aarch64]
-  - quay.io/condaforge/linux-anvil-ppc64le            # [linux and ppc64le]
-  - quay.io/condaforge/linux-anvil-cos7-x86_64        # [linux and x86_64]
-  - quay.io/condaforge/linux-anvil-aarch64-cuda:11.8  # [linux and aarch64]
-  - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8  # [linux and ppc64le]
-  - quay.io/condaforge/linux-anvil-cuda:11.8          # [linux and x86_64]
+  - quay.io/condaforge/linux-anvil-aarch64-cuda:11.8  # [linux and aarch64] # glibc 2.28
+  - quay.io/condaforge/linux-anvil-cos7-x86_64        # [linux and x86_64]  # glibc 2.17
+  - quay.io/condaforge/linux-anvil-aarch64-cuda:11.8  # [linux and aarch64] # glibc 2.28
+  - quay.io/condaforge/linux-anvil-cuda:11.8          # [linux and x86_64]  # glibc 2.17