Skip to content

Commit 21ef90c

Browse files
committed
Update wrappers
1 parent c575811 commit 21ef90c

File tree

2 files changed

+52
-20
lines changed

2 files changed

+52
-20
lines changed

gen/generator.jl

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,16 @@ using JuliaFormatter
1111
cd(@__DIR__)
1212

1313
# headers
14-
include_dir = joinpath(SuiteSparse_jll.artifact_dir, "include", "suitesparse") |> normpath
14+
if length(ARGS) == 0
15+
artifact_dir = SuiteSparse_jll.artifact_dir
16+
else
17+
if isdir(ARGS[1])
18+
artifact_dir = ARGS[1]
19+
else
20+
error("Usage: $PROGRAM_FILE <SuiteSparse artifact directory>")
21+
end
22+
end
23+
include_dir = joinpath(artifact_dir, "include", "suitesparse") |> normpath
1524

1625
cholmod_h = joinpath(include_dir, "cholmod.h")
1726
@assert isfile(cholmod_h)

src/solvers/wrappers.jl

Lines changed: 42 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,27 @@ function SuiteSparse_BLAS_integer_size()
155155
@ccall libsuitesparseconfig.SuiteSparse_BLAS_integer_size()::Csize_t
156156
end
157157

158+
@enum cholmod_query_t::UInt32 begin
159+
CHOLMOD_QUERY_HAS_GPL = 0
160+
CHOLMOD_QUERY_HAS_CHECK = 1
161+
CHOLMOD_QUERY_HAS_CHOLESKY = 2
162+
CHOLMOD_QUERY_HAS_CAMD = 3
163+
CHOLMOD_QUERY_HAS_PARTITION = 4
164+
CHOLMOD_QUERY_HAS_MATRIXOPS = 5
165+
CHOLMOD_QUERY_HAS_MODIFY = 6
166+
CHOLMOD_QUERY_HAS_SUPERNODAL = 7
167+
CHOLMOD_QUERY_HAS_CUDA = 8
168+
CHOLMOD_QUERY_HAS_OPENMP = 9
169+
end
170+
171+
function cholmod_query(feature)
172+
@ccall libcholmod.cholmod_query(feature::cholmod_query_t)::Bool
173+
end
174+
175+
function cholmod_l_query(feature)
176+
@ccall libcholmod.cholmod_l_query(feature::cholmod_query_t)::Bool
177+
end
178+
158179
struct cholmod_method_struct
159180
lnz::Cdouble
160181
fl::Cdouble
@@ -3343,19 +3364,19 @@ const CHOLMOD_INT = 0
33433364

33443365
const CHOLMOD_LONG = 2
33453366

3346-
const CHOLMOD_DATE = "Mar 22, 2024"
3367+
const CHOLMOD_DATE = "June 20, 2024"
33473368

33483369
const CHOLMOD_MAIN_VERSION = 5
33493370

3350-
const CHOLMOD_SUB_VERSION = 2
3371+
const CHOLMOD_SUB_VERSION = 3
33513372

3352-
const CHOLMOD_SUBSUB_VERSION = 1
3373+
const CHOLMOD_SUBSUB_VERSION = 0
33533374

33543375
SUITESPARSE_VER_CODE(main, sub) = main * 1000 + sub
33553376

33563377
CHOLMOD_VER_CODE(main, sub) = SUITESPARSE_VER_CODE(main, sub)
33573378

3358-
const CHOLMOD_VERSION = CHOLMOD_VER_CODE(5, 2)
3379+
const CHOLMOD_VERSION = CHOLMOD_VER_CODE(5, 3)
33593380

33603381
const _FILE_OFFSET_BITS = 64
33613382

@@ -3381,25 +3402,27 @@ const SUITESPARSE_COMPILER_MSC = 0
33813402

33823403
const SUITESPARSE_COMPILER_XLC = 0
33833404

3405+
const SUITESPARSE_CONFIG_TIMER = clock_gettime
3406+
33843407
const SUITESPARSE_TIME = SuiteSparse_time()
33853408

3386-
const SUITESPARSE_DATE = "Mar 22, 2024"
3409+
const SUITESPARSE_DATE = "Oct 10, 2024"
33873410

33883411
const SUITESPARSE_MAIN_VERSION = 7
33893412

