CompatHelper: bump compat for LazyArrays to 2, (keep existing compat) (#71)

* CompatHelper: bump compat for LazyArrays to 2, (keep existing compat)

* Update package deps

* fix import

* Update Project.toml

* Update ci.yml

---------

Co-authored-by: CompatHelper Julia <compathelper_noreply@julialang.org>
Co-authored-by: Sheehan Olver <solver@mac.com>

Author: 3 people

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.9'
+          - '1.10'
         os:
           - ubuntu-latest
           - macOS-latest

Project.toml

@@ -1,7 +1,7 @@
 name = "PiecewiseOrthogonalPolynomials"
 uuid = "4461d12d-4663-4550-8580-cb764c85e20f"
 authors = ["Sheehan Olver <solver@mac.com>"]
-version = "0.4.2"
+version = "0.5"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
@@ -21,19 +21,19 @@ QuasiArrays = "c4ea9172-b204-11e9-377d-29865faadc5c"
 
 [compat]
 ArrayLayouts = "1.0.12"
-BandedMatrices = "1.3"
-BlockArrays = "0.16.25"
-BlockBandedMatrices = "0.12.9"
-ClassicalOrthogonalPolynomials = "0.12.1"
-ContinuumArrays = "0.17.1"
+BandedMatrices = "1.7"
+BlockArrays = "1"
+BlockBandedMatrices = "0.13"
+ClassicalOrthogonalPolynomials = "0.13"
+ContinuumArrays = "0.18"
 FillArrays = "1.0"
-InfiniteArrays = "0.13"
-InfiniteLinearAlgebra = "0.7"
-LazyArrays = "1.8.2"
-LazyBandedMatrices = "0.9.1"
-MatrixFactorizations = "2.2"
+InfiniteArrays = "0.14"
+InfiniteLinearAlgebra = "0.8"
+LazyArrays = "2.0.4"
+LazyBandedMatrices = "0.10"
+MatrixFactorizations = "3"
 QuasiArrays = "0.11"
-julia = "1.9"
+julia = "1.10"
 
 [extras]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

src/PiecewiseOrthogonalPolynomials.jl

@@ -8,7 +8,7 @@ import BlockBandedMatrices: _BandedBlockBandedMatrix, AbstractBandedBlockBandedM
 import ClassicalOrthogonalPolynomials: grid, plotgrid, ldiv, pad, adaptivetransform_ldiv, Plan, singularities, basis_singularities, singularitiesbroadcast
 import ContinuumArrays: @simplify, factorize, TransformFactorization, AbstractBasisLayout, MemoryLayout, layout_broadcasted, ExpansionLayout, basis, plan_transform, plan_grid_transform, grammatrix, weaklaplacian, MulPlan, InvPlan
 import LazyArrays: paddeddata, AbstractLazyLayout
-import LazyBandedMatrices: BlockBroadcastMatrix, BlockVec, BandedLazyLayouts, AbstractLazyBandedBlockBandedLayout, UpperOrLowerTriangular
+import LazyBandedMatrices: BlockBroadcastMatrix, BlockVec, AbstractLazyBandedBlockBandedLayout
 import Base: size, axes, getindex, +, -, *, /, ==, \, OneTo, oneto, replace_in_print_matrix, copy, diff, getproperty, adjoint, transpose, tail, _sum, inv, show, summary
 import InfiniteArrays: OneToInf
 import FillArrays: AbstractFill

src/arrowhead.jl

@@ -6,13 +6,15 @@ import BlockArrays: BlockSlice, block, blockindex, blockvec
 import BlockBandedMatrices: subblockbandwidths, blockbandwidths, AbstractBandedBlockBandedLayout, AbstractBandedBlockBandedMatrix
 import Base: size, axes, getindex, +, -, *, /, ==, \, OneTo, oneto, replace_in_print_matrix, copy, diff, getproperty, adjoint, transpose, tail, _sum, inv, show, summary
 import LazyArrays: paddeddata, AbstractLazyLayout
-import LazyBandedMatrices: BlockBroadcastMatrix, BlockVec, BandedLazyLayouts, AbstractLazyBandedBlockBandedLayout, UpperOrLowerTriangular
-import LinearAlgebra: BlasInt, eigvals
+import LazyBandedMatrices: BlockBroadcastMatrix, BlockVec, AbstractLazyBandedBlockBandedLayout
+import LinearAlgebra: BlasInt, eigvals, UpperOrLowerTriangular
 import MatrixFactorizations: reversecholcopy
 import FillArrays: AbstractFill
 import FillArrays: SquareEye
 import InfiniteArrays: OneToInf
 
+import LazyBandedMatrices.LazyArraysBandedMatricesExt: BandedLazyLayouts
+
 
 export BBBArrowheadMatrix
 
@@ -186,8 +188,8 @@ end
 
 function materialize!(M::MatMulVecAdd{<:ArrowheadLayouts,<:AbstractStridedLayout,<:AbstractStridedLayout})
     α, A, x_in, β, y_in = M.α, M.A, M.B, M.β, M.C
-    x = PseudoBlockArray(x_in, (axes(A,2), ))
-    y = PseudoBlockArray(y_in, (axes(A,1),))
+    x = BlockedArray(x_in, (axes(A,2), ))
+    y = BlockedArray(y_in, (axes(A,1),))
     m,n = size(A.A)
 
     _fill_lmul!(β, y)
@@ -209,8 +211,8 @@ end
 
 function materialize!(M::MatMulMatAdd{<:ArrowheadLayouts,<:AbstractColumnMajor,<:AbstractColumnMajor})
     α, A, X_in, β, Y_in = M.α, M.A, M.B, M.β, M.C
-    X = PseudoBlockArray(X_in, (axes(A,2), axes(X_in,2)))
-    Y = PseudoBlockArray(Y_in, (axes(A,1), axes(X_in,2)))
+    X = BlockedArray(X_in, (axes(A,2), axes(X_in,2)))
+    Y = BlockedArray(Y_in, (axes(A,1), axes(X_in,2)))
     m,n = size(A.A)
 
     _fill_lmul!(β, Y)
@@ -232,8 +234,8 @@ end
 
 function materialize!(M::MatMulMatAdd{<:AbstractColumnMajor,<:ArrowheadLayouts,<:AbstractColumnMajor})
     α, X_in, A, β, Y_in = M.α, M.A, M.B, M.β, M.C
-    X = PseudoBlockArray(X_in, (axes(X_in,1), axes(A,1)))
-    Y = PseudoBlockArray(Y_in, (axes(Y_in,1), axes(A,2)))
+    X = BlockedArray(X_in, (axes(X_in,1), axes(A,1)))
+    Y = BlockedArray(Y_in, (axes(Y_in,1), axes(A,2)))
     m,n = size(A.A)
 
     _fill_lmul!(β, Y)
@@ -439,7 +441,7 @@ for (UNIT, Tri) in (('U',UnitUpperTriangular), ('N', UpperTriangular))
         N = blocksize(P,1)
 
         # impose block structure
-        b = PseudoBlockArray(dest, (axes(P,1),))
+        b = BlockedArray(dest, (axes(P,1),))
         b̃_1 = view(b, Block(1))
 
         for K = 1:min(N-1,length(B))
@@ -463,7 +465,7 @@ for (UNIT, Tri) in (('U',UnitLowerTriangular), ('N', LowerTriangular))
         m = length(D)
 
         # impose block structure
-        b = PseudoBlockArray(dest, (axes(P,1),))
+        b = BlockedArray(dest, (axes(P,1),))
         b̃_1 = view(b, Block(1))
         ArrayLayouts.ldiv!($Tri(A), b̃_1)
 

src/continuouspolynomial.jl

@@ -108,7 +108,7 @@ _tensorsize2contblocks(M,N, Ns...) = (Vcat(N+1, Fill(N, M-2)), _tensorsize2contb
 
 function *(Pl::ContinuousPolynomialTransform{T,<:Any,<:Any,Int}, X::AbstractMatrix{T}) where T
     dat = Pl.R * (Pl.legendretransform*X)
-    cfs = PseudoBlockArray{T}(undef,  _tensorsize2contblocks(size(X)...)...)
+    cfs = BlockedArray{T}(undef,  _tensorsize2contblocks(size(X)...)...)
     dims = Pl.dims
     @assert dims == 1
 
@@ -157,7 +157,7 @@ function _contpolyinds2blocks(k, j)
 end
 function *(Pl::ContinuousPolynomialTransform{T}, X::AbstractArray{T,4}) where T
     dat = Pl.R * (Pl.legendretransform*X)
-    cfs = PseudoBlockArray{T}(undef,  _tensorsize2contblocks(size(X)...)...)
+    cfs = BlockedArray{T}(undef,  _tensorsize2contblocks(size(X)...)...)
     dims = Pl.dims
     @assert dims == (1,2)
 

src/dirichlet.jl

@@ -80,7 +80,7 @@ _tensorsize2dirichletblocks(M,N, Ns...) = (Vcat(N-1, Fill(N, M-2)), _tensorsize2
 
 function *(Pl::DirichletPolynomialTransform{T,<:Any,<:Any,Int}, X::AbstractMatrix{T}) where T
     dat = Pl.R * (Pl.legendretransform*X)
-    cfs = PseudoBlockArray{T}(undef,  _tensorsize2dirichletblocks(size(X)...)...)
+    cfs = BlockedArray{T}(undef,  _tensorsize2dirichletblocks(size(X)...)...)
     dims = Pl.dims
     @assert dims == 1
 
@@ -125,7 +125,7 @@ function _dirichletpolyinds2blocks(k, j)
 end
 function *(Pl::DirichletPolynomialTransform{T}, X::AbstractArray{T,4}) where T
     dat = Pl.R * (Pl.legendretransform*X)
-    cfs = PseudoBlockArray{T}(undef,  _tensorsize2dirichletblocks(size(X)...)...)
+    cfs = BlockedArray{T}(undef,  _tensorsize2dirichletblocks(size(X)...)...)
     dims = Pl.dims
     @assert dims == (1,2)
 

src/piecewisepolynomial.jl

@@ -78,7 +78,7 @@ end
 function _perm_blockvec(X::AbstractArray{T,3}, dims=1) where T
     @assert dims == 1
     X1 = _perm_blockvec(X[:,:,1])
-    ret = PseudoBlockMatrix{T}(undef, (axes(X1,1), axes(X,3)))
+    ret = BlockedMatrix{T}(undef, (axes(X1,1), axes(X,3)))
     ret[:,1] = X1
     for k = 2:size(X,3)
         ret[:,k] = _perm_blockvec(X[:,:,k])
@@ -93,7 +93,7 @@ function _perm_blockvec(X::AbstractArray{T,4}, dims=(1,2)) where T
     @assert dims == 1:2 || dims == (1,2)
     X1 = _perm_blockvec(X[:,:,1,1])
     X2 = _perm_blockvec(X[1,1,:,:])
-    ret = PseudoBlockMatrix{T}(undef, (axes(X1,1), axes(X2,1)))
+    ret = BlockedMatrix{T}(undef, (axes(X1,1), axes(X2,1)))
     for k = axes(X,1), j = axes(X,2), l = axes(X,3), m = axes(X,4)
         ret[Block(k)[j], Block(l)[m]] = X[k,j,l,m]
     end

test/test_arrowhead.jl

@@ -129,7 +129,7 @@ import Base: oneto, OneTo
         x = M[KR,KR] * transform(C, exp)[KR]
         @time c = F \ x;
 
-        @test_broken c isa PseudoBlockArray # TODO: overload copy_similar in BlockArrays.jl
+        @test_broken c isa BlockedArray # TODO: overload copy_similar in BlockArrays.jl
 
         @test (C[:,KR] * c)[0.1] ≈ 1.1952730862177243
     end