Skip to content

remove unpack #49

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
oscardssmith merged 3 commits into from
Jan 7, 2026
Merged

remove unpack #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d0903a
remove unpack
oscardssmith Jan 6, 2026
6965f7d
add parentheses
kylebeggs Jan 6, 2026
063f6d2
format with runic
kylebeggs Jan 7, 2026
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: 0 additions & 2 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8"
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
Unrolled = "9602ed7d-8fef-5bc8-8597-8f21381861e8"

[compat]
Expand All @@ -27,7 +26,6 @@ RecursiveArrayTools = "3.39.0"
SafeTestsets = "0.1.0"
SciMLBase = "2.77.0"
TimerOutputs = "0.5.28"
UnPack = "1.0.2"
Unrolled = "0.1.5"
julia = "1.10"

Expand Down
2 changes: 1 addition & 1 deletion docs/src/devdocs/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ end
solution_indices::Tuple, synchronizers::Tuple,
cache::MySimpleFirstOrderAlgorithmCache, tnext)
# We assume that the integrators are already synced
@unpack inner_caches = cache
(;inner_caches) = cache

# Advance first subproblem
OrdinaryDiffEqOperatorSplitting.forward_sync_subintegrator!(
Expand Down
2 changes: 0 additions & 2 deletions src/OrdinaryDiffEqOperatorSplitting.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ import RecursiveArrayTools

import OrdinaryDiffEqCore

import UnPack: @unpack

abstract type AbstractOperatorSplitFunction <: SciMLBase.AbstractODEFunction{true} end
abstract type AbstractOperatorSplittingAlgorithm end
abstract type AbstractOperatorSplittingCache end
Expand Down
12 changes: 6 additions & 6 deletions src/integrator.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ function DiffEqBase.solve!(integrator::OperatorSplittingIntegrator)
step_header!(integrator)
@timeit_debug "check_error" SciMLBase.check_error!(integrator) ∉ (
ReturnCode.Success, ReturnCode.Default,
)&&return
) && return
__step!(integrator)
step_footer!(integrator)
if !SciMLBase.has_tstop(integrator)
Expand All @@ -438,7 +438,7 @@ function DiffEqBase.step!(integrator::OperatorSplittingIntegrator)
step_header!(integrator)
@timeit_debug "check_error" SciMLBase.check_error!(integrator) ∉ (
ReturnCode.Success, ReturnCode.Default,
)&&return
) && return
__step!(integrator)
step_footer!(integrator)
if !SciMLBase.has_tstop(integrator)
Expand All @@ -449,14 +449,14 @@ function DiffEqBase.step!(integrator::OperatorSplittingIntegrator)
step_header!(integrator)
@timeit_debug "check_error" SciMLBase.check_error!(integrator) ∉ (
ReturnCode.Success, ReturnCode.Default,
)&&return
) && return
__step!(integrator)
step_footer!(integrator)
while !should_accept_step(integrator)
step_header!(integrator)
@timeit_debug "check_error" SciMLBase.check_error!(integrator) ∉ (
ReturnCode.Success, ReturnCode.Default,
)&&return
) && return
__step!(integrator)
step_footer!(integrator)
end
Expand Down Expand Up @@ -508,7 +508,7 @@ function DiffEqBase.step!(integrator::OperatorSplittingIntegrator, dt, stop_at_t
step_header!(integrator)
@timeit_debug "check_error" SciMLBase.check_error!(integrator) ∉ (
ReturnCode.Success, ReturnCode.Default,
)&&return
) && return
__step!(integrator)
step_footer!(integrator)
end
Expand Down Expand Up @@ -675,7 +675,7 @@ end
function synchronize_subintegrator!(
subintegrator::DEIntegrator, integrator::OperatorSplittingIntegrator
)
@unpack t, dt = integrator
(; t, dt) = integrator
@assert subintegrator.t == t
return if !isadaptive(subintegrator)
SciMLBase.set_proposed_dt!(subintegrator, dt)
Expand Down
2 changes: 1 addition & 1 deletion src/solver.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ end
synchronizers::Tuple, cache::LieTrotterGodunovCache, tnext
)
# We assume that the integrators are already synced
@unpack inner_caches = cache
(; inner_caches) = cache
# For each inner operator
i = 0
@unroll for subinteg in subintegrators
Expand Down