Merge pull request #432 from h-vetinari/cudnn

h-vetinari · web-flow · commit f003394e4885 · 2025-11-03T00:04:41.000+11:00
Unpin cudnn again; build against mkl v2025; switch win to llvm-openmp
diff --git a/.ci_support/linux_64_blas_implgenericchannel_targetsconda-forge_maincuda_compiler_version12.9is_rcFalse.yaml b/.ci_support/linux_64_blas_implgenericchannel_targetsconda-forge_maincuda_compiler_version12.9is_rcFalse.yaml
@@ -16,6 +16,8 @@ cuda_compiler:
 - cuda-nvcc
 cuda_compiler_version:
 - '12.9'
+cudnn:
+- '9.10'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -45,7 +47,9 @@ magma:
 megabuild:
 - true
 mkl:
-- '2024'
+- '2025'
+mkl_devel:
+- '2025'
 nccl:
 - '2'
 numpy:
@@ -72,6 +76,7 @@ zip_keys:
   - cxx_compiler_version
   - c_stdlib_version
   - cuda_compiler_version
+  - cudnn
 - - channel_targets
   - is_rc
 zlib:
diff --git a/.ci_support/linux_64_blas_implgenericchannel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml b/.ci_support/linux_64_blas_implgenericchannel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml
@@ -16,6 +16,8 @@ cuda_compiler:
 - cuda-nvcc
 cuda_compiler_version:
 - None
+cudnn:
+- '9'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -45,7 +47,9 @@ magma:
 megabuild:
 - true
 mkl:
-- '2024'
+- '2025'
+mkl_devel:
+- '2025'
 nccl:
 - '2'
 numpy:
@@ -72,6 +76,7 @@ zip_keys:
   - cxx_compiler_version
   - c_stdlib_version
   - cuda_compiler_version
+  - cudnn
 - - channel_targets
   - is_rc
 zlib:
diff --git a/.ci_support/linux_64_blas_implmklchannel_targetsconda-forge_maincuda_compiler_version12.9is_rcFalse.yaml b/.ci_support/linux_64_blas_implmklchannel_targetsconda-forge_maincuda_compiler_version12.9is_rcFalse.yaml
@@ -16,6 +16,8 @@ cuda_compiler:
 - cuda-nvcc
 cuda_compiler_version:
 - '12.9'
+cudnn:
+- '9.10'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -45,7 +47,9 @@ magma:
 megabuild:
 - true
 mkl:
-- '2024'
+- '2025'
+mkl_devel:
+- '2025'
 nccl:
 - '2'
 numpy:
@@ -72,6 +76,7 @@ zip_keys:
   - cxx_compiler_version
   - c_stdlib_version
   - cuda_compiler_version
+  - cudnn
 - - channel_targets
   - is_rc
 zlib:
diff --git a/.ci_support/linux_64_blas_implmklchannel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml b/.ci_support/linux_64_blas_implmklchannel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml
@@ -16,6 +16,8 @@ cuda_compiler:
 - cuda-nvcc
 cuda_compiler_version:
 - None
+cudnn:
+- '9'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -45,7 +47,9 @@ magma:
 megabuild:
 - true
 mkl:
-- '2024'
+- '2025'
+mkl_devel:
+- '2025'
 nccl:
 - '2'
 numpy:
@@ -72,6 +76,7 @@ zip_keys:
   - cxx_compiler_version
   - c_stdlib_version
   - cuda_compiler_version
+  - cudnn
 - - channel_targets
   - is_rc
 zlib:
diff --git a/.ci_support/linux_aarch64_channel_targetsconda-forge_maincuda_compiler_version12.9is_rcFalse.yaml b/.ci_support/linux_aarch64_channel_targetsconda-forge_maincuda_compiler_version12.9is_rcFalse.yaml
@@ -16,6 +16,8 @@ cuda_compiler:
 - cuda-nvcc
 cuda_compiler_version:
 - '12.9'
+cudnn:
+- '9.10'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -45,7 +47,7 @@ magma:
 megabuild:
 - true
 mkl:
-- '2024'
+- '2025'
 nccl:
 - '2'
 numpy:
@@ -72,6 +74,7 @@ zip_keys:
   - cxx_compiler_version
   - c_stdlib_version
   - cuda_compiler_version
+  - cudnn
 - - channel_targets
   - is_rc
 zlib:
diff --git a/.ci_support/linux_aarch64_channel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml b/.ci_support/linux_aarch64_channel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml
@@ -16,6 +16,8 @@ cuda_compiler:
 - cuda-nvcc
 cuda_compiler_version:
 - None
+cudnn:
+- '9'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -45,7 +47,7 @@ magma:
 megabuild:
 - true
 mkl:
-- '2024'
+- '2025'
 nccl:
 - '2'
 numpy:
@@ -72,6 +74,7 @@ zip_keys:
   - cxx_compiler_version
   - c_stdlib_version
   - cuda_compiler_version
+  - cudnn
 - - channel_targets
   - is_rc
 zlib:
diff --git a/.ci_support/migrations/cuda129.yaml b/.ci_support/migrations/cuda129.yaml
@@ -16,8 +16,8 @@ __migrator:
     cuda_compiler_version:
       - 12.4
       - 12.6
-      - 12.8
       - None
+      - 12.8
       - 12.9
       - 13.0
       # to allow manual opt-in for CUDA 11.8, see
