Skip to content

Commit 23df3f6

Browse files
Merge branch 'master' into abstractarray-breaking-update
2 parents 6a779d4 + a217961 commit 23df3f6

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Aqua = "0.8"
5050
ArrayInterface = "7.16"
5151
CUDA = "5"
5252
DocStringExtensions = "0.9.3"
53-
FastBroadcast = "0.3.5"
53+
FastBroadcast = "1.1"
5454
ForwardDiff = "0.10.38, 1"
5555
GPUArraysCore = "0.2"
5656
KernelAbstractions = "0.9.36"

ext/RecursiveArrayToolsFastBroadcastExt.jl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ const AbstractVectorOfSArray = AbstractVectorOfArray{
88
T, N, <:AbstractVector{<:StaticArraysCore.SArray},
99
} where {T, N}
1010

11+
# Override the base 2-arg path (called by Serial dispatch and direct macro path)
1112
@inline function FastBroadcast.fast_materialize!(
12-
::FastBroadcast.Static.False, ::DB, dst::AbstractVectorOfSArray,
13+
dst::AbstractVectorOfSArray,
1314
bc::Broadcast.Broadcasted{S}
14-
) where {S, DB}
15+
) where {S}
1516
if FastBroadcast.use_fast_broadcast(S)
1617
for i in 1:length(dst.u)
1718
unpacked = RecursiveArrayTools.unpack_voa(bc, i)

0 commit comments

Comments
 (0)