LazyArrays v2.0 support (#174)

* Support LazyArrays v2.0 * add block array tests * Update Project.toml * Fix padded * ambiguity with sublayout of ApplyBandedLayout * Julia v1.10 restriction * Revert "ambiguity with sublayout of ApplyBandedLayout" This reverts commit 31038e9. * add tests * Update Project.toml
JuliaArrays · May 21, 2024 · 0049f1b · 0049f1b · dlfivefifty · May 21, 2024
1 parent 99d9671
commit 0049f1b
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,8 +36,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.6'
-          - '1'
+          - '1.10'
         os:
           - ubuntu-latest
           - macOS-latest

diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "InfiniteArrays"
 uuid = "4858937d-0d70-526a-a4dd-2d5cb5dd786c"
-version = "0.13.8"
+version = "0.14"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
@@ -14,18 +14,18 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 [compat]
 Aqua = "0.8"
 ArrayLayouts = "1.8"
-BandedMatrices = "0.17.18, 1.0"
+BandedMatrices = "1.0"
+BlockArrays = "1.0"
 Base64 = "1"
 DSP = "0.7"
 FillArrays = "1.0"
 Infinities = "0.1.1"
-LazyArrays = "1.0"
-LazyBandedMatrices = "0.8.9, 0.9"
+LazyArrays = "2.0.2"
 LinearAlgebra = "1.6"
 SparseArrays = "1"
 Statistics = "1"
 Test = "1"
-julia = "1.6"
+julia = "1.10"
 
 [extensions]
 InfiniteArraysDSPExt = "DSP"
@@ -35,14 +35,14 @@ InfiniteArraysStatisticsExt = "Statistics"
 Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 BandedMatrices = "aae01518-5342-5314-be14-df237901396f"
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
+BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
 DSP = "717857b8-e6f2-59f4-9121-6e50c889abd2"
-LazyBandedMatrices = "d7e5e226-e90b-4449-9968-0f923699bf6f"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Aqua", "Test", "BandedMatrices", "LazyBandedMatrices", "Statistics", "SparseArrays", "Base64", "DSP"]
+test = ["Aqua", "Test", "BandedMatrices", "BlockArrays", "Statistics", "SparseArrays", "Base64", "DSP"]
 
 [weakdeps]
 DSP = "717857b8-e6f2-59f4-9121-6e50c889abd2"

diff --git a/src/InfiniteArrays.jl b/src/InfiniteArrays.jl
@@ -42,10 +42,12 @@ import FillArrays: AbstractFill, Eye, Fill, Ones, RectDiagonal, Zeros, fill_resh
 import Infinities: InfiniteCardinal, Infinity, ∞
 
 import LazyArrays: AbstractCachedVector, ApplyLayout, CachedArray, CachedVector, InvColumnLayout,
-                   LazyArrayStyle, LazyLayout, LazyMatrix, PaddedLayout, _padded_sub_materialize, sub_paddeddata
+                   LazyArrayStyle, LazyLayout, LazyMatrix, PaddedColumns, _padded_sub_materialize, sub_paddeddata
 
 import LinearAlgebra: AdjOrTrans, HermOrSym, diag, norm, norm1, norm2, normp
 
+import LazyArrays: AbstractPaddedLayout
+
 export ∞, ℵ₀, Hcat, Vcat, Zeros, Ones, Fill, Eye, BroadcastArray, cache
 import Base: unitrange, oneto
 

diff --git a/src/infarrays.jl b/src/infarrays.jl
@@ -295,15 +295,15 @@ sub_materialize(::AbstractBandedLayout, V, ::Tuple{InfAxes,OneTo{Int}}) = V
 ##
 
 sublayout(::DiagonalLayout{L}, ::Type{<:Tuple{KR,Integer}}) where {L,KR<:InfAxes} =
-    sublayout(PaddedLayout{UnknownLayout}(), Tuple{KR})
+    sublayout(PaddedColumns{UnknownLayout}(), Tuple{KR})
 sublayout(::DiagonalLayout{L}, ::Type{<:Tuple{Integer,JR}}) where {L,JR<:InfAxes} =
-    sublayout(PaddedLayout{UnknownLayout}(), Tuple{JR})
+    sublayout(PaddedColumns{UnknownLayout}(), Tuple{JR})
 -
 
 sublayout(::AbstractBandedLayout, ::Type{<:Tuple{KR,Integer}}) where {KR<:InfAxes} =
-    sublayout(PaddedLayout{UnknownLayout}(), Tuple{KR})
+    sublayout(PaddedColumns{UnknownLayout}(), Tuple{KR})
 sublayout(::AbstractBandedLayout, ::Type{<:Tuple{Integer,JR}}) where {JR<:InfAxes} =
-    sublayout(PaddedLayout{UnknownLayout}(), Tuple{JR})
+    sublayout(PaddedColumns{UnknownLayout}(), Tuple{JR})
 
 
 function sub_paddeddata(::AbstractBandedLayout, S::SubArray{T,1,<:AbstractMatrix,<:Tuple{InfAxes,Integer}}) where T
@@ -393,7 +393,7 @@ sub_materialize(::ApplyLayout{typeof(hcat)}, V::AbstractMatrix, ::Tuple{<:Any,In
 sub_materialize(::ApplyLayout{typeof(hcat)}, V::AbstractMatrix, ::Tuple{InfAxes,Any}) = ApplyArray(V)
 
 
-sub_materialize(::PaddedLayout, v::AbstractVector{T}, ::Tuple{InfAxes}) where T =
+sub_materialize(::AbstractPaddedLayout, v::AbstractVector{T}, ::Tuple{InfAxes}) where T =
     _padded_sub_materialize(v)
 
 sub_materialize(lay::InvColumnLayout, v::AbstractVector, ax::Tuple{InfAxes}) =

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,5 +1,5 @@
 using LinearAlgebra, SparseArrays, InfiniteArrays, Infinities, FillArrays, LazyArrays, Statistics, Test, Base64
-using BandedMatrices, LazyBandedMatrices
+using BandedMatrices
 import InfiniteArrays: InfUnitRange, InfStepRange, OneToInf, NotANumber, oneto, unitrange
 import LazyArrays: CachedArray, MemoryLayout, LazyLayout, DiagonalLayout, LazyArrayStyle, colsupport, DualLayout
 import BandedMatrices: _BandedMatrix, BandedColumns
@@ -1208,4 +1208,13 @@ end
     @inferred Val((D -> diag(D,1))(D))
 end
 
+@testset "inf padded" begin
+    v = Vcat(1, Zeros(∞))
+    @test LazyArrays.sub_materialize(view(v, 1:∞))[1:10] == [1; zeros(9)]
+    @test LazyArrays.sub_materialize(view(v, 2:∞))[1:10] == zeros(10)
+    @test v[2:∞] isa Zeros
+    @test v[1:∞] == v
+end
+
 include("test_infconv.jl")
+include("test_block.jl")
diff --git a/test/test_block.jl b/test/test_block.jl
@@ -0,0 +1,10 @@
+using InfiniteArrays, BlockArrays
+using InfiniteArrays: OneToInf
+
+@testset "blockedonetoinf" begin
+    b = blockedrange(OneToInf())
+    b2 = b .+ b;
+    for i in 1:10
+        @test b2[Block(i)] == b[Block(i)] + b[Block(i)]
+    end
+end