Skip to content

Commit f576105

Browse files
committed
Reactant_jll build 0.0.35+0
1 parent 17fb3bc commit f576105

6 files changed

+106
-93
lines changed

.pkg/platform_augmentation.jl

+54-41
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,90 @@
1-
using Base.BinaryPlatforms
2-
using Libdl
3-
const Reactant_UUID = Base.UUID("0192cb87-2b54-54ad-80e0-3be72ad8a3c0")
4-
const preferences = Base.get_preferences(Reactant_UUID)
5-
Base.record_compiletime_preference(Reactant_UUID, "mode")
6-
Base.record_compiletime_preference(Reactant_UUID, "gpu")
1+
using Base.BinaryPlatforms
2+
using Libdl
3+
const Reactant_UUID = Base.UUID("0192cb87-2b54-54ad-80e0-3be72ad8a3c0")
4+
const preferences = Base.get_preferences(Reactant_UUID)
5+
Base.record_compiletime_preference(Reactant_UUID, "mode")
6+
Base.record_compiletime_preference(Reactant_UUID, "gpu")
77

8-
const mode_preference = if haskey(preferences, "mode")
9-
if isa(preferences["mode"], String) && preferences["mode"] in ["opt", "dbg"]
10-
preferences["mode"]
11-
else
12-
@error "Mode preference is not valid; expected 'opt' or 'dbg', but got '$(preferences["debug"])'"
13-
nothing
14-
end
8+
const mode_preference = if haskey(preferences, "mode")
9+
if isa(preferences["mode"], String) && preferences["mode"] in ["opt", "dbg"]
10+
preferences["mode"]
1511
else
12+
@error "Mode preference is not valid; expected 'opt' or 'dbg', but got '$(preferences["debug"])'"
1613
nothing
1714
end
18-
19-
const gpu_preference = if haskey(preferences, "gpu")
20-
if isa(preferences["gpu"], String) && preferences["gpu"] in ["none", "cuda", "rocm"]
21-
preferences["gpu"]
22-
else
23-
@error "GPU preference is not valid; expected 'none', 'cuda' or 'rocm', but got '$(preferences["debug"])'"
24-
nothing
25-
end
15+
else
16+
nothing
17+
end
18+
19+
const gpu_preference = if haskey(preferences, "gpu")
20+
if isa(preferences["gpu"], String) && preferences["gpu"] in ["none", "cuda", "rocm"]
21+
preferences["gpu"]
2622
else
23+
@error "GPU preference is not valid; expected 'none', 'cuda' or 'rocm', but got '$(preferences["debug"])'"
2724
nothing
2825
end
26+
else
27+
nothing
28+
end
2929

30-
function augment_platform!(platform::Platform)
30+
function augment_platform!(platform::Platform)
3131

32-
mode = get(ENV, "REACTANT_MODE", something(mode_preference, "opt"))
33-
if !haskey(platform, "mode")
34-
platform["mode"] = mode
35-
end
36-
37-
gpu = something(gpu_preference, "none")
32+
mode = get(ENV, "REACTANT_MODE", something(mode_preference, "opt"))
33+
if !haskey(platform, "mode")
34+
platform["mode"] = mode
35+
end
36+
37+
# "none" is for no gpu, but use "nothing" here to distinguish the case where the
38+
# user explicitly asked for no GPU in the preferences.
39+
gpu = something(gpu_preference, "undecided")
3840

39-
cuname = if Sys.iswindows()
41+
# Don't do GPU discovery on platforms for which we don't have GPU builds.
42+
# Keep this in sync with list of platforms for which we actually build with GPU support.
43+
if !(Sys.isapple(platform) || (Sys.islinux(platform) && arch(platform) == "aarch64"))
44+
45+
cuname = if Sys.iswindows()
4046
Libdl.find_library("nvcuda")
4147
else
4248
Libdl.find_library(["libcuda.so.1", "libcuda.so"])
4349
end
4450

