Reexport

ChrisRackauckas · ChrisRackauckas · commit 5c234ad17a13 · 2022-04-25T08:28:45.000-04:00
diff --git a/lib/GalacticEvolutionary/Project.toml b/lib/GalacticEvolutionary/Project.toml
@@ -6,6 +6,7 @@ version = "0.1.0"
 [deps]
 Evolutionary = "86b6b26d-c046-49b6-aa0b-5f0f74682bd6"
 GalacticOptim = "a75be94c-b780-496d-a8a9-0878b188d577"
+Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 
 [compat]
 julia = "1"
diff --git a/lib/GalacticEvolutionary/src/GalacticEvolutionary.jl b/lib/GalacticEvolutionary/src/GalacticEvolutionary.jl
@@ -1,6 +1,7 @@
 module GalacticEvolutionary
 
-using Evolutionary, GalacticOptim, GalacticOptim.SciMLBase
+using Reexport, GalacticOptim, GalacticOptim.SciMLBase
+@reexport using Evolutionary
 
 decompose_trace(trace::Evolutionary.OptimizationTrace) = last(trace)
 decompose_trace(trace::Evolutionary.OptimizationTraceRecord) = trace
diff --git a/lib/GalacticFlux/Project.toml b/lib/GalacticFlux/Project.toml
@@ -8,6 +8,7 @@ Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
 GalacticOptim = "a75be94c-b780-496d-a8a9-0878b188d577"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 ProgressLogging = "33c8b6b6-d38a-422a-b730-caa89a2f386c"
+Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 
 [compat]
 julia = "1"
diff --git a/lib/GalacticFlux/src/GalacticFlux.jl b/lib/GalacticFlux/src/GalacticFlux.jl
@@ -1,6 +1,7 @@
 module GalacticFlux
 
-using GalacticOptim, Flux, Printf, ProgressLogging, GalacticOptim.SciMLBase
+using GalacticOptim, Reexport, Printf, ProgressLogging, GalacticOptim.SciMLBase
+@reexport using Flux
 
 function SciMLBase.__solve(prob::OptimizationProblem, opt::Flux.Optimise.AbstractOptimiser, data = GalacticOptim.DEFAULT_DATA;
     maxiters::Number = 0, cb = (args...) -> (false),
diff --git a/lib/GalacticMetaheuristics/Project.toml b/lib/GalacticMetaheuristics/Project.toml
@@ -6,6 +6,7 @@ version = "0.1.0"
 [deps]
 GalacticOptim = "a75be94c-b780-496d-a8a9-0878b188d577"
 Metaheuristics = "bcdb8e00-2c21-11e9-3065-2b553b22f898"
+Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 
 [compat]
 julia = "1"
diff --git a/lib/GalacticMetaheuristics/src/GalacticMetaheuristics.jl b/lib/GalacticMetaheuristics/src/GalacticMetaheuristics.jl
@@ -1,6 +1,7 @@
 module GalacticMetaheuristics
 
-using Metaheuristics, GalacticOptim, GalacticOptim.SciMLBase
+using Reexport, GalacticOptim, GalacticOptim.SciMLBase
+@reexport using Metaheuristics
 
 function initial_population!(opt, prob, bounds, f)
     opt_init = deepcopy(opt)
diff --git a/lib/GalacticNLopt/Project.toml b/lib/GalacticNLopt/Project.toml
@@ -6,6 +6,7 @@ version = "0.1.0"
 [deps]
 GalacticOptim = "a75be94c-b780-496d-a8a9-0878b188d577"
 NLopt = "76087f3c-5699-56af-9a33-bf431cd00edd"
+Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 
 [compat]
 julia = "1"
diff --git a/lib/GalacticNLopt/src/GalacticNLopt.jl b/lib/GalacticNLopt/src/GalacticNLopt.jl
@@ -1,6 +1,7 @@
 module GalacticNLopt
 
-using NLopt, GalacticOptim, GalacticOptim.SciMLBase
+using Reexport, GalacticOptim, GalacticOptim.SciMLBase
+@reexport using NLopt
 
 (f::NLopt.Algorithm)() = f
 
diff --git a/lib/GalacticOptimJL/Project.toml b/lib/GalacticOptimJL/Project.toml
@@ -6,6 +6,7 @@ version = "0.1.0"
 [deps]
 GalacticOptim = "a75be94c-b780-496d-a8a9-0878b188d577"
 Optim = "429524aa-4258-5aef-a3af-852621145aeb"
+Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 
 [compat]
 julia = "1"
diff --git a/lib/GalacticOptimJL/src/GalacticOptimJL.jl b/lib/GalacticOptimJL/src/GalacticOptimJL.jl
@@ -1,7 +1,7 @@
 module GalacticOptimJL
 
-using Optim, GalacticOptim, GalacticOptim.SciMLBase
-
+using Reexport, GalacticOptim, GalacticOptim.SciMLBase
+@reexport using Optim
 decompose_trace(trace::Optim.OptimizationTrace) = last(trace)
 decompose_trace(trace::Optim.OptimizationState) = trace
 
diff --git a/test/ADtests.jl b/test/ADtests.jl
@@ -1,4 +1,4 @@
-using GalacticOptim, Optim, Test, Flux
+using GalacticOptim, GalacticOptimJL, GalacticFluxJL, Test
 using ForwardDiff, Zygote, ReverseDiff, FiniteDiff, Tracker
 
 x0 = zeros(2)
diff --git a/test/diffeqfluxtests.jl b/test/diffeqfluxtests.jl
@@ -1,4 +1,4 @@
-using OrdinaryDiffEq, DiffEqFlux, GalacticOptim, Optim, Flux, ForwardDiff
+using OrdinaryDiffEq, DiffEqFlux, GalacticOptim, GalacticOptimJL, GalacticFlux, ForwardDiff
 
 function lotka_volterra!(du, u, p, t)
   x, y = u
diff --git a/test/minibatch.jl b/test/minibatch.jl
@@ -1,4 +1,4 @@
-using DiffEqFlux, GalacticOptim, OrdinaryDiffEq, Flux
+using DiffEqFlux, GalacticOptim, OrdinaryDiffEq, GalacticFlux
 
 function newtons_cooling(du, u, p, t)
     temp = u[1]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using GalacticOptim, Optim, Test, Flux`
	`1`	`+using GalacticOptim, GalacticOptimJL, GalacticFluxJL, Test`
`2`	`2`	`using ForwardDiff, Zygote, ReverseDiff, FiniteDiff, Tracker`
`3`	`3`
`4`	`4`	`x0 = zeros(2)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using OrdinaryDiffEq, DiffEqFlux, GalacticOptim, Optim, Flux, ForwardDiff`
	`1`	`+using OrdinaryDiffEq, DiffEqFlux, GalacticOptim, GalacticOptimJL, GalacticFlux, ForwardDiff`
`2`	`2`
`3`	`3`	`function lotka_volterra!(du, u, p, t)`
`4`	`4`	`x, y = u`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using DiffEqFlux, GalacticOptim, OrdinaryDiffEq, Flux`
	`1`	`+using DiffEqFlux, GalacticOptim, OrdinaryDiffEq, GalacticFlux`
`2`	`2`
`3`	`3`	`function newtons_cooling(du, u, p, t)`
`4`	`4`	`temp = u[1]`