Skip to content

Commit cdb3f80

Browse files
committed
CUDA_Driver_jll build 0.2.0+0
1 parent ca6e405 commit cdb3f80

File tree

6 files changed

+66
-36
lines changed

6 files changed

+66
-36
lines changed

Artifacts.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ os = "linux"
77

88
[[CUDA_Driver.download]]
99
sha256 = "a6cd6aa5c0ceb95e2d14064e012ecfd81e2ea1104612a7e0aec1ddabe59c153b"
10-
url = "https://github.com/JuliaBinaryWrappers/CUDA_Driver_jll.jl/releases/download/CUDA_Driver-v0.1.0+0/CUDA_Driver.v0.1.0.x86_64-linux-gnu.tar.gz"
10+
url = "https://github.com/JuliaBinaryWrappers/CUDA_Driver_jll.jl/releases/download/CUDA_Driver-v0.2.0+0/CUDA_Driver.v0.2.0.x86_64-linux-gnu.tar.gz"
1111
[[CUDA_Driver]]
1212
arch = "powerpc64le"
1313
git-tree-sha1 = "7b4d06d1a0ff9386810fdf729b067d8ba77c97b5"
@@ -17,7 +17,7 @@ os = "linux"
1717

1818
[[CUDA_Driver.download]]
1919
sha256 = "c732d8d14860892002d8e1f492deb6cdce899bdf934d89c09b2f3e7bb5414a7e"
20-
url = "https://github.com/JuliaBinaryWrappers/CUDA_Driver_jll.jl/releases/download/CUDA_Driver-v0.1.0+0/CUDA_Driver.v0.1.0.powerpc64le-linux-gnu.tar.gz"
20+
url = "https://github.com/JuliaBinaryWrappers/CUDA_Driver_jll.jl/releases/download/CUDA_Driver-v0.2.0+0/CUDA_Driver.v0.2.0.powerpc64le-linux-gnu.tar.gz"
2121
[[CUDA_Driver]]
2222
arch = "aarch64"
2323
git-tree-sha1 = "6775921ab78b370d8da50fb0b79e1cff0baa94b9"
@@ -27,4 +27,4 @@ os = "linux"
2727

2828
[[CUDA_Driver.download]]
2929
sha256 = "2bbf905872c1d57d076c74aae9f7f57ecd2525ca3b36386eee8fbc18ca71dd7a"
30-
url = "https://github.com/JuliaBinaryWrappers/CUDA_Driver_jll.jl/releases/download/CUDA_Driver-v0.1.0+0/CUDA_Driver.v0.1.0.aarch64-linux-gnu.tar.gz"
30+
url = "https://github.com/JuliaBinaryWrappers/CUDA_Driver_jll.jl/releases/download/CUDA_Driver-v0.2.0+0/CUDA_Driver.v0.2.0.aarch64-linux-gnu.tar.gz"

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "CUDA_Driver_jll"
22
uuid = "4ee394cb-3365-5eb0-8335-949819d2adfc"
3-
version = "0.1.0+0"
3+
version = "0.2.0+0"
44

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

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# `CUDA_Driver_jll.jl` (v0.1.0+0)
1+
# `CUDA_Driver_jll.jl` (v0.2.0+0)
22

