Skip to content

Commit e3753ce

Browse files
committed
Set macOS min version to 3.13
Use LAPACK 3.11 Run tests only on Apple Set compat to Julia 1.9 Add Statistics and DSP for tests Re-enable Windows tests to make sure that AppleAccelerate loads without error and is a no-op
1 parent e821d32 commit e3753ce

File tree

9 files changed

+955
-183
lines changed

9 files changed

+955
-183
lines changed

.github/workflows/CI.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
- '1'
1717
- 'nightly'
1818
os:
19+
- macOS-13
1920
- ubuntu-latest
20-
- macOS-12
21-
# - windows-latest
21+
- windows-latest
2222
arch:
2323
- x64
2424
steps:

Manifest.toml

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

Project.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
99
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1010

1111
[compat]
12-
julia = "1.10"
12+
julia = "1.9"
13+
LAPACK32_jll = "3.11"
14+
LAPACK_jll = "3.11"
1315

1416
[extras]
1517
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
@@ -20,7 +22,9 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
2022
Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
2123
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
2224
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
25+
DSP = "717857b8-e6f2-59f4-9121-6e50c889abd2"
26+
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
2327
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
2428

2529
[targets]
26-
test = ["Dates", "Distributed", "Printf", "Random", "REPL", "Sockets", "SparseArrays", "SpecialFunctions", "Test"]
30+
test = ["Dates", "Distributed", "Printf", "Random", "REPL", "Sockets", "SparseArrays", "SpecialFunctions", "DSP", "Statistics", "Test"]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ functions, though there does appear to be some reduced accuracy.
1212

1313
## OS Requirements
1414

15-
MacOS 12 is required in order to run AppleAccelerate.jl. On older MacOS versions, your mileage may vary.
15+
MacOS 13.3 is required in order to run AppleAccelerate.jl. On older MacOS versions, your mileage may vary.
1616

1717
## Supported Functions
1818

src/AppleAccelerate.jl

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function load_accelerate(;clear::Bool = true, verbose::Bool = false, load_ilp64:
5858
if load_ilp64
5959
BLAS.lbt_forward(LAPACK_jll.liblapack_path; suffix_hint="64_", verbose)
6060
end
61-
BLAS.lbt_forward(LAPACK32_jll.liblapack_path; verbose)
61+
BLAS.lbt_forward(LAPACK32_jll.liblapack32_path; verbose)
6262
end
6363
end
6464

@@ -84,10 +84,17 @@ end
8484
function __init__()
8585
# Default to loading the ILP64 interface on macOS 13.3+
8686
ver = get_macos_version()
87-
load_ilp64 = ver !== nothing && ver >= v"13.3"
87+
ver == nothing && return
88+
load_ilp64 = ver >= v"13.3"
8889
# dsptrf has a bug in the initial release of the $NEWLAPACK symbols, so if we're
8990
# on a version older than macOS 13.4, use an external LAPACK:
9091
load_accelerate(; load_ilp64, use_external_lapack = ver < v"13.4")
9192
end
9293

94+
if Sys.isapple()
95+
include("Array.jl")
96+
include("DSP.jl")
97+
include("Util.jl")
98+
end
99+
93100
end # module

0 commit comments

Comments
 (0)