From 19fc98b782f00acd983b96ad15843c7cc2c3ccd7 Mon Sep 17 00:00:00 2001 From: Tamme Claus Date: Tue, 1 Jul 2025 08:56:03 +0200 Subject: [PATCH 1/3] fix conversion of 0x0 CuSparseMatrixCSC <-> CSR --- lib/cusparse/conversions.jl | 8 ++++---- test/libraries/cusparse/conversions.jl | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/cusparse/conversions.jl b/lib/cusparse/conversions.jl index fc1f2c75a3..13cc17bab7 100644 --- a/lib/cusparse/conversions.jl +++ b/lib/cusparse/conversions.jl @@ -332,7 +332,7 @@ for elty in (:Float32, :Float64, :ComplexF32, :ComplexF64) @eval begin function CuSparseMatrixCSC{$elty}(csr::CuSparseMatrixCSR{$elty}; index::SparseChar='O', action::cusparseAction_t=CUSPARSE_ACTION_NUMERIC, algo::cusparseCsr2CscAlg_t=CUSPARSE_CSR2CSC_ALG1) m,n = size(csr) - colPtr = CUDA.zeros(Cint, n+1) + colPtr = (index == 'O') ? CUDA.ones(Cint, n+1) : CUDA.zeros(Cint, n+1) rowVal = CUDA.zeros(Cint, nnz(csr)) nzVal = CUDA.zeros($elty, nnz(csr)) function bufferSize() @@ -352,7 +352,7 @@ for elty in (:Float32, :Float64, :ComplexF32, :ComplexF64) function CuSparseMatrixCSR{$elty}(csc::CuSparseMatrixCSC{$elty}; index::SparseChar='O', action::cusparseAction_t=CUSPARSE_ACTION_NUMERIC, algo::cusparseCsr2CscAlg_t=CUSPARSE_CSR2CSC_ALG1) m,n = size(csc) - rowPtr = CUDA.zeros(Cint,m+1) + rowPtr = (index == 'O') ? CUDA.ones(Cint, m+1) : CUDA.zeros(Cint, m+1) colVal = CUDA.zeros(Cint,nnz(csc)) nzVal = CUDA.zeros($elty,nnz(csc)) function bufferSize() @@ -379,7 +379,7 @@ for (elty, welty) in ((:Float16, :Float32), @eval begin function CuSparseMatrixCSC{$elty}(csr::CuSparseMatrixCSR{$elty}; index::SparseChar='O', action::cusparseAction_t=CUSPARSE_ACTION_NUMERIC, algo::cusparseCsr2CscAlg_t=CUSPARSE_CSR2CSC_ALG1) m,n = size(csr) - colPtr = CUDA.zeros(Cint, n+1) + colPtr = (index == 'O') ? CUDA.ones(Cint, n+1) : CUDA.zeros(Cint, n+1) rowVal = CUDA.zeros(Cint, nnz(csr)) nzVal = CUDA.zeros($elty, nnz(csr)) if $elty == Float16 #broken for ComplexF16? @@ -405,7 +405,7 @@ for (elty, welty) in ((:Float16, :Float32), function CuSparseMatrixCSR{$elty}(csc::CuSparseMatrixCSC{$elty}; index::SparseChar='O', action::cusparseAction_t=CUSPARSE_ACTION_NUMERIC, algo::cusparseCsr2CscAlg_t=CUSPARSE_CSR2CSC_ALG1) m,n = size(csc) - rowPtr = CUDA.zeros(Cint,m+1) + rowPtr = (index == 'O') ? CUDA.ones(Cint, m+1) : CUDA.zeros(Cint, m+1) colVal = CUDA.zeros(Cint,nnz(csc)) nzVal = CUDA.zeros($elty,nnz(csc)) if $elty == Float16 #broken for ComplexF16? diff --git a/test/libraries/cusparse/conversions.jl b/test/libraries/cusparse/conversions.jl index 870d591fa0..f946fd1967 100644 --- a/test/libraries/cusparse/conversions.jl +++ b/test/libraries/cusparse/conversions.jl @@ -113,17 +113,19 @@ if !(v"12.0" <= CUSPARSE.version() < v"12.1") end end -for (n, bd, p) in [(100, 5, 0.02), (5, 1, 0.8), (4, 2, 0.5)] +for (n, bd, p) in [(100, 5, 0.02), (5, 1, 0.8), (4, 2, 0.5), (0, 1, 0.0)] v"12.0" <= CUSPARSE.version() < v"12.1" && n == 4 && continue @testset "conversions between CuSparseMatrices (n, bd, p) = ($n, $bd, $p)" begin A = sprand(n, n, p) blockdim = bd for CuSparseMatrixType1 in (CuSparseMatrixCSC, CuSparseMatrixCSR, CuSparseMatrixCOO, CuSparseMatrixBSR) + if CuSparseMatrixType1 == CuSparseMatrixBSR && n == 0 continue end # TODO: conversion to CuSparseMatrixBSR breaks with (0x0) matrices dA1 = CuSparseMatrixType1 == CuSparseMatrixBSR ? CuSparseMatrixType1(A, blockdim) : CuSparseMatrixType1(A) @testset "conversion $CuSparseMatrixType1 --> SparseMatrixCSC" begin @test SparseMatrixCSC(dA1) ≈ A end for CuSparseMatrixType2 in (CuSparseMatrixCSC, CuSparseMatrixCSR, CuSparseMatrixCOO, CuSparseMatrixBSR) + if CuSparseMatrixType2 == CuSparseMatrixBSR && n == 0 continue end # TODO: conversion to CuSparseMatrixBSR breaks with (0x0) matrices CuSparseMatrixType1 == CuSparseMatrixType2 && continue dA2 = CuSparseMatrixType2 == CuSparseMatrixBSR ? CuSparseMatrixType2(dA1, blockdim) : CuSparseMatrixType2(dA1) @testset "conversion $CuSparseMatrixType1 --> $CuSparseMatrixType2" begin From 95a2eb6f05748522789a730c2299d0640ffbbfb3 Mon Sep 17 00:00:00 2001 From: Tamme Claus Date: Sat, 5 Jul 2025 19:22:56 +0200 Subject: [PATCH 2/3] Respect zero/one based indexing in COO->CSC/CSR conversions --- lib/cusparse/conversions.jl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/cusparse/conversions.jl b/lib/cusparse/conversions.jl index 13cc17bab7..e477e049d4 100644 --- a/lib/cusparse/conversions.jl +++ b/lib/cusparse/conversions.jl @@ -586,10 +586,10 @@ end ## CSR to COO and vice-versa function CuSparseMatrixCSR{Tv}(coo::CuSparseMatrixCOO{Tv}; index::SparseChar='O') where {Tv} - m,n = size(coo) - nnz(coo) == 0 && return CuSparseMatrixCSR{Tv}(CUDA.ones(Cint, m+1), coo.colInd, nonzeros(coo), size(coo)) + m, n = size(coo) + csrRowPtr = (index == 'O') ? CUDA.ones(Cint, m + 1) : CUDA.zeros(Cint, m + 1) + nnz(coo) == 0 && return CuSparseMatrixCSR{Tv}(csrRowPtr, coo.colInd, nonzeros(coo), size(coo)) coo = sort_coo(coo, 'R') - csrRowPtr = CuVector{Cint}(undef, m+1) cusparseXcoo2csr(handle(), coo.rowInd, nnz(coo), m, csrRowPtr, index) CuSparseMatrixCSR{Tv}(csrRowPtr, coo.colInd, nonzeros(coo), size(coo)) end @@ -605,10 +605,10 @@ end ### CSC to COO and viceversa function CuSparseMatrixCSC{Tv}(coo::CuSparseMatrixCOO{Tv}; index::SparseChar='O') where {Tv} - m,n = size(coo) - nnz(coo) == 0 && return CuSparseMatrixCSC{Tv}(CUDA.ones(Cint, n+1), coo.rowInd, nonzeros(coo), size(coo)) + m, n = size(coo) + cscColPtr = (index == 'O') ? CUDA.ones(Cint, n + 1) : CUDA.zeros(Cint, n + 1) + nnz(coo) == 0 && return CuSparseMatrixCSC{Tv}(cscColPtr, coo.rowInd, nonzeros(coo), size(coo)) coo = sort_coo(coo, 'C') - cscColPtr = CuVector{Cint}(undef, n+1) cusparseXcoo2csr(handle(), coo.colInd, nnz(coo), n, cscColPtr, index) CuSparseMatrixCSC{Tv}(cscColPtr, coo.rowInd, nonzeros(coo), size(coo)) end From 6ae58bfc8cdd6abc1af40ee6df36f455094e0721 Mon Sep 17 00:00:00 2001 From: Tim Besard Date: Tue, 29 Jul 2025 14:36:05 +0200 Subject: [PATCH 3/3] Reduce scope of workaround. --- lib/cusparse/conversions.jl | 46 +++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/lib/cusparse/conversions.jl b/lib/cusparse/conversions.jl index e477e049d4..6ae0752118 100644 --- a/lib/cusparse/conversions.jl +++ b/lib/cusparse/conversions.jl @@ -332,9 +332,13 @@ for elty in (:Float32, :Float64, :ComplexF32, :ComplexF64) @eval begin function CuSparseMatrixCSC{$elty}(csr::CuSparseMatrixCSR{$elty}; index::SparseChar='O', action::cusparseAction_t=CUSPARSE_ACTION_NUMERIC, algo::cusparseCsr2CscAlg_t=CUSPARSE_CSR2CSC_ALG1) m,n = size(csr) - colPtr = (index == 'O') ? CUDA.ones(Cint, n+1) : CUDA.zeros(Cint, n+1) - rowVal = CUDA.zeros(Cint, nnz(csr)) - nzVal = CUDA.zeros($elty, nnz(csr)) + colPtr = CuArray{Cint}(undef, n+1) + rowVal = CuArray{Cint}(undef, nnz(csr)) + nzVal = CuArray{$elty}(undef, nnz(csr)) + if version() <= v"12.6-" + # JuliaGPU/CUDA.jl#2806 (NVBUG 5384319) + colPtr .= (index == 'O' ? 1 : 0) + end function bufferSize() out = Ref{Csize_t}(1) cusparseCsr2cscEx2_bufferSize(handle(), m, n, nnz(csr), nonzeros(csr), @@ -352,9 +356,13 @@ for elty in (:Float32, :Float64, :ComplexF32, :ComplexF64) function CuSparseMatrixCSR{$elty}(csc::CuSparseMatrixCSC{$elty}; index::SparseChar='O', action::cusparseAction_t=CUSPARSE_ACTION_NUMERIC, algo::cusparseCsr2CscAlg_t=CUSPARSE_CSR2CSC_ALG1) m,n = size(csc) - rowPtr = (index == 'O') ? CUDA.ones(Cint, m+1) : CUDA.zeros(Cint, m+1) - colVal = CUDA.zeros(Cint,nnz(csc)) - nzVal = CUDA.zeros($elty,nnz(csc)) + rowPtr = CuArray{Cint}(undef, m+1) + colVal = CuArray{Cint}(undef, nnz(csc)) + nzVal = CuArray{$elty}(undef, nnz(csc)) + if version() <= v"12.6-" + # JuliaGPU/CUDA.jl#2806 (NVBUG 5384319) + rowPtr .= (index == 'O' ? 1 : 0) + end function bufferSize() out = Ref{Csize_t}(1) cusparseCsr2cscEx2_bufferSize(handle(), n, m, nnz(csc), nonzeros(csc), @@ -379,9 +387,13 @@ for (elty, welty) in ((:Float16, :Float32), @eval begin function CuSparseMatrixCSC{$elty}(csr::CuSparseMatrixCSR{$elty}; index::SparseChar='O', action::cusparseAction_t=CUSPARSE_ACTION_NUMERIC, algo::cusparseCsr2CscAlg_t=CUSPARSE_CSR2CSC_ALG1) m,n = size(csr) - colPtr = (index == 'O') ? CUDA.ones(Cint, n+1) : CUDA.zeros(Cint, n+1) - rowVal = CUDA.zeros(Cint, nnz(csr)) - nzVal = CUDA.zeros($elty, nnz(csr)) + colPtr = CuArray{Cint}(undef, n+1) + rowVal = CuArray{Cint}(undef, nnz(csr)) + nzVal = CuArray{$elty}(undef, nnz(csr)) + if version() <= v"12.6-" + # JuliaGPU/CUDA.jl#2806 (NVBUG 5384319) + colPtr .= (index == 'O' ? 1 : 0) + end if $elty == Float16 #broken for ComplexF16? function bufferSize() out = Ref{Csize_t}(1) @@ -405,9 +417,13 @@ for (elty, welty) in ((:Float16, :Float32), function CuSparseMatrixCSR{$elty}(csc::CuSparseMatrixCSC{$elty}; index::SparseChar='O', action::cusparseAction_t=CUSPARSE_ACTION_NUMERIC, algo::cusparseCsr2CscAlg_t=CUSPARSE_CSR2CSC_ALG1) m,n = size(csc) - rowPtr = (index == 'O') ? CUDA.ones(Cint, m+1) : CUDA.zeros(Cint, m+1) - colVal = CUDA.zeros(Cint,nnz(csc)) - nzVal = CUDA.zeros($elty,nnz(csc)) + rowPtr = CuArray{Cint}(undef, m+1) + colVal = CuArray{Cint}(undef, nnz(csc)) + nzVal = CuArray{$elty}(undef, nnz(csc)) + if version() <= v"12.6-" + # JuliaGPU/CUDA.jl#2806 (NVBUG 5384319) + rowPtr .= (index == 'O' ? 1 : 0) + end if $elty == Float16 #broken for ComplexF16? function bufferSize() out = Ref{Csize_t}(1) @@ -523,9 +539,9 @@ for (fname,elty) in ((:cusparseSbsr2csr, :Float32), nb = cld(n, bsr.blockDim) cudesca = CuMatrixDescriptor('G', 'L', 'N', index) cudescc = CuMatrixDescriptor('G', 'L', 'N', indc) - csrRowPtr = CUDA.zeros(Cint, m + 1) - csrColInd = CUDA.zeros(Cint, nnz(bsr)) - csrNzVal = CUDA.zeros($elty, nnz(bsr)) + csrRowPtr = CuArray{Cint}(undef, m + 1) + csrColInd = CuArray{Cint}(undef, nnz(bsr)) + csrNzVal = CuArray{$elty}(undef, nnz(bsr)) $fname(handle(), bsr.dir, mb, nb, cudesca, nonzeros(bsr), bsr.rowPtr, bsr.colVal, bsr.blockDim, cudescc, csrNzVal, csrRowPtr,