fix up part of umfpack tests, hyperpack

Author: rayegun

src/pack.jl

@@ -67,7 +67,6 @@ function _packbitmap!(
     else
         throw(ArgumentError("order must be either RowMajor() or ColMajor()"))
     end
-
 end
 
 function _packcscmatrix!(
@@ -146,6 +145,60 @@ function _packcsrmatrix!(
     return A
 end
 
+function _packhypermatrix!(
+    A::AbstractGBArray{T}, ptr::Vector{Ti}, idx1::Vector{Ti}, idx2::Vector{Ti}, values::Vector{T};
+    desc = nothing, order = ColMajor()
+) where {T}
+    desc = _handledescriptor(desc)
+    valsize = length(A) * sizeof(T)
+    ptrsize = length(ptr) * sizeof(Ti)
+    idx1size = length(idx1) * sizeof(Ti)
+    idx2size = length(idx2) * sizeof(Ti)
+    nvec = length(ptr) - 1
+    isiso = (length(values) == 1) && (length(A) != 1)
+    ptrpointer = Ref{Ptr{LibGraphBLAS.GrB_Index}}(pointer(ptr))
+    idx1pointer = Ref{Ptr{LibGraphBLAS.GrB_Index}}(pointer(idx1))
+    idx2pointer = Ref{Ptr{LibGraphBLAS.GrB_Index}}(pointer(idx2))
+    valpointer = Ref{Ptr{Cvoid}}(pointer(values))
+
+    if order === ColMajor()
+        @wraperror LibGraphBLAS.GxB_Matrix_pack_HyperCSC(
+            A,
+            ptrpointer,
+            idx1pointer,
+            idx2pointer,
+            valpointer,
+            ptrsize,
+            idx1size,
+            idx2size,
+            valsize,
+            isiso,
+            nvec,
+            false,
+            desc
+        )
+    elseif order === RowMajor()
+        @wraperror LibGraphBLAS.GxB_Matrix_pack_HyperCSR(
+            A,
+            ptrpointer,
+            idx1pointer,
+            idx2pointer,
+            valpointer,
+            ptrsize,
+            idx1size,
+            idx2size,
+            valsize,
+            isiso,
+            nvec,
+            false,
+            desc
+        )
+    else
+        throw(ArgumentError("order must be either RowMajor() or ColMajor()"))
+    end
+
+end
+
 function makeshallow!(A)
     ccall((:GB_make_shallow, libgraphblas), Cvoid, (LibGraphBLAS.GrB_Matrix,), parent(A))
 end
@@ -184,6 +237,16 @@ function unsafepack!(
     return A
 end
 
+function unsafepack!(
+    A::AbstractGBArray, ptr, idx1, idx2, values, shallow::Bool = true;
+    order = ColMajor(), decrementindices = true
+)
+    _packhypermatrix!(A, ptr, idx1, idx2, values; decrementindices)
+    shallow && makeshallow!(A)
+    LibGraphBLAS.GxB_Matrix_Option_set(A, LibGraphBLAS.GxB_FORMAT, option_toconst(storageorder(A)))
+    return A
+end
+
 function unsafepack!(A::AbstractGBArray, S::SparseMatrixCSC, shallow::Bool = true; decrementindices =  true)
     unsafepack!(A, getcolptr(S), getrowval(S), getnzval(S), shallow; decrementindices)
 end

src/random.jl

@@ -22,9 +22,9 @@ Any input which supports `eltype(typeorrange)`.
 - `GBMatrix`
 """
 function gbrand(
-    rng::AbstractRNG, typeorrange, nrows::Integer, ncols::Integer, density::AbstractFloat;
+    rng::AbstractRNG, fn::F, typeorrange, nrows::Integer, ncols::Integer, density::AbstractFloat;
     symmetric=false, pattern=false, skewsymmetric=false, hermitian=false, nodiagonal=false
-)
+) where F
     type = eltype(typeorrange)
     A = GBMatrix{type}(nrows, ncols)
     (type <: Unsigned || type == Bool) && (skewsymmetric = false)
@@ -52,7 +52,7 @@ function gbrand(
         if pattern
             x = one(type)
         else
-            x = rand(rng, typeorrange)
+            x = fn(rng, typeorrange)
         end
         A[i, j] = x
         symmetric && (A[j, i] = x)
@@ -68,7 +68,27 @@ function gbrand(
     symmetric=false, pattern=false, skewsymmetric=false, hermitian=false, nodiagonal=false
 )
     return gbrand(
-        default_rng(), typeorrange, nrows, ncols, density;
+        default_rng(), rand, typeorrange, nrows, ncols, density;
+        symmetric, pattern, skewsymmetric, hermitian, nodiagonal
+    )
+end
+
+function gbrandn(
+    rng::AbstractRNG, type::DataType, nrows::Integer, ncols::Integer, density::AbstractFloat;
+    symmetric=false, pattern=false, skewsymmetric=false, hermitian=false, nodiagonal=false
+)
+    return gbrand(
+        rng, randn, type, nrows, ncols, density;
         symmetric, pattern, skewsymmetric, hermitian, nodiagonal
     )
 end
+
+function gbrandn(
+    type::DataType, nrows::Integer, ncols::Integer, density::AbstractFloat;
+    symmetric=false, pattern=false, skewsymmetric=false, hermitian=false, nodiagonal=false
+)
+    return gbrand(
+        default_rng(), randn, type, nrows, ncols, density;
+        symmetric, pattern, skewsymmetric, hermitian, nodiagonal
+    )
+end

src/unpack.jl

@@ -281,8 +281,9 @@ function _unpackhypermatrix!(
         isjumbled,
         desc
     )
-    colptr = unsafe_wrap(Array, Ptr{Int64}(colptr[]), size(A, 2) + 1)
-    colidx = unsafe_wrap(Array, Ptr{Int64}(colidx), colidxsize[])
+    nvec = nvec[]
+    colptr = unsafe_wrap(Array, Ptr{Int64}(colptr[]), nvec + 1)
+    colidx = unsafe_wrap(Array, Ptr{Int64}(colidx), nvec)
     rowidx = unsafe_wrap(Array, Ptr{Int64}(rowidx), nnonzeros)
     nstored = isiso[] ? 1 : nnonzeros
     vals = unsafe_wrap(Array, Ptr{T}(values[]), nstored)
@@ -343,8 +344,9 @@ desc = _handledescriptor(desc)
         isjumbled,
         desc
     )
-    rowptr = unsafe_wrap(Array, Ptr{Int64}(rowptr[]), size(A, 2) + 1)
-    rowidx = unsafe_wrap(Array, Ptr{Int64}(rowidx[]), rowidxsize[])
+    nvec = nvec[] + 1
+    rowptr = unsafe_wrap(Array, Ptr{Int64}(rowptr[]), nvec + 1)
+    rowidx = unsafe_wrap(Array, Ptr{Int64}(rowidx[]), nvec)
     colidx = unsafe_wrap(Array, Ptr{Int64}(colidx[]), nnonzeros)
     nstored = isiso[] ? 1 : nnonzeros
     vals = unsafe_wrap(Array, Ptr{T}(values[]), nstored)

test/Manifest.toml

@@ -1,8 +1,8 @@
 # This file is machine-generated - editing it directly is not advised
 
-julia_version = "1.8.1"
+julia_version = "1.8.2"
 manifest_format = "2.0"
-project_hash = "0e610cf8435f78ad82784147cc6e89c101047f5f"
+project_hash = "361dc7471c854e70013567d84463ce04c149fb88"
 
 [[deps.ArgTools]]
 uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
@@ -168,6 +168,10 @@ version = "1.3.0"
 deps = ["LinearAlgebra", "SparseArrays"]
 uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
+[[deps.SuiteSparse]]
+deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"]
+uuid = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9"
+
 [[deps.SuiteSparse_jll]]
 deps = ["Artifacts", "Libdl", "Pkg", "libblastrampoline_jll"]
 uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c"
@@ -181,7 +185,7 @@ version = "1.0.0"
 [[deps.Tar]]
 deps = ["ArgTools", "SHA"]
 uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
-version = "1.10.0"
+version = "1.10.1"
 
 [[deps.Test]]
 deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]

test/Project.toml

@@ -5,7 +5,9 @@ FiniteDifferences = "26cc04aa-876d-5657-8c51-4c34ba976000"
 KLU = "ef3ab10e-7fda-4108-b977-705223b18434"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+SuiteSparse = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]