Skip to content

Commit e494bf6

Browse files
committed
Fix aarch64 tests
1 parent 3596b4a commit e494bf6

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

test/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ We compile these tests first against vanilla OpenBLAS installations (both LP64 a
66
If available, we will test against `MKL` and `libblas64` as well.
77
If we are on a 64-bit platform, we will build a test case that uses LP64 and ILP64 routines in the same executable.
88

9-
Running these tests currently requires the latest tip of `master` on Julia, to deal with JLL lib paths properly.
9+
Note that these tests require Julia v1.7+, especially on aarch64 where we switched from shipping an LP64 to ILP64 OpenBLAS by default.
1010

1111
Run via:
1212
```
1313
julia --project run-tests.jl
14-
```
14+
```

test/direct.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ lbt_handle = dlopen("$(lbt_prefix)/$(binlib)/lib$(lbt_link_name).$(shlib_ext)",
6161

6262
# First check OpenBLAS_jll which may or may not be ILP64
6363
@test libs[1].libname == OpenBLAS_jll.libopenblas_path
64-
if Sys.WORD_SIZE == 64 && Sys.ARCH != :aarch64
64+
if Sys.WORD_SIZE == 64
6565
@test libs[1].suffix == "64_"
6666
@test libs[1].interface == LBT_INTERFACE_ILP64
6767
else
@@ -120,7 +120,7 @@ end
120120
@test lbt_get_num_threads(lbt_handle) == nthreads
121121

122122
# If we're on a 64-bit system, load OpenBLAS_jll in and cause a mismatch in the threading
123-
if Sys.WORD_SIZE == 64 && Sys.ARCH != :aarch64
123+
if Sys.WORD_SIZE == 64
124124
lbt_forward(lbt_handle, OpenBLAS_jll.libopenblas_path)
125125

126126
lbt_set_num_threads(lbt_handle, 1)

test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ end
9999

100100
# Build version that links against vanilla OpenBLAS
101101
openblas_interface = :LP64
102-
if Sys.WORD_SIZE == 64 && Sys.ARCH != :aarch64
102+
if Sys.WORD_SIZE == 64
103103
openblas_interface = :ILP64
104104
end
105105
openblas_jll_libname = splitext(basename(OpenBLAS_jll.libopenblas_path)[4:end])[1]

0 commit comments

Comments
 (0)