4551
# if we've found a system driver, put a dependency on it,
4652
# so that we get recompiled if the driver changes.
47-
if cuname != "" && gpu == "none"
53+
if cuname != "" && gpu == "undecided"
4854
handle = Libdl.dlopen(cuname)
4955
path = Libdl.dlpath(handle)
5056
Libdl.dlclose(handle)
5157

5258
@debug "Adding include dependency on $path"
5359
Base.include_dependency(path)
54-
gpu = "cuda"
60+
gpu = "cuda"
5561
end
56-
57-
roname = ""
62+
63+
roname = ""
5864
# if we've found a system driver, put a dependency on it,
5965
# so that we get recompiled if the driver changes.
60-
if roname != "" && gpu == "none"
66+
if roname != "" && gpu == "undecided"
6167
handle = Libdl.dlopen(roname)
6268
path = Libdl.dlpath(handle)
6369
Libdl.dlclose(handle)
6470

6571
@debug "Adding include dependency on $path"
6672
Base.include_dependency(path)
67-
gpu = "rocm"
73+
gpu = "rocm"
6874
end
6975

70-
gpu = get(ENV, "REACTANT_GPU", gpu)
71-
if !haskey(platform, "gpu")
72-
platform["gpu"] = gpu
73-
end
76+
end
7477

75-
return platform
78+
# If gpu option is still "undecided" (no preference expressed) at this point, then
79+
# make it "none" (no GPU support).
80+
if gpu == "undecided"
81+
gpu = "none"
7682
end
77-
83+
84+
gpu = get(ENV, "REACTANT_GPU", gpu)
85+
if !haskey(platform, "gpu")
86+
platform["gpu"] = gpu
87+
end
88+
89+
return platform
90+
end

Artifacts.toml

+14-14
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ os = "linux"
1010

1111
[[Reactant.download]]
1212
sha256 = "7d1dd525cc5d3589a92b16a2d2342a43635ce457bedad593decce1b8a26a9fc8"
13-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.34+0/Reactant.v0.0.34.x86_64-linux-gnu-cxx03-gpu+none-mode+opt.tar.gz"
13+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.35+0/Reactant.v0.0.35.x86_64-linux-gnu-cxx03-gpu+none-mode+opt.tar.gz"
1414
[[Reactant]]
1515
arch = "x86_64"
1616
cxxstring_abi = "cxx11"
@@ -23,7 +23,7 @@ os = "linux"
2323

2424
[[Reactant.download]]
2525
sha256 = "fe10147d133fa7c45f0ec884ce1f28fc9fb499703a706269a64eb7a6133fcf45"
26-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.34+0/Reactant.v0.0.34.x86_64-linux-gnu-cxx11-gpu+none-mode+opt.tar.gz"
26+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.35+0/Reactant.v0.0.35.x86_64-linux-gnu-cxx11-gpu+none-mode+opt.tar.gz"
2727
[[Reactant]]
2828
arch = "aarch64"
2929
cxxstring_abi = "cxx03"
@@ -36,7 +36,7 @@ os = "linux"
3636

3737
[[Reactant.download]]
3838
sha256 = "556c2801f5b32f5425e07ed2c01232172754bbfeb97db5bd6c09f0be66a28776"
39-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.34+0/Reactant.v0.0.34.aarch64-linux-gnu-cxx03-gpu+none-mode+opt.tar.gz"
39+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.35+0/Reactant.v0.0.35.aarch64-linux-gnu-cxx03-gpu+none-mode+opt.tar.gz"
4040
[[Reactant]]
4141
arch = "aarch64"
4242
cxxstring_abi = "cxx11"
@@ -49,7 +49,7 @@ os = "linux"
4949

5050
[[Reactant.download]]
5151
sha256 = "17b079737f0c51be62d0c4ee001cb665fc97ec8a8acd4c7c3bf139ce6646eb82"
52-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.34+0/Reactant.v0.0.34.aarch64-linux-gnu-cxx11-gpu+none-mode+opt.tar.gz"
52+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.35+0/Reactant.v0.0.35.aarch64-linux-gnu-cxx11-gpu+none-mode+opt.tar.gz"
5353
[[Reactant]]
5454
arch = "x86_64"
5555
git-tree-sha1 = "583f0af812e430e4eb01af55d9f30fcf928d2622"
@@ -60,7 +60,7 @@ os = "macos"
6060

