Skip to content

Commit 4713883

Browse files
committed
SuiteSparse_GPU_jll build 7.5.0+0
1 parent 6bb650d commit 4713883

15 files changed

+439
-147
lines changed

.pkg/platform_augmentation.jl

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,32 @@ catch
77
# in that case, we just won't select an artifact.
88
end
99

10-
function cuda_comparison_strategy(a::String, b::String, a_requested::Bool, b_requested::Bool)
11-
if a == "none" || b == "none"
12-
return a == b
10+
# can't use Preferences for the same reason
11+
const CUDA_Runtime_jll_uuid = Base.UUID("76a88914-d11a-5bdc-97e0-2f5a05c973a2")
12+
const preferences = Base.get_preferences(CUDA_Runtime_jll_uuid)
13+
Base.record_compiletime_preference(CUDA_Runtime_jll_uuid, "version")
14+
Base.record_compiletime_preference(CUDA_Runtime_jll_uuid, "local")
15+
const local_toolkit = something(tryparse(Bool, get(preferences, "local", "false")), false)
16+
17+
function cuda_comparison_strategy(_a::String, _b::String, a_requested::Bool, b_requested::Bool)
18+
# if we're using a local toolkit, we can't use artifacts
19+
if local_toolkit
20+
return false
1321
end
14-
if a == "local" || b == "local"
15-
return a == b
22+
23+
# if either isn't a version number (e.g. "none"), perform a simple equality check
24+
a = tryparse(VersionNumber, _a)
25+
b = tryparse(VersionNumber, _b)
26+
if a === nothing || b === nothing
27+
return _a == _b
1628
end
17-
a = VersionNumber(a)
18-
b = VersionNumber(b)
1929

20-
# If both b and a requested, then we fall back to equality:
30+
# if both b and a requested, then we fall back to equality
2131
if a_requested && b_requested
2232
return Base.thisminor(a) == Base.thisminor(b)
2333
end
2434

25-
# Otherwise, do the comparison between the the single version cap and the single version:
35+
# otherwise, do the comparison between the the single version cap and the single version:
2636
function is_compatible(artifact::VersionNumber, host::VersionNumber)
2737
if host >= v"11.0"
2838
# enhanced compatibility, semver-style
@@ -49,5 +59,9 @@ function augment_platform!(platform::Platform)
4959
CUDA_Runtime_jll.augment_platform!(platform)
5060
end
5161
BinaryPlatforms.set_compare_strategy!(platform, "cuda", cuda_comparison_strategy)
62+
63+
# store the fact that we're using a local CUDA toolkit, for debugging purposes
64+
platform["cuda_local"] = string(local_toolkit)
65+
5266
return platform
5367
end

Artifacts.toml

Lines changed: 77 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,99 @@
11
[[SuiteSparse_GPU]]
22
arch = "x86_64"
3-
cuda = "10.2"
4-
git-tree-sha1 = "11aff9edd8f2eb871b659f807f48a800d07f08ca"
3+
cuda = "11.4"
4+
git-tree-sha1 = "89e3aa44981eec95d81000e8f78f8e6a2adf2def"
55
lazy = true
66
libc = "glibc"
77
os = "linux"
88

99
[[SuiteSparse_GPU.download]]
10-
sha256 = "b9310adf841ade7bae78a82bdd17c726ec472e30b6c75b28277d31a6675215e5"
11-
url = "https://github.com/JuliaBinaryWrappers/SuiteSparse_GPU_jll.jl/releases/download/SuiteSparse_GPU-v5.10.1+2/SuiteSparse_GPU.v5.10.1.x86_64-linux-gnu-cuda+10.2.tar.gz"
10+
sha256 = "4b92ad571287f5ac30b206699433b400c2b904226a7401eabce285251bf67d19"
11+
url = "https://github.com/JuliaBinaryWrappers/SuiteSparse_GPU_jll.jl/releases/download/SuiteSparse_GPU-v7.5.0+0/SuiteSparse_GPU.v7.5.0.x86_64-linux-gnu-cuda+11.4.tar.gz"
1212
[[SuiteSparse_GPU]]
1313
arch = "x86_64"
14-
cuda = "11.0"
15-
git-tree-sha1 = "fa2b2e20beac1aa5d47d7eafd776462887c20651"
14+
cuda = "11.5"
15+
git-tree-sha1 = "332793132889f008e3f14f9ebc85a51a950b64a5"
1616
lazy = true
1717
libc = "glibc"
1818
os = "linux"
1919

