diff --git a/Project.toml b/Project.toml index ea64a3d5..3ff7be3b 100644 --- a/Project.toml +++ b/Project.toml @@ -7,6 +7,7 @@ Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b" +SuiteSparse_jll = "bea87d4a-7f5b-5778-9afe-8cc45184846c" [compat] diff --git a/src/solvers/LibSuiteSparse.jl b/src/solvers/LibSuiteSparse.jl index 3511a4ac..7154ab2e 100644 --- a/src/solvers/LibSuiteSparse.jl +++ b/src/solvers/LibSuiteSparse.jl @@ -1,19 +1,6 @@ module LibSuiteSparse -# using SuiteSparse_jll (move to this when stdlibs have full support for jlls) -const libumfpack = :libumfpack -const libcholmod = :libcholmod -const libspqr = :libspqr - -# Special treatment for Win64 since Clong is 32-bit on Win64 -# LONG_MAX is used everywhere, except on Win64 -# See discussion in https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/master/SuiteSparse_config/SuiteSparse_config.h -# if Sys.iswindows() && Sys.ARCH === :x86_64 -# const __int64 = Clonglong -# const _I64_MAX = typemax(Clonglong) -# else -# const LONG_MAX = typemax(Clong) -# end +using SuiteSparse_jll if Sys.WORD_SIZE == 64 const SuiteSparse_long = Clonglong