6161
[[Reactant.download]]
6262
sha256 = "d2dfc2cd5db7d723b5d588f8fcc79a29f90d54f8c1fa42f7848d0357b003d3fd"
63-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.34+0/Reactant.v0.0.34.x86_64-apple-darwin-gpu+none-mode+opt.tar.gz"
63+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.35+0/Reactant.v0.0.35.x86_64-apple-darwin-gpu+none-mode+opt.tar.gz"
6464
[[Reactant]]
6565
arch = "aarch64"
6666
git-tree-sha1 = "3c1a3adbd5fea9dc6cef5ff6f459ce623bb25db8"
@@ -71,7 +71,7 @@ os = "macos"
7171

7272
[[Reactant.download]]
7373
sha256 = "4fe87a0124e798fc4da373c63b3a5ea1a9917cc8b1f377c024a60a777fd3c9ba"
74-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.34+0/Reactant.v0.0.34.aarch64-apple-darwin-gpu+none-mode+opt.tar.gz"
74+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.35+0/Reactant.v0.0.35.aarch64-apple-darwin-gpu+none-mode+opt.tar.gz"
7575
[[Reactant]]
7676
arch = "x86_64"
7777
git-tree-sha1 = "ef2223bbe0aa0ed1f66d6f385cfaa493180e79d9"
@@ -82,7 +82,7 @@ os = "macos"
8282

8383
[[Reactant.download]]
8484
sha256 = "9a81a6876b39c8de6a34ba5e225636e11312cd776c7b4768754e56824560fec2"
85-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.34+0/Reactant.v0.0.34.x86_64-apple-darwin-gpu+none-mode+dbg.tar.gz"
85+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.35+0/Reactant.v0.0.35.x86_64-apple-darwin-gpu+none-mode+dbg.tar.gz"
8686
[[Reactant]]
8787
arch = "aarch64"
8888
git-tree-sha1 = "06797e9cd5897286cd5bfc4eded9a6947b08523c"
@@ -93,30 +93,30 @@ os = "macos"
9393

9494
[[Reactant.download]]
9595
sha256 = "82e07f4f49231986e21d6bb9e92683c00cca72dac7fa0ce537dbeec31daf2552"
96-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.34+0/Reactant.v0.0.34.aarch64-apple-darwin-gpu+none-mode+dbg.tar.gz"
96+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.35+0/Reactant.v0.0.35.aarch64-apple-darwin-gpu+none-mode+dbg.tar.gz"
9797
[[Reactant]]
9898
arch = "x86_64"
9999
cxxstring_abi = "cxx03"
100-
git-tree-sha1 = "9fef6aa9f23b578d457bdd3ee1a629c1f0944ba9"
100+
git-tree-sha1 = "773fefed110ad4708618728134e1bced542470b3"
101101
gpu = "cuda"
102102
lazy = true
103103
libc = "glibc"
104104
mode = "opt"
105105
os = "linux"
106106

107107
[[Reactant.download]]
108-
sha256 = "28e878639cb77db56c88f65f7274ae5269d65761c56506bc5ecb5cfc600f046a"
109-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.34+0/Reactant.v0.0.34.x86_64-linux-gnu-cxx03-gpu+cuda-mode+opt.tar.gz"
108+
sha256 = "977a2160f64321375395c36f45ca0e597d9b88b023577bb1bf9fab9a7f83baa5"
109+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.35+0/Reactant.v0.0.35.x86_64-linux-gnu-cxx03-gpu+cuda-mode+opt.tar.gz"
110110
[[Reactant]]
111111
arch = "x86_64"
112112
cxxstring_abi = "cxx11"
113-
git-tree-sha1 = "10d00164efeea49b4f1e73e7790c085421ff276f"
113+
git-tree-sha1 = "3cc6d15fde666723c6132f6b2c7d62714bcb4280"
114114
gpu = "cuda"
115115
lazy = true
116116
libc = "glibc"
117117
mode = "opt"
118118
os = "linux"
119119