2020
[[SuiteSparse_GPU.download]]
21-
sha256 = "a11683230e20903b72df2aaf870357ba215d3a97e150641b786cf3f44672e5b1"
22-
url = "https://github.com/JuliaBinaryWrappers/SuiteSparse_GPU_jll.jl/releases/download/SuiteSparse_GPU-v5.10.1+2/SuiteSparse_GPU.v5.10.1.x86_64-linux-gnu-cuda+11.0.tar.gz"
21+
sha256 = "86700f70a09a08c79d0ae99574aa314438d8456a70b9e49b89e80442aaa7784f"
22+
url = "https://github.com/JuliaBinaryWrappers/SuiteSparse_GPU_jll.jl/releases/download/SuiteSparse_GPU-v7.5.0+0/SuiteSparse_GPU.v7.5.0.x86_64-linux-gnu-cuda+11.5.tar.gz"
23+
[[SuiteSparse_GPU]]
24+
arch = "x86_64"
25+
cuda = "11.6"
26+
git-tree-sha1 = "a48d9f53a0eea49b75c7ef323a58ee4a60d3cef6"
27+
lazy = true
28+
libc = "glibc"
29+
os = "linux"
30+
31+
[[SuiteSparse_GPU.download]]
32+
sha256 = "182e7b59591cd72b74aaee0ad18fca6887be763b7e87f3e3984edb1a3be96c68"
33+
url = "https://github.com/JuliaBinaryWrappers/SuiteSparse_GPU_jll.jl/releases/download/SuiteSparse_GPU-v7.5.0+0/SuiteSparse_GPU.v7.5.0.x86_64-linux-gnu-cuda+11.6.tar.gz"
34+
[[SuiteSparse_GPU]]
35+
arch = "x86_64"
36+
cuda = "11.7"
37+
git-tree-sha1 = "99677c200eaa14660a59f2b74cdff738afc2de20"
38+
lazy = true
39+
libc = "glibc"
40+
os = "linux"
41+
42+
[[SuiteSparse_GPU.download]]
43+
sha256 = "9a333b67e5dbe4428e1d589e59c9038802d1ea1365aa03bc01f7d5199b96b6f1"
44+
url = "https://github.com/JuliaBinaryWrappers/SuiteSparse_GPU_jll.jl/releases/download/SuiteSparse_GPU-v7.5.0+0/SuiteSparse_GPU.v7.5.0.x86_64-linux-gnu-cuda+11.7.tar.gz"
45+
[[SuiteSparse_GPU]]
46+
arch = "x86_64"
47+
cuda = "11.8"
48+
git-tree-sha1 = "c773accec279033bd79bc804effa2d851bf1fec8"
49+
lazy = true
50+
libc = "glibc"
51+
os = "linux"
52+
53+
[[SuiteSparse_GPU.download]]
54+
sha256 = "33cc26da03b5dde2b10a97982f1fb5a7092d4743a2eaaec1e53a5aecc892de9b"
55+
url = "https://github.com/JuliaBinaryWrappers/SuiteSparse_GPU_jll.jl/releases/download/SuiteSparse_GPU-v7.5.0+0/SuiteSparse_GPU.v7.5.0.x86_64-linux-gnu-cuda+11.8.tar.gz"
2356
[[SuiteSparse_GPU]]
2457
arch = "x86_64"
2558
cuda = "12.0"
26-
git-tree-sha1 = "d60b87dd33b0dd18571cd4ebd8f03b5f88971236"
59+
git-tree-sha1 = "b63ea9c60bfc46d780fc26627fd33b2898becc8d"
60+
lazy = true
61+
libc = "glibc"
62+
os = "linux"
63+
64+
[[SuiteSparse_GPU.download]]
65+
sha256 = "84d482c056664175a43d16e771d86f84a4a1f08b4f87e98b60ad39e92f4b2def"
66+
url = "https://github.com/JuliaBinaryWrappers/SuiteSparse_GPU_jll.jl/releases/download/SuiteSparse_GPU-v7.5.0+0/SuiteSparse_GPU.v7.5.0.x86_64-linux-gnu-cuda+12.0.tar.gz"
67+
[[SuiteSparse_GPU]]
68+
arch = "x86_64"
69+
cuda = "12.1"
70+
git-tree-sha1 = "62cb5db61738e90b263e24aabe08e6563f38ce25"
71+
lazy = true
72+
libc = "glibc"
73+
os = "linux"
74+
75+
[[SuiteSparse_GPU.download]]
76+
sha256 = "1863d7b4dcdd375e88e834a6e02e6eb8d78bf2c54b6461fdd6bbca4148516991"
77+
url = "https://github.com/JuliaBinaryWrappers/SuiteSparse_GPU_jll.jl/releases/download/SuiteSparse_GPU-v7.5.0+0/SuiteSparse_GPU.v7.5.0.x86_64-linux-gnu-cuda+12.1.tar.gz"
78+
[[SuiteSparse_GPU]]
79+
arch = "x86_64"
80+
cuda = "12.2"
81+
git-tree-sha1 = "6fb2340971ccd3d9fa83d974fdfc1a82d081b118"
82+
lazy = true
83+
libc = "glibc"
84+
os = "linux"
85+
86+
[[SuiteSparse_GPU.download]]
87+
sha256 = "abbd914fba824f6c3f8fe9b09c1e34e96eacafc17075c35b25ad76c20f6e20e6"
88+
url = "https://github.com/JuliaBinaryWrappers/SuiteSparse_GPU_jll.jl/releases/download/SuiteSparse_GPU-v7.5.0+0/SuiteSparse_GPU.v7.5.0.x86_64-linux-gnu-cuda+12.2.tar.gz"
89+
[[SuiteSparse_GPU]]
90+
arch = "x86_64"
91+
cuda = "12.3"
92+
git-tree-sha1 = "28f6719c328941b159636615adf171e7dcd7afb8"
2793
lazy = true
2894
libc = "glibc"
2995
os = "linux"
3096

