Skip to content

Commit 48f4e0a

Browse files
authored
Drop Julia <v1.10 (#191)
* Drop Julia <v1.10 * Update InfiniteLinearAlgebra.jl
1 parent 24f9718 commit 48f4e0a

File tree

4 files changed

+14
-30
lines changed

4 files changed

+14
-30
lines changed

src/InfiniteLinearAlgebra.jl

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import LazyBandedMatrices: AbstractLazyBandedBlockBandedLayout, AbstractLazyBand
4646
BroadcastBandedLayout, KronTravBandedBlockBandedLayout, LazyBandedLayout,
4747
_block_interlace_axes, _krontrav_axes, krontravargs
4848

49-
import LinearAlgebra: AbstractQ, AdjOrTrans, factorize, matprod, qr
49+
import LinearAlgebra: AbstractQ, AdjointQ, AdjOrTrans, factorize, matprod, qr
5050

5151
import MatrixFactorizations: AdjQLPackedQLayout, LayoutQ, QL, QLPackedQ, QLPackedQLayout, QR, QRPackedQ,
5252
copymutable_size, getL, getQ, getR, getU, ql, ql!, ql_layout, reversecholesky_layout, ul,
@@ -55,10 +55,9 @@ import MatrixFactorizations: AdjQLPackedQLayout, LayoutQ, QL, QLPackedQ, QLPacke
5555
import SemiseparableMatrices: AbstractAlmostBandedLayout, _almostbanded_qr!
5656

5757

58-
if VERSION v"1.7-"
59-
LinearAlgebra._cut_B(x::AbstractVector, ::InfUnitRange) = x
60-
LinearAlgebra._cut_B(X::AbstractMatrix, ::InfUnitRange) = X
61-
end
58+
LinearAlgebra._cut_B(x::AbstractVector, ::InfUnitRange) = x
59+
LinearAlgebra._cut_B(X::AbstractMatrix, ::InfUnitRange) = X
60+
6261

6362
if VERSION v"1.11.0-DEV.21"
6463
using LinearAlgebra: UpperOrLowerTriangular
@@ -69,7 +68,6 @@ else
6968
LinearAlgebra.UnitLowerTriangular{T,S}}
7069
end
7170

72-
const AdjointQtype = isdefined(LinearAlgebra, :AdjointQ) ? LinearAlgebra.AdjointQ : Adjoint
7371

7472
# BroadcastStyle(::Type{<:BandedMatrix{<:Any,<:Any,<:OneToInf}}) = LazyArrayStyle{2}()
7573

src/banded/infqltoeplitz.jl

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,11 @@ struct ProductQ{T,QQ<:Tuple} <: LayoutQ{T}
9191
Qs::QQ
9292
end
9393

94-
if VERSION < v"1.8-"
95-
ArrayLayouts.@layoutmatrix ProductQ
96-
ArrayLayouts.@_layoutlmul ProductQ
97-
else # ArrayLayouts.@layoutmatrix ProductQ without ArrayLayouts.@layoutgetindex
98-
ArrayLayouts.@layoutldiv ProductQ
99-
ArrayLayouts.@layoutmul ProductQ
100-
ArrayLayouts.@layoutlmul ProductQ
101-
ArrayLayouts.@layoutfactorizations ProductQ
102-
ArrayLayouts.@_layoutlmul ProductQ
103-
end
94+
ArrayLayouts.@layoutldiv ProductQ
95+
ArrayLayouts.@layoutmul ProductQ
96+
ArrayLayouts.@layoutlmul ProductQ
97+
ArrayLayouts.@layoutfactorizations ProductQ
98+
ArrayLayouts.@_layoutlmul ProductQ
10499

105100
ProductQ(Qs::Union{AbstractMatrix,AbstractQ}...) = ProductQ{mapreduce(eltype, promote_type, Qs),typeof(Qs)}(Qs)
106101

@@ -116,16 +111,7 @@ function lmul!(Q::ProductQ, v::AbstractVecOrMat)
116111
v
117112
end
118113

119-
if VERSION < v"1.8-"
120-
# Avoid ambiguities
121-
getindex(Q::ProductQ, i::Int, j::Int) = Q[:, j][i]
122114

