Avoid creating static array due to bug in ClassicalOPs.jl (#83)

* Avoid creating static array

* Update Project.toml

* add tests

Author: dlfivefifty

Project.toml

@@ -1,7 +1,7 @@
 name = "QuasiArrays"
 uuid = "c4ea9172-b204-11e9-377d-29865faadc5c"
 authors = ["Sheehan Olver <[email protected]>"]
-version = "0.9.1"
+version = "0.9.2"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"

src/lazyquasiarrays.jl

@@ -95,12 +95,15 @@ subbroadcaststyle(::AbstractQuasiArrayStyle{N}, _) where N = DefaultArrayStyle{N
 
 # TODO: generalise
 subbroadcaststyle(::AbstractQuasiArrayStyle{2}, ::Type{<:Tuple{Number,Number}}) = DefaultArrayStyle{0}()
-subbroadcaststyle(::AbstractQuasiArrayStyle{2}, ::Type{<:Tuple{Number,JR}}) where JR = Base.BroadcastStyle(JR)
-subbroadcaststyle(::AbstractQuasiArrayStyle{2}, ::Type{<:Tuple{KR,Number}}) where KR = Base.BroadcastStyle(KR)
+subbroadcaststyle(::AbstractQuasiArrayStyle{2}, ::Type{<:Tuple{Number,JR}}) where JR = _lazyiflazystyle(Base.BroadcastStyle(JR))
+subbroadcaststyle(::AbstractQuasiArrayStyle{2}, ::Type{<:Tuple{KR,Number}}) where KR = _lazyiflazystyle(Base.BroadcastStyle(KR))
 
 subbroadcaststyle(::LazyQuasiArrayStyle{2}, ::Type{<:Tuple{Number,Number}}) = DefaultArrayStyle{0}()
-subbroadcaststyle(::LazyQuasiArrayStyle{2}, ::Type{<:Tuple{Number,JR}}) where JR = Base.BroadcastStyle(JR)
-subbroadcaststyle(::LazyQuasiArrayStyle{2}, ::Type{<:Tuple{KR,Number}}) where KR = Base.BroadcastStyle(KR)
+subbroadcaststyle(::LazyQuasiArrayStyle{2}, ::Type{<:Tuple{Number,JR}}) where JR = _lazyiflazystyle(Base.BroadcastStyle(JR))
+subbroadcaststyle(::LazyQuasiArrayStyle{2}, ::Type{<:Tuple{KR,Number}}) where KR = _lazyiflazystyle(Base.BroadcastStyle(KR))
+
+_lazyiflazystyle(_) = DefaultArrayStyle{1}()
+_lazyiflazystyle(laz::LazyArrayStyle) = laz
 
 layout_broadcasted(_, f, args...) = Broadcasted{typeof(combine_styles(args...))}(f, args)
 

test/test_quasibroadcast.jl

@@ -1,6 +1,6 @@
 # This file is based on a part of Julia. License is MIT: https://julialang.org/license
 
-using QuasiArrays, LazyArrays, Base64, Test
+using QuasiArrays, LazyArrays, Base64, StaticArrays, Test
 import Base: OneTo, Slice
 import Base.Broadcast: check_broadcast_axes, newindex, broadcasted, broadcastable, Broadcasted, DefaultArrayStyle, BroadcastStyle
 import QuasiArrays: QuasiCartesianIndex, QuasiCartesianIndices, DefaultQuasiArrayStyle, SubQuasiArray
@@ -266,7 +266,7 @@ import QuasiArrays: QuasiCartesianIndex, QuasiCartesianIndices, DefaultQuasiArra
                 end
                 @testset "constvec .$op mat" begin
                     B = BroadcastQuasiArray(op, c, A)
-                    @test B * b ≈ op.(c, A) * b 
+                    @test B * b ≈ op.(c, A) * b
                     @test B * A ≈ op.(c, A) * A
                     @test A * B ≈ A * op.(c, A)
                 end
@@ -281,7 +281,16 @@ import QuasiArrays: QuasiCartesianIndex, QuasiCartesianIndices, DefaultQuasiArra
             B = BroadcastQuasiArray(+, A, 2A)
             C = BroadcastQuasiArray(-, A, 2A)
             @test B*C ≈ 3A * (-A)
-            @test C*B ≈ (-A) * 3A 
+            @test C*B ≈ (-A) * 3A
         end
     end
+
+    @testset "Static Broadcasting" begin
+        a = QuasiArray(randn(3,2), [0.1,0.2,0.3], [0.2,0.3])
+        v = view(a, SVector(0.1,0.2),0.2)
+        @test Base.BroadcastStyle(typeof(v)) isa DefaultArrayStyle{1}
+
+        v = view(a, BroadcastArray(+, [0.1,0.2]), 0.2)
+        @test Base.BroadcastStyle(typeof(v)) isa LazyArrays.LazyArrayStyle{1}
+    end
 end