reshape fixes, copy of ShallowVec

Author: rayegun

docs/src/arrays.md

@@ -40,8 +40,8 @@ x = GBMatrix{Bool}(20_000_000, 50_000)
 x = GBMatrix([[1,2] [3,4]])
 x = GBMatrix(sprand(100, 100, 0.5); fill = 0.0)
 x = GBMatrix(
-    rand(1:50_000, 5000), rand(1:500_000, 5000), 1; 
-    ncols = 500_000, nrows = 500_000
+    rand(1:50_000, 5000), rand(1:500_000, 5000), 1,
+    500_000, 500_000
 )
 ```
 

src/abstractgbarray.jl

@@ -205,7 +205,8 @@ reshape!(A::AbstractGBMatrix, dims...; bycol = true) =
     reshape!(A, dims...; bycol)
 reshape!(A::AbstractGBMatrix, n; bycol = true) =
     reshape!(A, n, 1; bycol)
-function Base.reshape(
+
+function _reshape(
     A::AbstractGBMatrix, nrows::Int, ncols::Int; 
     bycol = true, desc = nothing)
     desc = _handledescriptor(desc)
@@ -214,10 +215,15 @@ function Base.reshape(
         C, A, 
         bycol, nrows, ncols, desc
     )
-    out = similar(A)
-    out.p = finalizer(C) do ref
+    return finalizer(C) do ref
         @wraperror LibGraphBLAS.GrB_Matrix_free(ref)
     end
+end
+function Base.reshape(
+    A::AbstractGBMatrix, nrows::Int, ncols::Int; 
+    bycol = true, desc = nothing)
+    out = similar(A)
+    out.p = _reshape(A, nrows, ncols; bycol, desc)
     return out
 end
 
@@ -238,7 +244,16 @@ Base.reshape(
     bycol = true
 ) = reshape(A, dims...; bycol)
 
-Base.reshape(A::AbstractGBMatrix, n::Union{Int, Colon}; bycol = true) = reshape(A, n, 1; bycol)
+function Base.reshape(A::AbstractGBMatrix, ::Colon; bycol = true)
+    out = similar(A, length(A))
+    out.p = _reshape(A, length(A), 1; bycol)
+    return out
+end
+Base.reshape(A::AbstractGBMatrix, n::Int; bycol = true) = n == length(A) ? reshape(A, :; bycol) :
+    throw(DimensionMismatch("new dimensions ($n,) must be consistent with array size $(length(A))"))
+Base.reshape(A::AbstractGBMatrix, n::Integer; bycol = true) = n == length(A) ? reshape(A, :; bycol) :
+    throw(DimensionMismatch("new dimensions ($n,) must be consistent with array size $(length(A))"))
+
 
 function build!(A::AbstractGBMatrix{T}, I::AbstractVector, J::AbstractVector, x::T) where {T}
     nnz(A) == 0 || throw(OutputNotEmptyError())

src/mmread.jl

@@ -123,6 +123,6 @@ function mmread(filename, infoonly::Bool=false, retcoord::Bool=false)
         end
         (retcoord
          ? (rr, cc, xx, rows, cols, entries, rep, field, symm)
-         : symlabel(GBMatrix(rr, cc, xx, nrows=rows, ncols=cols)))
+         : symlabel(GBMatrix(rr, cc, xx, rows, cols)))
     end
 end

src/shallowtypes.jl

@@ -44,7 +44,10 @@ function Base.copy(A::GBShallowMatrix{T}) where {T}
     r = _copyGrBMat(A.p)
     return GBMatrix{T}(r; fill = A.fill)
 end
-
+function Base.copy(A::GBShallowVector{T}) where {T}
+    r = _copyGrBMat(A.p)
+    return GBVector{T}(r; fill = A.fill)
+end
 
 # similar functions:
 # Note well, these should *never* return a GBShallowArray.
@@ -94,3 +97,4 @@ Base.resize!(::GBShallowMatrix, nrows, ncols) = throw(ShallowException())
 Base.resize!(::GBShallowVector, nrows) = throw(ShallowException())
 build!(::GBShallowMatrix{T}, I::AbstractVector, J::AbstractVector, x::T) where T = throw(ShallowException())
 
+LinearAlgebra.Diagonal(v::GBShallowVector) = Diagonal(copy(v))

test/abstractgbarray.jl

@@ -30,7 +30,7 @@
             @test size(reshape(A, 2, :)) == (2, 2)
             @test size(reshape(A, (:, 2))) == (2, 2)
             @test size(reshape(A, (2, 2))) == (2, 2)
-            @test size(reshape(A, :)) == (4, 1)
+            @test size(reshape(A, :)) == (4,)
             B = copy(A)
             @test resize!(B, 1, 4) == GBMatrix([1, 1], [1, 2], [1, 3], 1, 4)
             @test resize!(B, 1, 1) === B

test/issues.jl

@@ -53,4 +53,18 @@
         A = GBMatrix([1,1,2,2,3,4,4,5,6,7,7,7], [2,4,5,7,6,1,3,6,3,3,4,5], [1:12...])
         @test reduce(any, A, dims=2) == GBVector([1,3,5,6,8,9,10])
     end
+
+    @testset "#109ish" begin
+        # test that masking works correctly:
+
+    end
+    @testset "#106" begin
+        a = rand(2, 4) |> GBMatrix
+        @test reshape(a, :) isa AbstractVector
+        @test reshape(a, :) == reshape(a, 8)
+    end
+    @testset "#98" begin
+        x = GBMatrix([1,2], [2, 3], [1,2], fill=0)
+        @test Array(x) .* [1,2] ≈ x .* [1,2]
+    end
 end