Skip to content

revert 648 (extend scatter to CUDA sparse) #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CarloLucibello merged 1 commit into from
Jan 13, 2026
+24 −14
Merged

revert 648 (extend scatter to CUDA sparse) #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 22 additions & 12 deletions ext/NNlibCUDAExt/scatter.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# supported op: +, -, *, /, max, min, &, |, mean
import CUDA.CUSPARSE: AbstractCuSparseArray

## TODO support sparse dst/src/idx
## See issue https://github.com/FluxML/NNlib.jl/issues/647
# import CUDA.CUSPARSE: AbstractCuSparseMatrix, CuSparseMatrixCSC, CuSparseMatrixCSR, CuSparseMatrixCOO, AnyCuSparseVector
# const AnyCuSparseMatrix{Tv,Ti} = Union{
# AbstractCuSparseMatrix{Tv,Ti},
# CUDA.CuSparseMatrixCSC{Tv,Ti}, # these types do not inherit from AbstractCuSparseMatrix
# CUDA.CuSparseMatrixCSR{Tv,Ti}, # but from GPUArrays.AbstractGPUSparseMatrixXXX
# CUDA.CuSparseMatrixCOO{Tv,Ti},
# }
# const AnyCuSparseArray{Tv,Ti} = Union{AnyCuSparseVector{Tv,Ti},AnyCuSparseMatrix{Tv,Ti}}

function scatter_kernel!(op::OP, dst, src, idx) where OP
index = threadIdx().x + (blockIdx().x - 1) * blockDim().x
Expand Down Expand Up @@ -45,9 +55,9 @@ function scatter_kernel!(op::OP, dst, src, idx::CUDA.CuDeviceArray{<:CartesianIn
end


function NNlib.scatter!(op::OP, dst::Union{AnyCuArray,AbstractCuSparseArray},
src::Union{AnyCuArray,AbstractCuSparseArray},
idx::Union{AnyCuArray,AbstractCuSparseArray}) where OP
function NNlib.scatter!(op::OP, dst::AnyCuArray,
src::AnyCuArray,
idx::AnyCuArray) where OP
dims = NNlib.scatter_dims(dst, src, idx)
args = if dims == 0
max_idx = length(idx)
Expand All @@ -67,9 +77,9 @@ function NNlib.scatter!(op::OP, dst::Union{AnyCuArray,AbstractCuSparseArray},
return dst
end

function NNlib.scatter!(op::typeof(mean), dst::Union{AnyCuArray,AbstractCuSparseArray},
src::Union{AnyCuArray,AbstractCuSparseArray},
idx::Union{AnyCuArray,AbstractCuSparseArray})
function NNlib.scatter!(op::typeof(mean), dst::AnyCuArray,
src::AnyCuArray,
idx::AnyCuArray)
Ns = NNlib.scatter!(+, zero(dst), one.(src), idx)
dst_ = NNlib.scatter!(+, zero(dst), src, idx)
dst .+= NNlib.safe_div.(dst_, Ns)
Expand Down Expand Up @@ -166,21 +176,21 @@ function ∇scatter_src_kernel!(op::OP, Δsrc, src, idx::CUDA.CuDeviceArray{<:Ca
end

function NNlib.∇scatter_src(op::Union{typeof(*),typeof(/)}, Δ, dst,
src::Union{AnyCuArray{Tsrc,Nsrc},AbstractCuSparseArray},
idx::Union{AnyCuArray{Tidx,Nidx},AbstractCuSparseArray}) where {Tsrc,Tidx,Nsrc,Nidx}
dims = Nsrc - Nidx
src::AnyCuArray,
idx::AnyCuArray)
dims = ndims(src) - ndims(idx)
Δsrc = NNlib.modify_src(op, NNlib.gather(Δ, idx), src)
rev_idx = NNlib.reverse_indices(idx)
rev_idx = CuArray(map(CUDA.cudaconvert, rev_idx))

if dims == 0
max_idx = length(idx)
args = op, Δsrc, src, idx, rev_idx, max_idx, Tsrc
args = op, Δsrc, src, idx, rev_idx, max_idx, eltype(src)
else
pre_cart_idx = CartesianIndices(axes(src)[1:dims])
max_dims_idx = length(pre_cart_idx)
max_idx = max_dims_idx * length(idx)
args = op, Δsrc, src, idx, rev_idx, pre_cart_idx, max_dims_idx, max_idx, Tsrc
args = op, Δsrc, src, idx, rev_idx, pre_cart_idx, max_dims_idx, max_idx, eltype(src)
end

kernel = @cuda launch=false ∇scatter_src_kernel!(args...)
Expand Down
4 changes: 2 additions & 2 deletions test/ext_cuda/scatter.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ idxs = [
(3,) (5,) (5,) (3,)])), # CartesianIndex index
]

types = [CuArray{Int32}, CuArray{Int64}, CuArray{Float32}, CuArray{Float64}, CuSparseMatrixCSC{Float32}, CuSparseMatrixCSR{Float32}, CuSparseMatrixCOO{Float32}]
types = [CuArray{Int32}, CuArray{Int64}, CuArray{Float32}, CuArray{Float64}]


@testset "scatter" begin
Expand Down Expand Up @@ -70,7 +70,7 @@ types = [CuArray{Int32}, CuArray{Int64}, CuArray{Float32}, CuArray{Float64}, CuS
end


for T = [CuArray{Float32}, CuArray{Float64}, Sparse, CuSparseMatrixCSC{Float32}, CuSparseMatrixCSR{Float32}, CuSparseMatrixCOO{Float32}]
for T = [CuArray{Float32}, CuArray{Float64}]
@testset "$(T)" begin
@testset "*" begin
for idx = idxs, dims = [0, 1]
Expand Down
Loading