Merge pull request #81 from haasad/bump/MKL-2022.0

Update MKL to 2022.0 build
conda-forge · Jan 19, 2022 · 064c846 · 064c846
2 parents 7dc8c18 + da35b9a
commit 064c846
Show file tree

Hide file tree

Showing 18 changed files with 12 additions and 60 deletions.
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_blas_implblisblas_impl_liblibblis.so.3.yaml b/.ci_support/linux_64_blas_implblisblas_impl_liblibblis.so.3.yaml
@@ -20,10 +20,6 @@ fortran_compiler:
 - gfortran
 fortran_compiler_version:
 - '9'
-mkl_devel:
-- '2021'
-openblas:
-- 0.3.*
 target_platform:
 - linux-64
 zip_keys:

diff --git a/.ci_support/linux_64_blas_implmklblas_impl_liblibmkl_rt.so.yaml b/.ci_support/linux_64_blas_implmklblas_impl_liblibmkl_rt.so.yaml
@@ -20,10 +20,6 @@ fortran_compiler:
 - gfortran
 fortran_compiler_version:
 - '9'
-mkl_devel:
-- '2021'
-openblas:
-- 0.3.*
 target_platform:
 - linux-64
 zip_keys:

diff --git a/.ci_support/linux_64_blas_implopenblasblas_impl_liblibopenblas.so.0.yaml b/.ci_support/linux_64_blas_implopenblasblas_impl_liblibopenblas.so.0.yaml
@@ -20,10 +20,6 @@ fortran_compiler:
 - gfortran
 fortran_compiler_version:
 - '9'
-mkl_devel:
-- '2021'
-openblas:
-- 0.3.*
 target_platform:
 - linux-64
 zip_keys:

diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -24,8 +24,6 @@ fortran_compiler:
 - gfortran
 fortran_compiler_version:
 - '9'
-openblas:
-- 0.3.*
 target_platform:
 - linux-aarch64
 zip_keys:

diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
@@ -20,8 +20,6 @@ fortran_compiler:
 - gfortran
 fortran_compiler_version:
 - '9'
-openblas:
-- 0.3.*
 target_platform:
 - linux-ppc64le
 zip_keys:

diff --git a/.ci_support/osx_64_blas_implaccelerateblas_impl_liblibvecLibFort-ng.dylib.yaml b/.ci_support/osx_64_blas_implaccelerateblas_impl_liblibvecLibFort-ng.dylib.yaml
@@ -20,10 +20,6 @@ fortran_compiler_version:
 - '9'
 macos_machine:
 - x86_64-apple-darwin13.4.0
-mkl_devel:
-- '2021'
-openblas:
-- 0.3.*
 target_platform:
 - osx-64
 zip_keys:

diff --git a/.ci_support/osx_64_blas_implblisblas_impl_liblibblis.3.dylib.yaml b/.ci_support/osx_64_blas_implblisblas_impl_liblibblis.3.dylib.yaml
@@ -20,10 +20,6 @@ fortran_compiler_version:
 - '9'
 macos_machine:
 - x86_64-apple-darwin13.4.0
-mkl_devel:
-- '2021'
-openblas:
-- 0.3.*
 target_platform:
 - osx-64
 zip_keys:

diff --git a/.ci_support/osx_64_blas_implmklblas_impl_liblibmkl_rt.dylib.yaml b/.ci_support/osx_64_blas_implmklblas_impl_liblibmkl_rt.dylib.yaml
@@ -20,10 +20,6 @@ fortran_compiler_version:
 - '9'
 macos_machine:
 - x86_64-apple-darwin13.4.0
-mkl_devel:
-- '2021'
-openblas:
-- 0.3.*
 target_platform:
 - osx-64
 zip_keys:

diff --git a/.ci_support/osx_64_blas_implopenblasblas_impl_liblibopenblas.0.dylib.yaml b/.ci_support/osx_64_blas_implopenblasblas_impl_liblibopenblas.0.dylib.yaml
@@ -20,10 +20,6 @@ fortran_compiler_version:
 - '9'
 macos_machine:
 - x86_64-apple-darwin13.4.0
-mkl_devel:
-- '2021'
-openblas:
-- 0.3.*
 target_platform:
 - osx-64
 zip_keys:

diff --git a/.ci_support/osx_arm64_blas_implaccelerateblas_impl_liblibvecLibFort-ng.dylib.yaml b/.ci_support/osx_arm64_blas_implaccelerateblas_impl_liblibvecLibFort-ng.dylib.yaml
@@ -20,8 +20,6 @@ fortran_compiler_version:
 - '11'
 macos_machine:
 - arm64-apple-darwin20.0.0
