Merge pull request #71 from JuliaMath/vs/intel-mac

Use older MKL on Intel Macs
JuliaMath · Feb 23, 2024 · 2ca6b0c · 2ca6b0c
2 parents 679f02d + b4d591f
commit 2ca6b0c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 49 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         version:
           - "1.6"
-          - "1.8"
+          - "1"
         os:
           - ubuntu-latest
           - macOS-latest

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
diff --git a/Project.toml b/Project.toml
@@ -1,18 +1,18 @@
 name = "IntelVectorMath"
 uuid = "c8ce9da6-5d36-5c03-b118-5a70151be7bc"
-version = "0.5.2"
+version = "0.5.3"
 
 [deps]
 MKL_jll = "856f044c-d86e-5d09-b602-aeab76dc8ba7"
 
 [compat]
-julia = "1.3"
-MKL_jll = "2021, 2022, 2023, 2024"
+julia = "1.6"
+MKL_jll = "2022, 2023.2, 2024"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
-
+Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
 [targets]
-test = ["Test", "SpecialFunctions"]
+test = ["Test", "SpecialFunctions", "Pkg"]
diff --git a/test/Project.toml b/test/Project.toml
@@ -3,3 +3,4 @@ CpuId = "adafc99b-e345-5852-983c-f28acb93d879"
 MKL_jll = "856f044c-d86e-5d09-b602-aeab76dc8ba7"
 SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,4 +1,17 @@
+import Pkg
+using Pkg
+
+if Sys.isapple() && Sys.ARCH == :x86_64
+    Pkg.add(name="MKL_jll", version="2023");
+    Pkg.pin(name="MKL_jll", version="2023");
+end
+
 import MKL_jll
+if !MKL_jll.is_available()
+    @warn "MKL is not available/installed. Exiting."
+    exit()
+end
+
 using Test
 using IntelVectorMath
 using SpecialFunctions