Merge pull request #226 from SciML/subpckgs

Further testing clean up to get CI green

Author: Vaibhavdixit02

.github/workflows/CI.yml

@@ -25,7 +25,6 @@ jobs:
           - GalacticMultistartOptimization
           - GalacticNLopt
           - GalacticNOMAD
-          - GalacticNonconvex
           - GalacticOptimJL
           - GalacticQuadDIRECT
           - GalacticSpeedMapping
@@ -54,4 +53,4 @@ jobs:
       - uses: julia-actions/julia-processcoverage@v1
       - uses: codecov/codecov-action@v1
         with:
-          file: lcov.info
+          file: lcov.info

lib/GalacticBBO/test/runtests.jl

@@ -1,4 +1,4 @@
-using GalacticBBO, GalacticOptim, Zygote
+using GalacticBBO, GalacticOptim
 using Test
 
 @testset "GalacticBBO.jl" begin
@@ -7,7 +7,7 @@ using Test
     _p = [1.0, 100.0]
     l1 = rosenbrock(x0, _p)
 
-    optprob = OptimizationFunction(rosenbrock, GalacticOptim.AutoZygote())
+    optprob = OptimizationFunction(rosenbrock)
     prob = GalacticOptim.OptimizationProblem(optprob, x0, _p, lb=[-1.0, -1.0], ub=[0.8, 0.8])
     sol = solve(prob, BBO_adaptive_de_rand_1_bin_radiuslimited())
     @test 10 * sol.minimum < l1

lib/GalacticCMAEvolutionStrategy/test/runtests.jl

@@ -1,12 +1,12 @@
-using GalacticCMAEvolutionStrategy, GalacticOptim, ForwardDiff
+using GalacticCMAEvolutionStrategy, GalacticOptim
 using Test
 
 @testset "GalacticCMAEvolutionStrategy.jl" begin
     rosenbrock(x, p) = (p[1] - x[1])^2 + p[2] * (x[2] - x[1]^2)^2
     x0 = zeros(2)
     _p = [1.0, 100.0]
     l1 = rosenbrock(x0, _p)
-    f = OptimizationFunction(rosenbrock, GalacticOptim.AutoForwardDiff())
+    f = OptimizationFunction(rosenbrock)
     prob = OptimizationProblem(f, x0, _p, lb=[-1.0, -1.0], ub=[0.8, 0.8])
     sol = solve(prob, CMAEvolutionStrategyOpt())
     @test 10 * sol.minimum < l1

lib/GalacticEvolutionary/test/runtests.jl

@@ -1,12 +1,12 @@
-using GalacticEvolutionary, Zygote, GalacticOptim
+using GalacticEvolutionary, GalacticOptim
 using Test
 
 @testset "GalacticEvolutionary.jl" begin
     rosenbrock(x, p) = (p[1] - x[1])^2 + p[2] * (x[2] - x[1]^2)^2
     x0 = zeros(2)
     _p = [1.0, 100.0]
     l1 = rosenbrock(x0, _p)
-    optprob = OptimizationFunction(rosenbrock, GalacticOptim.AutoZygote())
+    optprob = OptimizationFunction(rosenbrock)
     prob = GalacticOptim.OptimizationProblem(optprob, x0, _p)
     sol = solve(prob, CMAES(μ=40, λ=100), abstol=1e-15)
     @test 10 * sol.minimum < l1

lib/GalacticFlux/Project.toml

@@ -14,7 +14,8 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 julia = "1"
 
 [extras]
+ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test"]
+test = ["ForwardDiff","Test"]

lib/GalacticFlux/test/runtests.jl

@@ -1,4 +1,4 @@
-using GalacticFlux, GalacticOptim
+using GalacticFlux, GalacticOptim, ForwardDiff
 using Test
 
 @testset "GalacticFlux.jl" begin

lib/GalacticGCMAES/Project.toml

@@ -11,7 +11,8 @@ GalacticOptim = "a75be94c-b780-496d-a8a9-0878b188d577"
 julia = "1"
 
 [extras]
+ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test"]
+test = ["ForwardDiff", "Test"]

lib/GalacticMOI/Project.toml

@@ -6,14 +6,15 @@ version = "0.1.0"
 [deps]
 GalacticOptim = "a75be94c-b780-496d-a8a9-0878b188d577"
 MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
-NLopt = "76087f3c-5699-56af-9a33-bf431cd00edd"
 
 [compat]
 julia = "1"
 
 [extras]
 Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
+NLopt = "76087f3c-5699-56af-9a33-bf431cd00edd"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
 [targets]
-test = ["Test"]
+test = ["Ipopt", "NLopt", "Test", "Zygote"]

lib/GalacticMetaheuristics/test/runtests.jl

@@ -1,12 +1,12 @@
-using GalacticMetaheuristics, GalacticOptim, Zygote
+using GalacticMetaheuristics, GalacticOptim
 using Test
 
 @testset "GalacticMetaheuristics.jl" begin
     rosenbrock(x, p) = (p[1] - x[1])^2 + p[2] * (x[2] - x[1]^2)^2
     x0 = zeros(2)
     _p = [1.0, 100.0]
     l1 = rosenbrock(x0, _p)
