Skip to content

Commit

Permalink
allow MKL_jll version 2025 (#314)
Browse files Browse the repository at this point in the history 
* allow MKL_jll version 2025

* bump version

* disable x86 with MKL in CI tests

* Apply suggestions from code review

Co-authored-by: Mosè Giordano <[email protected]>

* simplify exclusion rules in CI

---------

Co-authored-by: Mosè Giordano <[email protected]>
  • Loading branch information
@ranocha @giordano
ranocha and giordano authored Jan 22, 2025
1 parent cd4f9b9 commit cefd827
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/CI.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,11 @@ jobs:
# 32-bit Julia binaries are not available on macOS
- os: macOS-latest
arch: x86
# 32-bit Linux binary for MKL isn't always available, let's ignore it
- os: ubuntu-latest
provider: 'mkl'
arch: x86
- provider: 'mkl'
threads: '2'
# MKL 2025 doesn't support i686
- provider: 'mkl'
arch: x86
# Disable various OS-arch combinations that are not available
- os: ubuntu-latest
arch: aarch64
Expand Down
4 changes: 2 additions & 2 deletions Project.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "FFTW"
uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
version = "1.8"
version = "1.8.1"

[deps]
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
Expand All @@ -14,7 +14,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
AbstractFFTs = "1.5"
FFTW_jll = "3.3.9"
LinearAlgebra = "<0.0.1, 1"
MKL_jll = "2019.0.117, 2020, 2021, 2022, 2023, 2024"
MKL_jll = "2019.0.117, 2020, 2021, 2022, 2023, 2024, 2025"
Preferences = "1.2"
Reexport = "0.2, 1.0"
julia = "1.6"

2 comments on commit cefd827

@giordano
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/123511

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v1.8.1 -m "<description of version>" cefd8272f4c89bd8ee6a6c1e396768b98c063b5a
git push origin v1.8.1

Please sign in to comment.