Adapt to changes in CUDAdrv and CUDAapi.

Author: maleadt

Manifest.toml

@@ -28,21 +28,19 @@ version = "0.2.0"
 
 [[CUDAapi]]
 deps = ["Libdl", "Logging"]
-git-tree-sha1 = "56a813440ac98a1aa64672ab460a1512552211a7"
+git-tree-sha1 = "d9614968b9a13df433870115acff20f41e7b400a"
 uuid = "3895d2a7-ec45-59b8-82bb-cfc6a382f9b3"
-version = "2.1.0"
+version = "3.0.0"
 
 [[CUDAdrv]]
 deps = ["CEnum", "CUDAapi", "Printf"]
-git-tree-sha1 = "1fce616fa0806c67c133eb1d2f68f0f1a7504665"
+git-tree-sha1 = "01e90fa34e25776bc7c8661183d4519149ebfe59"
 uuid = "c5f51814-7f29-56b8-a69c-e4d8f6be1fde"
-version = "5.0.1"
+version = "6.0.0"
 
 [[CUDAnative]]
 deps = ["Adapt", "CEnum", "CUDAapi", "CUDAdrv", "DataStructures", "InteractiveUtils", "LLVM", "Libdl", "Printf", "TimerOutputs"]
-git-tree-sha1 = "f38cf81a0c6c08cb532b7324eb85f3e2d438bed7"
-repo-rev = "0f65bc6ebc9c490c068d65436dc42b93c7650fce"
-repo-url = "https://github.com/JuliaGPU/CUDAnative.jl.git"
+git-tree-sha1 = "59d6c3e313b874abc718f7d6ad02ea604f96db14"
 uuid = "be33ccc6-a3ff-5ff2-a52e-74243cff1e17"
 version = "2.10.0"
 
@@ -79,6 +77,7 @@ uuid = "929cbde3-209d-540e-8aea-75f648917ca0"
 version = "1.3.3"
 
 [[LibGit2]]
+deps = ["Printf"]
 uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
 
 [[Libdl]]
@@ -93,9 +92,9 @@ uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
 
 [[MacroTools]]
 deps = ["DataStructures", "Markdown", "Random"]
-git-tree-sha1 = "e2fc7a55bb2224e203bbd8b59f72b91323233458"
+git-tree-sha1 = "07ee65e03e28ca88bc9a338a3726ae0c3efaa94b"
 uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
-version = "0.5.3"
+version = "0.5.4"
 
 [[Markdown]]
 deps = ["Base64"]
@@ -114,7 +113,7 @@ uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
 version = "1.1.0"
 
 [[Pkg]]
-deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Test", "UUIDs"]
+deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
 uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
 [[Printf]]
@@ -137,9 +136,9 @@ version = "0.2.0"
 
 [[Requires]]
 deps = ["UUIDs"]
-git-tree-sha1 = "999513b7dea8ac17359ed50ae8ea089e4464e35e"
+git-tree-sha1 = "d37400976e98018ee840e0ca4f9d20baa231dc6b"
 uuid = "ae029012-a4dd-5104-9daa-d747884805df"
-version = "1.0.0"
+version = "1.0.1"
 
 [[SHA]]
 uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"

Project.toml

@@ -26,9 +26,9 @@ TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
 AbstractFFTs = "0.4, 0.5"
 Adapt = "1.0"
 CEnum = "0.2"
-CUDAapi = "2.1"
-CUDAdrv = "5.0"
-CUDAnative = "2.9"
+CUDAapi = "3.0"
+CUDAdrv = "6.0"
+CUDAnative = "2.10"
 DataStructures = "0.17"
 GPUArrays = "2.0"
 MacroTools = "0.5"

src/CuArrays.jl

@@ -82,7 +82,7 @@ function __init__()
 
             # check if we can't find the library
             if Libdl.dlopen_e(handle[]) == C_NULL
-                path = find_cuda_library(name, toolkit)
+                path = find_cuda_library(name, CUDAnative.prefix(), [CUDAnative.version()])
                 if path !== nothing
                     handle[] = path
                 end

src/memory.jl

@@ -69,7 +69,7 @@ function actual_alloc(bytes)::Union{Nothing,CuPtr{Nothing}}
     allocated[ptr] = buf
     return ptr
   catch ex
-    ex == CUDAdrv.ERROR_OUT_OF_MEMORY || rethrow()
+    ex.code == CUDAdrv.ERROR_OUT_OF_MEMORY || rethrow()
   end
 
   return nothing