dup => combine

Author: Will Kimmerer

src/matrix.jl

@@ -17,17 +17,17 @@ GBMatrix{T}(size::Tuple{Base.OneTo, Base.OneTo}) where {T} =
     GBMatrix{T}(size[1].stop, size[2].stop)
 
 """
-    GBMatrix(I, J, X; dup = +, nrows = maximum(I), ncols = maximum(J))
+    GBMatrix(I, J, X; combine = +, nrows = maximum(I), ncols = maximum(J))
 
-Create an nrows x ncols GBMatrix M such that M[I[k], J[k]] = X[k]. The dup function defaults
+Create an nrows x ncols GBMatrix M such that M[I[k], J[k]] = X[k]. The combine function defaults
 to `|` for booleans and `+` for nonbooleans.
 """
 function GBMatrix(
     I::AbstractVector, J::AbstractVector, X::AbstractVector{T};
-    dup = +, nrows = maximum(I), ncols = maximum(J)
+    combine = +, nrows = maximum(I), ncols = maximum(J)
 ) where {T}
     A = GBMatrix{T}(nrows, ncols)
-    build(A, I, J, X; dup)
+    build(A, I, J, X; combine)
     return A
 end
 
@@ -161,9 +161,9 @@ for T ∈ valid_vec
     func = Symbol(prefix, :_Matrix_build_, suffix(T))
     @eval begin
         function build(A::GBMatrix{$T}, I::AbstractVector, J::AbstractVector, X::Vector{$T};
-                dup = +
+                combine = +
             )
-            dup = BinaryOp(dup)($T)
+            combine = BinaryOp(combine)($T)
             if !(I isa Vector)
                 I = Vector(I)
             end
@@ -181,7 +181,7 @@ for T ∈ valid_vec
                 Vector{LibGraphBLAS.GrB_Index}(J),
                 X,
                 length(X),
-                dup
+                combine
             )
             increment!(I)
             increment!(J)
@@ -274,6 +274,7 @@ function Base.getindex(
     return extract(A, i, j; mask, accum, desc)
 end
 
+# Linear indexing
 function Base.getindex(A::GBMatOrTranspose, v::AbstractVector)
     throw("Not implemented")
 end

src/unpack.jl

@@ -35,7 +35,10 @@ function _unpackcscmatrix!(A::GBVecOrMat{T}; desc = nothing) where {T}
         isjumbled,
         desc
     )
-    colptr = unsafe_wrap(Array{LibGraphBLAS.GrB_Index}, colptr[], colptrsize[] ÷ sizeof(LibGraphBLAS.GrB_Index))
+    #TODO IMPROVE
+    # colptrsize isn't always exact. Or rather it can be bigger if GrB has allocated a bigger block.
+    # For now I'll unsafe_wrap based on size(A, 2) + 1
+    colptr = unsafe_wrap(Array{LibGraphBLAS.GrB_Index}, colptr[], size(A, 2) + 1)
     rowidx = unsafe_wrap(Array{LibGraphBLAS.GrB_Index}, rowidx[], rowidxsize[] ÷ sizeof(LibGraphBLAS.GrB_Index))
     colptr .+= 1
     rowidx .+= 1
@@ -66,7 +69,10 @@ function _unpackcsrmatrix!(A::GBVecOrMat{T}; desc = nothing) where {T}
         isjumbled,
         desc
     )
-    rowptr = unsafe_wrap(Array{LibGraphBLAS.GrB_Index}, rowptr[], rowptrsize[] ÷ sizeof(LibGraphBLAS.GrB_Index))
+    #TODO IMPROVE
+    # rowptrsize isn't always exact. Or rather it can be bigger if GrB has allocated a bigger block.
+    # For now I'll unsafe_wrap based on size(A, 1) + 1
+    rowptr = unsafe_wrap(Array{LibGraphBLAS.GrB_Index}, rowptr[],size(A, 1) + 1)
     colidx = unsafe_wrap(Array{LibGraphBLAS.GrB_Index}, colidx[], colidxsize[] ÷ sizeof(LibGraphBLAS.GrB_Index))
     rowptr .+= 1
     colidx .+= 1

src/vector.jl

@@ -21,9 +21,9 @@ GBVector{T}(nrows::Tuple{Base.OneTo,}) where {T} = GBVector{T}(first(nrows))
 
 Create a GBVector from a vector of indices `I` and a vector of values `X`.
 """
-function GBVector(I::AbstractVector{U}, X::AbstractVector{T}; dup = +, nrows = maximum(I)) where {U<:Integer, T}
+function GBVector(I::AbstractVector{U}, X::AbstractVector{T}; combine = +, nrows = maximum(I)) where {U<:Integer, T}
     x = GBVector{T}(nrows)
-    build(x, I, X, dup = dup)
+    build(x, I, X, combine = combine)
     return x
 end
 
@@ -139,18 +139,18 @@ for T ∈ valid_vec
     # Build functions
     func = Symbol(prefix, :_Matrix_build_, suffix(T))
     @eval begin
-        function build(v::GBVector{$T}, I::Vector, X::Vector{$T}; dup = +)
+        function build(v::GBVector{$T}, I::Vector, X::Vector{$T}; combine = +)
             nnz(v) == 0 || throw(OutputNotEmptyError("Cannot build vector with existing elements"))
             length(X) == length(I) || DimensionMismatch("I and X must have the same length")
-            dup = BinaryOp(dup)($T)
+            combine = BinaryOp(combine)($T)
             decrement!(I)
             @wraperror LibGraphBLAS.$func(
                 Ptr{LibGraphBLAS.GrB_Vector}(v.p), 
                 Vector{LibGraphBLAS.GrB_Index}(I), 
                 zeros(LibGraphBLAS.GrB_Index, length(I)), 
                 X, 
                 length(X), 
-                dup
+                combine
             )
             increment!(I)
         end