Merge branch 'release-0.13' into dl/moveoutbanded

.github/workflows/downstream.yml

@@ -41,7 +41,7 @@ jobs:
         package:
           - {repo: ApproxFunBase.jl, group: JuliaApproximation}
           - {repo: ApproxFun.jl, group: JuliaApproximation}
-          # - {repo: InfiniteLinearAlgebra.jl, group: JuliaLinearAlgebra}
+          - {repo: InfiniteLinearAlgebra.jl, group: JuliaLinearAlgebra}
 
     steps:
       - uses: actions/checkout@v4

src/BlockBandedMatrices.jl

@@ -2,46 +2,37 @@ module BlockBandedMatrices
 using BlockArrays, BandedMatrices, ArrayLayouts, FillArrays, MatrixFactorizations
 using LinearAlgebra
 
-import Base: getindex, setindex!, checkbounds, @propagate_inbounds, convert,
-                        +, *, -, /, \, strides, zeros, size,
-                        unsafe_convert, fill!, length, first, last,
-                        eltype, getindex, to_indices, to_index,
-                        reindex, tail, @_propagate_inbounds_meta,
-                        ==, axes, copy, copyto!, similar, OneTo, Slice
-
-import Base.Broadcast: BroadcastStyle, AbstractArrayStyle, DefaultArrayStyle, Broadcasted, broadcasted
-
-import LinearAlgebra: UniformScaling, isdiag, rmul!, lmul!, ldiv!, rdiv!, axpy!,
-                        AbstractTriangular, AdjOrTrans, HermOrSym, StructuredMatrixStyle,
-                        qr, qr!
-import LinearAlgebra.BLAS: BlasInt, BlasFloat, @blasfunc, BlasComplex, BlasReal
-import LinearAlgebra.LAPACK: chktrans, chkdiag, chklapackerror, checksquare, chkstride1,
-                    chkuplo
-import MatrixFactorizations: ql, ql!, _ql, QLPackedQ, AdjQRPackedQLayout, AdjQLPackedQLayout, QR, QRPackedQ
-
-import ArrayLayouts: BlasMatLmulVec, MatLmulVec, MatLmulMat,
-                    triangularlayout, UpperTriangularLayout, TriangularLayout, MatLdivVec,
-                    triangulardata, sublayout, sub_materialize, materialize, materialize!,
-                    AbstractColumnMajor, DenseColumnMajor, ColumnMajor,
-                    DiagonalLayout, MulAdd, mul, colsupport, rowsupport,
-                    _qr, _factorize, _copyto!, zero!, layout_replace_in_print_matrix,
-                    transposelayout, conjlayout, symmetriclayout, hermitianlayout
-
-import BlockArrays: blocksize, blockcheckbounds, BlockedUnitRange, blockisequal, DefaultBlockAxis,
-                        Block, BlockSlice, unblock, block, blockindex,
-                        _blocklengths2blocklasts, BlockIndexRange, sizes_from_blocks, BlockSlice1,
-                        blockcolsupport, blockrowsupport, blockcolstart, blockcolstop, blockrowstart, blockrowstop,
-                        AbstractBlockLayout, BlockLayout, blocks, hasmatchingblocks, BlockStyle, BlockSlices, _blockkron,
-                        BlockDiagonal, BlockTridiagonal, BlockBidiagonal, checksquareblocks, AbstractBlockedUnitRange
-
-import BandedMatrices: isbanded, bandwidths, bandwidth, banded_getindex, colrange,
-                        inbands_setindex!, inbands_getindex, banded_setindex!,
-                        banded_generic_axpy!,
-                        BlasFloat, banded_dense_axpy!, MemoryLayout,
-                        BandedLayout, BandedColumnMajor, BandedColumns, bandedcolumns,
-                        BandedSubBandedMatrix, bandeddata,
-                        _BandedMatrix, colstart, colstop, rowstart, rowstop,
-                        BandedStyle, bandshift
+import ArrayLayouts: AbstractColumnMajor, AdjQRPackedQLayout, ColumnMajor,
+                     DiagonalLayout, MatLmulMat, MatLmulVec, MemoryLayout, MulAdd, TriangularLayout,
+                     _copyto!, _factorize, _qr, colsupport, conjlayout, hermitianlayout,
+                     layout_replace_in_print_matrix, rowsupport, sub_materialize, sublayout, symmetriclayout,
+                     transposelayout, zero!, materialize!, materialize
+
+import BandedMatrices: BandedColumns, BandedLayout, BandedStyle, BlasFloat,
+                       _BandedMatrix, banded_getindex, banded_setindex!,
+                       bandedcolumns, bandeddata, bandshift, bandwidth, bandwidths, colrange,
+                       inbands_getindex, inbands_setindex!, isbanded
+
+import Base: *, +, -, /, \, ==, @propagate_inbounds, OneTo, Slice, axes, checkbounds,
+             convert, copy, copyto!, eltype, fill!, first, getindex, last, length, setindex!, similar, size,
+             strides, unsafe_convert, zeros
+
+import Base.Broadcast: AbstractArrayStyle, BroadcastStyle, Broadcasted, DefaultArrayStyle, broadcasted
+
+import BlockArrays: AbstractBlockLayout, Block, BlockIndexRange, BlockLayout, BlockSlice, BlockSlice1, BlockSlices,
+                    BlockStyle, BlockedUnitRange, DefaultBlockAxis, _blockkron, _blocklengths2blocklasts, block,
+                    blockcheckbounds, blockcolstart, blockcolstop, blockcolsupport, blockindex, blockisequal,
+                    blockrowstart, blockrowstop, blockrowsupport, blocks, blocksize, hasmatchingblocks,
+                    sizes_from_blocks
+
+import FillArrays: Fill, Ones, Zeros
+
+import LinearAlgebra: AbstractTriangular, AdjOrTrans, HermOrSym, StructuredMatrixStyle, UniformScaling, axpy!,
+                      isdiag, ldiv!, lmul!, qr, qr!, rmul!
+
+import LinearAlgebra.BLAS: BlasComplex, BlasFloat, BlasReal
+
+import MatrixFactorizations: AdjQLPackedQLayout, QR, QRPackedQ, _ql, ql, ql!
 
 export BandedBlockBandedMatrix, BlockBandedMatrix, BlockSkylineMatrix, blockbandwidth, blockbandwidths,
         subblockbandwidth, subblockbandwidths, Ones, Zeros, Fill, Block, BlockTridiagonal, BlockBidiagonal, isblockbanded