120120
[[Reactant.download]]
121-
sha256 = "b7751d75d1748cbf6a910747d509af90e8e5b4192f3bcff45301a335654eb148"
122-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.34+0/Reactant.v0.0.34.x86_64-linux-gnu-cxx11-gpu+cuda-mode+opt.tar.gz"
121+
sha256 = "b0bf28f75bc66f71b0544fcaa2886ebaec1c015ebdf751d8258e6f25e61750a9"
122+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.35+0/Reactant.v0.0.35.x86_64-linux-gnu-cxx11-gpu+cuda-mode+opt.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.34+0"
3+
version = "0.0.35+0"
44

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

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# `Reactant_jll.jl` (v0.0.34+0)
1+
# `Reactant_jll.jl` (v0.0.35+0)
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/48c81e4e57cb314c4f5d0dbc14214da7601f5685/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/7c1dd50ed9e090de767b9cead73b2e926d7a53d2/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

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

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

21-
* git repository: https://github.com/EnzymeAD/Reactant.jl.git (revision: `25abfe4030eaad85b1a76716afae8a0b82de789a`)
21+
* git repository: https://github.com/EnzymeAD/Reactant.jl.git (revision: `db7ee18af64bc4c0ad2285064426138c1a3746ca`)
2222
* file: https://github.com/wsmoses/binaries/releases/download/v0.0.1/bazel-dev (SHA256 checksum: `8b43ffdf519848d89d1c0574d38339dcb326b0a1f4015fceaa43d25107c3aade`)
2323

