Merge pull request #221 from minrk/finish-cuda

Finish cuda migration, fixes for linter
conda-forge · Dec 2, 2024 · 7f9ad1a · 7f9ad1a
2 parents a96bc23 + 10ac83d
commit 7f9ad1a
Show file tree

Hide file tree

Showing 54 changed files with 431 additions and 732 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/...ler_version11.8cxx_compiler_version11fortran_compiler_version11mpimpichscalarcomplex.yaml b/...ler_version11.8cxx_compiler_version11fortran_compiler_version11mpimpichscalarcomplex.yaml
@@ -7,7 +7,7 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -21,7 +21,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '11'
 docker_image:
-- quay.io/condaforge/linux-anvil-cuda:11.8
+- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:cos7
 fftw:
 - '3'
 fortran_compiler:
@@ -32,8 +32,6 @@ hdf5:
 - 1.14.4
 libblas:
 - 3.9 *netlib
-libcblas:
-- 3.9 *netlib
 liblapack:
 - 3.9 *netlib
 libptscotch:
@@ -62,8 +60,6 @@ zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
   - fortran_compiler_version
-  - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
diff --git a/...mpiler_version11.8cxx_compiler_version11fortran_compiler_version11mpimpichscalarreal.yaml b/...mpiler_version11.8cxx_compiler_version11fortran_compiler_version11mpimpichscalarreal.yaml
@@ -7,7 +7,7 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -21,7 +21,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '11'
 docker_image:
-- quay.io/condaforge/linux-anvil-cuda:11.8
+- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:cos7
 fftw:
 - '3'
 fortran_compiler:
@@ -32,8 +32,6 @@ hdf5:
 - 1.14.4
 libblas:
 - 3.9 *netlib
-libcblas:
-- 3.9 *netlib
 liblapack:
 - 3.9 *netlib
 libptscotch:
@@ -62,8 +60,6 @@ zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
   - fortran_compiler_version
-  - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
diff --git a/...r_version11.8cxx_compiler_version11fortran_compiler_version11mpiopenmpiscalarcomplex.yaml b/...r_version11.8cxx_compiler_version11fortran_compiler_version11mpiopenmpiscalarcomplex.yaml
@@ -7,7 +7,7 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -21,7 +21,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '11'
 docker_image:
-- quay.io/condaforge/linux-anvil-cuda:11.8
+- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:cos7
 fftw:
 - '3'
 fortran_compiler:
@@ -32,8 +32,6 @@ hdf5:
 - 1.14.4
 libblas:
 - 3.9 *netlib
-libcblas:
-- 3.9 *netlib
 liblapack:
 - 3.9 *netlib
 libptscotch:
@@ -62,8 +60,6 @@ zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
   - fortran_compiler_version
-  - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
diff --git a/...iler_version11.8cxx_compiler_version11fortran_compiler_version11mpiopenmpiscalarreal.yaml b/...iler_version11.8cxx_compiler_version11fortran_compiler_version11mpiopenmpiscalarreal.yaml
@@ -7,7 +7,7 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -21,7 +21,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '11'
 docker_image:
-- quay.io/condaforge/linux-anvil-cuda:11.8
+- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:cos7
 fftw:
 - '3'
 fortran_compiler:
@@ -32,8 +32,6 @@ hdf5:
 - 1.14.4
 libblas:
 - 3.9 *netlib
-libcblas:
-- 3.9 *netlib
 liblapack:
 - 3.9 *netlib
 libptscotch:
@@ -62,8 +60,6 @@ zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
   - fortran_compiler_version
-  - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
diff --git a/...piler_version12mpimpichscalarcomplex.yaml → ...piler_version12mpimpichscalarcomplex.yaml b/...piler_version12mpimpichscalarcomplex.yaml → ...piler_version12mpimpichscalarcomplex.yaml
@@ -7,21 +7,21 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:
 - cuda-nvcc
 cuda_compiler_version:
-- '12.4'
+- '12.6'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
 - '12'
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:cos7
 fftw:
 - '3'
 fortran_compiler:
@@ -32,8 +32,6 @@ hdf5:
 - 1.14.4
 libblas:
 - 3.9 *netlib
