simplify accumulate-family definitions

Also remove redundant `kwarg=kwarg` definitions for `accumulate`

Author: christiangnrd

ext/AcceleratedKernelsMetalExt.jl

@@ -10,27 +10,14 @@ import AcceleratedKernels as AK
 function AK.accumulate!(
     op, v::AbstractArray, backend::MetalBackend;
     init,
-    neutral=AK.neutral_element(op, eltype(v)),
-    dims::Union{Nothing, Int}=nothing,
-    inclusive::Bool=true,
-
-    # CPU settings - not used
-    max_tasks::Int=Threads.nthreads(),
-    min_elems::Int=1,
-
-    # Algorithm choice
+    # Algorithm choice is the only differing default
     alg::AK.AccumulateAlgorithm=AK.ScanPrefixes(),
-
-    # GPU settings
-    block_size::Int=256,
-    temp::Union{Nothing, AbstractArray}=nothing,
-    temp_flags::Union{Nothing, AbstractArray}=nothing,
+    kwargs...
 )
     AK._accumulate_impl!(
-        op, v, backend,
-        init=init, neutral=neutral, dims=dims, inclusive=inclusive,
-        alg=alg,
-        block_size=block_size, temp=temp, temp_flags=temp_flags,
+        op, v, backend;
+        init, alg,
+        kwargs...
     )
 end
 
@@ -39,28 +26,15 @@ end
 function AK.accumulate!(
     op, dst::AbstractArray, src::AbstractArray, backend::MetalBackend;
     init,
-    neutral=AK.neutral_element(op, eltype(dst)),
-    dims::Union{Nothing, Int}=nothing,
-    inclusive::Bool=true,
-
-    # CPU settings - not used
-    max_tasks::Int=Threads.nthreads(),
-    min_elems::Int=1,
-
-    # Algorithm choice
+    # Algorithm choice is the only differing default
     alg::AK.AccumulateAlgorithm=AK.ScanPrefixes(),
-
-    # GPU settings
-    block_size::Int=256,
-    temp::Union{Nothing, AbstractArray}=nothing,
-    temp_flags::Union{Nothing, AbstractArray}=nothing,
+    kwargs...
 )
     copyto!(dst, src)
     AK._accumulate_impl!(
-        op, dst, backend,
-        init=init, neutral=neutral, dims=dims, inclusive=inclusive,
-        alg=alg,
-        block_size=block_size, temp=temp, temp_flags=temp_flags,
+        op, dst, backend;
+        init, alg,
+        kwargs...
     )
 end
 

src/accumulate/accumulate.jl

@@ -124,58 +124,26 @@ AK.accumulate!(+, v, alg=AK.ScanPrefixes())
 function accumulate!(
     op, v::AbstractArray, backend::Backend=get_backend(v);
     init,
-    neutral=neutral_element(op, eltype(v)),
-    dims::Union{Nothing, Int}=nothing,
-    inclusive::Bool=true,
-
-    # CPU settings
-    max_tasks::Int=Threads.nthreads(),
-    min_elems::Int=2,
-
-    # Algorithm choice
-    alg::AccumulateAlgorithm=DecoupledLookback(),
-
-    # GPU settings
-    block_size::Int=256,
-    temp::Union{Nothing, AbstractArray}=nothing,
-    temp_flags::Union{Nothing, AbstractArray}=nothing,
+    kwargs...
 )
     _accumulate_impl!(
-        op, v, backend,
-        init=init, neutral=neutral, dims=dims, inclusive=inclusive,
-        max_tasks=max_tasks, min_elems=min_elems,
-        alg=alg,
-        block_size=block_size, temp=temp, temp_flags=temp_flags,
+        op, v, backend;
+        init,
+        kwargs...
     )
 end
 
 
 function accumulate!(
     op, dst::AbstractArray, src::AbstractArray, backend::Backend=get_backend(dst);
     init,
-    neutral=neutral_element(op, eltype(dst)),
-    dims::Union{Nothing, Int}=nothing,
-    inclusive::Bool=true,
-
-    # CPU settings
-    max_tasks::Int=Threads.nthreads(),
-    min_elems::Int=2,
-
-    # Algorithm choice
-    alg::AccumulateAlgorithm=DecoupledLookback(),
-
-    # GPU settings
-    block_size::Int=256,
-    temp::Union{Nothing, AbstractArray}=nothing,
-    temp_flags::Union{Nothing, AbstractArray}=nothing,
+    kwargs...
 )
     copyto!(dst, src)
     _accumulate_impl!(
-        op, dst, backend,
-        init=init, neutral=neutral, dims=dims, inclusive=inclusive,
-        max_tasks=max_tasks, min_elems=min_elems,
-        alg=alg,
-        block_size=block_size, temp=temp, temp_flags=temp_flags,
+        op, dst, backend;
+        init,
+        kwargs...
     )
 end
 
@@ -200,17 +168,17 @@ function _accumulate_impl!(
 )
     if isnothing(dims)
         return accumulate_1d!(
-            op, v, backend, alg,
-            init=init, neutral=neutral, inclusive=inclusive,
-            max_tasks=max_tasks, min_elems=min_elems,
-            block_size=block_size, temp=temp, temp_flags=temp_flags,
+            op, v, backend, alg;
+            init, neutral, inclusive,
+            max_tasks, min_elems,
+            block_size, temp, temp_flags,
         )
     else
         return accumulate_nd!(
-            op, v, backend,
-            init=init, neutral=neutral, dims=dims, inclusive=inclusive,
-            max_tasks=max_tasks, min_elems=min_elems,
-            block_size=block_size,
+            op, v, backend;
+            init, neutral, dims, inclusive,
+            max_tasks, min_elems,
+            block_size,
         )
     end
 end