Skip to content

Commit 5162d1f

Browse files
ViralBShahViralBShah
authored
Update to latest SuiteSparse and auto-generate wrappers (#18)
* Update clang generator * Remove klu_lib.jl and use auto-generated wrappers.jl * Only works on 1.10 - since it has to be synced with SuiteSparse * Update docs/make.jl * Update CI matrix to test only on 1.10 and introduce all platforms
1 parent aee5644 commit 5162d1f

23 files changed

+937
-6504
lines changed

‎.github/workflows/ci.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,17 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
version:
20-
- '1.6' # Replace this with the minimum Julia version that your package supports. E.g. if your package requires Julia 1.5 or higher, change this to '1.5'.
21-
- '1' # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia.
20+
- '1.10'
2221
os:
2322
- ubuntu-latest
2423
- windows-latest
2524
- macos-latest
2625
arch:
2726
- x64
28-
include:
29-
- os: ubuntu-latest
27+
- x86
28+
exclude:
29+
- os: macos-latest
3030
arch: x86
31-
version: 1
32-
- os: windows-latest
33-
arch: x86
34-
version: 1
3531
steps:
3632
- uses: actions/checkout@v4
3733
- uses: julia-actions/setup-julia@v1

‎Project.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
name = "KLU"
22
uuid = "ef3ab10e-7fda-4108-b977-705223b18434"
33
authors = ["Wimmerer <[email protected]> and contributors"]
4-
version = "0.4.1"
4+
version = "0.5.0"
55

66
[deps]
77
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
88
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
99
SuiteSparse_jll = "bea87d4a-7f5b-5778-9afe-8cc45184846c"
1010

1111
[compat]
12-
julia = "1.6"
12+
julia = "1.10"
1313

1414
[extras]
1515
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

‎docs/make.jl

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ using KLU
44
makedocs(
55
sitename = "KLU",
66
format = Documenter.HTML(),
7-
modules = [KLU]
7+
modules = [KLU];
8+
warnonly = [:missing_docs, :cross_references],
89
)
910

1011
# Documenter can also automatically deploy documentation to gh-pages.
1112
# See "Hosting Documentation" and deploydocs() in the Documenter manual
1213
# for more information.
1314
deploydocs(
14-
repo = "github.com/Wimmerer/KLU.jl.git",
15+
repo = "github.com/JuliaSparse/KLU.jl.git",
1516
devbranch="main"
1617
)

‎gen/Project.toml

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
[deps]
2-
Clang = "40e3b903-d033-50b4-a0cc-940c62c95e31"
2+
Clang = "40e3b903-d033-50b4-a0cc-940c62c95e31"
3+
SuiteSparse_jll = "bea87d4a-7f5b-5778-9afe-8cc45184846c"
4+
5+
[compat]
6+
Clang = "0.17"

‎gen/generator.jl

+7-31
Original file line numberDiff line numberDiff line change
@@ -20,37 +20,13 @@ klu_h = joinpath(include_dir, "klu.h")
2020
# load common option
2121
options = load_options(joinpath(@__DIR__, "generator.toml"))
2222

23-
# run generator for all platforms
24-
for target in JLLEnvs.JLL_ENV_TRIPLES
25-
@info "processing $target"
23+
# run generator. Header files are not platform specific so we have only one.
24+
options["general"]["output_file_path"] = joinpath(@__DIR__, "..", "src", "wrappers.jl")
25+
args = get_default_args()
26+
push!(args, "-I$include_dir")
2627

27-
options["general"]["output_file_path"] = joinpath(@__DIR__, "..", "lib", "$target.jl")
28+
header_files = [klu_h]
2829

29-
args = get_default_args(target)
30-
push!(args, "-I$include_dir")
31-
if startswith(target, "x86_64") || startswith(target, "powerpc64le") || startswith(target, "aarch64")
32-
push!(args, "-DSUN64 -DLONGBLAS='long long'")
33-
end
30+
ctx = create_context(header_files, args, options)
3431

35-
header_files = [klu_h]
36-
37-
ctx = create_context(header_files, args, options)
38-
39-
build!(ctx, BUILDSTAGE_NO_PRINTING)
40-
41-
# custom rewriter
42-
function rewrite!(dag::ExprDAG)
43-
replace!(get_nodes(dag)) do node
44-
filename = normpath(Clang.get_filename(node.cursor))
45-
if !contains(filename, "klu")
46-
return ExprNode(node.id, Generators.Skip(), node.cursor, Expr[], node.adj)
47-
end
48-
return node
49-
end
50-
end
51-
52-
rewrite!(ctx.dag)
53-
54-
# print
55-
build!(ctx, BUILDSTAGE_PRINTING_ONLY)
56-
end
32+
build!(ctx)

‎gen/generator.toml

+64-6
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,80 @@
11
[general]
2-
library_name = "libklu"
2+
library_names = {"SuiteSparse_config.h" = "libsuitesparseconfig", "klu.h" = "libklu", "amd.h" = "libamd", "btf.h" = "libbtf"}
33

44
use_julia_native_enum_type = true
55
use_deterministic_symbol = true
66
auto_mutability = true
77

8-
printer_blacklist = [
8+
output_ignorelist = [
99
# Clang.jl cannot handle these macro correctly, skip for now.
10-
"SuiteSparse_long_id"
10+
"UMFPACK_COPYRIGHT",
11+
"UMFPACK_LICENSE_PART1",
12+
"UMFPACK_LICENSE_PART2",
13+
"UMFPACK_LICENSE_PART3",
14+
"SuiteSparse_long",
15+
"SuiteSparse_long_max",
16+
"SuiteSparse_long_id",
17+
"CHOLMOD_CUBLAS_HANDLE",
18+
"CHOLMOD_CUDASTREAM",
19+
"CHOLMOD_CUDAEVENT",
20+
# useless macros
21+
"CHOLMOD_CPU_GEMM_CALLS",
22+
"CHOLMOD_CPU_SYRK_CALLS",
23+
"CHOLMOD_CPU_TRSM_CALLS",
24+
"CHOLMOD_CPU_POTRF_CALLS",
25+
"CHOLMOD_GPU_GEMM_CALLS",
26+
"CHOLMOD_GPU_SYRK_CALLS",
27+
"CHOLMOD_GPU_TRSM_CALLS",
28+
"CHOLMOD_GPU_POTRF_CALLS",
29+
"CHOLMOD_CPU_GEMM_TIME",
30+
"CHOLMOD_CPU_SYRK_TIME",
31+
"CHOLMOD_CPU_TRSM_TIME",
32+
"CHOLMOD_CPU_POTRF_TIME",
33+
"CHOLMOD_GPU_GEMM_TIME",
34+
"CHOLMOD_GPU_SYRK_TIME",
35+
"CHOLMOD_GPU_TRSM_TIME",
36+
"CHOLMOD_GPU_POTRF_TIME",
37+
"CHOLMOD_ASSEMBLE_TIME",
38+
"CHOLMOD_ASSEMBLE_TIME2",
39+
"SuiteSparse_long_idd",
40+
"SUITESPARSE_COMPILER_MAJOR",
41+
"SUITESPARSE_COMPILER_MINOR",
42+
"SUITESPARSE_COMPILER_SUB",
43+
"SUITESPARSE_COMPILER_NAME",
44+
"SUITESPARSE_STDC_VERSION",
45+
"SUITESPARSE_RESTRICT",
46+
"SUITESPARSE_LAPACK_[A-Z0-9]+",
47+
"SUITESPARSE_BLAS_[A-Z0-9]+",
48+
"SUITESPARSE_BLAS_DNRM2",
49+
"SUITESPARSE_BLAS_DZNRM2",
50+
"UMFPACK_VERSION",
1151
]
1252

1353
[codegen]
14-
use_ccall_macro = true
54+
use_ccall_macro = false
1555

1656
[codegen.macro]
1757
macro_mode = "basic"
1858

19-
functionlike_macro_whitelist = [
59+
functionlike_macro_includelist = [
2060
"SUITESPARSE_VER_CODE",
21-
"KLU_VERSION_CODE"
61+
"SUITESPARSE__VERCODE",
62+
"CHOLMOD_VER_CODE",
63+
"CHOLMOD__VERCODE",
64+
"SPQR_VER_CODE",
65+
"SPQR__VERCODE",
66+
"AMD_VERSION_CODE",
67+
"AMD__VERCODE",
68+
"UMFPACK_VER_CODE",
69+
"UMFPACK__VERCODE",
70+
"COLAMD_VERSION_CODE",
71+
"COLAMD__VERCODE",
72+
"KLU_VERSION_CODE",
73+
"KLU__VERCODE",
74+
"BTF_VERSION_CODE",
75+
"BTF__VERCODE",
76+
"CCOLAMD_VERSION_CODE",
77+
"CCOLAMD__VERCODE",
78+
"KLU_VERSION_CODE",
79+
"KLU__VERCODE",
2280
]

0 commit comments

Comments
 (0)