123-
function getindex(Q::ProductQ, ::Colon, j::Int)
124-
y = zeros(eltype(Q), size(Q, 2))
125-
y[j] = 1
126-
lmul!(Q, y)
127-
end
128-
end
129115
getindex(Q::ProductQ, I::AbstractVector{Int}, J::AbstractVector{Int}) =
130116
_getindex_by_col(Q, I, J)
131117

src/infql.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ ql(A::Adjoint{T,BlockTriPertToeplitz{T}}) where T = ql(BlockTridiagonal(A))
210210

211211
const InfBlockBandedMatrix{T} = BlockSkylineMatrix{T,<:Vcat{T,1,<:Tuple{Vector{T},<:BlockArray{T,1,<:Fill{<:Any,1,Tuple{OneToInf{Int64}}}}}}}
212212

213-
function lmul!(adjA::AdjointQtype{<:Any,<:QLPackedQ{<:Any,<:InfBlockBandedMatrix}}, B::AbstractVector)
213+
function lmul!(adjA::AdjointQ{<:Any,<:QLPackedQ{<:Any,<:InfBlockBandedMatrix}}, B::AbstractVector)
214214
require_one_based_indexing(B)
215215
A = parent(adjA)
216216
mA, nA = size(A.factors)
@@ -252,12 +252,12 @@ function (*)(A::QLPackedQ{T,<:InfBlockBandedMatrix}, x::AbstractVector{S}) where
252252
lmul!(A, cache(convert(AbstractVector{TS},x)))
253253
end
254254

255-
function (*)(A::AdjointQtype{T,<:QLPackedQ{T,<:InfBlockBandedMatrix}}, x::AbstractVector{S}) where {T,S}
255+
function (*)(A::AdjointQ{T,<:QLPackedQ{T,<:InfBlockBandedMatrix}}, x::AbstractVector{S}) where {T,S}
256256
TS = promote_op(matprod, T, S)
257257
lmul!(A, cache(convert(AbstractVector{TS},x)))
258258
end
259259

260-
function (*)(A::AdjointQtype{T,<:QLPackedQ{T,<:InfBlockBandedMatrix}}, x::LayoutVector{S}) where {T,S}
260+
function (*)(A::AdjointQ{T,<:QLPackedQ{T,<:InfBlockBandedMatrix}}, x::LayoutVector{S}) where {T,S}
261261
TS = promote_op(matprod, T, S)
262262
lmul!(A, cache(convert(AbstractVector{TS},x)))
263263
end

src/infqr.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,9 +322,9 @@ function _lmul_copymutable(A::Union{AbstractMatrix{T},AbstractQ{T}}, x::Abstract
322322
end
323323

324324
(*)(A::QRPackedQ{T,<:AdaptiveQRFactors}, x::AbstractVector; kwds...) where {T} = _lmul_copymutable(A, x; kwds...)
325-
(*)(A::AdjointQtype{T,<:QRPackedQ{T,<:AdaptiveQRFactors}}, x::AbstractVector; kwds...) where {T} = _lmul_copymutable(A, x; kwds...)
325+
(*)(A::AdjointQ{T,<:QRPackedQ{T,<:AdaptiveQRFactors}}, x::AbstractVector; kwds...) where {T} = _lmul_copymutable(A, x; kwds...)
326326
(*)(A::QRPackedQ{T,<:AdaptiveQRFactors}, x::LayoutVector; kwds...) where {T} = _lmul_copymutable(A, x; kwds...)
327-
(*)(A::AdjointQtype{T,<:QRPackedQ{T,<:AdaptiveQRFactors}}, x::LayoutVector; kwds...) where {T} = _lmul_copymutable(A, x; kwds...)
327+
(*)(A::AdjointQ{T,<:QRPackedQ{T,<:AdaptiveQRFactors}}, x::LayoutVector; kwds...) where {T} = _lmul_copymutable(A, x; kwds...)
328328

329329
function ldiv!(R::UpperTriangular{<:Any,<:AdaptiveQRFactors}, B::CachedVector{<:Any,<:Any,<:Zeros{<:Any,1}})
330330
n = B.datasize[1]

0 commit comments

Comments
 (0)