Skip to content

Commit 71d143b

Browse files
committed
Reactant_jll build 0.0.45+0
1 parent 34fa5b0 commit 71d143b

14 files changed

+91
-114
lines changed

.pkg/platform_augmentation.jl

+40-13
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,35 @@ Base.record_compiletime_preference(Reactant_UUID, "mode")
66
Base.record_compiletime_preference(Reactant_UUID, "gpu")
77

88
const mode_preference = if haskey(preferences, "mode")
9-
if isa(preferences["mode"], String) && preferences["mode"] in ["opt", "dbg"]
9+
expected = ("opt", "dbg")
10+
if isa(preferences["mode"], String) && preferences["mode"] in expected
1011
preferences["mode"]
1112
else
12-
@error "Mode preference is not valid; expected 'opt' or 'dbg', but got '$(preferences["debug"])'"
13+
@error "Mode preference is not valid; expected $(join(expected, ", ", ", or ")), but got '$(preferences["debug"])'"
1314
nothing
1415
end
1516
else
1617
nothing
1718
end
1819

1920
const gpu_preference = if haskey(preferences, "gpu")
20-
if isa(preferences["gpu"], String) && preferences["gpu"] in ["none", "cuda", "rocm"]
21+
expected = ("none", "cuda", "rocm")
22+
if isa(preferences["gpu"], String) && preferences["gpu"] in expected
2123
preferences["gpu"]
2224
else
23-
@error "GPU preference is not valid; expected 'none', 'cuda' or 'rocm', but got '$(preferences["debug"])'"
25+
@error "GPU preference is not valid; expected $(join(expected, ", ", ", or ")), but got '$(preferences["gpu"])'"
26+
nothing
27+
end
28+
else
29+
nothing
30+
end
31+
32+
const cuda_version_preference = if haskey(preferences, "cuda_version")
33+
expected = ("none", "12.1", "12.6")
34+
if isa(preferences["cuda_version"], String) && preferences["cuda_version"] in expected
35+
preferences["cuda_version"]
36+
else
37+
@error "CUDA version preference is not valid; expected $(join(expected, ", ", ", or ")), but got '$(preferences["cuda_version"])'"
2438
nothing
2539
end
2640
else
@@ -58,6 +72,8 @@ function augment_platform!(platform::Platform)
5872
# user explicitly asked for no GPU in the preferences.
5973
gpu = something(gpu_preference, "undecided")
6074

75+
cuda_version_tag = something(cuda_version_preference, "none")
76+
6177
# Don't do GPU discovery on platforms for which we don't have GPU builds.
6278
# Keep this in sync with list of platforms for which we actually build with GPU support.
6379
if !(Sys.isapple(platform) || (Sys.islinux(platform) && arch(platform) == "aarch64"))
@@ -72,20 +88,25 @@ function augment_platform!(platform::Platform)
7288
# so that we get recompiled if the driver changes.
7389
if cuname != "" && gpu == "undecided"
7490
handle = Libdl.dlopen(cuname)
75-
cuda_version = cuDriverGetVersion(handle)
91+
current_cuda_version = cuDriverGetVersion(handle)
7692
path = Libdl.dlpath(handle)
7793
Libdl.dlclose(handle)
7894

79-
if cuda_version isa VersionNumber
80-
min_cuda_version = v"12.3"
81-
if cuda_version >= min_cuda_version
82-
@debug "Adding include dependency on $path"
83-
Base.include_dependency(path)
84-
gpu = "cuda"
95+
if cuda_version_tag == "none" && current_cuda_version isa VersionNumber
96+
if v"12.1" <= current_cuda_version < v"12.6"
97+
cuda_version_tag = "12.1"
98+
elseif v"12.6" <= current_cuda_version < v"13"
99+
cuda_version_tag = "12.6"
85100
else
86-
@debug "CUDA version $(cuda_version) in $(path) not supported with this version of Reactant (min: $(min_cuda_version))"
101+
@debug "CUDA version $(current_cuda_version) in $(path) not supported with this version of Reactant"
87102
end
88103
end
104+
105+
if cuda_version_tag != "none"
106+
@debug "Adding include dependency on $(path)"
107+
Base.include_dependency(path)
108+
gpu = "cuda"
109+
end
89110
end
90111

91112
roname = ""
@@ -96,7 +117,7 @@ function augment_platform!(platform::Platform)
96117
path = Libdl.dlpath(handle)
97118
Libdl.dlclose(handle)
98119

