diff --git a/Project.toml b/Project.toml index 051f11da..8e5316f8 100644 --- a/Project.toml +++ b/Project.toml @@ -19,7 +19,7 @@ Pkg = "<0.0.1, 1" Printf = "<0.0.1, 1" Random = "<0.0.1, 1" Serialization = "<0.0.1, 1" -SuiteSparse_jll = "7.6.0" +SuiteSparse_jll = "7.7.0" Test = "<0.0.1, 1" julia = "1.11" diff --git a/gen/Project.toml b/gen/Project.toml index 7a340a2d..19c05f83 100644 --- a/gen/Project.toml +++ b/gen/Project.toml @@ -1,9 +1,8 @@ [deps] Clang = "40e3b903-d033-50b4-a0cc-940c62c95e31" -SuiteSparse_jll = "bea87d4a-7f5b-5778-9afe-8cc45184846c" JuliaFormatter = "98e50ef6-434e-11e9-1051-2b60c6c9e899" +SuiteSparse_jll = "bea87d4a-7f5b-5778-9afe-8cc45184846c" [compat] -Clang = "0.17.8" +Clang = "0.18" JuliaFormatter = "1.0.45" -SuiteSparse_jll = "7.6.0" diff --git a/gen/generator.toml b/gen/generator.toml index dc9e8b8c..7529b0ab 100644 --- a/gen/generator.toml +++ b/gen/generator.toml @@ -1,9 +1,11 @@ [general] +library_name = "SuiteSparse" library_names = {"SuiteSparse_config.h" = "libsuitesparseconfig", "SuiteSparseQR_C.h" = "libspqr", "umfpack.h" = "libumfpack", "cholmod.h" = "libcholmod", "amd.h" = "libamd"} use_julia_native_enum_type = true use_deterministic_symbol = true auto_mutability = true +skip_static_functions = true output_ignorelist = [ # Clang.jl cannot handle these macro correctly, skip for now. diff --git a/src/solvers/wrappers.jl b/src/solvers/wrappers.jl index 97e0edf0..7d5a4b69 100644 --- a/src/solvers/wrappers.jl +++ b/src/solvers/wrappers.jl @@ -3343,13 +3343,13 @@ const CHOLMOD_INT = 0 const CHOLMOD_LONG = 2 -const CHOLMOD_DATE = "Jan 20, 2024" +const CHOLMOD_DATE = "Mar 22, 2024" const CHOLMOD_MAIN_VERSION = 5 const CHOLMOD_SUB_VERSION = 2 -const CHOLMOD_SUBSUB_VERSION = 0 +const CHOLMOD_SUBSUB_VERSION = 1 SUITESPARSE_VER_CODE(main, sub) = main * 1000 + sub @@ -3383,23 +3383,23 @@ const SUITESPARSE_COMPILER_XLC = 0 const SUITESPARSE_TIME = SuiteSparse_time() -const SUITESPARSE_DATE = "Jan 20, 2024" +const SUITESPARSE_DATE = "Mar 22, 2024" const SUITESPARSE_MAIN_VERSION = 7 -const SUITESPARSE_SUB_VERSION = 6 +const SUITESPARSE_SUB_VERSION = 7 const SUITESPARSE_SUBSUB_VERSION = 0 -const SUITESPARSE_VERSION = SUITESPARSE_VER_CODE(7, 6) +const SUITESPARSE_VERSION = SUITESPARSE_VER_CODE(7, 7) function SUITESPARSE__VERCODE(main, sub, patch) return (main * Culonglong(1000) + sub) * Culonglong(1000) + patch end -const SUITESPARSE__VERSION = SUITESPARSE__VERCODE(7, 6, 0) +const SUITESPARSE__VERSION = SUITESPARSE__VERCODE(7, 7, 0) -const CHOLMOD__VERSION = SUITESPARSE__VERCODE(5, 2, 0) +const CHOLMOD__VERSION = SUITESPARSE__VERCODE(5, 2, 1) const CHOLMOD_DEVICE_SUPERNODE_BUFFERS = 6 @@ -3541,19 +3541,19 @@ const SPQR_RTX_EQUALS_B = 2 const SPQR_RTX_EQUALS_ETB = 3 -const SPQR_DATE = "Jan 20, 2024" +const SPQR_DATE = "Mar 22, 2024" const SPQR_MAIN_VERSION = 4 const SPQR_SUB_VERSION = 3 -const SPQR_SUBSUB_VERSION = 2 +const SPQR_SUBSUB_VERSION = 3 SPQR_VER_CODE(main, sub) = SUITESPARSE_VER_CODE(main, sub) const SPQR_VERSION = SPQR_VER_CODE(4, 3) -const SPQR__VERSION = SUITESPARSE__VERCODE(4, 3, 2) +const SPQR__VERSION = SUITESPARSE__VERCODE(4, 3, 3) const AMD_CONTROL = 5 @@ -3603,37 +3603,37 @@ const AMD_INVALID = -2 const AMD_OK_BUT_JUMBLED = 1 -const AMD_DATE = "Jan 10, 2024" +const AMD_DATE = "Mar 22, 2024" const AMD_MAIN_VERSION = 3 const AMD_SUB_VERSION = 3 -const AMD_SUBSUB_VERSION = 1 +const AMD_SUBSUB_VERSION = 2 AMD_VERSION_CODE(main, sub) = SUITESPARSE_VER_CODE(main, sub) const AMD_VERSION = AMD_VERSION_CODE(3, 3) -const AMD__VERSION = SUITESPARSE__VERCODE(3, 3, 1) +const AMD__VERSION = SUITESPARSE__VERCODE(3, 3, 2) const UMFPACK_INFO = 90 const UMFPACK_CONTROL = 20 -const UMFPACK_DATE = "Jan 20, 2024" +const UMFPACK_DATE = "Mar 22, 2024" const UMFPACK_MAIN_VERSION = 6 const UMFPACK_SUB_VERSION = 3 -const UMFPACK_SUBSUB_VERSION = 2 +const UMFPACK_SUBSUB_VERSION = 3 UMFPACK_VER_CODE(main, sub) = SUITESPARSE_VER_CODE(main, sub) const UMFPACK_VER = UMFPACK_VER_CODE(6, 3) -const UMFPACK__VERSION = SUITESPARSE__VERCODE(6, 3, 2) +const UMFPACK__VERSION = SUITESPARSE__VERCODE(6, 3, 3) const UMFPACK_STATUS = 0