Merge pull request #62 from JuliaMath/vs/macos13.4

Prepare for releasing with macOS 13.4

Author: ViralBShah

.github/workflows/CI.yml

@@ -17,6 +17,7 @@ jobs:
           - 'nightly'
         os:
           - macOS-13
+          - macOS-12
           - ubuntu-latest
           - windows-latest
         arch:

Project.toml

@@ -3,15 +3,11 @@ uuid = "13e28ba4-7ad8-5781-acae-3021b1ed3924"
 version = "0.4.0"
 
 [deps]
-LAPACK32_jll = "17f450c3-bd24-55df-bb84-8c51b4b939e3"
-LAPACK_jll = "51474c39-65e3-53ba-86ba-03b1b862ec14"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 
 [compat]
 julia = "1.9"
-LAPACK32_jll = "3.11"
-LAPACK_jll = "3.11"
 
 [extras]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

README.md

@@ -11,7 +11,7 @@ The performance is significantly better than using standard libm functions in so
 
 ## OS Requirements
 
-MacOS 13.3 is required in order to run AppleAccelerate.jl, especially for the libblastrampoline forwarding. On older MacOS versions, your mileage may vary.
+MacOS 13.4 is required in order to run AppleAccelerate.jl, especially for the libblastrampoline forwarding. On older MacOS versions, your mileage may vary.
 
 ## Supported Functions
 

src/AppleAccelerate.jl

@@ -1,7 +1,7 @@
 module AppleAccelerate
 
-using LinearAlgebra
-using Libdl, LAPACK_jll, LAPACK32_jll
+using LinearAlgebra, Libdl
+#using LAPACK_jll, LAPACK32_jll # Needed if use_external_lapack == true
 
 # For now, only use BLAS from Accelerate (that is to say, vecLib)
 global const libacc = "/System/Library/Frameworks/Accelerate.framework/Accelerate"
@@ -44,7 +44,7 @@ function load_accelerate(;clear::Bool = true, verbose::Bool = false, load_ilp64:
 
     # Check to see if we can load ILP64 symbols
     if load_ilp64 && dlsym_e(libacc_hdl, "dgemm\$NEWLAPACK\$ILP64") == C_NULL
-        error("Unable to load ILP64 interface from '$(libacc)'; You are running macOS version $(get_macos_version()), you need v13.3+")
+        error("Unable to load ILP64 interface from '$(libacc)'; You are running macOS version $(get_macos_version()), you need v13.4+")
     end
 
     # First, load :lp64 symbols, optionally clearing the current LBT forwarding tables
@@ -82,13 +82,13 @@ function get_macos_version()
 end
 
 function __init__()
-    # Default to loading the ILP64 interface on macOS 13.3+
+    Sys.isapple() || return
     ver = get_macos_version()
-    ver == nothing && return
-    load_ilp64 = ver >= v"13.3"
-    # dsptrf has a bug in the initial release of the $NEWLAPACK symbols, so if we're
-    # on a version older than macOS 13.4, use an external LAPACK:
-    load_accelerate(; load_ilp64, use_external_lapack = ver < v"13.4")
+    # Default to loading the ILP64 interface on macOS 13.3+
+    # dsptrf has a bug in the initial release of the $NEWLAPACK symbols in 13.3.
+    # Thus use macOS 13.4 for ILP64 and a correct LAPACK
+    ver < v"13.4" && return
+    load_accelerate(; load_ilp64=true, use_external_lapack=false)
 end
 
 if Sys.isapple()

test/runtests.jl

@@ -295,12 +295,15 @@ display(config.loaded_libs)
 
 using Test
 @testset "Accelerate Forwarding Sanity Tests" begin
-    @test LinearAlgebra.peakflops() > 0
-    @test endswith(BLAS.lbt_find_backing_library("dgemm_", :lp64).libname, "Accelerate")
-    @test endswith(BLAS.lbt_find_backing_library("dgemm_", :ilp64).libname, "Accelerate")
-
-    # Accelerate has `_rook` symbols:
-    @test endswith(BLAS.lbt_find_backing_library("dsytrf_rook_", :ilp64).libname, "Accelerate")
+    ver = AppleAccelerate.get_macos_version()
+    if ver >= v"13.4"
+        @test LinearAlgebra.peakflops() > 0
+        @test endswith(BLAS.lbt_find_backing_library("dgemm_", :lp64).libname, "Accelerate")
+        @test endswith(BLAS.lbt_find_backing_library("dgemm_", :ilp64).libname, "Accelerate")
+
+        # Accelerate has `_rook` symbols:
+        @test endswith(BLAS.lbt_find_backing_library("dsytrf_rook_", :ilp64).libname, "Accelerate")
+    end
 end
 
 @testset "CBLAS dot test" begin