99-
@debug "Adding include dependency on $path"
120+
@debug "Adding include dependency on $(path)"
100121
Base.include_dependency(path)
101122
gpu = "rocm"
102123
end
@@ -114,5 +135,11 @@ function augment_platform!(platform::Platform)
114135
platform["gpu"] = gpu
115136
end
116137

138+
gpu = get(ENV, "REACTANT_CUDA_VERSION", cuda_version_tag)
139+
if !haskey(platform, "cuda_version")
140+
platform["cuda_version"] = cuda_version_tag
141+
end
142+
117143
return platform
118144
end
145+

Artifacts.toml

+21-39
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
11
[[Reactant]]
22
arch = "x86_64"
3-
cxxstring_abi = "cxx03"
4-
git-tree-sha1 = "6f7f29ea54ce4104dff22d6cfd95b2be6e1dd634"
5-
gpu = "none"
6-
lazy = true
7-
libc = "glibc"
8-
mode = "opt"
9-
os = "linux"
10-
11-
[[Reactant.download]]
12-
sha256 = "102ce47313431c43240d8ea5a759102f15df871ecdbb73537627b667532f1102"
13-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.44+0/Reactant.v0.0.44.x86_64-linux-gnu-cxx03-gpu+none-mode+opt.tar.gz"
14-
[[Reactant]]
15-
arch = "x86_64"
3+
cuda_version = "none"
164
cxxstring_abi = "cxx11"
175
git-tree-sha1 = "61a0f246197e7e645f6bc64671d7a12105b6c13f"
186
gpu = "none"
@@ -23,22 +11,10 @@ os = "linux"
2311

2412
[[Reactant.download]]
2513
sha256 = "1c6e77fda99a4314804756d9cc51c448ab930b974530899155bb1e4bd724860a"
26-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.44+0/Reactant.v0.0.44.x86_64-linux-gnu-cxx11-gpu+none-mode+opt.tar.gz"
27-
[[Reactant]]
28-
arch = "aarch64"
29-
cxxstring_abi = "cxx03"
30-
git-tree-sha1 = "c835bdb13ac1cc60e8695892effc70250cfb3660"
31-
gpu = "none"
32-
lazy = true
33-
libc = "glibc"
34-
mode = "opt"
35-
os = "linux"
36-
37-
[[Reactant.download]]
38-
sha256 = "53db01ebc3068fcff4769469bfd9de9a80710dd9695d3887a9cd2e5614469266"
39-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.44+0/Reactant.v0.0.44.aarch64-linux-gnu-cxx03-gpu+none-mode+opt.tar.gz"
14+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.45+0/Reactant.v0.0.45.x86_64-linux-gnu-cxx11-cuda_version+none-gpu+none-mode+opt.tar.gz"
4015
[[Reactant]]
4116
arch = "aarch64"
17+
cuda_version = "none"
4218
cxxstring_abi = "cxx11"
4319
git-tree-sha1 = "e5809e6e301b993fe85acaf84ba44e6daa460470"
4420
gpu = "none"
@@ -49,9 +25,10 @@ os = "linux"
4925

5026
[[Reactant.download]]
5127
sha256 = "f820e16afbec4907d76fd8af5759953e16a7d4aed76afc967d0c558acd2e5204"
52-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.44+0/Reactant.v0.0.44.aarch64-linux-gnu-cxx11-gpu+none-mode+opt.tar.gz"
28+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.45+0/Reactant.v0.0.45.aarch64-linux-gnu-cxx11-cuda_version+none-gpu+none-mode+opt.tar.gz"
5329
[[Reactant]]
5430
arch = "x86_64"
31+
cuda_version = "none"
5532
git-tree-sha1 = "26bf183edd8ac2a99be31e7f8cfe31c82c59ea51"
5633
gpu = "none"
5734
lazy = true
@@ -60,9 +37,10 @@ os = "macos"
6037

6138
[[Reactant.download]]
6239
sha256 = "55c303c99b4c615fa3539326c65c99ed7669d422a0b5f0e94bb2d4a833b40fef"
63-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.44+0/Reactant.v0.0.44.x86_64-apple-darwin-gpu+none-mode+opt.tar.gz"
40+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.45+0/Reactant.v0.0.45.x86_64-apple-darwin-cuda_version+none-gpu+none-mode+opt.tar.gz"
6441
[[Reactant]]
6542
arch = "aarch64"
43+
cuda_version = "none"
6644
git-tree-sha1 = "2ad534de21af81830b3e1dbd42ecb1213c5211f1"
6745
gpu = "none"
6846
lazy = true
@@ -71,9 +49,10 @@ os = "macos"
7149