-openblas:
-- 0.3.*
 target_platform:
 - osx-arm64
 zip_keys:

diff --git a/.ci_support/osx_arm64_blas_implopenblasblas_impl_liblibopenblas.0.dylib.yaml b/.ci_support/osx_arm64_blas_implopenblasblas_impl_liblibopenblas.0.dylib.yaml
@@ -20,8 +20,6 @@ fortran_compiler_version:
 - '11'
 macos_machine:
 - arm64-apple-darwin20.0.0
-openblas:
-- 0.3.*
 target_platform:
 - osx-arm64
 zip_keys:

diff --git a/.ci_support/win_64_blas_implblisblas_impl_liblibblis.3.dll.yaml b/.ci_support/win_64_blas_implblisblas_impl_liblibblis.3.dll.yaml
@@ -12,10 +12,6 @@ m2w64_c_compiler:
 - m2w64-toolchain
 m2w64_fortran_compiler:
 - m2w64-toolchain
-mkl_devel:
-- '2021'
-openblas:
-- 0.3.*
 target_platform:
 - win-64
 zip_keys:

diff --git a/...las_implmklblas_impl_libmkl_rt.1.dll.yaml → ...las_implmklblas_impl_libmkl_rt.2.dll.yaml b/...las_implmklblas_impl_libmkl_rt.1.dll.yaml → ...las_implmklblas_impl_libmkl_rt.2.dll.yaml
@@ -3,7 +3,7 @@ blas_default_impl:
 blas_impl:
 - mkl
 blas_impl_lib:
-- mkl_rt.1.dll
+- mkl_rt.2.dll
 channel_sources:
 - conda-forge
 channel_targets:
@@ -12,10 +12,6 @@ m2w64_c_compiler:
 - m2w64-toolchain
 m2w64_fortran_compiler:
 - m2w64-toolchain
-mkl_devel:
-- '2021'
-openblas:
-- 0.3.*
 target_platform:
 - win-64
 zip_keys:

diff --git a/.ci_support/win_64_blas_implopenblasblas_impl_libopenblas.dll.yaml b/.ci_support/win_64_blas_implopenblasblas_impl_libopenblas.dll.yaml
@@ -12,10 +12,6 @@ m2w64_c_compiler:
 - m2w64-toolchain
 m2w64_fortran_compiler:
 - m2w64-toolchain
-mkl_devel:
-- '2021'
-openblas:
-- 0.3.*
 target_platform:
 - win-64
 zip_keys:

diff --git a/README.md b/README.md
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -11,7 +11,7 @@ blas_impl_lib:
 
 - libmkl_rt.so             # [linux64]
 - libmkl_rt.dylib          # [osx and x86_64]
-- mkl_rt.1.dll             # [win64]
+- mkl_rt.2.dll             # [win64]
 
 - libblis.so.3             # [linux64]
 - libblis.3.dylib          # [osx and x86_64]

diff --git 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 = 12 %}
+{% set build_num = 13 %}
 {% set version_major = version.split(".")[0] %}
 # blas_major denotes major infrastructural change to how blas is managed
 {% set blas_major = "2" %}
@@ -69,7 +69,7 @@ outputs:
       host:
         - libopenblas 0.3.18   # [blas_impl == 'openblas']
         # from https://github.com/conda-forge/intel_repack-feedstock/
-        - mkl 2021.4           # [blas_impl == 'mkl']
+        - mkl 2022.0           # [blas_impl == 'mkl']
         - blis 0.8.1           # [blas_impl == 'blis']
       run:
         - {{ pin_compatible("libopenblas", max_pin="x.x.x", exact=win) }}  # [blas_impl == 'openblas']
@@ -198,11 +198,11 @@ outputs:
       string: "{{ build_num }}_{{ build_string_platform }}_{{ blas_impl }}"
     requirements:
       host:
-        - openblas   # [blas_impl == "openblas"]
-        - mkl-devel  # [blas_impl == "mkl"]
+        - openblas   0.3.18  # [blas_impl == "openblas"]
+        - mkl-devel  2022.0  # [blas_impl == "mkl"]
       run:
-        - openblas   # [blas_impl == "openblas"]
-        - mkl-devel  # [blas_impl == "mkl"]
+        - openblas   0.3.18  # [blas_impl == "openblas"]
+        - mkl-devel  2022.0  # [blas_impl == "mkl"]
         - {{ pin_subpackage("liblapack", exact=True) }}      # [blas_impl != 'blis']
         - {{ pin_subpackage("liblapacke", exact=True) }}     # [blas_impl != 'blis']
         - liblapack  {{ version }} *netlib                   # [blas_impl == 'blis']