Skip to content

Commit 694b88f

Browse files
committed
Reactant_jll build 0.0.12+2
1 parent 0f0d75a commit 694b88f

File tree

4 files changed

+25
-77
lines changed

4 files changed

+25
-77
lines changed

.pkg/platform_augmentation.jl

+12-64
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,27 @@
11
using Base.BinaryPlatforms
22

3-
const Reactant_UUID = Base.UUID("3c362404-f566-11ee-1572-e11a4b42c853")
3+
const Reactant_UUID = Base.UUID("0192cb87-2b54-54ad-80e0-3be72ad8a3c0")
44
const preferences = Base.get_preferences(Reactant_UUID)
5-
6-
module __CUDA
7-
using Base.BinaryPlatforms
8-
9-
try
10-
using CUDA_Runtime_jll
11-
catch
12-
# during initial package installation, CUDA_Runtime_jll may not be available.
13-
# in that case, we just won't select an artifact.
14-
end
15-
16-
# can't use Preferences for the same reason
17-
const CUDA_Runtime_jll_uuid = Base.UUID("76a88914-d11a-5bdc-97e0-2f5a05c973a2")
18-
const preferences = Base.get_preferences(CUDA_Runtime_jll_uuid)
19-
Base.record_compiletime_preference(CUDA_Runtime_jll_uuid, "version")
20-
Base.record_compiletime_preference(CUDA_Runtime_jll_uuid, "local")
21-
const local_toolkit = something(tryparse(Bool, get(preferences, "local", "false")), false)
22-
23-
function cuda_comparison_strategy(_a::String, _b::String, a_requested::Bool, b_requested::Bool)
24-
# if we're using a local toolkit, we can't use artifacts
25-
if local_toolkit
26-
return false
27-
end
28-
29-
# if either isn't a version number (e.g. "none"), perform a simple equality check
30-
a = tryparse(VersionNumber, _a)
31-
b = tryparse(VersionNumber, _b)
32-
if a === nothing || b === nothing
33-
return _a == _b
34-
end
35-
36-
# if both b and a requested, then we fall back to equality
37-
if a_requested && b_requested
38-
return Base.thisminor(a) == Base.thisminor(b)
39-
end
40-
41-
# otherwise, do the comparison between the the single version cap and the single version:
42-
function is_compatible(artifact::VersionNumber, host::VersionNumber)
43-
if host >= v"11.0"
44-
# enhanced compatibility, semver-style
45-
artifact.major == host.major &&
46-
Base.thisminor(artifact) <= Base.thisminor(host)
47-
else
48-
Base.thisminor(artifact) == Base.thisminor(host)
49-
end
50-
end
51-
if a_requested
52-
is_compatible(b, a)
5+
Base.record_compiletime_preference(Reactant_UUID, "mode")
6+
const mode_preference = if haskey(preferences, "mode")
7+
if isa(preferences["mode"], String) && preferences["mode"] in ["opt", "dbg"]
8+
preferences["mode"]
539
else
54-
is_compatible(a, b)
10+
@error "Mode preference is not valid; expected 'opt' or 'dbg', but got '$(preferences["debug"])'"
11+
nothing
5512
end
13+
else
14+
nothing
5615
end
5716

58-
function augment_platform!(platform::Platform)
59-
if !@isdefined(CUDA_Runtime_jll)
60-
# don't set to nothing or Pkg will download any artifact
61-
platform["cuda"] = "none"
62-
end
63-
64-
if !haskey(platform, "cuda")
65-
CUDA_Runtime_jll.augment_platform!(platform)
66-
end
67-
BinaryPlatforms.set_compare_strategy!(platform, "cuda", cuda_comparison_strategy)
68-
69-
return platform
70-
end
17+
module __CUDA
18+
$(CUDA.augment::String)
7119
end
7220

7321
function augment_platform!(platform::Platform)
7422
__CUDA.augment_platform!(platform)
7523

76-
mode = get(ENV, "REACTANT_MODE", get(preferences, "mode", "opt"))
24+
mode = get(ENV, "REACTANT_MODE", something(mode_preference, "opt"))
7725
if !haskey(platform, "mode")
7826
platform["mode"] = mode
7927
end

Artifacts.toml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
[[Reactant]]
22
arch = "x86_64"
33
cxxstring_abi = "cxx03"
4-
git-tree-sha1 = "019030b32ad866ecee6a36651adf8f98429183c3"
4+
git-tree-sha1 = "b82b45674ec50aba972c7625f1443fcbfd79d382"
55
lazy = true
66
libc = "glibc"
77
mode = "opt"
88
os = "linux"
99