-    optprob = OptimizationFunction(rosenbrock, GalacticOptim.AutoZygote())
+    optprob = OptimizationFunction(rosenbrock)
     prob = GalacticOptim.OptimizationProblem(optprob, x0, _p, lb=[-1.0, -1.0], ub=[1.5, 1.5])
     sol = solve(prob, ECA())
     @test 10 * sol.minimum < l1

lib/GalacticMultistartOptimization/Project.toml

@@ -11,8 +11,9 @@ MultistartOptimization = "3933049c-43be-478e-a8bb-6e0f7fd53575"
 julia = "1"
 
 [extras]
-NLopt = "76087f3c-5699-56af-9a33-bf431cd00edd"
+ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
+Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test"]
+test = ["ForwardDiff", "Pkg", "Test"]

lib/GalacticMultistartOptimization/test/runtests.jl

@@ -1,4 +1,5 @@
-using GalacticMultistartOptimization, GalacticOptim, ForwardDiff
+using Pkg; Pkg.develop(path=joinpath(@__DIR__,"../../","GalacticNLopt"));
+using GalacticMultistartOptimization, GalacticOptim, ForwardDiff, GalacticNLopt
 using Test
 
 @testset "GalacticMultistartOptimization.jl" begin
@@ -8,6 +9,6 @@ using Test
     l1 = rosenbrock(x0, _p)
     f = OptimizationFunction(rosenbrock, GalacticOptim.AutoForwardDiff())
     prob = GalacticOptim.OptimizationProblem(f, x0, _p, lb=[-1.0, -1.0], ub=[1.5, 1.5])
-    sol = solve(prob, MultistartOptimization.TikTak(100), NLopt.LD_LBFGS())
+    sol = solve(prob, GalacticMultistartOptimization.TikTak(100), GalacticNLopt.Opt(:LD_LBFGS, 2))
     @test 10 * sol.minimum < l1
 end

lib/GalacticNLopt/Project.toml

@@ -13,6 +13,7 @@ julia = "1"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
 [targets]
-test = ["Test"]
+test = ["Test", "Zygote"]

lib/GalacticNonconvex/Project.toml

@@ -11,17 +11,19 @@ NonconvexBayesian = "fb352abc-de7b-48de-9ebd-665b54b5d9b3"
 NonconvexIpopt = "bf347577-a06d-49ad-a669-8c0e005493b8"
 NonconvexJuniper = "611adb69-ebe7-45d0-83f5-90aabba2c123"
 NonconvexMMA = "d3d89cbb-4ecd-4604-818d-8d1ff343e4da"
-NonconvexMultistart = "11b12826-7e46-4acf-9706-be0a67f2add7"
 NonconvexNLopt = "b43a31b8-ff9b-442d-8e31-c163daa8ab75"
 NonconvexPavito = "75d5b151-dcdf-4236-8ef5-9c4e63ef33e2"
 NonconvexPercival = "4296f080-e499-44ba-a02c-ae40015c44d5"
 NonconvexSearch = "75732972-a7cd-4375-b200-958e0814350d"
 
 [compat]
 julia = "1"
+NonconvexIpopt = "0.1.4"
 
 [extras]
+Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
 [targets]
-test = ["Test"]
+test = ["Pkg", "Test", "Zygote"]

lib/GalacticNonconvex/src/GalacticNonconvex.jl

@@ -8,7 +8,7 @@ include("nonconvex_juniper.jl")
 include("nonconvex_ipopt.jl")
 include("nonconvex_nlopt.jl")
 include("nonconvex_mma.jl")
-include("nonconvex_multistart.jl")
+# include("nonconvex_multistart.jl")
 include("nonconvex_percival.jl")
 include("nonconvex_search.jl")
 

lib/GalacticNonconvex/src/nonconvex_bayesian.jl

