Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ROCKernels.jl
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function KA.device!(kab::ROCBackend, id::Int)
return
end

Adapt.adapt_storage(::ROCBackend, a::Array) = Adapt.adapt(AMDGPU.ROCArray, a)
Adapt.adapt_storage(::ROCBackend, a::AbstractArray) = Adapt.adapt(AMDGPU.ROCArray, a)
Adapt.adapt_storage(::ROCBackend, a::Union{AMDGPU.ROCArray, GPUArrays.AbstractGPUSparseArray}) = a
Adapt.adapt_storage(::KA.CPU, a::Union{AMDGPU.ROCArray, GPUArrays.AbstractGPUSparseArray}) =
Adapt.adapt(Array, a)
Expand Down
12 changes: 12 additions & 0 deletions test/hip_rocsparse/conversions.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ using AMDGPU: ROCVector, ROCMatrix, ROCArray, roc
using AMDGPU.rocSPARSE
using SparseArrays
using LinearAlgebra
using Adapt

@assert AMDGPU.functional(:rocsparse)

Expand Down Expand Up @@ -55,6 +56,17 @@ end
end
end

@testset "Adapt sparse arrays to ROCBackend" begin
A = spdiagm(0 => ones(5), -1 => -ones(4), 1 => -ones(4))
@test adapt(ROCBackend(), A) isa ROCSparseMatrixCSC

v = sparsevec([1, 3, 5], [1.0, 2.0, 3.0], 5)
@test adapt(ROCBackend(), v) isa ROCSparseVector

dA = adapt(ROCBackend(), A)
@test adapt(ROCBackend(), dA) === dA
end

@testset "ROCSparseMatrix(::Diagonal)" begin
X = Diagonal(rand(10))
dX = roc(X)
Expand Down