From 489b7533373af586ab2f30e887f8cc514cee8c14 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 19 Feb 2025 08:54:02 +1100 Subject: [PATCH 1/3] delete obsolete pins --- recipe/conda_build_config.yaml | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml deleted file mode 100644 index 89f80e5..0000000 --- a/recipe/conda_build_config.yaml +++ /dev/null @@ -1,16 +0,0 @@ -m2w64_c_compiler: # [win] - - gcc # [win] -m2w64_c_compiler_version: # [win] - - 13 # [win] -m2w64_cxx_compiler: # [win] - - gxx # [win] -m2w64_cxx_compiler_version: # [win] - - 13 # [win] -m2w64_fortran_compiler: # [win] - - gfortran # [win] -m2w64_fortran_compiler_version: # [win] - - 13 # [win] -m2w64_c_stdlib: # [win] - - m2w64-sysroot # [win] -m2w64_c_stdlib_version: # [win] - - 12 # [win] From e6add9f96ad86ae2f2f09ef125c8652af1d89a33 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 19 Feb 2025 08:55:37 +1100 Subject: [PATCH 2/3] publish pre-release allowing MKL 2025 for building blas --- recipe/conda_build_config.yaml | 5 +++++ recipe/meta.yaml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 0000000..3576f47 --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,5 @@ +mkl_devel: + - 2025 + +channel_targets: + - conda-forge mkl_rc diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ded07b8..d5accdf 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set version = "3.9.0" %} # if build_num is reset to 0 (for new version), update increment for blas_minor below -{% set build_num = 9 %} +{% set build_num = 10 %} {% set version_major = version.split(".")[0] %} # blas_major denotes major infrastructural change to how blas is managed {% set blas_major = "2" %} From 4c91ae5d7b29f72c9f74215ba9f8750a92e0ab36 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 19 Feb 2025 08:57:12 +1100 Subject: [PATCH 3/3] MNT: Re-rendered with conda-build 25.1.2, conda-smithy 3.45.5.dev18+gdfe3c322, and conda-forge-pinning 2025.02.18.15.16.45 --- .ci_support/linux_64_.yaml | 4 ++-- .ci_support/linux_aarch64_.yaml | 4 +--- .ci_support/linux_ppc64le_.yaml | 4 +--- .ci_support/osx_64_.yaml | 4 +--- .ci_support/osx_arm64_.yaml | 4 +--- .ci_support/win_64_.yaml | 4 ++-- README.md | 16 ++++++++-------- 7 files changed, 16 insertions(+), 24 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 9d8a4a4..56a0be9 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -11,7 +11,7 @@ cdt_name: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge mkl_rc docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 fortran_compiler: @@ -27,7 +27,7 @@ liblapack: liblapacke: - 3.9.* *netlib mkl_devel: -- '2024' +- '2025' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index cb323be..6cf8a4b 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -11,7 +11,7 @@ cdt_name: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge mkl_rc docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 fortran_compiler: @@ -26,8 +26,6 @@ liblapack: - 3.9.* *netlib liblapacke: - 3.9.* *netlib -mkl_devel: -- '2024' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 51a0b31..3dc2e0c 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -11,7 +11,7 @@ cdt_name: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge mkl_rc docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 fortran_compiler: @@ -26,8 +26,6 @@ liblapack: - 3.9.* *netlib liblapacke: - 3.9.* *netlib -mkl_devel: -- '2024' target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 5b8d99a..fe195ed 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -13,7 +13,7 @@ c_stdlib_version: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge mkl_rc fortran_compiler: - gfortran fortran_compiler_version: @@ -28,8 +28,6 @@ liblapacke: - 3.9.* *netlib macos_machine: - x86_64-apple-darwin13.4.0 -mkl_devel: -- '2023' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 2b26651..60bf0bd 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -13,7 +13,7 @@ c_stdlib_version: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge mkl_rc fortran_compiler: - gfortran fortran_compiler_version: @@ -28,8 +28,6 @@ liblapacke: - 3.9.* *netlib macos_machine: - arm64-apple-darwin20.0.0 -mkl_devel: -- '2023' target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 19e3dba..a72b8b7 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -5,7 +5,7 @@ c_stdlib: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge mkl_rc fortran_compiler: - flang fortran_compiler_version: @@ -19,6 +19,6 @@ liblapack: liblapacke: - 3.9.* *netlib mkl_devel: -- '2024' +- '2025' target_platform: - win-64 diff --git a/README.md b/README.md index 7e7555f..6e0e0a5 100644 --- a/README.md +++ b/README.md @@ -93,14 +93,14 @@ Current release info Installing lapack ================= -Installing `lapack` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `lapack` from the `conda-forge/label/mkl_rc` channel can be achieved by adding `conda-forge/label/mkl_rc` to your channels with: ``` -conda config --add channels conda-forge +conda config --add channels conda-forge/label/mkl_rc conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `blas, blas-devel, lapack, libblas, libcblas, liblapack, liblapacke, libtmglib` can be installed with `conda`: +Once the `conda-forge/label/mkl_rc` channel has been enabled, `blas, blas-devel, lapack, libblas, libcblas, liblapack, liblapacke, libtmglib` can be installed with `conda`: ``` conda install blas blas-devel lapack libblas libcblas liblapack liblapacke libtmglib @@ -115,26 +115,26 @@ mamba install blas blas-devel lapack libblas libcblas liblapack liblapacke libtm It is possible to list all of the versions of `blas` available on your platform with `conda`: ``` -conda search blas --channel conda-forge +conda search blas --channel conda-forge/label/mkl_rc ``` or with `mamba`: ``` -mamba search blas --channel conda-forge +mamba search blas --channel conda-forge/label/mkl_rc ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search blas --channel conda-forge +mamba repoquery search blas --channel conda-forge/label/mkl_rc # List packages depending on `blas`: -mamba repoquery whoneeds blas --channel conda-forge +mamba repoquery whoneeds blas --channel conda-forge/label/mkl_rc # List dependencies of `blas`: -mamba repoquery depends blas --channel conda-forge +mamba repoquery depends blas --channel conda-forge/label/mkl_rc ```