Another attempt at fixing showing, test cases for showing and mapreduce

Author: ssz66666

src/abstractarray.jl

@@ -56,14 +56,24 @@ end
 
 ## showing
 
-Base.show(io::IO, x::GPUArray) = Base.show(io, Array(x))
-Base.show(io::IO, x::LinearAlgebra.Adjoint{<:Any,<:GPUArray}) =
-    Base.show(io, LinearAlgebra.adjoint(Array(x.parent)))
-Base.show(io::IO, x::LinearAlgebra.Transpose{<:Any,<:GPUArray}) =
-    Base.show(io, LinearAlgebra.transpose(Array(x.parent)))
-
-Base.show_vector(io::IO, x::GPUArray) = Base.show_vector(io, Array(x))
-
+for (atype, op) in
+    [(:(GPUArray), :(Array)),
+     (:(LinearAlgebra.Adjoint{<:Any,<:GPUArray}), :(x->LinearAlgebra.adjoint(Array(x.parent)))),
+     (:(LinearAlgebra.Transpose{<:Any,<:GPUArray}), :(x->LinearAlgebra.transpose(Array(x.parent))))]
+  @eval begin
+    # for display
+    Base.print_array(io::IO, X::($atype)) =
+        Base.print_array(io,($op)(X))
+
+    # for show
+    Base._show_nonempty(io::IO, X::($atype), prefix::String) = 
+        Base._show_nonempty(io,($op)(X),prefix)
+    Base._show_empty(io::IO, X::($atype)) =
+        Base._show_empty(io,($op)(X))
+    Base.show_vector(io::IO, v::($atype), args...) =
+        Base.show_vector(io,($op)(v),args...)
+  end
+end
 
 # memory operations
 

src/testsuite.jl

@@ -49,6 +49,7 @@ end
 Runs the entire GPUArrays test suite on array type `AT`
 """
 function test(AT::Type{<:GPUArray})
+    GPUArrays.allowscalar(false)
     TestSuite.test_construction(AT)
     TestSuite.test_gpuinterface(AT)
     TestSuite.test_indexing(AT)

src/testsuite/io.jl

@@ -3,11 +3,25 @@ function test_io(AT)
         @testset "showing" begin
           io = IOBuffer()
           A = AT(Int64[1])
+          B = AT(Int64[1 2;3 4]) # vectors and non-vector arrays showing
+                                 # are handled differently in base/arrayshow.jl
 
           show(io, MIME("text/plain"), A)
           seekstart(io)
           @test String(take!(io)) == "1-element $AT{Int64,1}:\n 1"
 
+          show(io, A)
+          seekstart(io)
+          @test String(take!(io)) == "[1]"
+
+          show(io, MIME("text/plain"), B)
+          seekstart(io)
+          @test String(take!(io)) == "2×2 $AT{Int64,2}:\n 1  2\n 3  4"
+
+          show(io, B)
+          seekstart(io)
+          @test String(take!(io)) == "[1 2; 3 4]"
+
           show(io, MIME("text/plain"), A')
           seekstart(io)
           msg = String(take!(io)) # the printing of Adjoint depends on global state

src/testsuite/mapreduce.jl

@@ -21,6 +21,15 @@ function test_mapreduce(AT)
                         x = T(y)
                         @test sum(y, dims = 2) ≈ Array(sum(x, dims = 2))
                         @test sum(y, dims = 1) ≈ Array(sum(x, dims = 1))
+
+                        y = rand(range, N, N)
+                        x = T(y)
+                        _zero = zero(ET)
+                        _addone(z) = z + one(ET)
+                        @test mapreduce(_addone, +, y; dims = 2, init = _zero) ≈
+                            Array(mapreduce(_addone, +, x; dims = 2, init = _zero))
+                        @test mapreduce(_addone, +, y; init = _zero) ≈
+                            mapreduce(_addone, +, x; init = _zero)
                     end
                 end
                 @testset "sum maximum minimum prod" begin