Skip to content

Commit ba7eb37

Browse files
committed
Update the wrappers for SuiteSparse 7
This reverts commit 4179450.
1 parent 4aab8df commit ba7eb37

16 files changed

+9210
-5903
lines changed

gen/Manifest.toml

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
# This file is machine-generated - editing it directly is not advised
22

3-
julia_version = "1.7.3"
3+
julia_version = "1.8.5"
44
manifest_format = "2.0"
55
project_hash = "61c6ad9feab9227ef7d89383b05c518b03764044"
66

77
[[deps.ArgTools]]
88
uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
9+
version = "1.1.1"
910

1011
[[deps.Artifacts]]
1112
uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
@@ -20,19 +21,20 @@ version = "0.4.2"
2021

2122
[[deps.Clang]]
2223
deps = ["CEnum", "Clang_jll", "Downloads", "Pkg", "TOML"]
23-
git-tree-sha1 = "b6998b85ea2abbc8a02ca1ccca9438338ed5f8e5"
24+
git-tree-sha1 = "9c5e5bf14878315b43ae322fe2f2a5080c827a27"
2425
uuid = "40e3b903-d033-50b4-a0cc-940c62c95e31"
25-
version = "0.15.8"
26+
version = "0.17.2"
2627

2728
[[deps.Clang_jll]]
2829
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll", "libLLVM_jll"]
29-
git-tree-sha1 = "8cf7e67e264dedc5d321ec87e78525e958aea057"
30+
git-tree-sha1 = "0dfffba1b32bb3e30cb0372bfe666a5ddffe37fb"
3031
uuid = "0ee61d77-7f21-5576-8119-9fcc46b10100"
31-
version = "12.0.1+3"
32+
version = "13.0.1+3"
3233

3334
[[deps.CompilerSupportLibraries_jll]]
3435
deps = ["Artifacts", "Libdl"]
3536
uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
37+
version = "1.0.1+0"
3638

3739
[[deps.Dates]]
3840
deps = ["Printf"]
@@ -41,6 +43,7 @@ uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
4143
[[deps.Downloads]]
4244
deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
4345
uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
46+
version = "1.6.0"
4447

4548
[[deps.FileWatching]]
4649
uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
@@ -58,10 +61,12 @@ version = "1.4.1"
5861
[[deps.LibCURL]]
5962
deps = ["LibCURL_jll", "MozillaCACerts_jll"]
6063
uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
64+
version = "0.6.3"
6165

6266
[[deps.LibCURL_jll]]
6367
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
6468
uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
69+
version = "7.84.0+0"
6570

6671
[[deps.LibGit2]]
6772
deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
@@ -70,6 +75,7 @@ uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
7075
[[deps.LibSSH2_jll]]
7176
deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
7277
uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
78+
version = "1.10.2+0"
7379

7480
[[deps.Libdl]]
7581
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
@@ -84,20 +90,25 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
8490
[[deps.MbedTLS_jll]]
8591
deps = ["Artifacts", "Libdl"]
8692
uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
93+
version = "2.28.0+0"
8794

8895
[[deps.MozillaCACerts_jll]]
8996
uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
97+
version = "2022.2.1"
9098

9199
[[deps.NetworkOptions]]
92100
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
101+
version = "1.2.0"
93102

94103
[[deps.OpenBLAS_jll]]
95104
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
96105
uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
106+
version = "0.3.20+0"
97107

98108
[[deps.Pkg]]
99109
deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
100110
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
111+
version = "1.8.0"
101112

102113
[[deps.Preferences]]
103114
deps = ["TOML"]
@@ -119,6 +130,7 @@ uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
119130

120131
[[deps.SHA]]
121132
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
133+
version = "0.7.0"
122134

123135
[[deps.Serialization]]
124136
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
@@ -129,14 +141,17 @@ uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
129141
[[deps.SuiteSparse_jll]]
130142
deps = ["Artifacts", "Libdl", "Pkg", "libblastrampoline_jll"]
131143
uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c"
144+
version = "5.10.1+0"
132145

133146
[[deps.TOML]]
134147
deps = ["Dates"]
135148
uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
149+
version = "1.0.0"
136150

137151
[[deps.Tar]]
138152
deps = ["ArgTools", "SHA"]
139153
uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
154+
version = "1.10.1"
140155

141156
[[deps.UUIDs]]
142157
deps = ["Random", "SHA"]
@@ -148,19 +163,24 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
148163
[[deps.Zlib_jll]]
149164
deps = ["Libdl"]
150165
uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
166+
version = "1.2.12+3"
151167

152168
[[deps.libLLVM_jll]]
153169
deps = ["Artifacts", "Libdl"]
154170
uuid = "8f36deef-c2a5-5394-99ed-8e07531fb29a"
171+
version = "13.0.1+3"
155172

156173
[[deps.libblastrampoline_jll]]
157174
deps = ["Artifacts", "Libdl", "OpenBLAS_jll"]
158175
uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
176+
version = "5.1.1+0"
159177

160178
[[deps.nghttp2_jll]]
161179
deps = ["Artifacts", "Libdl"]
162180
uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
181+
version = "1.48.0+0"
163182

164183
[[deps.p7zip_jll]]
165184
deps = ["Artifacts", "Libdl"]
166185
uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
186+
version = "17.4.0+0"

gen/generator.jl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ include_dir = joinpath(SuiteSparse_dir, "include") |> normpath
1515
cholmod_h = joinpath(include_dir, "cholmod.h")
1616
@assert isfile(cholmod_h)
1717

18-
cholmod_blas_h = joinpath(include_dir, "cholmod_blas.h")
19-
@assert isfile(cholmod_blas_h)
20-
2118
SuiteSparseQR_C_h = joinpath(include_dir, "SuiteSparseQR_C.h")
2219
@assert isfile(SuiteSparseQR_C_h)
2320

@@ -48,7 +45,7 @@ for target in JLLEnvs.JLL_ENV_TRIPLES
4845
push!(args, "-DSUN64 -DLONGBLAS='long long' -D'SuiteSparse_long_max=9223372036854775801'")
4946
end
5047

51-
header_files = [cholmod_h, cholmod_blas_h, SuiteSparseQR_C_h, amd_h, colamd_h, ccolamd_h, umfpack_h]
48+
header_files = [cholmod_h, SuiteSparseQR_C_h, amd_h, colamd_h, ccolamd_h, umfpack_h]
5249

5350
ctx = create_context(header_files, args, options)
5451

0 commit comments

Comments
 (0)