add countstored

Author: rayegun

src/operations/reduce.jl

@@ -90,3 +90,34 @@ Base.minimum(A::GBArrayOrTranspose) = reduce(min, A)
 Base.minimum(f::Function, A::GBArrayOrTranspose) = reduce(min, map(f, A))
 
 Base.sum(A::GBArrayOrTranspose; dims=:) = reduce(+, A; dims)
+
+function countstored!(
+    C::GBVector, A::GBArrayOrTranspose; 
+    dims=1, mask = nothing, accum = nothing, desc = nothing
+)
+    v=GBVector(size(A, dims), true)
+    A = dims == 1 ? A' : dims == 2 ? A : throw(ArgumentError("dims ∉ {1, 2}"))
+    return mul!(C, A, v, (+, pair); mask, accum, desc)
+end
+function countstored(
+    A::GBArrayOrTranspose; 
+    dims=1, mask = nothing, accum = nothing, desc = nothing
+)
+    v=GBVector(size(A, dims), true)
+    countstored!(
+        similar(A, Int64, size(A, dims == 1 ? 2 : 1)), A; 
+        dims, mask, accum, desc
+    )
+end
+
+function countstoredcol(A::GBArrayOrTranspose, i::Integer)
+    mask = GBVector{Bool}(size(A, 2))
+    mask[i] = true
+    countstored(A; mask)[i]
+end
+
+function countstoredrow(A::GBArrayOrTranspose, i::Integer)
+    mask = GBVector{Bool}(size(A, 2))
+    mask[i] = true
+    countstored(A'; mask)[i]
+end

src/operators/binaryops.jl

@@ -144,6 +144,7 @@ second(x, y) = y
 @binop any GxB_ANY T=>T # this doesn't match the semantics of Julia's any, but that may be ok...
 
 pair(x::T, y::T) where T = one(T)
+pair(x::T, y::U) where {T, U} = promote_type(T, U)(true)
 @binop pair GrB_ONEB T=>T # I prefer pair, but to keep up with the spec I'll match...
 @binop (+) GrB_PLUS T=>T
 @binop (-) GrB_MINUS T=>T

src/types.jl

@@ -472,6 +472,8 @@ macro gbmatrixtype(typename)
         $typename(dims::Dims{2}, x::T; fill = defaultfill(T)) where T = 
             $typename{T}(dims, x, fill)
 
+        $typename{T}(nrows, ncols, x; fill::F = defaultfill(T)) where {T, F} = 
+            $typename{T, F}((nrows, ncols), x; fill)
         $typename(nrows, ncols, x::T; fill = defaultfill(T)) where T = 
             $typename{T}((nrows, ncols), x; fill)
         $typename(dims::Tuple{<:Integer}, x::T; fill = defaultfill(T)) where T = 
@@ -726,12 +728,14 @@ macro gbvectortype(typename)
         $typename(dims::Dims{1}, x::T; fill = defaultfill(T)) where T = 
             $typename{T}(dims, x, fill)
 
-        $typename(nrows, ncols, x::T; fill = defaultfill(T)) where T = 
-            $typename{T}((nrows, ncols), x; fill)
+        $typename{T}(nrows, x; fill = defaultfill(T)) where T =
+            $typename{T}((nrows,), x; fill)
+        $typename(nrows, x::T; fill = defaultfill(T)) where T = 
+            $typename{T}(nrows, x; fill)
         $typename(dims::Tuple{<:Integer}, x::T; fill = defaultfill(T)) where T = 
             $typename{T}(dims..., x; fill)
-        $typename(size::Tuple{Base.OneTo, Base.OneTo}, x::T; fill = defaultfill(T)) where T = 
-            $typename{T}(size[1].stop, size[2].stop, x; fill)
+        $typename(size::Tuple{Base.OneTo}, x::T; fill = defaultfill(T)) where T = 
+            $typename{T}(size[1].stop, x; fill)
 
         function $typename{T, F}(v::AbstractGBVector; fill = getfill(v)) where {T, F}
             return convert($typename{T, F}, v; fill)