7250
[[Reactant.download]]
7351
sha256 = "1a4028eb1985e21b4fc93020c5a931d703c4898263806a0964dbd31cf8f7528a"
74-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.44+0/Reactant.v0.0.44.aarch64-apple-darwin-gpu+none-mode+opt.tar.gz"
52+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.45+0/Reactant.v0.0.45.aarch64-apple-darwin-cuda_version+none-gpu+none-mode+opt.tar.gz"
7553
[[Reactant]]
7654
arch = "x86_64"
55+
cuda_version = "none"
7756
git-tree-sha1 = "87301a1ae2c294a895322e807502ff6d829b3d4d"
7857
gpu = "none"
7958
lazy = true
@@ -82,9 +61,10 @@ os = "macos"
8261

8362
[[Reactant.download]]
8463
sha256 = "79fb1c5227955dca3b0d483dd708d0c5a8dbaf0180b3dbc5a4a70c5eb4caedee"
85-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.44+0/Reactant.v0.0.44.x86_64-apple-darwin-gpu+none-mode+dbg.tar.gz"
64+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.45+0/Reactant.v0.0.45.x86_64-apple-darwin-cuda_version+none-gpu+none-mode+dbg.tar.gz"
8665
[[Reactant]]
8766
arch = "aarch64"
67+
cuda_version = "none"
8868
git-tree-sha1 = "d5c44fd4d9c343c9b799eff44ee07d629ddeeae0"
8969
gpu = "none"
9070
lazy = true
@@ -93,30 +73,32 @@ os = "macos"
9373

9474
[[Reactant.download]]
9575
sha256 = "7e0622bf653844b29cf628b9bace0f12e6827be26b67375b4ae2accb652a0ab1"
96-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.44+0/Reactant.v0.0.44.aarch64-apple-darwin-gpu+none-mode+dbg.tar.gz"
76+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.45+0/Reactant.v0.0.45.aarch64-apple-darwin-cuda_version+none-gpu+none-mode+dbg.tar.gz"
9777
[[Reactant]]
9878
arch = "x86_64"
99-
cxxstring_abi = "cxx03"
100-
git-tree-sha1 = "4b3874e884e4856a4d2e88a5f200e58dcb057f04"
79+
cuda_version = "12.1"
80+
cxxstring_abi = "cxx11"
81+
git-tree-sha1 = "8bc242dd8be82e5f46dffebf824abe8f882bb817"
10182
gpu = "cuda"
10283
lazy = true
10384
libc = "glibc"
10485
mode = "opt"
10586
os = "linux"
10687

10788
[[Reactant.download]]
108-
sha256 = "30eeb034ce0a0a08bb19328c78ff3d3a4863c0466adb00b6785154d3aedee20d"
109-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.44+0/Reactant.v0.0.44.x86_64-linux-gnu-cxx03-gpu+cuda-mode+opt.tar.gz"
89+
sha256 = "6e80f05f7dc0afceda701d053861b00598b802d24e62131241db390286c61886"
90+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.45+0/Reactant.v0.0.45.x86_64-linux-gnu-cxx11-cuda_version+12.1-gpu+cuda-mode+opt.tar.gz"
11091
[[Reactant]]
11192
arch = "x86_64"
93+
cuda_version = "12.6"
11294
cxxstring_abi = "cxx11"
113-
git-tree-sha1 = "5e8aaca704d0946dde2abf4c37b0563cebf289b1"
95+
git-tree-sha1 = "91b44b72aac62e6ffcebf31b43be0e96617dcbbb"
11496
gpu = "cuda"
11597
lazy = true
11698
libc = "glibc"
11799
mode = "opt"
118100
os = "linux"
119101

120102
[[Reactant.download]]
121-
sha256 = "0186cdcb7fcb15ab20a3a967fd8ef49cccfcd9fc76c9a2f042aba469cc66c817"
122-
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.44+0/Reactant.v0.0.44.x86_64-linux-gnu-cxx11-gpu+cuda-mode+opt.tar.gz"
103+
sha256 = "82a5928ba2f0df609bbaa09b007e97cf037917e41b6609364605030940afadda"
104+
url = "https://github.com/JuliaBinaryWrappers/Reactant_jll.jl/releases/download/Reactant-v0.0.45+0/Reactant.v0.0.45.x86_64-linux-gnu-cxx11-cuda_version+12.6-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.44+0"
3+
version = "0.0.45+0"
44

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

