add reshape, partially fix #81

Author: rayegun

src/abstractgbarray.jl

@@ -43,6 +43,58 @@ function SparseArrays.SparseVector(v::GBVectorOrTranspose)
     return unpack!(T, SparseVector)
 end
 
+function reshape!(
+    A::AbstractGBMatrix, nrows, ncols; 
+    bycol::Bool = true, desc = nothing
+)
+    desc = _handledescriptor(desc)
+    lenA = length(A)
+    nrows isa Colon && ncols isa Colon && throw(
+        ArgumentError("nrows and ncols may not both be Colon"))
+    nrows isa Colon && (nrows = lenA ÷ ncols)
+    ncols isa Colon && (ncols = lenA ÷ nrows)
+    @wraperror LibGraphBLAS.GxB_Matrix_reshape(
+        gbpointer(A), bycol, nrows, ncols, desc
+    )
+    return A
+end
+reshape!(A::AbstractGBMatrix, dims...; bycol = true) = 
+    reshape!(A, dims...; bycol)
+reshape!(A::AbstractGBMatrix, n; bycol = true) =
+    reshape!(A, n, 1; bycol)
+function Base.reshape(
+    A::AbstractGBMatrix, nrows, ncols; 
+    bycol = true, desc = nothing)
+    desc = _handledescriptor(desc)
+    lenA = length(A)
+    nrows isa Colon && ncols isa Colon && throw(
+        ArgumentError("nrows and ncols may not both be Colon"))
+    nrows isa Colon && (nrows = lenA ÷ ncols)
+    ncols isa Colon && (ncols = lenA ÷ nrows)
+    C = Ref{LibGraphBLAS.GrB_Matrix}()
+    @wraperror LibGraphBLAS.GxB_Matrix_reshapeDup(
+        C, gbpointer(A), 
+        bycol, nrows, ncols, desc
+    )
+    # TODO, do better. This is ugly and allocates twice.
+    out = similar(A)
+    out.p = finalizer(C) do ref
+        @wraperror LibGraphBLAS.GrB_Matrix_free(ref)
+    end
+    return out
+end
+Base.reshape(A::AbstractGBMatrix, dims::Tuple{Vararg{Int64, N}}; bycol = true) where N =
+    reshape(A, dims...; bycol)
+Base.reshape(A::AbstractGBMatrix, dims::Tuple{Vararg{Union{Colon, Int64}}}; bycol = true) =
+    reshape(A, dims...; bycol)
+Base.reshape(
+    A::AbstractGBMatrix, 
+    dims::Tuple{Union{Integer, Base.OneTo}, Vararg{Union{Integer, Base.OneTo}}};
+    bycol = true
+) = reshape(A, dims...; bycol)
+
+Base.reshape(A::AbstractGBMatrix, n; bycol = true) = reshape(A, n, 1; bycol)
+
 # AbstractGBMatrix functions:
 #############################
 

src/operations/extract.jl

@@ -116,15 +116,18 @@ function extract(
     return extract!(C, A, :, J; mask, accum, desc)
 end
 
-# TODO: FINISH THIS WITH GxB_Matrix_reshape!!!
-# function extract(
-#     A::GBMatrixOrTranspose, I::Number, ::Colon;
-#     mask = nothing, accum = nothing, desc = nothing
-# )
-#     _, Jlen = _outlength(A, I, :)
-#     C = similar(A, 1, Jlen)
-#     return extract!(C, A, I, :; mask, accum, desc)
-# end
+function extract(
+    A::GBMatrixOrTranspose{T}, I::Number, ::Colon;
+    mask = nothing, accum = nothing, desc = nothing
+) where {T}
+    _, Jlen = _outlength(A, I, :)
+    C = similar(A, Jlen)
+    # TODO, better abstractions here.
+    @wraperror LibGraphBLAS.GxB_Matrix_reshape(C, true, 1, Jlen, C_NULL)
+    extract!(C, A, I, :; mask, accum, desc)
+    @wraperror LibGraphBLAS.GxB_Matrix_reshape(C, true, Jlen, 1, C_NULL)
+    return C
+end
 
 function extract!(
     w::AbstractGBVector, u::AbstractGBVector, I;

test/gbarray.jl

@@ -16,9 +16,10 @@
             #Indexing tests
             x = sprand(Int64, 100, 100, 0.05)
             m = GBMatrix(x)
+            deleteat!(m, 1, 2)
             @test m[1, 2] === nothing
             @test m[:, 2] == GBVector(x[:, 2])
-            @test m[2, :] == copy(GBVector(x[2, :])')
+            @test m[2, :] == GBVector(x[2, :])
             @test m[:, :] == m
             @test m[1:2:5, 1:2] == GBMatrix(x[1:2:5, 1:2])
             @test m[1:2:5, :] == GBMatrix(x[1:2:5, :])