src/BlockSkylineMatrix.jl

@@ -519,10 +519,10 @@ function copy_accommodating_diagonals(A::BlockSkylineMatrix, diagonals::UnitRang
         for (j,i) in enumerate(rows)
             # First we find which block the j:th element of the main
             # diagonal would occupy.
-            md_block = findfirst(≥(j), ax.lasts)
+            md_block = searchsortedfirst(blocklasts(ax), j)
 
             # Next we find which block covers row i
-            d_block = findfirst(≥(i), ax.lasts)
+            d_block = searchsortedfirst(blocklasts(ax), i)
 
             # Finally, we increase the block-bandwidth as necessary
             v[md_block] = max(v[md_block], abs(d_block-md_block))

test/runtests.jl

@@ -1,8 +1,7 @@
 using BlockBandedMatrices
-using LinearAlgebra
 using Test
 
-using Aqua
+import Aqua
 @testset "Project quality" begin
     Aqua.test_all(BlockBandedMatrices, ambiguities=false, piracies=false)
 end

test/test_adjtransblockbanded.jl

@@ -1,6 +1,8 @@
+module TestAdjTransBlockBanded
+
 using ArrayLayouts, BlockBandedMatrices, Test
-import BlockBandedMatrices: BandedBlockBandedRowMajor, BandedBlockBandedRows, 
-                            BandedBlockBandedColumns, BlockBandedRows, 
+import BlockBandedMatrices: BandedBlockBandedRowMajor, BandedBlockBandedRows,
+                            BandedBlockBandedColumns, BlockBandedRows,
                             BlockBandedColumns, blockcolsupport, blockrowsupport
 
 @testset "Adj/Trans" begin
@@ -62,3 +64,5 @@ import BlockBandedMatrices: BandedBlockBandedRowMajor, BandedBlockBandedRows,
         @test colsupport(E2', 1) == 1:0
     end
 end
+
+end # module

test/test_bandedblockbanded.jl

@@ -1,3 +1,5 @@
+module TestBandedBlockBanded
+
 using ArrayLayouts
 using BandedMatrices
 using BlockArrays
@@ -564,3 +566,5 @@ if false # turned off since tests have check-bounds=yes
     BandedMatrices.inbands_setindex!(V, -2, 5, 1)
     @test A[2,1] == -2
 end
+
+end # module

test/test_blockbanded.jl

@@ -1,3 +1,5 @@
+module TestBlockBanded
+
 using ArrayLayouts
 using BandedMatrices
 using BlockArrays
@@ -246,3 +248,5 @@ import BlockBandedMatrices: MemoryLayout, ColumnMajor, BroadcastStyle,
         @inferred(f(s))
     end
 end
+
+end # module

test/test_blockskyline.jl

@@ -1,3 +1,5 @@
+module TestBlockSkyline
+
 using ArrayLayouts
 using BlockArrays
 using BlockBandedMatrices
@@ -163,3 +165,5 @@ Random.seed!(0)
         @test s == " 1  │  0  0  │  ⋅  ⋅  ⋅  │  ⋅  ⋅  ⋅  ⋅"
     end
 end
+
+end # module

test/test_blockskylineqr.jl

@@ -1,3 +1,5 @@
+module TestBlockSkylineQR
+
 using BlockBandedMatrices
 using BlockArrays
 using LinearAlgebra
@@ -201,3 +203,5 @@ end
 # @time F = qr(A); # 11s
 # b = randn(size(A,1));
 # @time F\b; # 0.6s
+
+end # module

test/test_broadcasting.jl

@@ -1,3 +1,5 @@
+module TestBroadcasting
+
 using ArrayLayouts
 using BandedMatrices
 using BlockArrays
@@ -287,3 +289,5 @@ import Base: oneto
         end
     end
 end
+
+end # module

test/test_linalg.jl

@@ -1,3 +1,5 @@
+module TestLinalg
+
 using ArrayLayouts
 using BandedMatrices
 using BlockArrays
@@ -6,8 +8,7 @@ using LinearAlgebra
 using Test
 
 import BandedMatrices: BandError, bandeddata
-import BlockBandedMatrices: _BandedBlockBandedMatrix, MemoryLayout, mul!,
-                            blockcolstop, blockrowstop, BlockSkylineSizes
+import BlockBandedMatrices: _BandedBlockBandedMatrix
 
 @testset "lmul!/rmul!" begin
     C = BandedBlockBandedMatrix{Float64}(undef, 1:2,1:2, (1,1), (1,1))
@@ -201,3 +202,5 @@ end
     @test cholesky(Symmetric(Δ)).U ≈ cholesky(Matrix(Δ)).U
     @test cholesky(Symmetric(Δ,:L)).U ≈ cholesky(Matrix(Δ)).U
 end
+
+end # module

test/test_misc.jl

@@ -1,3 +1,5 @@
+module TestMisc
+
 using ArrayLayouts
 using BandedMatrices
 using BlockArrays
@@ -246,3 +248,4 @@ Base.size(F::FiniteDifference) = (F.n,F.n)
     end
 end
 
+end # module

test/test_triblockbanded.jl

@@ -1,3 +1,5 @@
+module TestTriBlockBanded
+
 using ArrayLayouts
 using BandedMatrices
 using BlockArrays
@@ -7,7 +9,6 @@ using Test
 
 import BlockBandedMatrices: MemoryLayout, TriangularLayout,
                             BandedBlockBandedColumnMajor,
-                            BandedColumnMajor, BlockSkylineSizes,
                             blockrowstop, blockcolstop, ColumnMajor
 
 import BlockArrays: blockisequal
@@ -209,3 +210,5 @@ import BlockArrays: blockisequal
         @test UpperTriangular(V2) \ b ≈ UpperTriangular(V) \ b
     end
 end
+
+end # module