README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# `Reactant_jll.jl` (v0.0.44+0)
1+
# `Reactant_jll.jl` (v0.0.45+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/1926e117bfa294356b5b47290d5dbe329a27f7cd/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/230689b8ff2d2af4258f3c4f8c2dca025b610412/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,14 +18,14 @@ 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: `ce038f847afec02dc3e0d62919179ced25d4745a`)
21+
* git repository: https://github.com/EnzymeAD/Reactant.jl.git (revision: `8ddb738b9e41725ac9201cca78d3ee1864e6d326`)
2222
* file: https://github.com/wsmoses/binaries/releases/download/v0.0.1/bazel-dev (SHA256 checksum: `8b43ffdf519848d89d1c0574d38339dcb326b0a1f4015fceaa43d25107c3aade`)
2323

2424
## Platforms
2525

2626
`Reactant_jll.jl` is available for the following platforms:
2727

28-
* `Linux x86_64 {cxxstring_abi=cxx11, gpu=cuda, libc=glibc, mode=opt}` (`x86_64-linux-gnu-cxx11-gpu+cuda-mode+opt`)
28+
* `Linux x86_64 {cuda_version=12.6, cxxstring_abi=cxx11, gpu=cuda, libc=glibc, mode=opt}` (`x86_64-linux-gnu-cxx11-cuda_version+12.6-gpu+cuda-mode+opt`)
2929

3030
## Dependencies
3131

@@ -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+
* `FileProduct`: `libdevice`
5556
* `LibraryProduct`: `libnccl`
57+
* `LibraryProduct`: `libnvJitLink`
5658
* `LibraryProduct`: `libnvrtc`
5759
* `LibraryProduct`: `libnvrtc_builtins`
5860
* `ExecutableProduct`: `fatbinary`
59-
* `FileProduct`: `libdevice`
60-
* `LibraryProduct`: `libnvJitLink`
6161
* `ExecutableProduct`: `ptxas`

src/wrappers/aarch64-apple-darwin-gpu+none-mode+dbg.jl src/wrappers/aarch64-apple-darwin-cuda_version+none-gpu+none-mode+dbg.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Autogenerated wrapper script for Reactant_jll for aarch64-apple-darwin-gpu+none-mode+dbg
1+
# Autogenerated wrapper script for Reactant_jll for aarch64-apple-darwin-cuda_version+none-gpu+none-mode+dbg
22
export libReactantExtra
33

44
JLLWrappers.@generate_wrapper_header("Reactant")

src/wrappers/aarch64-apple-darwin-gpu+none-mode+opt.jl src/wrappers/aarch64-apple-darwin-cuda_version+none-gpu+none-mode+opt.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Autogenerated wrapper script for Reactant_jll for aarch64-apple-darwin-gpu+none-mode+opt
1+
# Autogenerated wrapper script for Reactant_jll for aarch64-apple-darwin-cuda_version+none-gpu+none-mode+opt
22
export libReactantExtra
33

44
JLLWrappers.@generate_wrapper_header("Reactant")

src/wrappers/aarch64-linux-gnu-cxx03-gpu+none-mode+opt.jl src/wrappers/aarch64-linux-gnu-cxx11-cuda_version+none-gpu+none-mode+opt.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Autogenerated wrapper script for Reactant_jll for aarch64-linux-gnu-cxx03-gpu+none-mode+opt
1+
# Autogenerated wrapper script for Reactant_jll for aarch64-linux-gnu-cxx11-cuda_version+none-gpu+none-mode+opt
22
export libReactantExtra
33

44
using CUDA_Driver_jll

src/wrappers/aarch64-linux-gnu-cxx11-gpu+none-mode+opt.jl

-16
This file was deleted.

src/wrappers/x86_64-apple-darwin-gpu+none-mode+dbg.jl src/wrappers/x86_64-apple-darwin-cuda_version+none-gpu+none-mode+dbg.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Autogenerated wrapper script for Reactant_jll for x86_64-apple-darwin-gpu+none-mode+dbg
1+
# Autogenerated wrapper script for Reactant_jll for x86_64-apple-darwin-cuda_version+none-gpu+none-mode+dbg
22
export libReactantExtra
33

44
JLLWrappers.@generate_wrapper_header("Reactant")

src/wrappers/x86_64-apple-darwin-gpu+none-mode+opt.jl src/wrappers/x86_64-apple-darwin-cuda_version+none-gpu+none-mode+opt.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Autogenerated wrapper script for Reactant_jll for x86_64-apple-darwin-gpu+none-mode+opt
1+
# Autogenerated wrapper script for Reactant_jll for x86_64-apple-darwin-cuda_version+none-gpu+none-mode+opt
22
export libReactantExtra
33

44
JLLWrappers.@generate_wrapper_header("Reactant")

0 commit comments

Comments
 (0)