From de8bc5665461123ff5133d53a0cfc4b33d1ff9dc Mon Sep 17 00:00:00 2001 From: N5N3 <2642243996@qq.com> Date: Thu, 23 Jun 2022 13:46:36 +0800 Subject: [PATCH 1/5] move `backend` to GPUArraysCore --- Project.toml | 2 +- lib/GPUArraysCore/Project.toml | 2 +- lib/GPUArraysCore/src/GPUArraysCore.jl | 8 ++++++++ src/device/execution.jl | 9 +-------- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Project.toml b/Project.toml index 28f980e1..f8dafcd4 100644 --- a/Project.toml +++ b/Project.toml @@ -15,7 +15,7 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" [compat] Adapt = "2.0, 3.0" -GPUArraysCore = "= 0.1.1" +GPUArraysCore = "= 0.1.2" LLVM = "3.9, 4" Reexport = "1" julia = "1.6" diff --git a/lib/GPUArraysCore/Project.toml b/lib/GPUArraysCore/Project.toml index 80b926e8..e27744d4 100644 --- a/lib/GPUArraysCore/Project.toml +++ b/lib/GPUArraysCore/Project.toml @@ -1,7 +1,7 @@ name = "GPUArraysCore" uuid = "46192b85-c4d5-4398-a991-12ede77f4527" authors = ["Tim Besard "] -version = "0.1.1" +version = "0.1.2" [deps] Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" diff --git a/lib/GPUArraysCore/src/GPUArraysCore.jl b/lib/GPUArraysCore/src/GPUArraysCore.jl index 7b988b94..d55d16f9 100644 --- a/lib/GPUArraysCore/src/GPUArraysCore.jl +++ b/lib/GPUArraysCore/src/GPUArraysCore.jl @@ -111,5 +111,13 @@ macro allowscalar(ex) end end +""" + backend(T::Type) + backend(x) + +Gets the GPUArrays back-end responsible for managing arrays of type `T`. +""" +backend(::Type) = error("This object is not a GPU array") # COV_EXCL_LINE +backend(x) = backend(typeof(x)) end # module GPUArraysCore diff --git a/src/device/execution.jl b/src/device/execution.jl index e6a22204..41285bc3 100644 --- a/src/device/execution.jl +++ b/src/device/execution.jl @@ -6,14 +6,7 @@ abstract type AbstractGPUBackend end abstract type AbstractKernelContext end -""" - backend(T::Type) - backend(x) - -Gets the GPUArrays back-end responsible for managing arrays of type `T`. -""" -backend(::Type) = error("This object is not a GPU array") # COV_EXCL_LINE -backend(x) = backend(typeof(x)) +import GPUArraysCore: backend """ gpu_call(kernel::Function, arg0, args...; kwargs...) From 0137d1890494bc7182aa8a01ea5d2ea89c6cfba7 Mon Sep 17 00:00:00 2001 From: N5N3 <2642243996@qq.com> Date: Fri, 12 Aug 2022 16:31:52 +0800 Subject: [PATCH 2/5] export `GPUArraysCore.backend`. --- lib/GPUArraysCore/src/GPUArraysCore.jl | 4 ++++ src/device/execution.jl | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/GPUArraysCore/src/GPUArraysCore.jl b/lib/GPUArraysCore/src/GPUArraysCore.jl index d55d16f9..678bca8c 100644 --- a/lib/GPUArraysCore/src/GPUArraysCore.jl +++ b/lib/GPUArraysCore/src/GPUArraysCore.jl @@ -111,6 +111,10 @@ macro allowscalar(ex) end end +## backend + +export backend + """ backend(T::Type) backend(x) diff --git a/src/device/execution.jl b/src/device/execution.jl index 41285bc3..d45965ba 100644 --- a/src/device/execution.jl +++ b/src/device/execution.jl @@ -6,8 +6,6 @@ abstract type AbstractGPUBackend end abstract type AbstractKernelContext end -import GPUArraysCore: backend - """ gpu_call(kernel::Function, arg0, args...; kwargs...) From b309ab6a3c303631894551082433fb548bcd7923 Mon Sep 17 00:00:00 2001 From: N5N3 <2642243996@qq.com> Date: Fri, 12 Aug 2022 16:33:08 +0800 Subject: [PATCH 3/5] Also bump GPUArrays --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index f8dafcd4..c8f7aeb0 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "GPUArrays" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "8.4.2" +version = "8.4.3" [deps] Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" From 41cd03f9222ce8ab70396d543f100b26abf4d3fc Mon Sep 17 00:00:00 2001 From: N5N3 <2642243996@qq.com> Date: Fri, 12 Aug 2022 16:44:06 +0800 Subject: [PATCH 4/5] Relax compatibility between `JLarrays` and `GPUArrays` --- lib/JLArrays/Project.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/JLArrays/Project.toml b/lib/JLArrays/Project.toml index 4f9fb40c..a99b6b36 100644 --- a/lib/JLArrays/Project.toml +++ b/lib/JLArrays/Project.toml @@ -1,7 +1,7 @@ name = "JLArrays" uuid = "27aeb0d3-9eb9-45fb-866b-73c2ecf80fcb" authors = ["Tim Besard "] -version = "0.1.0" +version = "0.1.1" [deps] Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" @@ -10,5 +10,5 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" [compat] Adapt = "2.0, 3.0" -GPUArrays = "8.4.1" +GPUArrays = "~8.4.1" julia = "1.6" From 9cab2bd0a28d6a71cb288d8568e6da50d236c78e Mon Sep 17 00:00:00 2001 From: N5N3 <2642243996@qq.com> Date: Fri, 12 Aug 2022 18:00:11 +0800 Subject: [PATCH 5/5] Revert "export `GPUArraysCore.backend`." This reverts commit 0137d1890494bc7182aa8a01ea5d2ea89c6cfba7. --- lib/GPUArraysCore/src/GPUArraysCore.jl | 4 ---- src/device/execution.jl | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/GPUArraysCore/src/GPUArraysCore.jl b/lib/GPUArraysCore/src/GPUArraysCore.jl index 678bca8c..d55d16f9 100644 --- a/lib/GPUArraysCore/src/GPUArraysCore.jl +++ b/lib/GPUArraysCore/src/GPUArraysCore.jl @@ -111,10 +111,6 @@ macro allowscalar(ex) end end -## backend - -export backend - """ backend(T::Type) backend(x) diff --git a/src/device/execution.jl b/src/device/execution.jl index d45965ba..41285bc3 100644 --- a/src/device/execution.jl +++ b/src/device/execution.jl @@ -6,6 +6,8 @@ abstract type AbstractGPUBackend end abstract type AbstractKernelContext end +import GPUArraysCore: backend + """ gpu_call(kernel::Function, arg0, args...; kwargs...)