Skip to content

Commit 7a78df3

Browse files
Remove BoundaryValueDiffEqMIRK blanket reexports
Co-Authored-By: Chris Rackauckas <accounts@chrisrackauckas.com>
1 parent 219b502 commit 7a78df3

10 files changed

Lines changed: 31 additions & 30 deletions

lib/BoundaryValueDiffEqMIRK/Project.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ PreallocationTools = "d236fae5-4411-538c-8e31-a6e3d9e00b46"
1818
PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
1919
Preferences = "21216c6a-2e73-6563-6e65-726566657250"
2020
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
21-
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
2221
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
2322
SciMLStructures = "53ae85a6-f571-4167-b2af-e1d143709226"
2423
Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
@@ -37,14 +36,14 @@ FastClosures = "0.3.2"
3736
ForwardDiff = "0.10.38, 1"
3837
LinearAlgebra = "1.10"
3938
LinearSolve = "2.36.2, 3, 4.2"
39+
NonlinearSolveFirstOrder = "2"
4040
OptimizationIpopt = "1.2.2"
4141
OrdinaryDiffEqRosenbrock = "1, 2"
4242
PreallocationTools = "1.2"
4343
PrecompileTools = "1.2"
4444
Preferences = "1.4"
4545
Random = "1.10"
4646
RecursiveArrayTools = "3.27.0, 4"
47-
Reexport = "1.2"
4847
SafeTestsets = "0.1.0"
4948
SciMLBase = "3.30"
5049
SciMLStructures = "1.7.0"
@@ -58,6 +57,7 @@ julia = "1.10"
5857
[extras]
5958
DiffEqDevTools = "f3b72e0c-5b89-59e1-b016-84e28bfd966d"
6059
LinearSolve = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
60+
NonlinearSolveFirstOrder = "5959db7a-ea39-4486-b5fe-2dd0bf03d60d"
6161
OptimizationIpopt = "43fad042-7963-4b32-ab19-e2a4f9a67124"
6262
OrdinaryDiffEqRosenbrock = "43230ef6-c299-4910-a778-202eb28ce4ce"
6363
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
@@ -68,4 +68,4 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
6868
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
6969

7070
[targets]
71-
test = ["DiffEqDevTools", "LinearSolve", "OptimizationIpopt", "OrdinaryDiffEqRosenbrock", "Random", "RecursiveArrayTools", "SafeTestsets", "SciMLTesting", "StaticArrays", "Test"]
71+
test = ["DiffEqDevTools", "LinearSolve", "NonlinearSolveFirstOrder", "OptimizationIpopt", "OrdinaryDiffEqRosenbrock", "Random", "RecursiveArrayTools", "SafeTestsets", "SciMLTesting", "StaticArrays", "Test"]

lib/BoundaryValueDiffEqMIRK/src/BoundaryValueDiffEqMIRK.jl

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ using BoundaryValueDiffEqCore: BoundaryValueDiffEqCore,
77
AbstractBoundaryValueDiffEqAlgorithm,
88
AbstractBoundaryValueDiffEqCache, BVPJacobianAlgorithm,
99
DEFAULT_VERBOSE, GaussNewton, LevenbergMarquardt, REErrorControl,
10-
_process_verbose_param, integral,
10+
_process_verbose_param,
1111
recursive_flatten!, recursive_unflatten!,
1212
__concrete_solve_algorithm, diff!, EvalSol,
1313
concrete_jacobian_algorithm, eval_bc_residual,
@@ -41,7 +41,6 @@ using SciMLBase: SciMLBase, AbstractDiffEqInterpolation, BVPFunction, BVProblem,
4141
NonlinearProblem, ReturnCode, StandardBVProblem, TwoPointBVProblem,
4242
__solve, isinplace, remake, solve
4343
using Setfield: @set!
44-
using Reexport: @reexport
4544
using PreallocationTools: PreallocationTools, get_tmp, LazyBufferCache
4645
using PrecompileTools: @compile_workload, @setup_workload
4746
using Preferences: Preferences
@@ -50,8 +49,6 @@ using SciMLStructures: SciMLStructures
5049

5150
const DI = DifferentiationInterface
5251

53-
@reexport using ADTypes, BoundaryValueDiffEqCore, SciMLBase
54-
5552
include("types.jl")
5653
include("algorithms.jl")
5754
include("mirk.jl")
@@ -180,7 +177,6 @@ include("sparse_jacobians.jl")
180177
end
181178

182179
export MIRK2, MIRK3, MIRK4, MIRK5, MIRK6, MIRK6I
183-
export BVPJacobianAlgorithm
184-
export maxsol, minsol, integral
180+
export maxsol, minsol
185181

186182
end

lib/BoundaryValueDiffEqMIRK/test/AD/ad_tests.jl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
using BoundaryValueDiffEqMIRK
2+
using ADTypes: AutoEnzyme, AutoForwardDiff, AutoMooncake, AutoSparse
3+
using BoundaryValueDiffEqCore: BVPJacobianAlgorithm
4+
import SciMLBase
5+
using SciMLBase: BVProblem, ODEFunction, TwoPointBVProblem, solve
26
using Test
37

48
@testset "Different AD compatibility" begin
5-
using BoundaryValueDiffEqMIRK
69
using ForwardDiff, Enzyme, Mooncake
710

811
@testset "Test different AD on multipoint BVP" begin

lib/BoundaryValueDiffEqMIRK/test/Core/dynamic_optimization_tests.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
using BoundaryValueDiffEqMIRK
2+
import SciMLBase
3+
using SciMLBase: BVPFunction, BVProblem, TwoPointBVProblem, solve
24
using Test
35

