Fixup tests

Author: christiangnrd

test/runtests.jl

@@ -58,18 +58,15 @@ const IS_CPU_BACKEND = BACKEND == get_backend([])
 global prefer_threads::Bool = !(IS_CPU_BACKEND && "--cpuKA" in ARGS)
 
 array_from_host(h_arr::AbstractArray, dtype=nothing) = array_from_host(BACKEND, h_arr, dtype)
-@static if IS_CPU_BACKEND && prefer_threads
-    function array_from_host(backend, h_arr::AbstractArray, dtype=nothing)
-        d_arr = zeros(isnothing(dtype) ? eltype(h_arr) : dtype, size(h_arr))
-        copyto!(d_arr, h_arr isa Array ? h_arr : Array(h_arr))      # Allow unmaterialised types, e.g. ranges
-        d_arr
-    end
-else
-    function array_from_host(backend, h_arr::AbstractArray, dtype=nothing)
-        d_arr = KernelAbstractions.zeros(backend, isnothing(dtype) ? eltype(h_arr) : dtype, size(h_arr))
-        copyto!(d_arr, h_arr isa Array ? h_arr : Array(h_arr))      # Allow unmaterialised types, e.g. ranges
-        d_arr
+
+function array_from_host(backend, h_arr::AbstractArray, dtype=nothing)
+    d_arr = if IS_CPU_BACKEND && prefer_threads # Don't use KA zeros if not using KA algorithms
+        zeros(isnothing(dtype) ? eltype(h_arr) : dtype, size(h_arr))
+    else
+        KernelAbstractions.zeros(backend, isnothing(dtype) ? eltype(h_arr) : dtype, size(h_arr))
     end
+    copyto!(d_arr, h_arr isa Array ? h_arr : Array(h_arr))      # Allow unmaterialised types, e.g. ranges
+    d_arr
 end
 
 @testset "Aqua" begin