CUDA_Driver_jll build 0.5.0+1

JuliaBinaryWrappers · Apr 4, 2023 · 694e96a · 694e96a
1 parent 59ca88e
commit 694e96a
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 27 deletions.
diff --git a/Artifacts.toml b/Artifacts.toml
@@ -7,7 +7,7 @@ os = "linux"
 
     [[CUDA_Driver.download]]
     sha256 = "7866667028b5945bee04d8b6395cc9dc83c8850c01dd6f72d1301328c68b0cc5"
-    url = "https://github.com/JuliaBinaryWrappers/CUDA_Driver_jll.jl/releases/download/CUDA_Driver-v0.5.0+0/CUDA_Driver.v0.5.0.x86_64-linux-gnu.tar.gz"
+    url = "https://github.com/JuliaBinaryWrappers/CUDA_Driver_jll.jl/releases/download/CUDA_Driver-v0.5.0+1/CUDA_Driver.v0.5.0.x86_64-linux-gnu.tar.gz"
 [[CUDA_Driver]]
 arch = "powerpc64le"
 git-tree-sha1 = "8d72b82f4fedae990cd556031e12c872d80a904c"
@@ -17,7 +17,7 @@ os = "linux"
 
     [[CUDA_Driver.download]]
     sha256 = "c2449aae6a89f34f6479043c42d12b43bcccf0446f233bf00479f5f5916fd4ff"
-    url = "https://github.com/JuliaBinaryWrappers/CUDA_Driver_jll.jl/releases/download/CUDA_Driver-v0.5.0+0/CUDA_Driver.v0.5.0.powerpc64le-linux-gnu.tar.gz"
+    url = "https://github.com/JuliaBinaryWrappers/CUDA_Driver_jll.jl/releases/download/CUDA_Driver-v0.5.0+1/CUDA_Driver.v0.5.0.powerpc64le-linux-gnu.tar.gz"
 [[CUDA_Driver]]
 arch = "aarch64"
 git-tree-sha1 = "aa72e00d2e54224026ca1148a004b6b991849de9"
@@ -27,4 +27,4 @@ os = "linux"
 
     [[CUDA_Driver.download]]
     sha256 = "13779e57c87c2709e1c89cad1f44db92b5193da7f992a2fb1248fef62c55a60c"
-    url = "https://github.com/JuliaBinaryWrappers/CUDA_Driver_jll.jl/releases/download/CUDA_Driver-v0.5.0+0/CUDA_Driver.v0.5.0.aarch64-linux-gnu.tar.gz"
+    url = "https://github.com/JuliaBinaryWrappers/CUDA_Driver_jll.jl/releases/download/CUDA_Driver-v0.5.0+1/CUDA_Driver.v0.5.0.aarch64-linux-gnu.tar.gz"
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "CUDA_Driver_jll"
 uuid = "4ee394cb-3365-5eb0-8335-949819d2adfc"
-version = "0.5.0+0"
+version = "0.5.0+1"
 
 [deps]
 JLLWrappers = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"

diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
-# `CUDA_Driver_jll.jl` (v0.5.0+0)
+# `CUDA_Driver_jll.jl` (v0.5.0+1)
 
 [![deps](https://juliahub.com/docs/CUDA_Driver_jll/deps.svg)](https://juliahub.com/ui/Packages/CUDA_Driver_jll/QJyk7?page=2)
 
 This is an autogenerated package constructed using [`BinaryBuilder.jl`](https://github.com/JuliaPackaging/BinaryBuilder.jl).
 
-The originating [`build_tarballs.jl`](https://github.com/JuliaPackaging/Yggdrasil/blob/c923ae0034189c865d1e0a8696b498964113812c/C/CUDA/CUDA_Driver/build_tarballs.jl) script can be found on [`Yggdrasil`](https://github.com/JuliaPackaging/Yggdrasil/), the community build tree.
+The originating [`build_tarballs.jl`](https://github.com/JuliaPackaging/Yggdrasil/blob/604bf1414442ecc34da0d6eb454b0696b30008d5/C/CUDA/CUDA_Driver/build_tarballs.jl) script can be found on [`Yggdrasil`](https://github.com/JuliaPackaging/Yggdrasil/), the community build tree.
 
 ## Bug Reports
 

diff --git a/src/wrappers/aarch64-linux-gnu.jl b/src/wrappers/aarch64-linux-gnu.jl
@@ -134,28 +134,28 @@ function __init__()
         @debug "No forward-compatible CUDA library available for your platform."
         return
     end
+    compat_compiler = libnvidia_ptxjitcompiler
     compat_driver = libcuda_compat
     @debug "Forward-compatible CUDA driver found at $compat_driver;" *
             " known to be version $(compat_version)"
 
     # finally, load the compatibility driver to see if it supports this platform
+    compiler_handle = Libdl.dlopen(compat_compiler; throw_error=true)
     driver_handle = Libdl.dlopen(compat_driver; throw_error=true)
-    # TODO: do we need to dlopen the JIT compiler library for it to be discoverable?
-    #       doesn't that clash with a system one if compat cuInit fails? or should
-    #       we load it _after_ the compat driver initialization succeeds?
-    #compiler_handle = libnvidia_ptxjitcompiler
-    #Libdl.dlopen(compiler_handle)
 
     init_status = init_driver(driver_handle)
     if init_status != 0
         @debug "Could not use forward compatibility package (error $init_status)"
 
         # see comment above about unloading the system driver
         Libdl.dlclose(driver_handle)
+        Libdl.dlclose(compiler_handle)
         compat_driver_loaded = Libdl.dlopen(compat_driver, Libdl.RTLD_NOLOAD;
                                             throw_error=false) !== nothing
-        if compat_driver_loaded
-            error("Could not unload the forward compatible CUDA driver library." *
+        compat_compiler_loaded = Libdl.dlopen(compat_compiler, Libdl.RTLD_NOLOAD;
+                                                throw_error=false) !== nothing
+        if compat_driver_loaded || compat_compiler_loaded
+            error("Could not unload forwards compatible CUDA driver libraries." *
                     "This is probably caused by running Julia under a tool that hooks CUDA API calls." *
                     "In that case, prevent Julia from loading multiple drivers" *
                     " by setting JULIA_CUDA_USE_COMPAT=false in your environment.")

diff --git a/src/wrappers/powerpc64le-linux-gnu.jl b/src/wrappers/powerpc64le-linux-gnu.jl
@@ -134,28 +134,28 @@ function __init__()
         @debug "No forward-compatible CUDA library available for your platform."
         return
     end
+    compat_compiler = libnvidia_ptxjitcompiler
     compat_driver = libcuda_compat
     @debug "Forward-compatible CUDA driver found at $compat_driver;" *
             " known to be version $(compat_version)"
 
     # finally, load the compatibility driver to see if it supports this platform
+    compiler_handle = Libdl.dlopen(compat_compiler; throw_error=true)
     driver_handle = Libdl.dlopen(compat_driver; throw_error=true)
-    # TODO: do we need to dlopen the JIT compiler library for it to be discoverable?
-    #       doesn't that clash with a system one if compat cuInit fails? or should
-    #       we load it _after_ the compat driver initialization succeeds?
-    #compiler_handle = libnvidia_ptxjitcompiler
-    #Libdl.dlopen(compiler_handle)
 
     init_status = init_driver(driver_handle)
     if init_status != 0
         @debug "Could not use forward compatibility package (error $init_status)"
 
         # see comment above about unloading the system driver
         Libdl.dlclose(driver_handle)
+        Libdl.dlclose(compiler_handle)
         compat_driver_loaded = Libdl.dlopen(compat_driver, Libdl.RTLD_NOLOAD;
                                             throw_error=false) !== nothing
-        if compat_driver_loaded
-            error("Could not unload the forward compatible CUDA driver library." *
+        compat_compiler_loaded = Libdl.dlopen(compat_compiler, Libdl.RTLD_NOLOAD;
+                                                throw_error=false) !== nothing
+        if compat_driver_loaded || compat_compiler_loaded
+            error("Could not unload forwards compatible CUDA driver libraries." *
                     "This is probably caused by running Julia under a tool that hooks CUDA API calls." *
                     "In that case, prevent Julia from loading multiple drivers" *
                     " by setting JULIA_CUDA_USE_COMPAT=false in your environment.")

diff --git a/src/wrappers/x86_64-linux-gnu.jl b/src/wrappers/x86_64-linux-gnu.jl
@@ -134,28 +134,28 @@ function __init__()
         @debug "No forward-compatible CUDA library available for your platform."
         return
     end
+    compat_compiler = libnvidia_ptxjitcompiler
     compat_driver = libcuda_compat
     @debug "Forward-compatible CUDA driver found at $compat_driver;" *
             " known to be version $(compat_version)"
 
     # finally, load the compatibility driver to see if it supports this platform
+    compiler_handle = Libdl.dlopen(compat_compiler; throw_error=true)
     driver_handle = Libdl.dlopen(compat_driver; throw_error=true)
-    # TODO: do we need to dlopen the JIT compiler library for it to be discoverable?
-    #       doesn't that clash with a system one if compat cuInit fails? or should
-    #       we load it _after_ the compat driver initialization succeeds?
-    #compiler_handle = libnvidia_ptxjitcompiler
-    #Libdl.dlopen(compiler_handle)
 
     init_status = init_driver(driver_handle)
     if init_status != 0
         @debug "Could not use forward compatibility package (error $init_status)"
 
         # see comment above about unloading the system driver
         Libdl.dlclose(driver_handle)
+        Libdl.dlclose(compiler_handle)
         compat_driver_loaded = Libdl.dlopen(compat_driver, Libdl.RTLD_NOLOAD;
                                             throw_error=false) !== nothing
-        if compat_driver_loaded
-            error("Could not unload the forward compatible CUDA driver library." *
+        compat_compiler_loaded = Libdl.dlopen(compat_compiler, Libdl.RTLD_NOLOAD;
+                                                throw_error=false) !== nothing
+        if compat_driver_loaded || compat_compiler_loaded
+            error("Could not unload forwards compatible CUDA driver libraries." *
                     "This is probably caused by running Julia under a tool that hooks CUDA API calls." *
                     "In that case, prevent Julia from loading multiple drivers" *
                     " by setting JULIA_CUDA_USE_COMPAT=false in your environment.")