Update to GPUArrays@11.1 (#693)

Author: pxl-th

Project.toml

@@ -35,12 +35,12 @@ UnsafeAtomicsLLVM = "d80eeb9a-aca5-4d75-85e5-170c8b632249"
 
 [compat]
 AbstractFFTs = "1.0"
-AcceleratedKernels = "0.1, 0.2"
+AcceleratedKernels = "0.2"
 Adapt = "4"
 Atomix = "0.1"
 CEnum = "0.4, 0.5"
 ExprTools = "0.1"
-GPUArrays = "10"
+GPUArrays = "11.1"
 GPUCompiler = "0.27, 1.0"
 KernelAbstractions = "0.9.2"
 LLD_jll = "15, 16, 17"

src/AMDGPU.jl

@@ -114,7 +114,6 @@ include("tls.jl")
 include("highlevel.jl")
 include("reflection.jl")
 include("array.jl")
-include("gpuarrays.jl")
 include("conversions.jl")
 include("broadcast.jl")
 include("exception_handler.jl")

src/array.jl

@@ -21,7 +21,15 @@ mutable struct ROCArray{T, N, B} <: AbstractGPUArray{T, N}
     end
 end
 
-unsafe_free!(x::ROCArray) = GPUArrays.unsafe_free!(x.buf)
+GPUArrays.storage(a::ROCArray) = a.buf
+
+function GPUArrays.derive(
+    ::Type{T}, x::ROCArray, dims::Dims{N}, offset::Int,
+) where {N, T}
+    ref = copy(x.buf)
+    offset += (x.offset * Base.elsize(x)) ÷ sizeof(T)
+    ROCArray{T, N}(ref, dims; offset)
+end
 
 """
     device(A::ROCArray) -> HIPDevice
@@ -276,3 +284,19 @@ function Base.resize!(A::ROCVector{T}, n::Integer) where T
     A.offset = 0
     return A
 end
+
+# @roc conversion
+
+function Base.convert(
+    ::Type{ROCDeviceArray{T, N, AS.Global}}, a::ROCArray{T, N},
+) where {T, N}
+    # If HostBuffer, use device pointer.
+    buf = convert(Mem.AbstractAMDBuffer, a.buf[])
+    ptr = convert(Ptr{T}, typeof(buf) <: Mem.HIPBuffer ?
+        buf : buf.dev_ptr)
+    llvm_ptr = AMDGPU.LLVMPtr{T,AS.Global}(ptr + a.offset * sizeof(T))
+    ROCDeviceArray{T, N, AS.Global}(a.dims, llvm_ptr)
+end
+
+Adapt.adapt_storage(::Runtime.Adaptor, x::ROCArray{T,N}) where {T,N} =
+    convert(ROCDeviceArray{T,N,AS.Global}, x)

src/gpuarrays.jl

@@ -30,9 +30,6 @@ end
 @testitem "gpuarrays - indexing scalar" setup=[TSGPUArrays] begin
     gpuarrays_test("indexing scalar")
 end
-@testitem "gpuarrays - interface" setup=[TSGPUArrays] begin
-    gpuarrays_test("interface")
-end
 @testitem "gpuarrays - linalg" setup=[TSGPUArrays] begin
     gpuarrays_test("linalg")
 end