Merge pull request #44 from SciML/ChrisRackauckas-patch-1

Fix allowed indexing for CuArrays update

Author: ChrisRackauckas

src/ArrayInterface.jl

@@ -456,15 +456,7 @@ function __init__()
   end
 
   @require CuArrays="3a865a2d-5b23-5a0f-bc46-62713ec82fae" begin
-    fast_scalar_indexing(::Type{<:CuArrays.CuArray}) = false
-    @inline allowed_getindex(x::CuArrays.CuArray,i...) = CuArrays._getindex(x,i...)
-    @inline allowed_setindex!(x::CuArrays.CuArray,v,i...) = CuArrays._setindex!(x,v,i...)
-
-    function Base.setindex(x::CuArrays.CuArray,v,i::Int)
-      _x = copy(x)
-      allowed_setindex!(_x,v,i)
-      _x
-    end
+    include("cuarrays.jl")
   end
 
   @require BandedMatrices="aae01518-5342-5314-be14-df237901396f" begin

src/cuarrays.jl

@@ -0,0 +1,9 @@
+fast_scalar_indexing(::Type{<:CuArrays.CuArray}) = false
+@inline allowed_getindex(x::CuArrays.CuArray,i...) = CuArrays.@allowscalar(x[i...])
+@inline allowed_setindex!(x::CuArrays.CuArray,v,i...) = (CuArrays.@allowscalar(x[i...] = v))
+
+function Base.setindex(x::CuArrays.CuArray,v,i::Int)
+  _x = copy(x)
+  allowed_setindex!(_x,v,i)
+  _x
+end