Skip to content

Commit 2ca6b0c

Browse files
authored
Merge pull request #71 from JuliaMath/vs/intel-mac
Use older MKL on Intel Macs
2 parents 679f02d + b4d591f commit 2ca6b0c

File tree

5 files changed

+20
-49
lines changed

5 files changed

+20
-49
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
version:
1616
- "1.6"
17-
- "1.8"
17+
- "1"
1818
os:
1919
- ubuntu-latest
2020
- macOS-latest

.github/workflows/nightly.yml

Lines changed: 0 additions & 43 deletions
This file was deleted.

Project.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
name = "IntelVectorMath"
22
uuid = "c8ce9da6-5d36-5c03-b118-5a70151be7bc"
3-
version = "0.5.2"
3+
version = "0.5.3"
44

55
[deps]
66
MKL_jll = "856f044c-d86e-5d09-b602-aeab76dc8ba7"
77

88
[compat]
9-
julia = "1.3"
10-
MKL_jll = "2021, 2022, 2023, 2024"
9+
julia = "1.6"
10+
MKL_jll = "2022, 2023.2, 2024"
1111

1212
[extras]
1313
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1414
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
15-
15+
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
1616

1717
[targets]
18-
test = ["Test", "SpecialFunctions"]
18+
test = ["Test", "SpecialFunctions", "Pkg"]

test/Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ CpuId = "adafc99b-e345-5852-983c-f28acb93d879"
33
MKL_jll = "856f044c-d86e-5d09-b602-aeab76dc8ba7"
44
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
55
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
6+
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"

test/runtests.jl

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
1+
import Pkg
2+
using Pkg
3+
4+
if Sys.isapple() && Sys.ARCH == :x86_64
5+
Pkg.add(name="MKL_jll", version="2023");
6+
Pkg.pin(name="MKL_jll", version="2023");
7+
end
8+
19
import MKL_jll
10+
if !MKL_jll.is_available()
11+
@warn "MKL is not available/installed. Exiting."
12+
exit()
13+
end
14+
215
using Test
316
using IntelVectorMath
417
using SpecialFunctions

0 commit comments

Comments
 (0)