Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use square_view to avoid square check, instead of new hack #94

Merged
merged 2 commits into from
Apr 16, 2024
Merged

Use square_view to avoid square check, instead of new hack #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db710d5
Use `square_view` to avoid square check, instead of `new` hack
chriselrod Apr 15, 2024
4142194
Require Julia 1.10
chriselrod Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
julia-version: ['1', '1.6']
julia-version: ['1']
threads:
- '1'
- '3'
Expand Down
8 changes: 4 additions & 4 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "RecursiveFactorization"
uuid = "f2c3362d-daeb-58d1-803e-2bc74f2840b4"
authors = ["Yingbo Ma <mayingbo5@gmail.com>"]
version = "0.2.22"
version = "0.2.23"

[deps]
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Expand All @@ -16,9 +16,9 @@ LinearAlgebra = "1.5"
LoopVectorization = "0.10,0.11, 0.12"
Polyester = "0.3.2,0.4.1, 0.5, 0.6, 0.7"
PrecompileTools = "1"
StrideArraysCore = "0.1.13, 0.2.1, 0.3, 0.4.1, 0.5"
TriangularSolve = "0.1.1"
julia = "1.5"
StrideArraysCore = "0.5.5"
TriangularSolve = "0.2"
julia = "1.10"

[extras]
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
Expand Down
15 changes: 7 additions & 8 deletions src/lu.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ using TriangularSolve: ldiv!
using LinearAlgebra: BlasInt, BlasFloat, LU, UnitLowerTriangular, checknonsingular, BLAS,
LinearAlgebra, Adjoint, Transpose, UpperTriangular, AbstractVecOrMat
using StrideArraysCore
using StrideArraysCore: square_view
using Polyester: @batch

@generated function _unit_lower_triangular(B::A) where {T, A <: AbstractMatrix{T}}
Expr(:new, UnitLowerTriangular{T, A}, :B)
end
# 1.7 compat
normalize_pivot(t::Val{T}) where {T} = t
to_stdlib_pivot(t) = t
Expand Down Expand Up @@ -55,6 +53,7 @@ end
if CUSTOMIZABLE_PIVOT
function LinearAlgebra.ldiv!(A::LU{T, <:StridedMatrix, <:NotIPIV},
B::StridedVecOrMat{T}) where {T <: BlasFloat}
tri = @inbounds square_view(A.factors, size(A.factors, 1))
ldiv!(UpperTriangular(A.factors), ldiv!(UnitLowerTriangular(A.factors), B))
end
end
Expand Down Expand Up @@ -138,10 +137,10 @@ end
info = reckernel!(A, Val(Pivot), m, mnmin, ipiv, info, blocksize, Val(Thread))::Int
@inbounds if m < n # fat matrix
# [AL AR]
AL = @view A[:, 1:m]
AL = square_view(A, m)
AR = @view A[:, (m + 1):n]
Pivot && apply_permutation!(ipiv, AR, Val{Thread}())
ldiv!(_unit_lower_triangular(AL), AR, Val{Thread}())
ldiv!(UnitLowerTriangular(AL), AR, Val{Thread}())
end
info
end
Expand Down Expand Up @@ -190,7 +189,7 @@ function reckernel!(A::AbstractMatrix{T}, pivot::Val{Pivot}, m, n, ipiv, info, b

# ======================================== #
# Now, our LU process looks like this
# [ P1 ] [ A11 A21 ] [ L11 0 ] [ U11 U12 ]
# [ P1 ] [ A11 A12 ] [ L11 0 ] [ U11 U12 ]
# [ ] [ ] = [ ] [ ]
# [ P2 ] [ A21 A22 ] [ L21 I ] [ 0 A′22 ]
# ======================================== #
Expand All @@ -203,7 +202,7 @@ function reckernel!(A::AbstractMatrix{T}, pivot::Val{Pivot}, m, n, ipiv, info, b
# AL AR
# [A11 A12]
# [A21 A22]
A11 = @view A[1:n1, 1:n1]
A11 = square_view(A, n1)
A12 = @view A[1:n1, (n1 + 1):n]
A21 = @view A[(n1 + 1):m, 1:n1]
A22 = @view A[(n1 + 1):m, (n1 + 1):n]
Expand All @@ -223,7 +222,7 @@ function reckernel!(A::AbstractMatrix{T}, pivot::Val{Pivot}, m, n, ipiv, info, b
# [ A22 ] [ 0 ] [ A22 ]
Pivot && apply_permutation!(P1, AR, thread)
# A12 = L11 U12 => U12 = L11 \ A12
ldiv!(_unit_lower_triangular(A11), A12, thread)
ldiv!(UnitLowerTriangular(A11), A12, thread)
# Schur complement:
# We have A22 = L21 U12 + A′22, hence
# A′22 = A22 - L21 U12
Expand Down
Loading