Move style computation to runtime

Author: YingboMa

src/vector_of_array.jl

@@ -149,31 +149,30 @@ end
 
 ## broadcasting
 
-struct VectorOfArrayStyle{Style <: Broadcast.BroadcastStyle} <: Broadcast.AbstractArrayStyle{Any} end
-VectorOfArrayStyle(::S) where {S} = VectorOfArrayStyle{S}()
-VectorOfArrayStyle(::S, ::Val{N}) where {S,N} = VectorOfArrayStyle(S(Val(N)))
-VectorOfArrayStyle(::Val{N}) where N = VectorOfArrayStyle{Broadcast.DefaultArrayStyle{N}}()
+struct VectorOfArrayStyle <: Broadcast.AbstractArrayStyle{Any} end
+VectorOfArrayStyle(::Any) = VectorOfArrayStyle()
+VectorOfArrayStyle(::Any, ::Any) = VectorOfArrayStyle()
 
 # promotion rules
-@inline function Broadcast.BroadcastStyle(::VectorOfArrayStyle{AStyle}, ::VectorOfArrayStyle{BStyle}) where {AStyle, BStyle}
-    VectorOfArrayStyle(Broadcast.BroadcastStyle(AStyle(), BStyle()))
-end
-Broadcast.BroadcastStyle(::VectorOfArrayStyle{Style}, ::Broadcast.DefaultArrayStyle{0}) where Style<:Broadcast.BroadcastStyle = VectorOfArrayStyle{Style}()
-Broadcast.BroadcastStyle(::VectorOfArrayStyle, ::Broadcast.DefaultArrayStyle{N}) where N = Broadcast.DefaultArrayStyle{N}()
+#@inline function Broadcast.BroadcastStyle(::VectorOfArrayStyle{AStyle}, ::VectorOfArrayStyle{BStyle}) where {AStyle, BStyle}
+#    VectorOfArrayStyle(Broadcast.BroadcastStyle(AStyle(), BStyle()))
+#end
+Broadcast.BroadcastStyle(::VectorOfArrayStyle, ::Broadcast.BroadcastStyle) = VectorOfArrayStyle()
+#Broadcast.BroadcastStyle(::VectorOfArrayStyle, ::Broadcast.DefaultArrayStyle{N}) where N = Broadcast.DefaultArrayStyle{N}()
 
 function Broadcast.BroadcastStyle(::Type{<:AbstractVectorOfArray{T,S}}) where {T, S}
-    VectorOfArrayStyle(Broadcast.result_style(Broadcast.BroadcastStyle(T)))
+    VectorOfArrayStyle()
 end
 
-@inline function Base.copy(bc::Broadcast.Broadcasted{VectorOfArrayStyle{Style}}) where Style
+@inline function Base.copy(bc::Broadcast.Broadcasted{VectorOfArrayStyle})
     N = narrays(bc)
     x = unpack_voa(bc, 1)
     VectorOfArray(map(1:N) do i
         copy(unpack_voa(bc, i))
     end)
 end
 
-@inline function Base.copyto!(dest::AbstractVectorOfArray, bc::Broadcast.Broadcasted{VectorOfArrayStyle{Style}}) where Style
+@inline function Base.copyto!(dest::AbstractVectorOfArray, bc::Broadcast.Broadcasted{VectorOfArrayStyle})
     N = narrays(bc)
     @inbounds for i in 1:N
         copyto!(dest[i], unpack_voa(bc, i))
@@ -206,7 +205,7 @@ _narrays(args::Tuple{}) = 0
 
 # drop axes because it is easier to recompute
 @inline unpack_voa(bc::Broadcast.Broadcasted{Style}, i) where Style = Broadcast.Broadcasted{Style}(bc.f, unpack_args_voa(i, bc.args))
-@inline unpack_voa(bc::Broadcast.Broadcasted{VectorOfArrayStyle{Style}}, i) where Style = Broadcast.Broadcasted{Style}(bc.f, unpack_args_voa(i, bc.args))
+@inline unpack_voa(bc::Broadcast.Broadcasted{VectorOfArrayStyle}, i) = Broadcast.Broadcasted(bc.f, unpack_args_voa(i, bc.args))
 unpack_voa(x,::Any) = x
 unpack_voa(x::AbstractVectorOfArray, i) = x.u[i]
 unpack_voa(x::AbstractArray{T,N}, i) where {T,N} = @view x[ntuple(x->Colon(),N-1)...,i]

test/basic_indexing.jl

@@ -96,4 +96,4 @@ w = v .* v
 @test w[3] == v[3] .* v[3]
 x = copy(v)
 x .= v .* v
-@test all(x .== w)
+@test x.u == w.u