3197
[[SuiteSparse_GPU.download]]
32-
sha256 = "4ed900cfad6e235dfa58d135078486cec9e398a60d28c7d73f9fda1e2d6d4827"
33-
url = "https://github.com/JuliaBinaryWrappers/SuiteSparse_GPU_jll.jl/releases/download/SuiteSparse_GPU-v5.10.1+2/SuiteSparse_GPU.v5.10.1.x86_64-linux-gnu-cuda+12.0.tar.gz"
98+
sha256 = "a0f4bd28259c3b960123fbf295932bcf98e68a5d54d274bcc9839f7afa23593f"
99+
url = "https://github.com/JuliaBinaryWrappers/SuiteSparse_GPU_jll.jl/releases/download/SuiteSparse_GPU-v7.5.0+0/SuiteSparse_GPU.v7.5.0.x86_64-linux-gnu-cuda+12.3.tar.gz"

Project.toml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "SuiteSparse_GPU_jll"
22
uuid = "d273dfef-62f2-5f88-806b-f32b81b662f1"
3-
version = "5.10.1+2"
3+
version = "7.5.0+0"
44

55
[deps]
66
JLLWrappers = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
@@ -9,10 +9,15 @@ LazyArtifacts = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
99
CUDA_Runtime_jll = "76a88914-d11a-5bdc-97e0-2f5a05c973a2"
1010
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
1111
SuiteSparse_jll = "bea87d4a-7f5b-5778-9afe-8cc45184846c"
12-
METIS_jll = "d00139f3-1899-568f-a2f0-47f597d42d70"
1312
TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
1413
Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
1514

1615
[compat]
1716
JLLWrappers = "1.4.0"
18-
julia = "1.7"
17+
julia = "1.11"
18+
libblastrampoline_jll = "5.8.0"
19+
LazyArtifacts = "1"
20+
Libdl = "1"
21+
SuiteSparse_jll = "=7.5.0"
22+
TOML = "1"
23+
Artifacts = "1"

README.md

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# `SuiteSparse_GPU_jll.jl` (v5.10.1+2)
1+
# `SuiteSparse_GPU_jll.jl` (v7.5.0+0)
22