2424
## Platforms
@@ -52,10 +52,10 @@ The code bindings within this package are autogenerated from the following `Prod
5252
* `LibraryProduct`: `libcufft`
5353
* `LibraryProduct`: `libcusolver`
5454
* `LibraryProduct`: `libcusparse`
55-
* `ExecutableProduct`: `fatbinary`
56-
* `FileProduct`: `libdevice`
5755
* `LibraryProduct`: `libnccl`
5856
* `LibraryProduct`: `libnvJitLink`
5957
* `LibraryProduct`: `libnvrtc`
6058
* `LibraryProduct`: `libnvrtc_builtins`
59+
* `ExecutableProduct`: `fatbinary`
60+
* `FileProduct`: `libdevice`
6161
* `ExecutableProduct`: `ptxas`

src/wrappers/x86_64-linux-gnu-cxx03-gpu+cuda-mode+opt.jl

+20-20
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ JLLWrappers.@declare_library_product(libcudnn_ops, "libcudnn_ops.so.9")
1818
JLLWrappers.@declare_library_product(libcufft, "libcufft.so.11")
1919
JLLWrappers.@declare_library_product(libcusolver, "libcusolver.so.11")
2020
JLLWrappers.@declare_library_product(libcusparse, "libcusparse.so.12")
21-
JLLWrappers.@declare_file_product(libdevice)
22-
JLLWrappers.@declare_library_product(libnccl, "libnccl.so.2")
23-
JLLWrappers.@declare_library_product(libnvJitLink, "libnvJitLink.so.12")
2421
JLLWrappers.@declare_library_product(libnvrtc, "libnvrtc.so.12")
2522
JLLWrappers.@declare_library_product(libnvrtc_builtins, "libnvrtc-builtins.so.12.6")
2623
JLLWrappers.@declare_executable_product(fatbinary)
24+
JLLWrappers.@declare_file_product(libdevice)
25+
JLLWrappers.@declare_library_product(libnccl, "libnccl.so.2")
26+
JLLWrappers.@declare_library_product(libnvJitLink, "libnvJitLink.so.12")
2727
JLLWrappers.@declare_executable_product(ptxas)
2828
function __init__()
2929
JLLWrappers.@generate_init_header(CUDA_Driver_jll)
@@ -117,23 +117,6 @@ function __init__()
117117
nothing,
118118
)
119119

120-
JLLWrappers.@init_file_product(
121-
libdevice,
122-
"lib/cuda/nvvm/libdevice/libdevice.10.bc",
123-
)
124-
125-
JLLWrappers.@init_library_product(
126-
libnccl,
127-
"lib/libnccl.so.2",
128-
nothing,
129-
)
130-
131-
JLLWrappers.@init_library_product(
132-
libnvJitLink,
133-
"lib/libnvJitLink.so.12",
134-
nothing,
135-
)
136-
137120
JLLWrappers.@init_library_product(
138121
libnvrtc,
139122
"lib/libnvrtc.so.12",
@@ -151,6 +134,23 @@ function __init__()
151134
"lib/cuda/bin/fatbinary",
152135
)
153136

137+
JLLWrappers.@init_file_product(
138+
libdevice,
139+
"lib/cuda/nvvm/libdevice/libdevice.10.bc",
140+
)
141+
142+
JLLWrappers.@init_library_product(
143+
libnccl,
144+
"lib/libnccl.so.2",
145+
nothing,
146+
)
147+
148+
JLLWrappers.@init_library_product(
149+
libnvJitLink,
150+
"lib/libnvJitLink.so.12",
151+
nothing,
152+
)
153+
154154
JLLWrappers.@init_executable_product(
155155
ptxas,
156156
"lib/cuda/bin/ptxas",

src/wrappers/x86_64-linux-gnu-cxx11-gpu+cuda-mode+opt.jl

+12-12
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ JLLWrappers.@declare_library_product(libcudnn_ops, "libcudnn_ops.so.9")
1818
JLLWrappers.@declare_library_product(libcufft, "libcufft.so.11")
1919
JLLWrappers.@declare_library_product(libcusolver, "libcusolver.so.11")
2020
JLLWrappers.@declare_library_product(libcusparse, "libcusparse.so.12")
21-
JLLWrappers.@declare_executable_product(fatbinary)
22-
JLLWrappers.@declare_file_product(libdevice)
2321
JLLWrappers.@declare_library_product(libnccl, "libnccl.so.2")
2422
JLLWrappers.@declare_library_product(libnvJitLink, "libnvJitLink.so.12")
2523
JLLWrappers.@declare_library_product(libnvrtc, "libnvrtc.so.12")
2624
JLLWrappers.@declare_library_product(libnvrtc_builtins, "libnvrtc-builtins.so.12.6")
25+
JLLWrappers.@declare_executable_product(fatbinary)
26+
JLLWrappers.@declare_file_product(libdevice)
2727
JLLWrappers.@declare_executable_product(ptxas)
2828
function __init__()
2929
JLLWrappers.@generate_init_header(CUDA_Driver_jll)
@@ -117,16 +117,6 @@ function __init__()
117117
nothing,
118118
)
119119

120-
JLLWrappers.@init_executable_product(
121-
fatbinary,
122-
"lib/cuda/bin/fatbinary",
123-
)
124-
125-
JLLWrappers.@init_file_product(
126-
libdevice,
127-
"lib/cuda/nvvm/libdevice/libdevice.10.bc",
128-
)
129-
130120
JLLWrappers.@init_library_product(
131121
libnccl,
132122
"lib/libnccl.so.2",
@@ -151,6 +141,16 @@ function __init__()
151141
nothing,
152142
)
153143

144+
JLLWrappers.@init_executable_product(
145+
fatbinary,
146+
"lib/cuda/bin/fatbinary",
147+
)
148+
149+
JLLWrappers.@init_file_product(
150+
libdevice,
151+
"lib/cuda/nvvm/libdevice/libdevice.10.bc",
152+
)
153+
154154
JLLWrappers.@init_executable_product(
155155
ptxas,
156156
"lib/cuda/bin/ptxas",

0 commit comments

Comments
 (0)