Skip to content

Commit

Permalink
Merge pull request #116 from h-vetinari/impl_bump
Browse files Browse the repository at this point in the history
OpenBLAS 0.3.27 & MKL 2024.1
  • Loading branch information
h-vetinari authored Apr 8, 2024
2 parents 166a641 + 5d5ed76 commit f32074a
Show file tree
Hide file tree
Showing 22 changed files with 81 additions and 21 deletions.
1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -27,3 +31,5 @@ zip_keys:
- blas_impl_lib
- - c_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -27,3 +31,5 @@ zip_keys:
- blas_impl_lib
- - c_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -27,3 +31,5 @@ zip_keys:
- blas_impl_lib
- - c_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
6 changes: 6 additions & 0 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -31,3 +35,5 @@ zip_keys:
- blas_impl_lib
- - c_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
6 changes: 6 additions & 0 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand All @@ -27,3 +31,5 @@ zip_keys:
- blas_impl_lib
- - c_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
channel_sources:
- conda-forge
channel_targets:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
channel_sources:
- conda-forge
channel_targets:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
channel_sources:
- conda-forge
channel_targets:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ blas_impl:
- blis
blas_impl_lib:
- libblis.4.dll
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/win_64_blas_implmklblas_impl_libmkl_rt.2.dll.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ blas_impl:
- mkl
blas_impl_lib:
- mkl_rt.2.dll
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ blas_impl:
- openblas
blas_impl_lib:
- openblas.dll
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
Expand Down
5 changes: 3 additions & 2 deletions .gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/run_win_build.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions azure-pipelines.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions build-locally.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -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 = 21 %}
{% set build_num = 22 %}
{% set version_major = version.split(".")[0] %}
# blas_major denotes major infrastructural change to how blas is managed
{% set blas_major = "2" %}
Expand Down Expand Up @@ -67,9 +67,9 @@ outputs:
build:
- {{ compiler('fortran') }} # [blas_impl == 'accelerate']
host:
- libopenblas 0.3.26 # [blas_impl == 'openblas']
- libopenblas 0.3.27 # [blas_impl == 'openblas']
# from https://github.com/conda-forge/intel_repack-feedstock/
- mkl 2024.0 # [blas_impl == 'mkl']
- mkl 2024.1 # [blas_impl == 'mkl']
- blis 0.9.0 # [blas_impl == 'blis']
run:
- {{ pin_compatible("libopenblas", max_pin="x.x.x", exact=win) }} # [blas_impl == 'openblas']
Expand Down Expand Up @@ -200,11 +200,11 @@ outputs:
string: "{{ build_num }}_{{ build_string_platform }}_{{ blas_impl }}"
requirements:
host:
- openblas 0.3.26 # [blas_impl == "openblas"]
- mkl-devel 2024.0 # [blas_impl == "mkl"]
- openblas 0.3.27 # [blas_impl == "openblas"]
- mkl-devel 2024.1 # [blas_impl == "mkl"]
run:
- openblas 0.3.26 # [blas_impl == "openblas"]
- mkl-devel 2024.0 # [blas_impl == "mkl"]
- openblas 0.3.27 # [blas_impl == "openblas"]
- mkl-devel 2024.1 # [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']
Expand Down

0 comments on commit f32074a

Please sign in to comment.