From 6bf7697de0c71513439b8c991c64bd0b9fc16f51 Mon Sep 17 00:00:00 2001 From: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com> Date: Tue, 28 Jan 2025 18:12:53 +0100 Subject: [PATCH 1/4] Fix `fill!(::ArrayPartition)` --- src/array_partition.jl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/array_partition.jl b/src/array_partition.jl index 7bd8bb52..ce93d555 100644 --- a/src/array_partition.jl +++ b/src/array_partition.jl @@ -209,6 +209,13 @@ function Base.copyto!(A::ArrayPartition, src::ArrayPartition) A end +function Base.fill!(A::ArrayPartition, x) + for i in eachindex(A.x) + fill!(A.x[i], x) + end + A +end + ## indexing # Interface for the linear indexing. This is just a view of the underlying nested structure From fa3ffc2b9ad6e4ab87b03e11ff361a6a87159e03 Mon Sep 17 00:00:00 2001 From: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com> Date: Wed, 29 Jan 2025 11:30:53 +0100 Subject: [PATCH 2/4] Use for type stability --- src/array_partition.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/array_partition.jl b/src/array_partition.jl index 4ad46df2..b0325fe0 100644 --- a/src/array_partition.jl +++ b/src/array_partition.jl @@ -210,8 +210,8 @@ function Base.copyto!(A::ArrayPartition, src::ArrayPartition) end function Base.fill!(A::ArrayPartition, x) - for i in eachindex(A.x) - fill!(A.x[i], x) + unrolled_foreach!(A.x) do x_ + fill!(x_, x) end A end @@ -221,7 +221,7 @@ function recursivefill!(b::ArrayPartition, a::T2) where {T2 <: Union{Number, Boo fill!(x, a) end end - + ## indexing # Interface for the linear indexing. This is just a view of the underlying nested structure From 28aff8208e0df4efe7d13a21a6fb2147c1cceefc Mon Sep 17 00:00:00 2001 From: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com> Date: Wed, 29 Jan 2025 11:32:10 +0100 Subject: [PATCH 3/4] Add test --- test/gpu/arraypartition_gpu.jl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/gpu/arraypartition_gpu.jl b/test/gpu/arraypartition_gpu.jl index c9a87dc8..3b335855 100644 --- a/test/gpu/arraypartition_gpu.jl +++ b/test/gpu/arraypartition_gpu.jl @@ -14,3 +14,7 @@ mask = pA .> 0 # Test recursive filling is done using GPU kernels and not scalar indexing RecursiveArrayTools.recursivefill!(pA, true) @test all(pA .== true) + +# Test that regular filling is done using GPU kernels and not scalar indexing +fill!(pA, false) +@test all(pA .== false) From 9454936d1b2f20046f2367e5db022978269790e5 Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Wed, 29 Jan 2025 05:53:30 -0500 Subject: [PATCH 4/4] Update Project.toml --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 4a4b9322..8e5a9c38 100644 --- a/Project.toml +++ b/Project.toml @@ -60,7 +60,7 @@ SafeTestsets = "0.1" SparseArrays = "1.10" StaticArrays = "1.6" StaticArraysCore = "1.4" -Statistics = "1.10" +Statistics = "1.10, 1.11" StructArrays = "0.6.11, 0.7" SymbolicIndexingInterface = "0.3.25" Tables = "1.11"