Update to [email protected]

Author: pxl-th

Project.toml

@@ -16,12 +16,13 @@ Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
 GPUArraysCore = "46192b85-c4d5-4398-a991-12ede77f4527"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 
 [extensions]
 StructArraysAdaptExt = "Adapt"
-StructArraysGPUArraysCoreExt = "GPUArraysCore"
+StructArraysGPUArraysCoreExt = ["GPUArraysCore", "KernelAbstractions"]
 StructArraysLinearAlgebraExt = "LinearAlgebra"
 StructArraysSparseArraysExt = "SparseArrays"
 StructArraysStaticArraysExt = "StaticArrays"
@@ -32,10 +33,11 @@ Aqua = "0.8"
 ConstructionBase = "1"
 DataAPI = "1"
 Documenter = "1"
-GPUArraysCore = "0.1.2, 0.2"
+GPUArraysCore = "0.2"
 InfiniteArrays = "0.13"
-JLArrays = "0.1"
+JLArrays = "0.2"
 LinearAlgebra = "1"
+KernelAbstractions = "0.9"
 OffsetArrays = "1"
 PooledArrays = "1"
 SparseArrays = "1"
@@ -54,6 +56,7 @@ GPUArraysCore = "46192b85-c4d5-4398-a991-12ede77f4527"
 InfiniteArrays = "4858937d-0d70-526a-a4dd-2d5cb5dd786c"
 JLArrays = "27aeb0d3-9eb9-45fb-866b-73c2ecf80fcb"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
 OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
 PooledArrays = "2dfb63ee-cc39-5dd5-95bd-886bf059d720"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
@@ -63,4 +66,4 @@ TypedTables = "9d95f2ec-7b3d-5a63-8d20-e2491e220bb9"
 WeakRefStrings = "ea10d353-3f73-51f8-a26c-33c1cb351aa5"
 
 [targets]
-test = ["Adapt", "Aqua", "Documenter", "GPUArraysCore", "InfiniteArrays", "JLArrays", "LinearAlgebra", "OffsetArrays", "PooledArrays", "SparseArrays", "StaticArrays", "Test", "TypedTables", "WeakRefStrings"]
+test = ["Adapt", "Aqua", "Documenter", "GPUArraysCore", "InfiniteArrays", "JLArrays", "LinearAlgebra", "KernelAbstractions", "OffsetArrays", "PooledArrays", "SparseArrays", "StaticArrays", "Test", "TypedTables", "WeakRefStrings"]

ext/StructArraysAdaptExt.jl

@@ -1,5 +1,10 @@
 module StructArraysAdaptExt
 # Use Adapt allows for automatic conversion of CPU to GPU StructArrays
 using Adapt, StructArrays
-Adapt.adapt_structure(to, s::StructArray) = replace_storage(adapt(to), s)
+
+function Adapt.adapt_structure(to, s::StructArray)
+    @info "AAA"
+    @show s
+    replace_storage(adapt(to), s)
+end
 end

ext/StructArraysGPUArraysCoreExt.jl

@@ -6,16 +6,23 @@ using StructArrays: map_params, array_types
 using Base: tail
 
 import GPUArraysCore
+import KernelAbstractions as KA
+
+function KA.get_backend(x::T) where {T<:StructArray}
+    components = StructArrays.components(x)
+    array_components = filter(
+        fn -> getfield(components, fn) isa AbstractArray,
+        fieldnames(typeof(components)))
+    backends = map(
+        fn -> KA.get_backend(getfield(components, fn)),
+        array_components)
 
-# for GPU broadcast
-import GPUArraysCore
-function GPUArraysCore.backend(::Type{T}) where {T<:StructArray}
-    backends = map_params(GPUArraysCore.backend, array_types(T))
     backend, others = backends[1], tail(backends)
     isconsistent = mapfoldl(isequal(backend), &, others; init=true)
     isconsistent || throw(ArgumentError("all component arrays must have the same GPU backend"))
     return backend
 end
+
 StructArrays.always_struct_broadcast(::GPUArraysCore.AbstractGPUArrayStyle) = true
 
 end # module