clean up tests

Author: lkdvos

test/cuda.jl

@@ -1,25 +1,24 @@
+using Test
+using Strided
+using CUDA: CuMatrix
+using CUDA.Adapt: adapt
+
 for T in (Float32, Float64, Complex{Float32}, Complex{Float64})
     @testset "Copy with CuStridedView: $T, $f1, $f2" for f2 in (identity, conj, adjoint, transpose), f1 in (identity, conj, transpose, adjoint)
         for m1 in (0, 16, 32), m2 in (0, 16, 32)
-            A1 = CUDA.randn(T, (m1, m2))
-            A2 = similar(A1)
-            zA1 = CuMatrix(f1(zeros(T, (m1, m2))))
-            zA2 = CuMatrix(f2(zeros(T, (m1, m2))))
-            A1c = copy(A1)
-            A2c = copy(A2)
-            B1 = f1(StridedView(A1c))
-            B2 = f2(StridedView(A2c))
+            A1 = randn(T, (m1, m2))
+            A2 = randn(T, (m1, m2))
             axes(f1(A1)) == axes(f2(A2)) || continue
-            @test collect(CuMatrix(copy!(f2(A2), f1(A1)))) == CUDA.Adapt.adapt(Vector{T}, copy!(B2, B1))
-            @test copy!(zA1, f1(A1)) == copy!(zA2, B1)
-            A3 = CuArray(randn(T, (m1, m2)))
-            A3c = copy(A3)
-            B3 = f1(StridedView(A3c))
-            @. B1 = 2 * B1 - B3 / 3 # test copyto! of Broadcasted
-            @. A1 = 2 * A1 - A3 / 3 # test copyto! of Broadcasted
-            @test CUDA.Adapt.adapt(Vector{T}, f1(A1)) == CUDA.Adapt.adapt(Vector{T}, B1)
-            x = rand(T)
-            @test f1(StridedView(CUDA.Adapt.adapt(Vector{T}, fill!(A1c, x)))) == CUDA.Adapt.adapt(Vector{T}, fill!(B1, x))
+
+            cuA1 = CuMatrix(A1)
+            cuA2 = CuMatrix(A2)
+
+            B1 = f1(StridedView(A1))
+            B2 = f2(StridedView(A2))
+            cuB1 = f1(StridedView(cuA1))
+            cuB2 = f2(StridedView(cuA2))
+
+            @test copy!(B1, B2) == adapt(Vector{T}, copy!(cuB1, cuB2))
         end
     end
 end