Merge pull request #223 from JuliaGPU/tb/setindex_cpu_slice

Use Adapt to support setindex with CPU slices.

Author: maleadt

.gitlab-ci.yml

@@ -44,14 +44,14 @@ cuarrays:
     - sm_75
   image: juliagpu/cuda:10.1-cudnn7-cutensor-devel-ubuntu18.04
   script:
-    - export CUARRAYS="$HOME/.julia/dev/CuArrays"
+    - export CUARRAYS=".julia/dev/CuArrays"
     - julia -e 'using Pkg;
                 Pkg.develop("CuArrays");'
     - julia --project -e 'using Pkg;
                           Pkg.instantiate()'
     - julia --project=$CUARRAYS -e 'using Pkg;
                                     Pkg.instantiate();
-                                    Pkg.add(["FFTW", "ForwardDiff"])'
+                                    Pkg.add(["FFTW", "ForwardDiff", "FillArrays"])'
     - JULIA_LOAD_PATH=".:$CUARRAYS::" julia $CUARRAYS/test/runtests.jl
   allow_failure: true
 

src/indexing.jl

@@ -113,22 +113,13 @@ end
     end
 end
 
-# FIXME: this should use adapt
-gpu_convert(GPUType, x::GPUArray) = x
-function gpu_convert(GPUType, x::AbstractArray)
-    isbits(x) ? x : convert(GPUType, x)
-end
-function gpu_convert(GPUType, x)
-    isbits(x) ? x : error("Only isbits types are allowed for indexing. Found: $(typeof(x))")
-end
-
 function Base._unsafe_setindex!(::IndexStyle, dest::T, src, Is::Union{Real, AbstractArray}...) where T <: GPUArray
     if length(Is) == 1 && isa(first(Is), Array) && isempty(first(Is)) # indexing with empty array
         return dest
     end
     idims = length.(Is)
     len = prod(idims)
-    src_gpu = gpu_convert(T, src)
+    src_gpu = adapt(T, src)
     gpu_call(setindex_kernel!, dest, (dest, src_gpu, idims, map(x-> to_index(dest, x), Is), len), len)
     return dest
 end

test/testsuite/indexing.jl

@@ -18,7 +18,13 @@ function test_indexing(AT)
                 x[2:6, 2:6, :, :] = y
                 x[2:6, 2:6, :, :] == y
            end
-
+            @testset "multi dim, sliced setindex, CPU source" begin
+                x = fill(AT{T}, T(0), (2,3,4))
+                y = Array{T}(undef, 2,3)
+                rand!(y)
+                x[:, :, 2] = y
+                x[:, :, 2] == y
+           end
         end
 
         for T in (Float32, Int32)