Skip to content

Commit bf84038

Browse files
ChrisRackauckasChrisRackauckas
committed
fix a bunch
1 parent 6d1c5f9 commit bf84038

File tree

3 files changed

+27
-39
lines changed

3 files changed

+27
-39
lines changed

‎lib/OrdinaryDiffEqDifferentiation/src/OrdinaryDiffEqDifferentiation.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ import LinearAlgebra
1414
import LinearAlgebra: Diagonal, I, UniformScaling, diagind, mul!, lmul!, axpby!, opnorm, lu
1515
import LinearAlgebra: LowerTriangular, UpperTriangular
1616
import SparseArrays: SparseMatrixCSC, AbstractSparseMatrix, nonzeros, sparse, spzeros
17-
import ArrayInterface: fast_scalar_indexing, zeromatrix, lu_instance, can_setindex, restructure
17+
import ArrayInterface
18+
import ArrayInterface: fast_scalar_indexing, zeromatrix, lu_instance
1819

1920
# StaticArrayInterface imported but not used
2021
# import StaticArrayInterface
@@ -47,6 +48,7 @@ using OrdinaryDiffEqCore: OrdinaryDiffEqAlgorithm, OrdinaryDiffEqAdaptiveImplici
4748

4849
import OrdinaryDiffEqCore: get_chunksize, resize_J_W!, resize_nlsolver!, alg_autodiff, _get_fwd_tag
4950

51+
import ConstructionBase
5052
using ConstructionBase: constructorof
5153

5254
import DifferentiationInterface as DI

‎lib/OrdinaryDiffEqRosenbrock/src/OrdinaryDiffEqRosenbrock.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import OrdinaryDiffEqCore: alg_order, alg_adaptive_order, isWmethod, isfsal, _un
88
_vec, _reshape, perform_step!, trivial_limiter!,
99
OrdinaryDiffEqRosenbrockAdaptiveAlgorithm,
1010
OrdinaryDiffEqRosenbrockAlgorithm, generic_solver_docstring,
11-
namify, initialize!, perform_step!, get_fsalfirstlast,
11+
initialize!, perform_step!, get_fsalfirstlast,
1212
constvalue, only_diagonal_mass_matrix,
1313
calculate_residuals, has_stiff_interpolation, ODEIntegrator,
1414
resize_non_user_cache!, _ode_addsteps!, full_cache,
1515
DerivativeOrderNotPossibleError, _bool_to_ADType,
1616
_process_AD_choice, LinearAliasSpecifier
1717
using MuladdMacro, FastBroadcast, RecursiveArrayTools
1818
import MacroTools
19-
using MacroTools: @capture
19+
using MacroTools: @capture, namify
2020
using DiffEqBase: @def
2121
import DifferentiationInterface as DI
2222
import LinearSolve

‎src/OrdinaryDiffEq.jl

