Skip to content

Inline generic_matmatmul! branch in strided triangular matmul #1262

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

Merged
merged 2 commits into from
Apr 23, 2025
Merged

Inline generic_matmatmul! branch in strided triangular matmul #1262

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38b932b
Inline `generic_matmatmul!` branch in strided triangular matmul
jishnub Apr 4, 2025
331d7e2
Rename fn to generic_matmatmul_NN!
jishnub Apr 7, 2025
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
13 changes: 12 additions & 1 deletion src/triangular.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ const LowerOrUnitLowerTriangular{T,S<:AbstractMatrix{T}} = Union{LowerTriangular
const UpperOrLowerTriangular{T,S<:AbstractMatrix{T}} = Union{UpperOrUnitUpperTriangular{T,S}, LowerOrUnitLowerTriangular{T,S}}
const UnitUpperOrUnitLowerTriangular{T,S<:AbstractMatrix{T}} = Union{UnitUpperTriangular{T,S}, UnitLowerTriangular{T,S}}

const UpperOrLowerTriangularStrided{T,S<:StridedMatrix{T}} = UpperOrLowerTriangular{T,S}

uppertriangular(M) = UpperTriangular(M)
lowertriangular(M) = LowerTriangular(M)

Expand Down Expand Up @@ -1116,11 +1118,20 @@ for (TA, TB) in ((:AbstractTriangular, :AbstractMatrix),
if isone(alpha) && iszero(beta)
return _trimul!(C, A, B)
else
return generic_matmatmul!(C, 'N', 'N', A, B, alpha, beta)
return generic_matmatmul_NN!(C, A, B, alpha, beta)
end
end
end

generic_matmatmul_NN!(C, A, B, alpha, beta) = generic_matmatmul!(C, 'N', 'N', A, B, alpha, beta)
# Optimization for strided matrices, where we know that _generic_matmatmul! will be taken
for (TA, TB) in ((:UpperOrLowerTriangularStrided, :StridedMatrix),
(:StridedMatrix, :UpperOrLowerTriangularStrided),
(:UpperOrLowerTriangularStrided, :UpperOrLowerTriangularStrided)
)
@eval generic_matmatmul_NN!(C, A::$TA, B::$TB, alpha, beta) = _generic_matmatmul!(C, A, B, alpha, beta)
end

ldiv!(C::AbstractVecOrMat, A::AbstractTriangular, B::AbstractVecOrMat) = _ldiv!(C, A, B)
# generic fallback for AbstractTriangular, directs to 2-arg [l/r]div!
_ldiv!(C::AbstractVecOrMat, A::AbstractTriangular, B::AbstractVecOrMat) =
Expand Down