Skip to content

[3.9.x] pre-release for MKL 2025 #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
h-vetinari merged 3 commits into from
Feb 18, 2025
Merged

[3.9.x] pre-release for MKL 2025 #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
489b753
delete obsolete pins
h-vetinari Feb 18, 2025
e6add9f
publish pre-release allowing MKL 2025 for building blas
h-vetinari Feb 18, 2025
4c91ae5
MNT: Re-rendered with conda-build 25.1.2, conda-smithy 3.45.5.dev18+g…
h-vetinari Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -27,7 +27,7 @@ liblapack:
liblapacke:
- 3.9.* *netlib
mkl_devel:
- '2024'
- '2025'
target_platform:
- linux-64
zip_keys:
Expand Down
4 changes: 1 addition & 3 deletions .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -26,8 +26,6 @@ liblapack:
- 3.9.* *netlib
liblapacke:
- 3.9.* *netlib
mkl_devel:
- '2024'
target_platform:
- linux-aarch64
zip_keys:
Expand Down
4 changes: 1 addition & 3 deletions .ci_support/linux_ppc64le_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -26,8 +26,6 @@ liblapack:
- 3.9.* *netlib
liblapacke:
- 3.9.* *netlib
mkl_devel:
- '2024'
target_platform:
- linux-ppc64le
zip_keys:
Expand Down
4 changes: 1 addition & 3 deletions .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 1 addition & 3 deletions .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -28,8 +28,6 @@ liblapacke:
- 3.9.* *netlib
macos_machine:
- arm64-apple-darwin20.0.0
mkl_devel:
- '2023'
target_platform:
- osx-arm64
zip_keys:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -19,6 +19,6 @@ liblapack:
liblapacke:
- 3.9.* *netlib
mkl_devel:
- '2024'
- '2025'
target_platform:
- win-64
16 changes: 8 additions & 8 deletions README.md
View file
Open in desktop

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

21 changes: 5 additions & 16 deletions recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
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]
mkl_devel:
- 2025

channel_targets:
- conda-forge mkl_rc
2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Open in desktop
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 = 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" %}
Expand Down