@@ -50,5 +50,3 @@ function _create_options(opt::NonconvexBayesian.BayesOptAlg;
 end
 
 check_optimizer_backend(opt::NonconvexBayesian.BayesOptAlg) = false
-
-include("nonconvex.jl")

lib/GalacticNonconvex/src/nonconvex_ipopt.jl

@@ -52,5 +52,3 @@ function _create_options(opt::NonconvexIpopt.IpoptAlg;
 end
 
 check_optimizer_backend(opt::NonconvexIpopt.IpoptAlg) = false
-
-include("nonconvex.jl")

lib/GalacticNonconvex/src/nonconvex_juniper.jl

@@ -45,5 +45,3 @@ function _create_options(opt::NonconvexJuniper.JuniperIpoptAlg;
 end
 
 check_optimizer_backend(opt::NonconvexJuniper.JuniperIpoptAlg) = false
-
-include("nonconvex.jl")

lib/GalacticNonconvex/src/nonconvex_mma.jl

@@ -62,5 +62,3 @@ function _create_options(opt::Union{NonconvexMMA.MMA02, NonconvexMMA.MMA87};
 end
 
 check_optimizer_backend(opt::Union{NonconvexMMA.MMA02, NonconvexMMA.MMA87}) = false
-
-include("nonconvex.jl")

lib/GalacticNonconvex/src/nonconvex_multistart.jl

@@ -59,5 +59,3 @@ function _create_options(opt::NonconvexMultistart.HyperoptAlg;
 end
 
 check_optimizer_backend(opt::NonconvexMultistart.HyperoptAlg) = false
-
-include("nonconvex.jl")

lib/GalacticNonconvex/src/nonconvex_nlopt.jl

@@ -50,5 +50,3 @@ function _create_options(opt::NonconvexNLopt.NLoptAlg;
 end
 
 check_optimizer_backend(opt::NonconvexNLopt.NLoptAlg) = false
-
-include("nonconvex.jl")

lib/GalacticNonconvex/src/nonconvex_pavito.jl

@@ -45,5 +45,3 @@ function _create_options(opt::NonconvexPavito.PavitoIpoptCbcAlg;
 end
 
 check_optimizer_backend(opt::NonconvexPavito.PavitoIpoptCbcAlg) = false
-
-include("nonconvex.jl")

lib/GalacticNonconvex/src/nonconvex_percival.jl

@@ -51,5 +51,3 @@ function _create_options(opt::NonconvexPercival.AugLag;
 end
 
 check_optimizer_backend(opt::NonconvexPercival.AugLag) = false
-
-include("nonconvex.jl")

lib/GalacticNonconvex/src/nonconvex_search.jl

@@ -50,5 +50,3 @@ function _create_options(opt::Union{NonconvexSearch.MTSAlg, NonconvexSearch.LS1A
 end
 
 check_optimizer_backend(opt::Union{NonconvexSearch.MTSAlg, NonconvexSearch.LS1Alg}) = true
-
-include("nonconvex.jl")

lib/GalacticNonconvex/test/runtests.jl

@@ -1,4 +1,4 @@
-using GalacticNonconvex, GalacticOptim, Zygote
+using GalacticNonconvex, GalacticOptim, Zygote, Pkg
 using Test
 
 @testset "GalacticNonconvex.jl" begin

lib/GalacticOptimJL/Project.toml

@@ -13,8 +13,9 @@ julia = "1"
 
 [extras]
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
+Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
 [targets]
-test = ["Test"]
+test = ["ForwardDiff", "Random", "Test", "Zygote"]

lib/GalacticQuadDIRECT/Project.toml

@@ -5,13 +5,13 @@ version = "0.1.0"
 
 [deps]
 GalacticOptim = "a75be94c-b780-496d-a8a9-0878b188d577"
-QuadDIRECT = "dae52e8d-d666-5120-a592-9e15c33b8d7a"
 
 [compat]
 julia = "1"
 
 [extras]
+Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test"]
+test = ["Pkg", "Test"]

lib/GalacticQuadDIRECT/test/runtests.jl

@@ -1,3 +1,4 @@
+using Pkg; Pkg.develop(url="https://github.com/timholy/QuadDIRECT.jl.git");
 using GalacticQuadDIRECT, GalacticOptim
 using Test
 

lib/GalacticSpeedMapping/Project.toml

@@ -15,4 +15,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
 
 [targets]
-test = ["Test"]
+test = ["ForwardDiff", "Test"]

test/runtests.jl

@@ -18,17 +18,25 @@ end
 if GROUP == "All" || GROUP == "Core"
     dev_subpkg("GalacticOptimJL")
     dev_subpkg("GalacticFlux")
-    @safetestset "AD Tests" begin include("ADtests.jl") end
-    @safetestset "Mini batching" begin include("minibatch.jl") end
-    @safetestset "DiffEqFlux" begin include("diffeqfluxtests.jl") end
+    @safetestset "AD Tests" begin
+        include("ADtests.jl")
+    end
+    @safetestset "Mini batching" begin
+        include("minibatch.jl")
+    end
+    @safetestset "DiffEqFlux" begin
+        include("diffeqfluxtests.jl")
+    end
 elseif GROUP == "GPU"
     dev_subpkg("GalacticOptimJL")
     dev_subpkg("GalacticFlux")
     activate_downstream_env()
-    @safetestset "DiffEqFlux GPU" begin include("downstream/gpu_neural_ode.jl") end
+    @safetestset "DiffEqFlux GPU" begin
+        include("downstream/gpu_neural_ode.jl")
+    end
 else
+    dev_subpkg(GROUP)
     subpkg_path = joinpath(dirname(@__DIR__), "lib", GROUP)
-    Pkg.develop(PackageSpec(path=subpkg_path))
-    include(joinpath(subpkg_path,"test","runtests.jl"))
+    Pkg.test(PackageSpec(name=GROUP, path=subpkg_path))
 end
 end