Vector views of matrix should be lazy (#61)

* lazy broadcast for vector views of matrices * v0.9.5 * Update Project.toml * Update runtests.jl * Update runtests.jl
JuliaArrays · Feb 10, 2021 · 5968738 · 5968738 · dlfivefifty · Feb 10, 2021
1 parent 0f573aa
commit 5968738
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "InfiniteArrays"
 uuid = "4858937d-0d70-526a-a4dd-2d5cb5dd786c"
-version = "0.9.4"
+version = "0.9.5"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
@@ -14,7 +14,7 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 ArrayLayouts = "0.5"
 DSP = "0.6"
 FillArrays = "0.11"
-LazyArrays = "0.20.2"
+LazyArrays = "0.20.5"
 julia = "1.5"
 
 [extras]

diff --git a/src/InfiniteArrays.jl b/src/InfiniteArrays.jl
@@ -39,7 +39,7 @@ import Statistics: mean, median
 
 import FillArrays: AbstractFill, getindex_value, fill_reshape, RectDiagonal
 import LazyArrays: LazyArrayStyle, AbstractBandedLayout, MemoryLayout, LazyLayout, UnknownLayout,
-                    ZerosLayout, AbstractArrayApplyStyle, CachedArray, CachedVector, ApplyLayout,
+                    ZerosLayout, AbstractArrayApplyStyle, CachedArray, CachedVector, ApplyLayout, LazyMatrix,
                     reshapedlayout, sub_materialize, LayoutMatrix, LayoutVector, _padded_sub_materialize, PaddedLayout
 
 import DSP: conv

diff --git a/src/infrange.jl b/src/infrange.jl
@@ -420,9 +420,16 @@ BroadcastStyle(::Type{<:Base.Slice{<:InfRanges}}) = LazyArrayStyle{1}()
 const InfIndexRanges{T<:Integer} = Union{InfStepRange{T},AbstractInfUnitRange{T},Slice{OneToInf{T}}}
 
 BroadcastStyle(::Type{<:SubArray{<:Any,1,<:Any,Tuple{<:InfIndexRanges}}})= LazyArrayStyle{1}()
-BroadcastStyle(::Type{<:SubArray{<:Any,2,<:Any,<:Tuple{<:InfIndexRanges,<:InfIndexRanges}}})= LazyArrayStyle{1}()
-BroadcastStyle(::Type{<:SubArray{<:Any,2,<:Any,<:Tuple{<:InfIndexRanges,<:Any}}})= LazyArrayStyle{1}()
-BroadcastStyle(::Type{<:SubArray{<:Any,2,<:Any,<:Tuple{<:Any,<:InfIndexRanges}}})= LazyArrayStyle{1}()
+BroadcastStyle(::Type{<:SubArray{<:Any,1,<:Any,<:Tuple{<:InfIndexRanges,<:Any}}})= LazyArrayStyle{1}()
+BroadcastStyle(::Type{<:SubArray{<:Any,1,<:Any,<:Tuple{<:Any,<:InfIndexRanges}}})= LazyArrayStyle{1}()
+BroadcastStyle(::Type{<:SubArray{<:Any,1,<:LazyMatrix,<:Tuple{<:InfIndexRanges,<:Any}}})= LazyArrayStyle{1}()
+BroadcastStyle(::Type{<:SubArray{<:Any,1,<:LazyMatrix,<:Tuple{<:Any,<:InfIndexRanges}}})= LazyArrayStyle{1}()
+BroadcastStyle(::Type{<:SubArray{<:Any,2,<:Any,<:Tuple{<:InfIndexRanges,<:InfIndexRanges}}})= LazyArrayStyle{2}()
+BroadcastStyle(::Type{<:SubArray{<:Any,2,<:Any,<:Tuple{<:InfIndexRanges,<:Any}}})= LazyArrayStyle{2}()
+BroadcastStyle(::Type{<:SubArray{<:Any,2,<:Any,<:Tuple{<:Any,<:InfIndexRanges}}})= LazyArrayStyle{2}()
+
+
+
 
 broadcasted(::BroadcastStyle, f, r::Adjoint{<:Any,<:InfRanges}) = broadcast(f,parent(r))'
 broadcasted(::BroadcastStyle, f, r::Transpose{<:Any,<:InfRanges}) = transpose(broadcast(f,parent(r)))

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -833,6 +833,23 @@ end
         @test v isa BroadcastArray
         @test b[3:10] .+ 1 == v[1:8]
     end
+
+    @testset "views of matrices" begin
+        D = Diagonal(1:∞)
+        V = Vcat(Ones(2,∞), D)
+        @test view(D,:,5) .+ 1 isa BroadcastVector
+        @test view(D,5,:) .+ 1 isa BroadcastVector
+        @test view(V,:,5) .+ 1 isa BroadcastVector
+        @test view(V,5,:) .+ 1 isa BroadcastVector
+
+        @test view(D,2:∞,2:∞) .+ 1 isa BroadcastMatrix
+        @test view(V,2:∞,2:∞) .+ 1 isa BroadcastMatrix
+
+        @test view(D,2:∞,[1,2,3]) .+ 1 isa BroadcastMatrix
+        @test view(D,[1,2,3],2:∞) .+ 1 isa BroadcastMatrix
+        @test view(V,2:∞,[1,2,3]) .+ 1 isa BroadcastMatrix
+        @test view(V,[1,2,3],2:∞) .+ 1 isa BroadcastMatrix
+    end
 end
 
 @testset "Cumsum and diff" begin