Merge branch 'master' of https://github.com/JuliaGPU/GPUArrays.jl

Author: ssz66666

Project.toml

@@ -10,3 +10,9 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[extras]
+Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+
+[targets]
+test = ["Pkg"]

src/abstractarray.jl

@@ -56,9 +56,13 @@ end
 
 ## showing
 
-Base.print_array(io::IO, x::GPUArray) = Base.print_array(io, collect(x))
-Base.print_array(io::IO, x::LinearAlgebra.Adjoint{<:Any,<:GPUArray}) = Base.print_array(io, LinearAlgebra.adjoint(collect(x.parent)))
-Base.print_array(io::IO, x::LinearAlgebra.Transpose{<:Any,<:GPUArray}) = Base.print_array(io, LinearAlgebra.transpose(collect(x.parent)))
+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))
 
 
 # memory operations

test/runtests.jl

@@ -1,7 +1,36 @@
 using GPUArrays, Test
 using GPUArrays.TestSuite
 
+using Pkg
 
-@testset "Julia reference implementation:" begin
+@testset "JLArray" begin
     GPUArrays.test(JLArray)
 end
+
+function test_package(package, branch=nothing)
+    mktempdir() do devdir
+        withenv("JULIA_PKG_DEVDIR" => devdir) do
+            # try to install from the same branch of GPUArrays
+            try
+                if branch === nothing
+                    branch = chomp(read(`git -C $(@__DIR__) rev-parse --abbrev-ref HEAD`, String))
+                    branch == "HEAD" && error("in detached HEAD state")
+                end
+                Pkg.add(PackageSpec(name=package, rev=String(branch)))
+                @info "Installed $package from $branch branch"
+            catch ex
+                @warn "Could not install $package from same branch as GPUArrays, trying master branch" exception=ex
+                Pkg.add(PackageSpec(name=package, rev="master"))
+            end
+
+            Pkg.test(package)
+        end
+    end
+end
+
+if haskey(ENV, "GITLAB_CI")
+    branch = ENV["CI_COMMIT_REF_NAME"]
+    @testset "CuArray" begin
+        test_package("CuArrays", branch)
+    end
+end