Merge pull request #49 from christiangnrd/testboth

Test both 1d `accumulate` algorithms when supported

Author: anicusan

test/accumulate.jl

@@ -1,12 +1,16 @@
-@testset "accumulate_1d" begin
+ALGS = AK.AccumulateAlgorithm[AK.ScanPrefixes()]
+
+@isdefined(TEST_DL) && TEST_DL[] && push!(ALGS, AK.DecoupledLookback())
+
+@testset "accumulate_1d $(alg isa AK.DecoupledLookback ? "DL" : "SP")" for alg in ALGS
 
     Random.seed!(0)
 
     # Single block exlusive scan (each block processes two elements)
     for num_elems in 1:256
         x = array_from_host(ones(Int32, num_elems))
         y = copy(x)
-        AK.accumulate!(+, y; init=0, inclusive=false, block_size=128)
+        AK.accumulate!(+, y; init=0, inclusive=false, block_size=128, alg)
         yh = Array(y)
         @test all(yh .== 0:length(yh) - 1)
     end
@@ -15,7 +19,7 @@
     for num_elems in 1:256
         x = array_from_host(rand(1:1000, num_elems), Int32)
         y = copy(x)
-        AK.accumulate!(+, y; init=0, block_size=128)
+        AK.accumulate!(+, y; init=0, block_size=128, alg)
         @test all(Array(y) .== accumulate(+, Array(x)))
     end
 
@@ -24,7 +28,7 @@
         num_elems = rand(1:100_000)
         x = array_from_host(ones(Int32, num_elems))
         y = copy(x)
-        AK.accumulate!(+, y; init=0, inclusive=false)
+        AK.accumulate!(+, y; init=0, inclusive=false, alg)
         yh = Array(y)
         @test all(yh .== 0:length(yh) - 1)
     end
@@ -34,7 +38,7 @@
         num_elems = rand(1:100_000)
         x = array_from_host(rand(1:1000, num_elems), Int32)
         y = copy(x)
-        AK.accumulate!(+, y; init=0)
+        AK.accumulate!(+, y; init=0, alg)
         @test all(Array(y) .== accumulate(+, Array(x)))
     end
 
@@ -43,7 +47,7 @@
         num_elems = rand(1:100_000)
         x = array_from_host(rand(1:1000, num_elems), Int32)
         y = copy(x)
-        AK.accumulate!(+, y; init=0, block_size=16)
+        AK.accumulate!(+, y; init=0, block_size=16, alg)
         @test all(Array(y) .== accumulate(+, Array(x)))
     end
 
@@ -54,7 +58,7 @@
         n3 = rand(1:100)
         vh = rand(Float32, n1, n2, n3)
         v = array_from_host(vh)
-        AK.accumulate!(+, v; init=0)
+        AK.accumulate!(+, v; init=0, alg)
         @test all(Array(v) .≈ accumulate(+, vh))
     end
 
@@ -64,33 +68,33 @@
         x = array_from_host(rand(1:1000, num_elems), Int32)
         y = similar(x)
         init = rand(-1000:1000)
-        AK.accumulate!(+, y, x; init=Int32(init))
+        AK.accumulate!(+, y, x; init=Int32(init), alg)
         @test all(Array(y) .== accumulate(+, Array(x); init))
     end
 
     # Exclusive scan
     x = array_from_host(ones(Int32, 10))
     y = copy(x)
-    AK.accumulate!(+, y; init=0, inclusive=false)
+    AK.accumulate!(+, y; init=0, inclusive=false, alg)
     @test all(Array(y) .== 0:9)
 
     # Test init value is respected with exclusive scan too
     x = array_from_host(ones(Int32, 10))
     y = copy(x)
     init = 10
-    AK.accumulate!(+, y; init=Int32(init), inclusive=false)
+    AK.accumulate!(+, y; init=Int32(init), inclusive=false, alg)
     @test all(Array(y) .== 10:19)
 
     # Test that undefined kwargs are not accepted
     @test_throws MethodError AK.accumulate(+, y; init=10, dims=2, inclusive=false, bad=:kwarg)
 
     # Testing different settings
-    AK.accumulate!(+, array_from_host(ones(Int32, 1000)), init=0, inclusive=false,
-                block_size=128,
+    AK.accumulate!(+, array_from_host(ones(Int32, 1000)); init=0, inclusive=false,
+                block_size=128, alg,
                 temp=array_from_host(zeros(Int32, 1000)),
                 temp_flags=array_from_host(zeros(Int8, 1000)))
-    AK.accumulate(+, array_from_host(ones(Int32, 1000)), init=0, inclusive=false,
-                block_size=128,
+    AK.accumulate(+, array_from_host(ones(Int32, 1000)); init=0, inclusive=false,
+                block_size=128, alg,
                 temp=array_from_host(zeros(Int64, 1000)),
                 temp_flags=array_from_host(zeros(Int8, 1000)))
 end

test/runtests.jl

@@ -4,6 +4,8 @@ using Test
 using Random
 import Pkg
 
+# Set to true when testing backends that support this
+const TEST_DL = Ref{Bool}(false)
 
 # Pass command-line argument to test suite to install the right backend, e.g.
 #   julia> import Pkg
@@ -13,16 +15,19 @@ if "--CUDA" in ARGS
     using CUDA
     CUDA.versioninfo()
     const BACKEND = CUDABackend()
+    TEST_DL[] = true
 elseif "--oneAPI" in ARGS
     Pkg.add("oneAPI")
     using oneAPI
     oneAPI.versioninfo()
     const BACKEND = oneAPIBackend()
+    TEST_DL[] = true
 elseif "--AMDGPU" in ARGS
     Pkg.add("AMDGPU")
     using AMDGPU
     AMDGPU.versioninfo()
     const BACKEND = ROCBackend()
+    TEST_DL[] = true
 elseif "--Metal" in ARGS
     Pkg.add("Metal")
     using Metal
@@ -35,6 +40,7 @@ elseif "--OpenCL" in ARGS
     using OpenCL
     OpenCL.versioninfo()
     const BACKEND = OpenCLBackend()
+    TEST_DL[] = true
 elseif !@isdefined(BACKEND)
     # Otherwise do CPU tests
     using InteractiveUtils