Merge #176

176: fix permutedims dispatch, isapprox for complex numbers r=maleadt a=GiggleLiu

several bug fixes.

There should be some tests. Am I supposed to put tests in `CuArrays.jl` and submit another PR?

Co-authored-by: Leo <[email protected]>

Author: bors[bot]

src/indexing.jl

@@ -62,7 +62,7 @@ Base.setindex!(xs::GPUArray, v, i::Integer) = xs[i] = convert(eltype(xs), v)
 # Vector indexing
 
 to_index(a, x) = x
-to_index(::A, x::Array{ET}) where {A, ET} = copyto!(similar(A, ET, size(x)), x)
+to_index(a::A, x::Array{ET}) where {A, ET} = copyto!(similar(a, ET, size(x)...), x)
 to_index(a, x::UnitRange{<: Integer}) = convert(UnitRange{Int}, x)
 to_index(a, x::Base.LogicalIndex) = error("Logical indexing not implemented")
 

src/linalg.jl

@@ -80,7 +80,8 @@ function genperm(I::NTuple{N}, perm::NTuple{N}) where N
     ntuple(d-> (@inbounds return I[perm[d]]), Val(N))
 end
 
-function LinearAlgebra.permutedims!(dest::GPUArray, src::GPUArray, perm::NTuple{N, Integer}) where N
+function LinearAlgebra.permutedims!(dest::GPUArray, src::GPUArray, perm) where N
+    perm isa Tuple || (perm = Tuple(perm))
     gpu_call(dest, (dest, src, perm)) do state, dest, src, perm
         I = @cartesianidx src state
         @inbounds dest[genperm(I, perm)...] = src[I...]

src/mapreduce.jl

@@ -189,6 +189,6 @@ function fast_isapprox(x::Number, y::Number, rtol::Real = Base.rtoldefault(x, y)
     x == y || (isfinite(x) && isfinite(y) && abs(x - y) <= atol + rtol*max(abs(x), abs(y)))
 end
 
-Base.isapprox(A::GPUArray{T1}, B::GPUArray{T2}, rtol::Real = Base.rtoldefault(T1, T2, 0), atol::Real=0) where {T1, T2} = all(fast_isapprox.(A, B, T1(rtol), T1(atol)))
-Base.isapprox(A::AbstractArray{T1}, B::GPUArray{T2}, rtol::Real = Base.rtoldefault(T1, T2, 0), atol::Real=0) where {T1, T2} = all(fast_isapprox.(A, Array(B), T1(rtol), T1(atol)))
-Base.isapprox(A::GPUArray{T1}, B::AbstractArray{T2}, rtol::Real = Base.rtoldefault(T1, T2, 0), atol::Real=0) where {T1, T2} = all(fast_isapprox.(Array(A), B, T1(rtol), T1(atol)))
+Base.isapprox(A::GPUArray{T1}, B::GPUArray{T2}, rtol::Real = Base.rtoldefault(T1, T2, 0), atol::Real=0) where {T1, T2} = all(fast_isapprox.(A, B, T1(rtol)|>real, T1(atol)|>real))
+Base.isapprox(A::AbstractArray{T1}, B::GPUArray{T2}, rtol::Real = Base.rtoldefault(T1, T2, 0), atol::Real=0) where {T1, T2} = all(fast_isapprox.(A, Array(B), T1(rtol)|>real, T1(atol)|>real))
+Base.isapprox(A::GPUArray{T1}, B::AbstractArray{T2}, rtol::Real = Base.rtoldefault(T1, T2, 0), atol::Real=0) where {T1, T2} = all(fast_isapprox.(Array(A), B, T1(rtol)|>real, T1(atol)|>real))

src/testsuite/linalg.jl

@@ -9,6 +9,7 @@ function test_linalg(AT)
             @test compare(x -> permutedims(x, (2, 1)), AT, rand(Float32, 2, 3))
             @test compare(x -> permutedims(x, (2, 1, 3)), AT, rand(Float32, 4, 5, 6))
             @test compare(x -> permutedims(x, (3, 1, 2)), AT, rand(Float32, 4, 5, 6))
+            @test compare(x -> permutedims(x, [2,1,4,3]), AT, randn(ComplexF64,3,4,5,1))
         end
 
         @testset "issymmetric/ishermitian" begin

src/testsuite/mapreduce.jl

@@ -55,6 +55,13 @@ function test_mapreduce(AT)
                 @test !(A ≈ B)
                 @test !(A ≈ Array(B))
                 @test !(Array(A) ≈ B)
+
+
+                ca = AT(randn(ComplexF64,3,3))
+                cb = copy(ca)
+                cb[1:1, 1:1] .+= 1e-7im
+                @test isapprox(ca, cb, atol=1e-5)
+                @test !isapprox(ca, cb, atol=1e-9)
             end
         end
     end