Merge pull request #335 from JuliaGPU/tb/1.6

Fixes for 1.6.

Author: maleadt

.buildkite/pipeline.yml

@@ -0,0 +1,43 @@
+env:
+  SECRET_CODECOV_TOKEN: "GrevHmzmr2Vt6UK4wbbTTB1+kcMcIlF6nCXVCk3Z0plHDimpD6BwdN9T2A+5J9k3I2em0xXUqpt+2qUSqM8Bn5mNdpjR0TvxVY3oYXc+qzvBXmcZJpuCgJeoTP1P+kVFwszUn4na3fohNq9Qffp6tXMn/j8yJQKOiiC8mkD0aPEI0zISHuDaa/7j7JYf0vTrMRRZ9BMUQHmFuVaIQN8FLGG2BiE3236rj4eHh0lj2IfekCG3wd/LUzAsMx0MC3kIR8WzOWW2rf6xUMPkjm5+NuHwhAOcZc0+LRM7GYIwoW/nHAgyIqjvLiInNFmaJk+7V/GAKtd+gSAIzmyBUHAy6A==;U2FsdGVkX1+4ZljneQoaNE295nRIx8D6+WoFIgT6Pg2BXHaTyhTL4sxEcG0jX0e7oq68uvi4bK7x7YMS4L0Kew=="
+
+steps:
+  - label: "CUDA.jl"
+    plugins:
+      - JuliaCI/julia#v0.4:
+          version: 1.5
+      - JuliaCI/julia-coverage#v0.2:
+          codecov: true
+    command: |
+      julia -e 'using Pkg;
+
+                println("--- :julia: Instantiating project");
+                Pkg.develop(PackageSpec(path=pwd()));
+                Pkg.add(PackageSpec(name="CUDA", rev="master"));
+                Pkg.instantiate();
+
+                println("+++ :julia: Running tests");
+                Pkg.test("CUDA"; coverage=true);'
+    agents:
+      queue: "juliagpu"
+      cuda: "*"
+
+  - label: "oneAPI.jl"
+    plugins:
+      - JuliaCI/julia#v0.4:
+          version: 1.5
+      - JuliaCI/julia-coverage#v0.2:
+          codecov: true
+    command: |
+      julia -e 'using Pkg;
+
+                println("--- :julia: Instantiating project");
+                Pkg.develop(PackageSpec(path=pwd()));
+                Pkg.add(PackageSpec(name="oneAPI", rev="master"));
+                Pkg.instantiate();
+
+                println("+++ :julia: Running tests");
+                Pkg.test("oneAPI"; coverage=true);'
+    agents:
+      queue: "juliagpu"
+      intel: "*"

.gitlab-ci.yml

@@ -74,8 +74,8 @@ Base.all(A::AnyGPUArray{Bool}) = mapreduce(identity, &, A)
 Base.any(f::Function, A::AnyGPUArray) = mapreduce(f, |, A)
 Base.all(f::Function, A::AnyGPUArray) = mapreduce(f, &, A)
 
-Base.count(pred::Function, A::AnyGPUArray; dims=:) =
-    mapreduce(pred, Base.add_sum, A; init=0, dims=dims)
+Base.count(pred::Function, A::AnyGPUArray; dims=:, init=0) =
+    mapreduce(pred, Base.add_sum, A; init=init, dims=dims)
 
 Base.:(==)(A::AnyGPUArray, B::AnyGPUArray) = Bool(mapreduce(==, &, A, B))
 

src/host/mapreduce.jl

@@ -28,6 +28,7 @@
         # the printing of Adjoint depends on global state
         msg = replstr(A')
         @test occursin(Regex("^1×1 Adjoint{Int64,\\s?$AT{Int64,\\s?1}}:\n 1\$"), msg) ||
-            occursin(Regex("^1×1 LinearAlgebra.Adjoint{Int64,\\s?$AT{Int64,\\s?1}}:\n 1\$"), msg)
+            occursin(Regex("^1×1 LinearAlgebra.Adjoint{Int64,\\s?$AT{Int64,\\s?1}}:\n 1\$"), msg) ||
+            occursin(Regex("^1×1 adjoint\\(::$AT{Int64,\\s?1}\\) with eltype Int64:\n 1\$"), msg)
     end
 end