46
@testset "Rocket launching problem" begin
5-
using BoundaryValueDiffEqMIRK, OptimizationIpopt
7+
using OptimizationIpopt
68
h_0 = 1 # Initial height
79
v_0 = 0 # Initial velocity
810
m_0 = 1.0 # Initial mass

lib/BoundaryValueDiffEqMIRK/test/Core/ensemble_tests.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
using BoundaryValueDiffEqMIRK
2+
using ADTypes: AutoFiniteDiff, AutoSparse
3+
using BoundaryValueDiffEqCore: BVPJacobianAlgorithm
4+
using SciMLBase: BVProblem, EnsembleProblem, remake, solve
25
using Test
36

47
@testset "EnsembleProblem" begin
5-
using BoundaryValueDiffEqMIRK
68
using Random
79

810
function ode!(du, u, p, t)

lib/BoundaryValueDiffEqMIRK/test/Core/mirk_basic_tests.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
using BoundaryValueDiffEqMIRK
2+
using ADTypes: AutoFiniteDiff, AutoSparse
3+
using BoundaryValueDiffEqCore: BVPJacobianAlgorithm, DefectControl, GlobalErrorControl,
4+
HybridErrorControl, SequentialErrorControl
5+
using RecursiveArrayTools: DiffEqArray, VectorOfArray
6+
import SciMLBase
7+
using SciMLBase: BVProblem, ODEFunction, TwoPointBVProblem, init, remake, solve
28
using Test
39

4-
using BoundaryValueDiffEqMIRK
5-
610
for order in (2, 3, 4, 5, 6)
711
s = Symbol("MIRK$(order)")
812
@eval mirk_solver(::Val{$order}, args...; kwargs...) = $(s)(args...; kwargs...)
@@ -758,8 +762,6 @@ end
758762
# explicit strip the entire solution type gets embedded in the cache type and
759763
# every downstream method recompiles against it (~20x compile-time blowup).
760764
@testset "Initial-guess object does not leak into cache type (issue 500)" begin
761-
using SciMLBase, RecursiveArrayTools
762-
763765
tspan = (0.0, 1.0)
764766
function f!(du, u, p, t)
765767
du[1] = -u[2] / p[1]
@@ -800,8 +802,6 @@ end
800802
# `ForwardDiff.Dual`s that must not be written into the `Float64` `EvalSol` buffer. This
801803
# reproduces the geodesic BVP on an embedded torus from Manifolds.jl (`solve_chart_log_bvp`).
802804
@testset "Solution-object BC survives Dual residual (issue 566)" begin
803-
using SciMLBase
804-
805805
R, r = 3.0, 2.0
806806
function affine_connection(a, Xc, Yc)
807807
θ = a[1]

lib/BoundaryValueDiffEqMIRK/test/Core/nlls_tests.jl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
using BoundaryValueDiffEqMIRK
2+
using NonlinearSolveFirstOrder: GaussNewton, LevenbergMarquardt, TrustRegion
3+
import SciMLBase
4+
using SciMLBase: BVPFunction, BVProblem, TwoPointBVProblem, solve
25
using Test
36

47
@testset "Overconstrained BVP" begin
5-
using BoundaryValueDiffEqMIRK, LinearAlgebra
8+
using LinearAlgebra
69

710
SOLVERS = [
811
mirk(; nlsolve)
@@ -99,7 +102,7 @@ end
99102
# This is not a very meaningful problem, but it tests that our solvers are not throwing an
100103
# error
101104
@testset "Underconstrained BVP: Rod BVP" begin
102-
using LinearAlgebra, BoundaryValueDiffEqMIRK
105+
using LinearAlgebra
103106

104107
# Force normal form for GN
105108
SOLVERS = [

lib/BoundaryValueDiffEqMIRK/test/Core/singular_bvp_tests.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
using BoundaryValueDiffEqMIRK
2+
import SciMLBase
3+
using SciMLBase: TwoPointBVProblem, solve
24
using Test
35

46
@testset "Singular BVP" begin
5-
using BoundaryValueDiffEqMIRK
67
using LinearAlgebra
78

89
for order in (2, 3, 4, 5, 6)

lib/BoundaryValueDiffEqMIRK/test/Core/vectorofvector_initials_tests.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
using BoundaryValueDiffEqMIRK
2+
import SciMLBase
3+
using SciMLBase: BVProblem, ODEProblem, solve
24
using Test
35

46
@testset "VectorOfVector Initial Condition" begin
5-
using BoundaryValueDiffEqMIRK, OrdinaryDiffEqRosenbrock
7+
using OrdinaryDiffEqRosenbrock
68
#System Constants
79
ss = 1 #excitatory parameter
810
sj = 0 #inhibitory parameter

lib/BoundaryValueDiffEqMIRK/test/qa/qa.jl

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ using SciMLTesting
22
using BoundaryValueDiffEqMIRK
33
using Test
44

5-
const DOCS_SRC = normpath(joinpath(@__DIR__, "..", "..", "..", "..", "docs", "src"))
6-
include(joinpath(@__DIR__, "..", "..", "..", "..", "test", "qa", "reexports.jl"))
7-
85
run_qa(
96
BoundaryValueDiffEqMIRK;
107
ei_kwargs = (;
@@ -20,9 +17,4 @@ run_qa(
2017
ignore = (:Tunable, :canonicalize, :isscimlstructure),
2118
),
2219
),
23-
reexports_allow = MIRK_REEXPORTS,
24-
api_docs_kwargs = (;
25-
docs_src = DOCS_SRC, ignore = MIRK_REEXPORTS,
26-
rendered_ignore = MIRK_REEXPORTS,
27-
),
2820
)

0 commit comments

Comments
 (0)