Merge pull request #360 from JuliaGPU/tb/julia_1.7

Fixes for Julia 1.7

Author: maleadt

Project.toml

@@ -17,8 +17,7 @@ Adapt = "2.0, 3.0"
 julia = "1.5"
 
 [extras]
-FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test", "FillArrays"]
+test = ["Test"]

docs/src/testsuite.md

@@ -12,21 +12,6 @@ gpuarrays_root = dirname(dirname(gpuarrays))
 include(joinpath(gpuarrays_root, "test", "testsuite.jl"))
 ```
 
-This however implies that the test system will not know about extra dependencies that are
-required by the test suite. To remedy this, you should add the following dependencies to
-your `Project.toml`:
-
-```
-[extras]
-FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
-FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
-ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
-...
-
-[targets]
-test = [..., "FFTW", "ForwardDiff", "FillArrays"]
-```
-
 With this set-up, you can run the test suite like this:
 
 ```julia

src/host/indexing.jl

@@ -145,7 +145,7 @@ function _getindex(src::AbstractGPUArray, Is...)
 end
 
 @generated function getindex_kernel(ctx::AbstractKernelContext, dest, src, idims,
-                                    Is::Vararg{<:Any,N}) where {N}
+                                    Is::Vararg{Any,N}) where {N}
     quote
         i = @linearidx dest
         is = @inbounds CartesianIndices(idims)[i]
@@ -172,7 +172,7 @@ function _setindex!(dest::AbstractGPUArray, src, Is...)
 end
 
 @generated function setindex_kernel(ctx::AbstractKernelContext, dest, src, idims, len,
-                                    Is::Vararg{<:Any,N}) where {N}
+                                    Is::Vararg{Any,N}) where {N}
     quote
         i = linear_index(ctx)
         i > len && return

test/testsuite.jl

@@ -13,7 +13,6 @@ using Random
 using Test
 
 using Adapt
-using FillArrays
 
 struct ArrayAdaptor{AT} end
 Adapt.adapt_storage(::ArrayAdaptor{AT}, xs::AbstractArray) where {AT} = AT(xs)

test/testsuite/construction.jl

@@ -174,17 +174,3 @@ end
         @test Array(x1) ≈ x
     end
 end
-
-@testsuite "construct/iterator" AT->begin
-    for T in supported_eltypes()
-        @test Array(AT(Fill(T(0), (10,)))) == Array(fill!(similar(AT{T}, (10,)), T(0)))
-        @test Array(AT(Fill(T(0), (10, 10)))) == Array(fill!(similar(AT{T}, (10, 10)), T(0)))
-        if T <: Real
-            x = AT{Float32}(Fill(T(0), (10, 10)))
-            @test eltype(x) == Float32
-            @test Array(AT(Eye{T}((10)))) == Array(AT{T}(I, 10, 10))
-            x = AT{Float32}(Eye{T}(10))
-            @test eltype(x) == Float32
-        end
-    end
-end