Skip to content

Use SuiteSparse_jll for LibSuiteSparse.jl #378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 3, 2023
Merged

Use SuiteSparse_jll for LibSuiteSparse.jl #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
15 changes: 1 addition & 14 deletions src/solvers/LibSuiteSparse.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down