33
[![deps](https://juliahub.com/docs/SuiteSparse_GPU_jll/deps.svg)](https://juliahub.com/ui/Packages/SuiteSparse_GPU_jll/vIIES?page=2)
44

55
This is an autogenerated package constructed using [`BinaryBuilder.jl`](https://github.com/JuliaPackaging/BinaryBuilder.jl).
66

7-
The originating [`build_tarballs.jl`](https://github.com/JuliaPackaging/Yggdrasil/blob/99b076321ab5bbc87b8dfbb39ba33aaa3bb04da6/S/SuiteSparse/SuiteSparse_GPU@5/build_tarballs.jl) script can be found on [`Yggdrasil`](https://github.com/JuliaPackaging/Yggdrasil/), the community build tree.
7+
The originating [`build_tarballs.jl`](https://github.com/JuliaPackaging/Yggdrasil/blob/d275e80f7eff8d0bd015abedee39f3f9cb633931/S/SuiteSparse/SuiteSparse_GPU@7/build_tarballs.jl) script can be found on [`Yggdrasil`](https://github.com/JuliaPackaging/Yggdrasil/), the community build tree.
88

99
## Bug Reports
1010

@@ -18,30 +18,27 @@ For more details about JLL packages and how to use them, see `BinaryBuilder.jl`
1818

1919
The tarballs for `SuiteSparse_GPU_jll.jl` have been built from these sources:
2020

21-
* git repository: https://github.com/DrTimothyAldenDavis/SuiteSparse.git (revision: `538273cfd53720a10e34a3d80d3779b607e1ac26`)
22-
* files in directory, relative to originating `build_tarballs.jl`: [`./bundled`](https://github.com/JuliaPackaging/Yggdrasil/tree/99b076321ab5bbc87b8dfbb39ba33aaa3bb04da6/S/SuiteSparse/SuiteSparse_GPU@5/bundled)
21+
* git repository: https://github.com/DrTimothyAldenDavis/SuiteSparse.git (revision: `da5050cd3f6b6a15ec4d7c42b2c1e2dfe4f8ef6e`)
2322

2423
## Platforms
2524

2625
`SuiteSparse_GPU_jll.jl` is available for the following platforms:
2726

28-
* `Linux x86_64 {cuda=12.0, libc=glibc}` (`x86_64-linux-gnu-cuda+12.0`)
27+
* `Linux x86_64 {cuda=12.3, libc=glibc}` (`x86_64-linux-gnu-cuda+12.3`)
2928

3029
## Dependencies
3130

3231
The following JLL packages are required by `SuiteSparse_GPU_jll.jl`:
3332

3433
* [`CUDA_Runtime_jll`](https://github.com/JuliaBinaryWrappers/CUDA_Runtime_jll.jl)
35-
* [`METIS_jll`](https://github.com/JuliaBinaryWrappers/METIS_jll.jl)
3634
* [`SuiteSparse_jll`](https://github.com/JuliaBinaryWrappers/SuiteSparse_jll.jl)
3735
* [`libblastrampoline_jll`](https://github.com/JuliaBinaryWrappers/libblastrampoline_jll.jl)
3836

3937
## Products
4038

4139
The code bindings within this package are autogenerated from the following `Products`:
4240

43-
* `LibraryProduct`: `libGPUQREngine`
44-
* `LibraryProduct`: `libSuiteSparse_GPURuntime`
4541
* `LibraryProduct`: `libcholmod`
42+
* `LibraryProduct`: `libgpuqrengine`
4643
* `LibraryProduct`: `libspqr`
47-
* `LibraryProduct`: `libsuitesparseconfig`
44+
* `LibraryProduct`: `libsuitesparse_gpuruntime`

src/wrappers/x86_64-linux-gnu-cuda+10.2.jl

Lines changed: 0 additions & 47 deletions
This file was deleted.

src/wrappers/x86_64-linux-gnu-cuda+11.0.jl

Lines changed: 0 additions & 47 deletions
This file was deleted.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Autogenerated wrapper script for SuiteSparse_GPU_jll for x86_64-linux-gnu-cuda+11.4
2+
export libcholmod, libgpuqrengine, libspqr, libsuitesparse_gpuruntime
3+
4+
using libblastrampoline_jll
5+
using SuiteSparse_jll
6+
using CUDA_Runtime_jll
7+
JLLWrappers.@generate_wrapper_header("SuiteSparse_GPU")
8+
JLLWrappers.@declare_library_product(libcholmod, "libcholmod_cuda.so.5")
9+
JLLWrappers.@declare_library_product(libgpuqrengine, "libgpuqrengine_cuda.so.4")
10+
JLLWrappers.@declare_library_product(libspqr, "libspqr_cuda.so.4")
11+
JLLWrappers.@declare_library_product(libsuitesparse_gpuruntime, "libsuitesparse_gpuruntime_cuda.so.4")
12+
function __init__()
13+
JLLWrappers.@generate_init_header(libblastrampoline_jll, SuiteSparse_jll, CUDA_Runtime_jll)
14+
JLLWrappers.@init_library_product(
15+
libcholmod,
16+
"lib/libcholmod_cuda.so",
17+
RTLD_LAZY | RTLD_DEEPBIND,
18+
)
19+
20+
JLLWrappers.@init_library_product(
21+
libgpuqrengine,
22+
"lib/libgpuqrengine_cuda.so",
23+
RTLD_LAZY | RTLD_DEEPBIND,
24+
)
25+
26+
JLLWrappers.@init_library_product(
27+
libspqr,
28+
"lib/libspqr_cuda.so",
29+
RTLD_LAZY | RTLD_DEEPBIND,
30+
)
31+
32+
JLLWrappers.@init_library_product(
33+
libsuitesparse_gpuruntime,
34+
"lib/libsuitesparse_gpuruntime_cuda.so",
35+
RTLD_LAZY | RTLD_DEEPBIND,
36+
)
37+
38+
JLLWrappers.@generate_init_footer()
39+
end # __init__()

0 commit comments

Comments
 (0)