Merge pull request #40 from conda-forge-admin/conda_forge_admin_39

Support CUDA 12
conda-forge · Apr 6, 2023 · 3a74556 · 3a74556
2 parents 5941a48 + 043cde3
commit 3a74556
Show file tree

Hide file tree

Showing 19 changed files with 78 additions and 426 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/...ler_version11.0cxx_compiler_version9.yaml → .ci_support/linux_64_.yaml b/...ler_version11.0cxx_compiler_version9.yaml → .ci_support/linux_64_.yaml
@@ -1,28 +1,21 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '9'
+- '11'
 cdt_name:
 - cos7
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-cuda_compiler:
-- nvcc
-cuda_compiler_version:
-- '11.0'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '9'
+- '11'
 docker_image:
-- quay.io/condaforge/linux-anvil-cuda:11.0
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 target_platform:
 - linux-64
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-  - cuda_compiler_version
-  - cdt_name
-  - docker_image
diff --git a/...support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10.yaml b/...support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10.yaml
diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7.yaml
diff --git a/...ux_aarch64_cuda_compiler_version11.1.yaml → .ci_support/linux_aarch64_.yaml b/...ux_aarch64_cuda_compiler_version11.1.yaml → .ci_support/linux_aarch64_.yaml
@@ -1,9 +1,11 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
+arm_variant_type:
+- sbsa
 c_compiler:
 - gcc
 c_compiler_version:
-- '9'
+- '11'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -12,21 +14,14 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-cuda_compiler:
-- nvcc
-cuda_compiler_version:
-- '11.1'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '9'
+- '11'
 docker_image:
-- quay.io/condaforge/linux-anvil-aarch64-cuda:11.1
+- quay.io/condaforge/linux-anvil-aarch64
 target_platform:
 - linux-aarch64
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-  - cuda_compiler_version
-  - cdt_name
-  - docker_image
diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.0.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.0.yaml
diff --git a/...ler_version11.1cxx_compiler_version9.yaml → .ci_support/linux_ppc64le_.yaml b/...ler_version11.1cxx_compiler_version9.yaml → .ci_support/linux_ppc64le_.yaml
@@ -1,28 +1,21 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '9'
+- '11'
 cdt_name:
 - cos7
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-cuda_compiler:
-- nvcc
-cuda_compiler_version:
-- '11.1'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '9'
+- '11'
 docker_image:
-- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.1
+- quay.io/condaforge/linux-anvil-ppc64le
 target_platform:
 - linux-ppc64le
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-  - cuda_compiler_version
-  - cdt_name
-  - docker_image
diff --git a/...port/linux_ppc64le_c_compiler_version8cuda_compiler_version10.2cxx_compiler_version8.yaml b/...port/linux_ppc64le_c_compiler_version8cuda_compiler_version10.2cxx_compiler_version8.yaml
diff --git a/...port/linux_ppc64le_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9.yaml b/...port/linux_ppc64le_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9.yaml
diff --git a/...ort/win_64_cuda_compiler_version10.2.yaml → .ci_support/win_64_.yaml b/...ort/win_64_cuda_compiler_version10.2.yaml → .ci_support/win_64_.yaml
@@ -4,10 +4,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-cuda_compiler:
-- nvcc
-cuda_compiler_version:
-- '10.2'
 cxx_compiler:
 - vs2019
 target_platform:

diff --git a/.ci_support/win_64_cuda_compiler_version11.0.yaml b/.ci_support/win_64_cuda_compiler_version11.0.yaml
diff --git a/.ci_support/win_64_cuda_compiler_version11.1.yaml b/.ci_support/win_64_cuda_compiler_version11.1.yaml
diff --git a/.travis.yml b/.travis.yml