Merge pull request #329 from JuliaGPU/tb/compat

Simplify compatibility with GPUArrays

Author: maleadt

Project.toml

@@ -16,9 +16,8 @@ Adapt = "2.0"
 julia = "1.5"
 
 [extras]
-FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
 FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test", "FFTW", "FillArrays"]
+test = ["Test", "FillArrays"]

docs/src/testsuite.md

@@ -44,7 +44,6 @@ TestSuite.test_base(T) # basic functionality like launching a kernel on the GPU
 TestSuite.test_blas(T) # tests the blas interface
 TestSuite.test_broadcasting(T) # tests the broadcasting implementation
 TestSuite.test_construction(T) # tests all kinds of different ways of constructing the array
-TestSuite.test_fft(T) # fft tests
 TestSuite.test_linalg(T) # linalg function tests
 TestSuite.test_mapreduce(T) # mapreduce sum, etc
 TestSuite.test_indexing(T) # indexing tests

src/host/linalg.jl

@@ -211,12 +211,3 @@ function LinearAlgebra.permutedims!(dest::AbstractGPUArray, src::AbstractGPUArra
     end
     return dest
 end
-
-
-## inv for Triangular
-for TR in (UpperTriangular, LowerTriangular, UnitUpperTriangular, UnitLowerTriangular)
-    @eval function Base.inv(x::$TR{<:Any,<:AbstractGPUArray})
-      out = typeof(parent(x))(I(size(x,1)))
-      $TR(LinearAlgebra.ldiv!(x,out))
-    end
-end

src/reference.jl

@@ -329,30 +329,6 @@ Base.copyto!(dest::DenseJLArray{T}, source::DenseJLArray{T}) where {T} =
     copyto!(dest, 1, source, 1, length(source))
 
 
-## fft
-
-using AbstractFFTs
-
-# defining our own plan type is the easiest way to pass around the plans in FFTW interface
-# without ambiguities
-
-struct FFTPlan{T}
-    p::T
-end
-
-AbstractFFTs.plan_fft(A::JLArray; kw_args...) = FFTPlan(plan_fft(A.data; kw_args...))
-AbstractFFTs.plan_fft!(A::JLArray; kw_args...) = FFTPlan(plan_fft!(A.data; kw_args...))
-AbstractFFTs.plan_bfft!(A::JLArray; kw_args...) = FFTPlan(plan_bfft!(A.data; kw_args...))
-AbstractFFTs.plan_bfft(A::JLArray; kw_args...) = FFTPlan(plan_bfft(A.data; kw_args...))
-AbstractFFTs.plan_ifft!(A::JLArray; kw_args...) = FFTPlan(plan_ifft!(A.data; kw_args...))
-AbstractFFTs.plan_ifft(A::JLArray; kw_args...) = FFTPlan(plan_ifft(A.data; kw_args...))
-
-function Base.:(*)(plan::FFTPlan, A::JLArray)
-    x = plan.p * A.data
-    JLArray(x)
-end
-
-
 ## Random
 
 using Random
@@ -389,14 +365,4 @@ function GPUArrays.default_rng(::Type{<:JLArray})
     GLOBAL_RNG[]
 end
 
-
-## LinearAlgebra
-
-using LinearAlgebra
-
-for TR in (UpperTriangular, LowerTriangular, UnitUpperTriangular, UnitLowerTriangular)
-    @eval LinearAlgebra.ldiv!(x::$TR{T,<:JLArray{T,2}}, y::JLArray{T,2}) where T<:Union{Complex{Float32}, Complex{Float64}, Float32, Float64} = JLArray(LinearAlgebra.ldiv!($TR(parent(x).data),y.data))
-    @eval LinearAlgebra.rdiv!(x::JLArray{T,2}, y::$TR{T,<:JLArray{T,2}}) where T<:Union{Complex{Float32}, Complex{Float64}, Float32, Float64} = JLArray(LinearAlgebra.rdiv!(x.data,$TR(parent(y).data)))
-end
-
 end

test/testsuite.jl

@@ -12,7 +12,6 @@ using LinearAlgebra
 using Random
 using Test
 
-using FFTW
 using Adapt
 using FillArrays
 
@@ -72,7 +71,6 @@ include("testsuite/mapreduce.jl")
 include("testsuite/broadcasting.jl")
 include("testsuite/linalg.jl")
 include("testsuite/math.jl")
-include("testsuite/fft.jl")
 include("testsuite/random.jl")
 include("testsuite/uniformscaling.jl")
 

test/testsuite/fft.jl

@@ -30,21 +30,17 @@
 
             rand!(gpu_a)
             gpu_c = copyto!(gpu_b, TR(gpu_a))
-            @test all(gpu_b .== TR(gpu_a))
+            @test all(Array(gpu_b) .== TR(Array(gpu_a)))
             @test gpu_c isa AT
         end
 
-        @testset "inv for triangular" for TR in (UpperTriangular, LowerTriangular, UnitUpperTriangular, UnitLowerTriangular)
-            @test compare(x -> inv(TR(x)), AT, rand(Float32, 32, 32))
-        end
-
         for TR in (UpperTriangular, LowerTriangular, UnitUpperTriangular, UnitLowerTriangular)
             gpu_a = AT{Float32}(undef, 128, 128) |> rand! |> TR
             gpu_b = AT{Float32}(undef, 128, 128) |> TR
 
             gpu_c = copyto!(gpu_b, gpu_a)
-            @test all(gpu_b .== gpu_a)
-            @test all(gpu_c .== gpu_a)
+            @test all(Array(gpu_b) .== Array(gpu_a))
+            @test all(Array(gpu_c) .== Array(gpu_a))
             @test gpu_c isa TR
         end
     end