Added test for similar for COO and BSR with custom types/dims

Author: rainerrodrigues

lib/cusparse/src/array.jl

@@ -295,20 +295,20 @@ Base.similar(Mat::CuSparseMatrixCOO, dims::Tuple{Int, Int}) = similar(Mat, dims.
 
 Base.similar(Mat::CuSparseArrayCSR) = CuSparseArrayCSR(copy(Mat.rowPtr), copy(Mat.colVal), similar(nonzeros(Mat)), size(Mat))
 
-
-function Base.similar(mat::CuSparseMatrixCOO, ::Type{T}, dims::Dims{2}) where {T}
+function Base.similar(mat::CuSparseMatrixCOO{Tv, Ti}, ::Type{T}, N::Int, M::Int) where {Tv, Ti, T}
     new_rowInd = similar(mat.rowInd)
     new_colInd = similar(mat.colInd)
     new_nzVal = similar(mat.nzVal, T)
-    return CuSparseMatrixCOO{T, Ti}(new_rowInd, new_colInd, new_nzVal, dims)
+    
+    return CuSparseMatrixCOO{T, Ti}(new_rowInd, new_colInd, new_nzVal, (N, M))
 end
 
-function Base.similar(mat::CuSparseMatrixBSR{Tv, Ti}, ::Type{T}, dims::Dims{2}) where {Tv, Ti, T}
+function Base.similar(mat::CuSparseMatrixBSR{Tv, Ti}, ::Type{T}, N::Int, M::Int) where {Tv, Ti, T}
     new_rowPtr = similar(mat.rowPtr)
     new_colVal = similar(mat.colVal)
     new_nzVal = similar(mat.nzVal, T) 
 
-    return CuSparseMatrixBSR{T, Ti}(new_rowPtr, new_colVal, new_nzVal, dims, mat.blockDim, mat.dir, mat.nnzb)
+    return CuSparseMatrixBSR{T, Ti}(new_rowPtr, new_colVal, new_nzVal, (N, M), mat.blockDim, mat.dir, mat.nnzb)
 end
 
 ## array interface

lib/cusparse/test/construction.jl

@@ -88,4 +88,28 @@ if capability(device()) >= v"5.3"
         end
     end
 end
+
+@testset "similar for COO and BSR with custom types/dims" begin
+    row = CuVector{Cint}([1, 2, 3])
+    col = CuVector{Cint}([1, 2, 3])
+    val = CuVector{Float32}([1.0, 2.0, 3.0])
+    coo_mat = CuSparseMatrixCOO(row, col, val, (3, 3))
+
+    coo_sim = similar(coo_mat, Float64, (3, 3))
+    @test eltype(coo_sim) == Float64
+    @test size(coo_sim) == (3, 3)
+    @test typeof(coo_sim) <: CuSparseMatrixCOO
+
+    rowPtr = CuVector{Cint}([1, 2, 3])
+    colVal = CuVector{Cint}([1, 2])
+    valBSR = CuVector{Float32}([1.0, 2.0, 3.0, 4.0]) 
+    bsr_mat = CuSparseMatrixBSR(rowPtr, colVal, valBSR, 2, 'R', 1, (4, 4))
+
+    bsr_sim = similar(bsr_mat, Float64, (4, 4))
+    @test eltype(bsr_sim) == Float64
+    @test size(bsr_sim) == (4, 4)
+    @test typeof(bsr_sim) <: CuSparseMatrixBSR
+    @test bsr_sim.blockDim == bsr_mat.blockDim
+end
+
 end

test/core/device/intrinsics.jl

@@ -338,3 +338,16 @@ end
 
 ############################################################################################
 
+@testset "intrinsic range metadata" begin
+    # Create tiny kernels to isolate the x-dimension
+    kernel_block() = CUDA.blockDim().x
+    kernel_grid()  = CUDA.gridDim().x
+
+    ir_block = sprint(io -> CUDA.code_llvm(io, kernel_block, Tuple{}; dump_module=true, raw=true))
+    @test occursin("!range", ir_block)
+
+    ir_grid = sprint(io -> CUDA.code_llvm(io, kernel_grid, Tuple{}; dump_module=true, raw=true))
+    @test !occursin("!range", ir_grid)
+end
+
+############################################################################################