Skip to content

Commit 9b1561d

Browse files
committed
Merge branch 'dl/layoutmatrix' into dl/semiseparable
2 parents 146ed7b + 94ffc7d commit 9b1561d

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ MatrixFactorizations = "a3b82374-2e81-5b9e-98ce-41277c0e4c87"
1616
SemiseparableMatrices = "f8ebbe35-cbfb-4060-bf7f-b10e4670cf57"
1717

1818
[compat]
19-
ArrayLayouts = "0.1, 0.2"
20-
BandedMatrices = "0.14, 0.15"
19+
ArrayLayouts = "0.2"
20+
BandedMatrices = "0.15"
2121
BlockArrays = "0.11"
2222
BlockBandedMatrices = "0.7.1"
2323
FillArrays = "0.8.4"

src/InfiniteLinearAlgebra.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import InfiniteArrays: OneToInf, InfUnitRange, Infinity, InfStepRange, AbstractI
1515
import LinearAlgebra: lmul!, ldiv!, matprod, qr, AbstractTriangular, AbstractQ, adjoint, transpose
1616
import LazyArrays: applybroadcaststyle, CachedArray, CachedMatrix, CachedVector, DenseColumnMajor, FillLayout, ApplyMatrix, check_mul_axes, ApplyStyle, LazyArrayApplyStyle, LazyArrayStyle,
1717
resizedata!, MemoryLayout, mulapplystyle, LmulStyle, RmulStyle,
18-
factorize, sub_materialize, LazyLayout, LazyArrayStyle, lazy_getindex,
18+
factorize, sub_materialize, LazyLayout, LazyArrayStyle, layout_getindex,
1919
@lazymul, applylayout, ApplyLayout, PaddedLayout, materialize!, zero!, MulAddStyle,
2020
LazyArray, LazyMatrix, LazyVector
2121
import MatrixFactorizations: ql, ql!, QLPackedQ, getL, getR, reflector!, reflectorApply!, QL, QR, QRPackedQ

src/banded/infbanded.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Diagonal
33
###
44

5-
getindex(D::Diagonal, k::InfAxes, j::InfAxes) = lazy_getindex(D, k, j)
5+
getindex(D::Diagonal, k::InfAxes, j::InfAxes) = layout_getindex(D, k, j)
66

77
const TriToeplitz{T} = Tridiagonal{T,Fill{T,1,Tuple{OneToInf{Int}}}}
88
const ConstRowMatrix{T} = ApplyMatrix{T,typeof(*),<:Tuple{<:AbstractVector,<:AbstractFill{<:Any,2,Tuple{OneTo{Int},OneToInf{Int}}}}}

0 commit comments

Comments
 (0)