-libcblas:
-- 3.9 *netlib
 liblapack:
 - 3.9 *netlib
 libptscotch:
@@ -62,8 +60,6 @@ zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
   - fortran_compiler_version
-  - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
diff --git a/...compiler_version12mpimpichscalarreal.yaml → ...compiler_version12mpimpichscalarreal.yaml b/...compiler_version12mpimpichscalarreal.yaml → ...compiler_version12mpimpichscalarreal.yaml
@@ -7,21 +7,21 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:
 - cuda-nvcc
 cuda_compiler_version:
-- '12.4'
+- '12.6'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
 - '12'
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:cos7
 fftw:
 - '3'
 fortran_compiler:
@@ -32,8 +32,6 @@ hdf5:
 - 1.14.4
 libblas:
 - 3.9 *netlib
-libcblas:
-- 3.9 *netlib
 liblapack:
 - 3.9 *netlib
 libptscotch:
@@ -62,8 +60,6 @@ zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
   - fortran_compiler_version
-  - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
diff --git a/...ler_version12mpiopenmpiscalarcomplex.yaml → ...ler_version12mpiopenmpiscalarcomplex.yaml b/...ler_version12mpiopenmpiscalarcomplex.yaml → ...ler_version12mpiopenmpiscalarcomplex.yaml
@@ -7,21 +7,21 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:
 - cuda-nvcc
 cuda_compiler_version:
-- '12.4'
+- '12.6'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
 - '12'
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:cos7
 fftw:
 - '3'
 fortran_compiler:
@@ -32,8 +32,6 @@ hdf5:
 - 1.14.4
 libblas:
 - 3.9 *netlib
-libcblas:
-- 3.9 *netlib
 liblapack:
 - 3.9 *netlib
 libptscotch:
@@ -62,8 +60,6 @@ zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
   - fortran_compiler_version
-  - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
diff --git a/...mpiler_version12mpiopenmpiscalarreal.yaml → ...mpiler_version12mpiopenmpiscalarreal.yaml b/...mpiler_version12mpiopenmpiscalarreal.yaml → ...mpiler_version12mpiopenmpiscalarreal.yaml
@@ -7,21 +7,21 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:
 - cuda-nvcc
 cuda_compiler_version:
-- '12.4'
+- '12.6'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
 - '12'
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:cos7
 fftw:
 - '3'
 fortran_compiler:
@@ -32,8 +32,6 @@ hdf5:
 - 1.14.4
 libblas:
 - 3.9 *netlib
-libcblas:
-- 3.9 *netlib
 liblapack:
 - 3.9 *netlib
 libptscotch:
@@ -62,8 +60,6 @@ zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
   - fortran_compiler_version
-  - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
diff --git a/...ler_versionNonecxx_compiler_version13fortran_compiler_version13mpimpichscalarcomplex.yaml b/...ler_versionNonecxx_compiler_version13fortran_compiler_version13mpimpichscalarcomplex.yaml
@@ -7,7 +7,7 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -21,7 +21,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '13'
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:cos7
 fftw:
 - '3'
 fortran_compiler:
@@ -32,8 +32,6 @@ hdf5:
 - 1.14.4
 libblas:
 - 3.9 *netlib
-libcblas:
-- 3.9 *netlib
 liblapack:
 - 3.9 *netlib
 libptscotch:
@@ -62,8 +60,6 @@ zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
   - fortran_compiler_version
-  - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
diff --git a/...mpiler_versionNonecxx_compiler_version13fortran_compiler_version13mpimpichscalarreal.yaml b/...mpiler_versionNonecxx_compiler_version13fortran_compiler_version13mpimpichscalarreal.yaml
@@ -7,7 +7,7 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -21,7 +21,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '13'
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:cos7
 fftw:
 - '3'
 fortran_compiler:
@@ -32,8 +32,6 @@ hdf5:
 - 1.14.4
 libblas:
 - 3.9 *netlib
-libcblas:
-- 3.9 *netlib
 liblapack:
 - 3.9 *netlib
 libptscotch:
@@ -62,8 +60,6 @@ zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
   - fortran_compiler_version
-  - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image