1010
[[Reactant.download]]
11-
sha256 = "1d442d5c721cb5d9818de074f58a21e1e138b03b66c405c73df06e374498457a"
12-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.12+1/Reactant.v0.0.12.x86_64-linux-gnu-cxx03-mode+opt.tar.gz"
11+
sha256 = "1a5491a6139c5915071c78093ad40edb17f0438e788a5eeb8aed75bc04d4c37d"
12+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.12+2/Reactant.v0.0.12.x86_64-linux-gnu-cxx03-mode+opt.tar.gz"
1313
[[Reactant]]
1414
arch = "x86_64"
1515
cxxstring_abi = "cxx11"
16-
git-tree-sha1 = "6f385e914eb022a7a89b3a30e2918fbfcb50588b"
16+
git-tree-sha1 = "cc0cc2e07262e90ad6964f4d886c2b2a0fadb34b"
1717
lazy = true
1818
libc = "glibc"
1919
mode = "opt"
2020
os = "linux"
2121

2222
[[Reactant.download]]
23-
sha256 = "eec32285597cee023ffbc63a7f9f61120e37a87000b609664c834ba2c2bc98a7"
24-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.12+1/Reactant.v0.0.12.x86_64-linux-gnu-cxx11-mode+opt.tar.gz"
23+
sha256 = "4b9537e1c955d52059c9dc427fcf091bd046d1c24fd5220c6a037bba88be5ecf"
24+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.12+2/Reactant.v0.0.12.x86_64-linux-gnu-cxx11-mode+opt.tar.gz"
2525
[[Reactant]]
2626
arch = "x86_64"
2727
git-tree-sha1 = "1284924e0fd23a71212daf91fdeb303c5e00ac52"
@@ -31,7 +31,7 @@ os = "macos"
3131

3232
[[Reactant.download]]
3333
sha256 = "a45a32410c6c818f52579be61886fad3e82f73945b78281e360a958bd72dc3eb"
34-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.12+1/Reactant.v0.0.12.x86_64-apple-darwin-mode+opt.tar.gz"
34+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.12+2/Reactant.v0.0.12.x86_64-apple-darwin-mode+opt.tar.gz"
3535
[[Reactant]]
3636
arch = "aarch64"
3737
git-tree-sha1 = "174ba4c10048a1723687d4450c221b69f21cc757"
@@ -41,7 +41,7 @@ os = "macos"
4141

4242
[[Reactant.download]]
4343
sha256 = "25931550e3f908416d4c4acb06e6ca9ba36a1ed9376e541fa94a3ad90587d432"
44-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.12+1/Reactant.v0.0.12.aarch64-apple-darwin-mode+opt.tar.gz"
44+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.12+2/Reactant.v0.0.12.aarch64-apple-darwin-mode+opt.tar.gz"
4545
[[Reactant]]
4646
arch = "x86_64"
4747
git-tree-sha1 = "606aa544c4505c5990b684a11c51a93dd52bd2fa"
@@ -51,7 +51,7 @@ os = "macos"
5151

5252
[[Reactant.download]]
5353
sha256 = "e073a733e6e74a7f5232cc679bc6c2e5282e8029da304a908464a0741c4f6baa"
54-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.12+1/Reactant.v0.0.12.x86_64-apple-darwin-mode+dbg.tar.gz"
54+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.12+2/Reactant.v0.0.12.x86_64-apple-darwin-mode+dbg.tar.gz"
5555
[[Reactant]]
5656
arch = "aarch64"
5757
git-tree-sha1 = "b8c782c91ccae48026286c8a54e95ab15fced213"
@@ -61,4 +61,4 @@ os = "macos"
6161

6262
[[Reactant.download]]
6363
sha256 = "06a5c62cded3f0ef28baac42ec6815950a6e553f5412a5fb4e451d27794594cc"
64-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.12+1/Reactant.v0.0.12.aarch64-apple-darwin-mode+dbg.tar.gz"
64+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.12+2/Reactant.v0.0.12.aarch64-apple-darwin-mode+dbg.tar.gz"

Project.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "Reactant_jll"
22
uuid = "0192cb87-2b54-54ad-80e0-3be72ad8a3c0"
3-
version = "0.0.12+1"
3+
version = "0.0.12+2"
44

55
[deps]
66
JLLWrappers = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# `Reactant_jll.jl` (v0.0.12+1)
1+
# `Reactant_jll.jl` (v0.0.12+2)
22

33
[![deps](https://juliahub.com/docs/Reactant_jll/deps.svg)](https://juliahub.com/ui/Packages/General/Reactant_jll/)
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/b4591d45f94250a24d4901c99495756516a33cfc/R/Reactant/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/e3b5baf5c84aa18ba7c5c40d0889b010d96ece15/R/Reactant/build_tarballs.jl) script can be found on [`Yggdrasil`](https://github.com/JuliaPackaging/Yggdrasil/), the community build tree.
88

99
## Bug Reports
1010

0 commit comments

Comments
 (0)