@@ -51,6 +51,9 @@ cuda_compiler_version:         # [((linux and (x86_64 or aarch64)) or win64) and
 cuda_compiler_version_min:     # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
   - 12.9                       # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
 
+cudnn:                         # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
+  - 9                          # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
+
 c_stdlib_version:              # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
   - 2.17                       # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
 
diff --git a/.ci_support/migrations/cudnn910.yaml b/.ci_support/migrations/cudnn910.yaml
@@ -0,0 +1,34 @@
+# needs to be ordered before CUDA 13.0 migrator
+migrator_ts: 1755016000
+__migrator:
+  kind:
+    version
+  migration_number:
+    1
+  build_number:
+    1
+  ordering:
+    cudnn:
+      - None
+      - 9
+      - 9.10
+  commit_message: |
+    Rebuild for cudnn 9.10
+    
+    Conda-forge assumed cudnn 9.x builds would stay compatible with each other.
+    This is the case for the API/ABI of the library, but nvidia dropped support
+    for older GPU architectures in cudnn 9.11. Since we have no package-level
+    metadata about compatibility with specific GPU architectures, this effectively
+    breaks all packages built atop cudnn for users on affected older GPUs.
+    
+    In order to remedy this situation, we need to rebuild all cudnn-dependent
+    feedstocks against cudnn 9.10 (the last version with full architecture support),
+    before we mark all those newer cudnn builds as broken. This only affects artefacts
+    for CUDA 12.x; those for CUDA 13.x are not affected, since CUDA 13 never supported
+    those older architectures in the first place.
+    
+    For more details see: https://github.com/conda-forge/cudnn-feedstock/issues/124
+
+cudnn:
+  - None
+  - 9.10                       # [((linux and not ppc64le) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
diff --git a/.ci_support/migrations/mkl2025.yaml b/.ci_support/migrations/mkl2025.yaml
@@ -0,0 +1,10 @@
+__migrator:
+  build_number: 1
+  commit_message: Rebuild for mkl 2025
+  kind: version
+  migration_number: 1
+migrator_ts: 1731082955.2367358
+mkl:
+- '2025'
+mkl_devel:
+- '2025'
diff --git a/.ci_support/migrations/python313.yaml b/.ci_support/migrations/python313.yaml
diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.10.____cpython.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.10.____cpython.yaml
@@ -48,6 +48,8 @@ megabuild:
 - false
 mkl:
 - '2023'
+mkl_devel:
+- '2023'
 numpy:
 - '2'
 orc:
diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.11.____cpython.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.11.____cpython.yaml
@@ -48,6 +48,8 @@ megabuild:
 - false
 mkl:
 - '2023'
+mkl_devel:
+- '2023'
 numpy:
 - '2'
 orc:
diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.12.____cpython.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.12.____cpython.yaml
@@ -48,6 +48,8 @@ megabuild:
 - false
 mkl:
 - '2023'
+mkl_devel:
+- '2023'
 numpy:
 - '2'
 orc:
diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.13.____cp313.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.13.____cp313.yaml
@@ -48,6 +48,8 @@ megabuild:
 - false
 mkl:
 - '2023'
+mkl_devel:
+- '2023'
 numpy:
 - '2'
 orc:
diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.10.____cpython.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.10.____cpython.yaml
@@ -48,6 +48,8 @@ megabuild:
 - false
 mkl:
 - '2023'
+mkl_devel:
+- '2023'
 numpy:
 - '2'
 orc:
diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.11.____cpython.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.11.____cpython.yaml
@@ -48,6 +48,8 @@ megabuild:
 - false
 mkl:
 - '2023'
+mkl_devel:
+- '2023'
 numpy:
 - '2'
 orc:
diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.12.____cpython.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.12.____cpython.yaml
@@ -48,6 +48,8 @@ megabuild:
 - false
 mkl:
 - '2023'
+mkl_devel:
+- '2023'
 numpy:
 - '2'
 orc:
diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.13.____cp313.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.13.____cp313.yaml
@@ -48,6 +48,8 @@ megabuild:
 - false
 mkl:
 - '2023'
+mkl_devel:
+- '2023'
 numpy:
 - '2'
 orc:
diff --git a/.ci_support/win_64_channel_targetsconda-forge_maincuda_compiler_version12.8is_rcFalse.yaml b/.ci_support/win_64_channel_targetsconda-forge_maincuda_compiler_version12.8is_rcFalse.yaml
@@ -12,6 +12,8 @@ cuda_compiler:
 - cuda-nvcc
 cuda_compiler_version:
 - '12.8'
+cudnn:
+- '9.10'
 cxx_compiler:
 - vs2022
 github_actions_labels:
@@ -31,7 +33,9 @@ magma:
 megabuild:
 - true
 mkl:
-- '2024'
+- '2025'
+mkl_devel:
+- '2025'
 numpy:
 - '2'
 orc:
@@ -54,5 +58,7 @@ target_platform:
 zip_keys:
 - - channel_targets
   - is_rc
+- - cuda_compiler_version
+  - cudnn
 zlib:
 - '1'
diff --git a/.ci_support/win_64_channel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml b/.ci_support/win_64_channel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml
diff --git a/conda-forge.yml b/conda-forge.yml
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
diff --git a/recipe/patches/0018-Use-Intel-LLVM-openmp.patch b/recipe/patches/0018-Use-Intel-LLVM-openmp.patch
