Skip to content

Commit cccdca2

Browse files
amontoisonstaticfloat
authored andcommitted
libblas.so and liblapack.so could be already installed on the CI computers
1 parent 81730b9 commit cccdca2

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

test/runtests.jl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@ end
129129
run_all_tests("blas32", reverse(ReferenceBLAS32_jll.LIBPATH_list), :LP64, "", tests = [dgemm, sdot])
130130
end
131131

132-
@testset "Vanilla ReferenceBLAS_jll (ILP64)" begin
133-
run_all_tests("blas", reverse(ReferenceBLAS_jll.LIBPATH_list), :ILP64, "", tests = [dgemm, sdot])
134-
end
132+
# @testset "Vanilla ReferenceBLAS_jll (ILP64)" begin
133+
# run_all_tests("blas", reverse(ReferenceBLAS_jll.LIBPATH_list), :ILP64, "", tests = [dgemm, sdot])
134+
# end
135135

136136
# Next, build a version that links against `libblastrampoline`, and tell
137137
# the trampoline to forwards calls to `OpenBLAS_jll`
@@ -184,6 +184,7 @@ end
184184
run_all_tests(blastrampoline_link_name(), libdirs, :LP64, string(ReferenceBLAS32_jll.libblas32_path, ";", LAPACK32_jll.liblapack32_path); tests = [dgemm, dpstrf, sgesv, sdot])
185185
end
186186

187+
# Disabling these tests for now, until we rename `libblas.so` and `liblapack.so` to `libblas64.so` and `liblapack64.so` in Yggdrasil.
187188
# @testset "LBT -> ReferenceBLAS_jll / LAPACK_jll (ILP64)" begin
188189
# libdirs = unique(vcat(lbt_dir, ReferenceBLAS_jll.LIBPATH_list..., LAPACK_jll.LIBPATH_list..., CompilerSupportLibraries_jll.LIBPATH_list...))
189190
# run_all_tests(blastrampoline_link_name(), libdirs, :ILP64, string(ReferenceBLAS_jll.libblas_path, ";", LAPACK_jll.liblapack_path); tests = [dgemm, dpstrf, sgesv, sdot])
@@ -197,6 +198,7 @@ if MKL_jll.is_available()
197198
if Sys.ARCH == :i686
198199
extra_env["LBT_FORCE_RETSTYLE"] = "ARGUMENT"
199200
end
201+
200202
@testset "LBT -> MKL_jll (LP64)" begin
201203
libdirs = unique(vcat(lbt_dir, MKL_jll.LIBPATH_list..., CompilerSupportLibraries_jll.LIBPATH_list...))
202204
run_all_tests(blastrampoline_link_name(), libdirs, :LP64, MKL_jll.libmkl_rt_path; tests = [dgemm, dgemmt, dpstrf, sgesv, sdot, cdotc], extra_env)

0 commit comments

Comments
 (0)