Skip to content

Explicitly qualify new methods in GB_CHOLMOD #153

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

Open
JamesWrigley wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Explicitly qualify new methods in GB_CHOLMOD #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
346e143
Fix references to SparseBase.NoValues
JamesWrigley Apr 29, 2026
334086a
Explicitly qualify new methods in GB_CHOLMOD
JamesWrigley Apr 29, 2026
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
4 changes: 2 additions & 2 deletions src/SuiteSparseGraphBLAS.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ using Blobs
using SparseBase
using CIndices
import SparseBase: storedeltype
const NoValue = SparseBase.NoValue
const novalue = SparseBase.novalue
const NoValue = SparseBase.NoValues.NoValue
const novalue = SparseBase.NoValues.novalue

export ColMajor, RowMajor, storageorder #reexports from StorageOrders

Expand Down
22 changes: 11 additions & 11 deletions src/solvers/cholmod.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ function _extract_args(s, ::Type{T}) where {T<:CHOLMOD.VTypes}
SuiteSparseGraphBLAS._copytoraw(unsafe_wrap(Array, Ptr{T}(s.x), (l + 1,), own = false))
end

function GBVector{T}(D::CHOLMOD.Dense{T}) where {T}
function SuiteSparseGraphBLAS.GBVector{T}(D::CHOLMOD.Dense{T}) where {T}
@assert size(D, 2) == 1
M = SuiteSparseGraphBLAS._sizedjlmalloc(length(D), T)
copyto!(M, D)
A = GBVector{T}(size(D, 1))
SuiteSparseGraphBLAS.unsafepack!(A, D, false; order = ColMajor())
return A
end
function GBVector{T}(S::CHOLMOD.Sparse{T}) where {T}
function SuiteSparseGraphBLAS.GBVector{T}(S::CHOLMOD.Sparse{T}) where {T}
@assert size(S, 2) == 1
s = unsafe_load(pointer(S))
if s.stype != 0
Expand All @@ -97,21 +97,21 @@ function GBVector{T}(S::CHOLMOD.Sparse{T}) where {T}
return A
end

GBVector{T}(D::Union{CHOLMOD.Sparse{T}, CHOLMOD.Dense{T}}) where {T} =
SuiteSparseGraphBLAS.GBVector{T}(D::Union{CHOLMOD.Sparse{T}, CHOLMOD.Dense{T}}) where {T} =
GBVector{T}(D)
GBVector(D::Union{CHOLMOD.Sparse{T}, CHOLMOD.Dense{T}}) where {T} =
SuiteSparseGraphBLAS.GBVector(D::Union{CHOLMOD.Sparse{T}, CHOLMOD.Dense{T}}) where {T} =
GBVector{T}(D)

for Mat ∈ [:GBMatrix, :GBMatrixC, :GBMatrixR]
@eval begin
function $Mat{T}(D::CHOLMOD.Dense{T}) where {T}
function SuiteSparseGraphBLAS.$Mat{T}(D::CHOLMOD.Dense{T}) where {T}
M = SuiteSparseGraphBLAS._sizedjlmalloc(length(D), T)
copyto!(M, D)
A = $Mat{T}(size(D))
SuiteSparseGraphBLAS.unsafepack!(A, D, false; order = ColMajor())
return A
end
function $Mat{T}(S::CHOLMOD.Sparse{T}) where {T}
function SuiteSparseGraphBLAS.$Mat{T}(S::CHOLMOD.Sparse{T}) where {T}
s = unsafe_load(pointer(S))
if s.stype != 0
throw(ArgumentError("matrix has stype != 0. Convert to matrix " *
Expand All @@ -125,9 +125,9 @@ for Mat ∈ [:GBMatrix, :GBMatrixC, :GBMatrixR]
return A
end

$Mat{T}(D::Union{CHOLMOD.Sparse{T}, CHOLMOD.Dense{T}}) where {T} =
SuiteSparseGraphBLAS.$Mat{T}(D::Union{CHOLMOD.Sparse{T}, CHOLMOD.Dense{T}}) where {T} =
$Mat{T}(D)
$Mat(D::Union{CHOLMOD.Sparse{T}, CHOLMOD.Dense{T}}) where {T} =
SuiteSparseGraphBLAS.$Mat(D::Union{CHOLMOD.Sparse{T}, CHOLMOD.Dense{T}}) where {T} =
$Mat{T}(D)

function LinearAlgebra.Symmetric{Float64,<:$Mat{Float64}}(S::Sparse{Float64})
Expand All @@ -146,16 +146,16 @@ for Mat ∈ [:GBMatrix, :GBMatrixC, :GBMatrixR]
end
convert(T::Type{Hermitian{Tv,<:$Mat{Tv}}}, A::Sparse{Tv}) where {Tv<:VTypes} = T(A)

function $Mat(FC::CHOLMOD.FactorComponent{Tv, :L}) where Tv
function SuiteSparseGraphBLAS.$Mat(FC::CHOLMOD.FactorComponent{Tv, :L}) where Tv
F = Factor(FC)
s = unsafe_load(pointer(F))
if s.is_ll == 0
throw(CHOLMODException("sparse: supported only for :LD on LDLt factorizations"))
end
return $Mat(Sparse(F))
end
$Mat(FC::FactorComponent{Tv,:LD}) where {Tv} = $Mat(Sparse(Factor(FC)))
function $Mat(F::Factor)
SuiteSparseGraphBLAS.$Mat(FC::FactorComponent{Tv,:LD}) where {Tv} = $Mat(Sparse(Factor(FC)))
function SuiteSparseGraphBLAS.$Mat(F::Factor)
s = unsafe_load(pointer(F))
if s.is_ll != 0
L = Sparse(F)
Expand Down
Loading