33
[![deps](https://juliahub.com/docs/CUDA_Driver_jll/deps.svg)](https://juliahub.com/ui/Packages/CUDA_Driver_jll/QJyk7?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/558c4345b3f0cfb367490777144063d4582a0f77/C/CUDA/CUDA_Driver/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/478c7490b3aa7e5ed482b65edb917d2a3fc9c286/C/CUDA/CUDA_Driver/build_tarballs.jl) script can be found on [`Yggdrasil`](https://github.com/JuliaPackaging/Yggdrasil/), the community build tree.
88

99
## Bug Reports
1010

src/wrappers/aarch64-linux-gnu.jl

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ function __init__()
2020

2121
JLLWrappers.@generate_init_footer()
2222
global compat_version = v"11.8.0"
23+
# global variables we will set
24+
global libcuda
25+
global libcuda_version
26+
global libcuda_original_version
27+
2328
# minimal API call wrappers we need
2429
function driver_version(library_handle)
2530
function_handle = Libdl.dlsym(library_handle, "cuDriverGetVersion")
@@ -49,16 +54,12 @@ function __init__()
4954
@debug "No system CUDA driver found"
5055
return
5156
end
52-
global libcuda = system_driver
57+
libcuda = system_driver
5358

5459
# check if the system driver is already loaded. in that case, we have to use it because
5560
# the code that loaded it in the first place might have made assumptions based on it.
5661
system_driver_loaded = Libdl.dlopen(system_driver, Libdl.RTLD_NOLOAD;
5762
throw_error=false) !== nothing
58-
if system_driver_loaded
59-
@debug "System CUDA driver already loaded, continuing using it"
60-
return
61-
end
6263
driver_handle = Libdl.dlopen(system_driver; throw_error=true)
6364

6465
# query the system driver version
@@ -73,6 +74,14 @@ function __init__()
7374
return
7475
end
7576
@debug "System CUDA driver found at $system_driver, detected as version $system_version"
77+
libcuda = system_driver
78+
libcuda_version = system_version
79+
80+
# check if the system driver is already loaded (see above)
81+
if system_driver_loaded
82+
@debug "System CUDA driver already loaded, continuing using it"
83+
return
84+
end
7685

7786
# check the user preference
7887
if !parse(Bool, get(ENV, "JULIA_CUDA_USE_COMPAT", "true"))
@@ -136,16 +145,17 @@ function __init__()
136145
throw_error=false) !== nothing
137146
if compat_driver_loaded
138147
error("Could not unload the forward compatible CUDA driver library." *
139-
"This is probably caused by running Julia under a tool that hooks CUDA API calls." *
140-
"In that case, prevent Julia from loading multiple drivers" *
141-
" by setting JULIA_CUDA_USE_COMPAT=false in your environment.")
148+
"This is probably caused by running Julia under a tool that hooks CUDA API calls." *
149+
"In that case, prevent Julia from loading multiple drivers" *
150+
" by setting JULIA_CUDA_USE_COMPAT=false in your environment.")
142151
end
143152

144153
return
145154
end
146155

147156
@debug "Successfully loaded forwards-compatible CUDA driver"
148-
global system_version = system_version
149-
global libcuda = compat_driver
157+
libcuda = compat_driver
158+
libcuda_version = compat_version
159+
libcuda_original_version = system_version
150160

151161
end # __init__()

src/wrappers/powerpc64le-linux-gnu.jl

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ function __init__()
2020

2121
JLLWrappers.@generate_init_footer()
2222
global compat_version = v"11.8.0"
23+
# global variables we will set
24+
global libcuda
25+
global libcuda_version
26+
global libcuda_original_version
27+
2328
# minimal API call wrappers we need
2429
function driver_version(library_handle)
2530
function_handle = Libdl.dlsym(library_handle, "cuDriverGetVersion")
@@ -49,16 +54,12 @@ function __init__()
4954
@debug "No system CUDA driver found"
5055
return
5156
end
52-
global libcuda = system_driver
57+
libcuda = system_driver
5358

5459
# check if the system driver is already loaded. in that case, we have to use it because
5560
# the code that loaded it in the first place might have made assumptions based on it.
5661
system_driver_loaded = Libdl.dlopen(system_driver, Libdl.RTLD_NOLOAD;
5762
throw_error=false) !== nothing
58-
if system_driver_loaded
59-
@debug "System CUDA driver already loaded, continuing using it"
60-
return
61-
end
6263
driver_handle = Libdl.dlopen(system_driver; throw_error=true)
6364

6465
# query the system driver version
@@ -73,6 +74,14 @@ function __init__()
7374
return
7475
end
7576
@debug "System CUDA driver found at $system_driver, detected as version $system_version"
77+
libcuda = system_driver
78+
libcuda_version = system_version
79+
80+
# check if the system driver is already loaded (see above)
81+
if system_driver_loaded
82+
@debug "System CUDA driver already loaded, continuing using it"
83+
return
84+
end
7685

