Skip to content

Commit cefd827

Browse files
ranochagiordano
andauthored
allow MKL_jll version 2025 (#314)
* 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]>
1 parent cd4f9b9 commit cefd827

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.github/workflows/CI.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,11 @@ jobs:
4646
# 32-bit Julia binaries are not available on macOS
4747
- os: macOS-latest
4848
arch: x86
49-
# 32-bit Linux binary for MKL isn't always available, let's ignore it
50-
- os: ubuntu-latest
51-
provider: 'mkl'
52-
arch: x86
5349
- provider: 'mkl'
5450
threads: '2'
51+
# MKL 2025 doesn't support i686
52+
- provider: 'mkl'
53+
arch: x86
5554
# Disable various OS-arch combinations that are not available
5655
- os: ubuntu-latest
5756
arch: aarch64

Project.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "FFTW"
22
uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
3-
version = "1.8"
3+
version = "1.8.1"
44

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

0 commit comments

Comments
 (0)