add back opencl

Author: SimonDanisch

src/abstractarray.jl

@@ -506,11 +506,12 @@ function Base.reshape(a::AbstractAccArray{T}, dims::NTuple{N,Int}) where T where
 end
 
 
+
 function mapreducedim_kernel(state, f, op, R::AbstractArray{T1, N}, A::AbstractArray{T, N}, slice_size, sizeA, dim) where {T1, T, N}
     ilin = Cuint(linear_index(R, state))
     accum = zero(T1)
     @inbounds for i = Cuint(1):slice_size
-        idx = ifelse.(ntuple(Cuint, Val{N}) .== dim, i, ilin)
+        idx = N == dim ? (ilin, i) : (i, ilin)
         i2d = gpu_sub2ind(sizeA, idx)
         accum = op(accum, f(A[i2d]))
     end

test/shared.jl

@@ -156,20 +156,18 @@ end
 
 
 @allbackends "mapreduce" backend begin
-    if backend != :opencl
-        y = rand(Float32, 40, 40)
-        x = GPUArray(y)
-        @test sum(y, 2) ≈ Array(sum(x, 2))
-        @test sum(y, 1) ≈ Array(sum(x, 1))
-
-        y = rand(Float32, 40, 10)
-        x = GPUArray(y)
-        @test sum(y, 2) ≈ Array(sum(x, 2))
-        @test sum(y, 1) ≈ Array(sum(x, 1))
-
-        y = rand(Float32, 10, 40)
-        x = GPUArray(y)
-        @test sum(y, 2) ≈ Array(sum(x, 2))
-        @test sum(y, 1) ≈ Array(sum(x, 1))
-    end
+    y = rand(Float32, 40, 40)
+    x = GPUArray(y)
+    @test sum(y, 2) ≈ Array(sum(x, 2))
+    @test sum(y, 1) ≈ Array(sum(x, 1))
+
+    y = rand(Float32, 40, 10)
+    x = GPUArray(y)
+    @test sum(y, 2) ≈ Array(sum(x, 2))
+    @test sum(y, 1) ≈ Array(sum(x, 1))
+
+    y = rand(Float32, 10, 40)
+    x = GPUArray(y)
+    @test sum(y, 2) ≈ Array(sum(x, 2))
+    @test sum(y, 1) ≈ Array(sum(x, 1))
 end