7786
# check the user preference
7887
if !parse(Bool, get(ENV, "JULIA_CUDA_USE_COMPAT", "true"))
@@ -136,16 +145,17 @@ function __init__()
136145
throw_error=false) !== nothing
137146
if compat_driver_loaded
138147
error("Could not unload the forward compatible CUDA driver library." *
139-
"This is probably caused by running Julia under a tool that hooks CUDA API calls." *
140-
"In that case, prevent Julia from loading multiple drivers" *
141-
" by setting JULIA_CUDA_USE_COMPAT=false in your environment.")
148+
"This is probably caused by running Julia under a tool that hooks CUDA API calls." *
149+
"In that case, prevent Julia from loading multiple drivers" *
150+
" by setting JULIA_CUDA_USE_COMPAT=false in your environment.")
142151
end
143152

144153
return
145154
end
146155

147156
@debug "Successfully loaded forwards-compatible CUDA driver"
148-
global system_version = system_version
149-
global libcuda = compat_driver
157+
libcuda = compat_driver
158+
libcuda_version = compat_version
159+
libcuda_original_version = system_version
150160

151161
end # __init__()

src/wrappers/x86_64-linux-gnu.jl

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ function __init__()
2020

2121
JLLWrappers.@generate_init_footer()
2222
global compat_version = v"11.8.0"
23+
# global variables we will set
24+
global libcuda
25+
global libcuda_version
26+
global libcuda_original_version
27+
2328
# minimal API call wrappers we need
2429
function driver_version(library_handle)
2530
function_handle = Libdl.dlsym(library_handle, "cuDriverGetVersion")
@@ -49,16 +54,12 @@ function __init__()
4954
@debug "No system CUDA driver found"
5055
return
5156
end
52-
global libcuda = system_driver
57+
libcuda = system_driver
5358

5459
# check if the system driver is already loaded. in that case, we have to use it because
5560
# the code that loaded it in the first place might have made assumptions based on it.
5661
system_driver_loaded = Libdl.dlopen(system_driver, Libdl.RTLD_NOLOAD;
5762
throw_error=false) !== nothing
58-
if system_driver_loaded
59-
@debug "System CUDA driver already loaded, continuing using it"
60-
return
61-
end
6263
driver_handle = Libdl.dlopen(system_driver; throw_error=true)
6364

6465
# query the system driver version
@@ -73,6 +74,14 @@ function __init__()
7374
return
7475
end
7576
@debug "System CUDA driver found at $system_driver, detected as version $system_version"
77+
libcuda = system_driver
78+
libcuda_version = system_version
79+
80+
# check if the system driver is already loaded (see above)
81+
if system_driver_loaded
82+
@debug "System CUDA driver already loaded, continuing using it"
83+
return
84+
end
7685

7786
# check the user preference
7887
if !parse(Bool, get(ENV, "JULIA_CUDA_USE_COMPAT", "true"))
@@ -136,16 +145,17 @@ function __init__()
136145
throw_error=false) !== nothing
137146
if compat_driver_loaded
138147
error("Could not unload the forward compatible CUDA driver library." *
139-
"This is probably caused by running Julia under a tool that hooks CUDA API calls." *
140-
"In that case, prevent Julia from loading multiple drivers" *
141-
" by setting JULIA_CUDA_USE_COMPAT=false in your environment.")
148+
"This is probably caused by running Julia under a tool that hooks CUDA API calls." *
149+
"In that case, prevent Julia from loading multiple drivers" *
150+
" by setting JULIA_CUDA_USE_COMPAT=false in your environment.")
142151
end
143152

144153
return
145154
end
146155

147156
@debug "Successfully loaded forwards-compatible CUDA driver"
148-
global system_version = system_version
149-
global libcuda = compat_driver
157+
libcuda = compat_driver
158+
libcuda_version = compat_version
159+
libcuda_original_version = system_version
150160

151161
end # __init__()

0 commit comments

Comments
 (0)