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 index df86cfd65..ba5e25c61 100644 --- 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 @@ -17,7 +17,7 @@ cuda_compiler: cuda_compiler_version: - '12.9' cudnn: -- '9.10' +- '9' cxx_compiler: - gxx cxx_compiler_version: @@ -76,7 +76,6 @@ 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 index 1518e21be..ae65b5e2c 100644 --- 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 @@ -76,7 +76,6 @@ 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 index 38c27f7d9..ec9909281 100644 --- 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 @@ -17,7 +17,7 @@ cuda_compiler: cuda_compiler_version: - '12.9' cudnn: -- '9.10' +- '9' cxx_compiler: - gxx cxx_compiler_version: @@ -76,7 +76,6 @@ 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 index 22425b7bd..8678ee6e0 100644 --- 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 @@ -76,7 +76,6 @@ 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 index 2f89bcc36..3f1420dc5 100644 --- 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 @@ -17,7 +17,7 @@ cuda_compiler: cuda_compiler_version: - '12.9' cudnn: -- '9.10' +- '9' cxx_compiler: - gxx cxx_compiler_version: @@ -74,7 +74,6 @@ 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 index 6798e33df..de49b27a3 100644 --- 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 @@ -74,7 +74,6 @@ zip_keys: - cxx_compiler_version - c_stdlib_version - cuda_compiler_version - - cudnn - - channel_targets - is_rc zlib: diff --git a/.ci_support/migrations/cudnn910.yaml b/.ci_support/migrations/cudnn910.yaml deleted file mode 100644 index 0a657ef15..000000000 --- a/.ci_support/migrations/cudnn910.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# 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/fmt121_spdlog117.yaml b/.ci_support/migrations/fmt121_spdlog117.yaml new file mode 100644 index 000000000..f46fced4a --- /dev/null +++ b/.ci_support/migrations/fmt121_spdlog117.yaml @@ -0,0 +1,10 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for fmt 12.1 and spdlog 1.17 + kind: version + migration_number: 1 +migrator_ts: 1767674179.1402016 +fmt: +- '12.1' +spdlog: +- '1.17' 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 index 6742b21df..5b359f330 100644 --- 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 @@ -13,7 +13,7 @@ cuda_compiler: cuda_compiler_version: - '12.8' cudnn: -- '9.10' +- '9' cxx_compiler: - vs2022 github_actions_labels: @@ -58,7 +58,5 @@ 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 index 5a4749d18..66374482d 100644 --- 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 @@ -58,7 +58,5 @@ target_platform: zip_keys: - - channel_targets - is_rc -- - cuda_compiler_version - - cudnn zlib: - '1' diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 6e7bede8a..0a61c8069 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -259,4 +259,4 @@ jobs: name: ${{ steps.prepare-artifacts.outputs.ENV_ARTIFACT_NAME }} path: ${{ steps.prepare-artifacts.outputs.ENV_ARTIFACT_PATH }} retention-days: 14 - continue-on-error: true + continue-on-error: true \ No newline at end of file diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 361edeb2c..bac7141a9 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -63,6 +63,25 @@ if [[ "${sha:-}" == "" ]]; then sha=$(git rev-parse HEAD) fi +if [[ "${OSX_SDK_DIR:-}" == "" ]]; then + if [[ "${CI:-}" == "" ]]; then + echo "Please set OSX_SDK_DIR to a directory where SDKs can be downloaded to. Aborting" + exit 1 + else + export OSX_SDK_DIR=/opt/conda-sdks + /usr/bin/sudo mkdir -p "${OSX_SDK_DIR}" + /usr/bin/sudo chown "${USER}" "${OSX_SDK_DIR}" + fi +else + if tmpf=$(mktemp -p "$OSX_SDK_DIR" tmp.XXXXXXXX 2>/dev/null); then + rm -f "$tmpf" + echo "OSX_SDK_DIR is writeable without sudo, continuing" + else + echo "User-provided OSX_SDK_DIR is not writeable for current user! Aborting" + exit 1 + fi +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8bd21290b..8fd4414ab 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ # if you wish to build release candidate number X, append the version string with ".rcX" {% set version = "2.8.0" %} -{% set build = 2 %} +{% set build = 3 %} # Use a higher build number for the CUDA variant, to ensure that it's # preferred by conda's solver, and it's preferentially