Lines changed: 22 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,18 @@ $(DocStringExtensions.README)
33
"""
44
module OrdinaryDiffEq
55

6-
using Reexport
6+
import Reexport
7+
using Reexport: @reexport
78
@reexport using DiffEqBase
89

10+
# Explicit imports for functions that are re-exported
11+
import DiffEqBase: DiffEqBase, init, solve, solve!, step!, addsteps!, savevalues!, terminate!
12+
913
import OrdinaryDiffEqCore: OrdinaryDiffEqCore,
1014
trivial_limiter!, CompositeAlgorithm, alg_order,
1115
ShampineCollocationInit, BrownFullBasicInit, NoInit,
1216
set_new_W!, set_W_γdt!, get_W, isfirstcall, isfirststage,
1317
isJcurrent, get_new_W_γdt_cutoff,
14-
DIRK, COEFFICIENT_MULTISTEP, NORDSIECK_MULTISTEP, GLM,
15-
MethodType, Divergence, VerySlowConvergence,
16-
SlowConvergence, Convergence, FastConvergence, NLStatus,
17-
TryAgain, AbstractNLSolverCache,
18-
AbstractNLSolverAlgorithm, AbstractNLSolver,
1918
handle_discontinuities!, copyat_or_push!,
2019
du_cache, full_cache, isfsal, ode_interpolant, u_cache,
2120
AutoSwitch, has_discontinuity,
@@ -29,7 +28,7 @@ import OrdinaryDiffEqCore: OrdinaryDiffEqCore,
2928
stepsize_controller!,
3029
accept_step_controller, step_accept_controller!,
3130
step_reject_controller!,
32-
DummyController, issplit, calculate_residuals,
31+
issplit, calculate_residuals,
3332
calculate_residuals!,
3433
nlsolve_f, unwrap_cache, ode_addsteps!, get_chunksize,
3534
handle_callback_modifiers!,
@@ -38,41 +37,37 @@ import OrdinaryDiffEqCore: OrdinaryDiffEqCore,
3837
isimplicit, initialize_d_discontinuities, isdtchangeable,
3938
_searchsortedfirst,
4039
_searchsortedlast,
41-
@unpack, ismultistep, DEFAULT_PRECS, isautoswitch,
40+
@unpack, ismultistep, isautoswitch,
4241
get_chunksize_int,
4342
_unwrap_val, alg_autodiff, concrete_jac, alg_difftype,
4443
standardtag,
4544
alg_extrapolates, alg_maximum_order, alg_adaptive_order,
46-
OrdinaryDiffEqCompositeAlgorithm, initialize_callbacks!,
47-
PredictiveController,
48-
get_differential_vars, alg_cache, AutoSwitchCache,
49-
InterpolationData,
50-
DEOptions, OrdinaryDiffEqAlgorithm, @cache, fsal_typeof,
51-
OrdinaryDiffEqCache,
52-
OrdinaryDiffEqAdaptiveAlgorithm, handle_dt!,
45+
initialize_callbacks!,
46+
get_differential_vars, alg_cache,
47+
@cache, fsal_typeof,
48+
handle_dt!,
5349
ode_determine_initdt,
54-
loopheader!, OrdinaryDiffEqConstantCache, _loopfooter!,
50+
loopheader!, _loopfooter!,
5551
isadaptive,
56-
OrdinaryDiffEqMutableCache, current_interpolant!,
52+
current_interpolant!,
5753
is_mass_matrix_alg,
58-
False, True, _savevalues!, postamble!, recursivefill!,
59-
_change_t_via_interpolation!, ODEIntegrator, _ode_interpolant!,
54+
_savevalues!, postamble!, recursivefill!,
55+
_change_t_via_interpolation!, _ode_interpolant!,
6056
current_interpolant, resize_nlsolver!, _ode_interpolant,
6157
handle_tstop!, _postamble!, update_uprev!, resize_J_W!,
62-
DAEAlgorithm, get_fsalfirstlast, strip_cache,
63-
Sequential, BaseThreads, PolyesterThreads
58+
get_fsalfirstlast, strip_cache
6459

6560
export CompositeAlgorithm, ShampineCollocationInit, BrownFullBasicInit, NoInit,
6661
AutoSwitch
6762

6863
import OrdinaryDiffEqDifferentiation
69-
using OrdinaryDiffEqDifferentiation: _alg_autodiff, resize_grad_config!, dolinsolve,
70-
wrapprecs, UJacobianWrapper, build_jac_config,
71-
WOperator, FirstAutodiffJacError, calc_J!, calc_W!,
64+
using OrdinaryDiffEqDifferentiation: resize_grad_config!, dolinsolve,
65+
wrapprecs, build_jac_config,
66+
calc_J!, calc_W!,
7267
calc_J, calc_W, jacobian2W!, isnewton
7368

7469
using OrdinaryDiffEqNonlinearSolve: NLNewton, NLAnderson, NLFunctional, nlsolvefail,
75-
initial_η, NonlinearSolveAlg, compute_step!, NLSolver,
70+
initial_η, NonlinearSolveAlg, compute_step!,
7671
nlsolve!, resize_jac_config!, anderson!, build_nlsolver,
7772
markfirststage!, anderson
7873
export NLNewton, NLAnderson, NLFunctional, NonlinearSolveAlg
@@ -152,7 +147,6 @@ using OrdinaryDiffEqSDIRK: ImplicitEuler, ImplicitMidpoint, Trapezoid, TRBDF2, S
152147
Kvaerno5, KenCarp4, KenCarp47, KenCarp5, KenCarp58, ESDIRK54I8L2SA, SFSDIRK4,
153148
SFSDIRK5, CFNLIRK3, SFSDIRK6, SFSDIRK7, SFSDIRK8,
154149
ESDIRK436L2SA2, ESDIRK437L2SA, ESDIRK547L2SA2, ESDIRK659L2SA
155-
import OrdinaryDiffEqSDIRK: ImplicitEulerConstantCache, ImplicitEulerCache
156150
export ImplicitEuler, ImplicitMidpoint, Trapezoid, TRBDF2, SDIRK2, SDIRK22,
157151
Kvaerno3, KenCarp3, Cash4, Hairer4, Hairer42, SSPSDIRK2, Kvaerno4,
158152
Kvaerno5, KenCarp4, KenCarp47, KenCarp5, KenCarp58, ESDIRK54I8L2SA, SFSDIRK4,
@@ -167,9 +161,8 @@ export ABDF2, QNDF1, QBDF1, QNDF2, QBDF2, QNDF, QBDF, FBDF,
167161
SBDF2, SBDF3, SBDF4, MEBDF2, IMEXEuler, IMEXEulerARK,
168162
DImplicitEuler, DABDF2, DFBDF
169163

170-
using OrdinaryDiffEqTsit5: Tsit5, AutoTsit5, Tsit5ConstantCache, Tsit5Cache
164+
using OrdinaryDiffEqTsit5: Tsit5, AutoTsit5
171165
export Tsit5, AutoTsit5
172-
import OrdinaryDiffEqTsit5: Tsit5ConstantCache, Tsit5Cache
173166

174167
using OrdinaryDiffEqRosenbrock: Rosenbrock23, Rosenbrock32, RosShamp4, Veldd4, Velds4, GRK4T, GRK4A,
175168
Ros4LStab, ROS3P, Rodas3, Rodas23W, Rodas3P, Rodas4, Rodas42, Rodas4P, Rodas4P2,
@@ -184,7 +177,6 @@ export Rosenbrock23, Rosenbrock32, RosShamp4, Veldd4, Velds4, GRK4T, GRK4A,
184177
RosenbrockW6S4OS, ROS34PW1a, ROS34PW1b, ROS34PW2, ROS34PW3, ROS34PRw, ROS3PRL,
185178
ROS3PRL2, ROK4a,
186179
ROS2, ROS2PR, ROS2S, ROS3, ROS3PR, Scholz4_7
187-
import OrdinaryDiffEqRosenbrock: RosenbrockMutableCache
188180

189181
using OrdinaryDiffEqDefault: DefaultODEAlgorithm
190182
export DefaultODEAlgorithm
@@ -201,14 +193,8 @@ export PDIRK44
201193
using OrdinaryDiffEqPRK: KuttaPRK2p5
202194
export KuttaPRK2p5
203195

204-
using OrdinaryDiffEqHighOrderRK: TanYam7, DP8, PFRK87, TsitPap8, DP8ConstantCache, DP8Cache
205196

206-
using OrdinaryDiffEqLowOrderRK: Euler, SplitEuler, Heun, Ralston, Midpoint, RK4,
207-
BS3, OwrenZen3, OwrenZen4, OwrenZen5, BS5,
208-
DP5, Anas5, RKO65, FRK65, RKM, MSRK5, MSRK6,
209-
PSRK4p7q6, PSRK3p5q4, PSRK3p6q5, Stepanov5, SIR54,
210-
Alshina2, Alshina3, Alshina6, AutoDP5,
211-
BS3Cache, BS3ConstantCache, RK4ConstantCache, RK4Cache
197+
using OrdinaryDiffEqLowOrderRK: AutoDP5
212198

213199
using OrdinaryDiffEqFunctionMap: FunctionMap
214200
export FunctionMap

0 commit comments

Comments
 (0)