Skip to content

Reduce load-time invalidations from untyped operator methods #77

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

Open
DavidSagan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Reduce load-time invalidations from untyped operator methods #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 9 additions & 4 deletions src/map.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,8 +731,10 @@ function ∘(m2::$t, m1::$t)
return m
end

# When composing a TPS scalar/vector function w a map, use orbital part of map:
function ∘(m2, m1::$t)
# When composing a TPS scalar/vector function w a map, use orbital part of map.
# `m2` is constrained to Number/AbstractArray (a TPS scalar or vector function) so
# that inserting this method does not invalidate compiled `∘(::Any, ...)` callers.
function ∘(m2::Union{Number,AbstractArray}, m1::$t)
TI.is_tps_type(eltype(m2)) isa TI.IsTPSType || error("Cannot compose: $(eltype(m2)) is not a TPS type supported by TPSAInterface.jl")
T = promote_type(eltype(m1.v), eltype(m2))
T == eltype(m1.v) ? m1xprom = m1.v : m1xprom = T.(m1.v)
Expand All @@ -751,8 +753,11 @@ literal_pow(::typeof(^), m::$t{V0,V,Q,S}, vn::Val{-1}) where {V0,V,Q,S} = inv(m)
inv(m::$t; do_spin::Bool=true) = (out_m = zero(m); inv!(out_m, m, do_spin=do_spin); return out_m)
^(m::$t, n::Integer) = (out_m = zero(m); pow!(out_m, m, n); return out_m)

# Also allow * for simplicity and \ and /
*(m2, m1::$t) = ∘(m2, m1)
# Also allow * for simplicity and \ and /
# Split the former untyped `*(m2, m1::$t)` into concrete-argument methods so that
# inserting them does not invalidate compiled `*(::Any, ...)` callers.
*(m2::$t, m1::$t) = ∘(m2, m1)
*(m2::Union{Number,AbstractArray}, m1::$t) = ∘(m2, m1)
/(m2::$t, m1::$t) = m2 ∘ inv(m1)
\(m2::$t, m1::$t) = inv(m2) ∘ m1

Expand Down
4 changes: 2 additions & 2 deletions src/utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,8 +475,8 @@ const S = SymplecticS()

for op = (:+, :-, :*, :/)
@eval begin
Base.$op(S::SymplecticS,M) = Base.$op(JMatrix{Int8,+1}(size(M,1)), M)
Base.$op(M,S::SymplecticS) = Base.$op(M, JMatrix{Int8,+1}(size(M,2)))
Base.$op(S::SymplecticS,M::AbstractVecOrMat) = Base.$op(JMatrix{Int8,+1}(size(M,1)), M)
Base.$op(M::AbstractVecOrMat,S::SymplecticS) = Base.$op(M, JMatrix{Int8,+1}(size(M,2)))
end
end

Expand Down
Loading