expand reduce to vector properly

Author: rayegun

src/operations/reduce.jl

@@ -29,17 +29,17 @@ function Base.reduce(
         typeout = eltype(A)
     end
 
-    if dims == 2 && !(A isa GBVectorOrTranspose)
+    if dims == 2
         w = similar(A, typeout, size(A, 1))
         reduce!(op, w, A; desc, accum, mask)
         return w
-    elseif dims == 1 && !(A isa GBVectorOrTranspose)
+    elseif dims == 1
         desc.transpose_input1 = true
         w = similar(A, typeout, size(A, 2))
         reduce!(op, w, A; desc, accum, mask)
         return w
     elseif dims == (1,2) || dims == Colon() || A isa GBVectorOrTranspose
-        mask !== nothing && throw(
+        mask != C_NULL && throw(
             ArgumentError("Reduction to a scalar does not support masking."))
         if init === nothing
             c = GBScalar{typeout}()

test/operations/reduce.jl

@@ -1,7 +1,9 @@
 @testset "reduce" begin
     @testset "Reduction of Vec -> Scalar" begin
-        v = GBVector(1:10)
+        v = GBVector(Int128.(1:10))
         @test reduce(+, v) == 55
         @test reduce(*, v) == 3628800
+        @test reduce(+, v, dims=1) == 55
+        @test reduce(+, v, dims=2) == v
     end
 end

test/runtests.jl

@@ -70,25 +70,25 @@ SuiteSparseGraphBLAS.@unop foo F=>F
 println("Testing SuiteSparseGraphBLAS.jl")
 println("$(SuiteSparseGraphBLAS.get_lib())")
 @testset "SuiteSparseGraphBLAS" begin
-    # include_test("libutils.jl")
-    # include_test("operatorutils.jl")
-    # include_test("ops.jl")
-    # include_test("gbarray.jl")
-    # include_test("issues.jl")
-    # include_test("operations/ewise.jl")
-    # include_test("operations/kron.jl")
-    # include_test("operations/map.jl")
-    # include_test("operations/mul.jl")
+    include_test("libutils.jl")
+    include_test("operatorutils.jl")
+    include_test("ops.jl")
+    include_test("gbarray.jl")
+    include_test("issues.jl")
+    include_test("operations/ewise.jl")
+    include_test("operations/kron.jl")
+    include_test("operations/map.jl")
+    include_test("operations/mul.jl")
     include_test("operations/reduce.jl")
-    # include_test("operations/select.jl")
-    # include_test("operations/transpose.jl")
-    # include_test("operations/broadcasting.jl")
-    # include_test("operations/concat.jl")
-    # include_test("chainrules/chainrulesutils.jl")
-    # include_test("chainrules/mulrules.jl")
-    # include_test("chainrules/ewiserules.jl")
-    # include_test("chainrules/selectrules.jl")
-    # include_test("chainrules/constructorrules.jl")
-    # include_test("chainrules/maprules.jl")
+    include_test("operations/select.jl")
+    include_test("operations/transpose.jl")
+    include_test("operations/broadcasting.jl")
+    include_test("operations/concat.jl")
+    include_test("chainrules/chainrulesutils.jl")
+    include_test("chainrules/mulrules.jl")
+    include_test("chainrules/ewiserules.jl")
+    include_test("chainrules/selectrules.jl")
+    include_test("chainrules/constructorrules.jl")
+    include_test("chainrules/maprules.jl")
 
 end