3390-
const SUITESPARSE_SUB_VERSION = 7
3413+
const SUITESPARSE_SUB_VERSION = 8
33913414

3392-
const SUITESPARSE_SUBSUB_VERSION = 0
3415+
const SUITESPARSE_SUBSUB_VERSION = 3
33933416

3394-
const SUITESPARSE_VERSION = SUITESPARSE_VER_CODE(7, 7)
3417+
const SUITESPARSE_VERSION = SUITESPARSE_VER_CODE(7, 8)
33953418

33963419
function SUITESPARSE__VERCODE(main, sub, patch)
33973420
return (main * Culonglong(1000) + sub) * Culonglong(1000) + patch
33983421
end
33993422

3400-
const SUITESPARSE__VERSION = SUITESPARSE__VERCODE(7, 7, 0)
3423+
const SUITESPARSE__VERSION = SUITESPARSE__VERCODE(7, 8, 3)
34013424

3402-
const CHOLMOD__VERSION = SUITESPARSE__VERCODE(5, 2, 1)
3425+
const CHOLMOD__VERSION = SUITESPARSE__VERCODE(5, 3, 0)
34033426

34043427
const CHOLMOD_DEVICE_SUPERNODE_BUFFERS = 6
34053428

@@ -3541,19 +3564,19 @@ const SPQR_RTX_EQUALS_B = 2
35413564

35423565
const SPQR_RTX_EQUALS_ETB = 3
35433566

3544-
const SPQR_DATE = "Mar 22, 2024"
3567+
const SPQR_DATE = "June 20, 2024"
35453568

35463569
const SPQR_MAIN_VERSION = 4
35473570

35483571
const SPQR_SUB_VERSION = 3
35493572

3550-
const SPQR_SUBSUB_VERSION = 3
3573+
const SPQR_SUBSUB_VERSION = 4
35513574

35523575
SPQR_VER_CODE(main, sub) = SUITESPARSE_VER_CODE(main, sub)
35533576

35543577
const SPQR_VERSION = SPQR_VER_CODE(4, 3)
35553578

3556-
const SPQR__VERSION = SUITESPARSE__VERCODE(4, 3, 3)
3579+
const SPQR__VERSION = SUITESPARSE__VERCODE(4, 3, 4)
35573580

35583581
const AMD_CONTROL = 5
35593582

@@ -3603,37 +3626,37 @@ const AMD_INVALID = -2
36033626

36043627
const AMD_OK_BUT_JUMBLED = 1
36053628

3606-
const AMD_DATE = "Mar 22, 2024"
3629+
const AMD_DATE = "June 20, 2024"
36073630

36083631
const AMD_MAIN_VERSION = 3
36093632

36103633
const AMD_SUB_VERSION = 3
36113634

3612-
const AMD_SUBSUB_VERSION = 2
3635+
const AMD_SUBSUB_VERSION = 3
36133636

36143637
AMD_VERSION_CODE(main, sub) = SUITESPARSE_VER_CODE(main, sub)
36153638

36163639
const AMD_VERSION = AMD_VERSION_CODE(3, 3)
36173640

3618-
const AMD__VERSION = SUITESPARSE__VERCODE(3, 3, 2)
3641+
const AMD__VERSION = SUITESPARSE__VERCODE(3, 3, 3)
36193642

36203643
const UMFPACK_INFO = 90
36213644

36223645
const UMFPACK_CONTROL = 20
36233646

3624-
const UMFPACK_DATE = "Mar 22, 2024"
3647+
const UMFPACK_DATE = "Sept 23, 2024"
36253648

36263649
const UMFPACK_MAIN_VERSION = 6
36273650

36283651
const UMFPACK_SUB_VERSION = 3
36293652

3630-
const UMFPACK_SUBSUB_VERSION = 3
3653+
const UMFPACK_SUBSUB_VERSION = 5
36313654

36323655
UMFPACK_VER_CODE(main, sub) = SUITESPARSE_VER_CODE(main, sub)
36333656

36343657
const UMFPACK_VER = UMFPACK_VER_CODE(6, 3)
36353658

3636-
const UMFPACK__VERSION = SUITESPARSE__VERCODE(6, 3, 3)
3659+
const UMFPACK__VERSION = SUITESPARSE__VERCODE(6, 3, 5)
36373660

36383661
const UMFPACK_STATUS = 0
36393662

0 commit comments

Comments
 (0)