Skip to content

Commit 846e6c1

Browse files
Merge pull request #1080 from SebastianM-C/optbase
Use the current OptimizationBase instead of the release
2 parents f880035 + 8c199c0 commit 846e6c1

File tree

27 files changed

+120
-18
lines changed

27 files changed

+120
-18
lines changed

.github/workflows/CI.yml

Lines changed: 51 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ jobs:
7474
using Pkg
7575
const GROUP = get(ENV, "GROUP", "Core")
7676
77-
function dev_subpkg(subpkg)
78-
subpkg_path = "lib/$subpkg"
79-
Pkg.develop(PackageSpec(path = subpkg_path))
77+
function dev_subpkg(subpkgs::Vector{String})
78+
specs = [PackageSpec(path = "lib/$subpkg") for subpkg in subpkgs]
79+
Pkg.develop(specs)
8080
end
8181
8282
if GROUP == "Core"
@@ -90,25 +90,59 @@ jobs:
9090
@info "Preparing env"
9191
if GROUP == "Core"
9292
@info "Testing Core"
93-
dev_subpkg("OptimizationBase")
94-
dev_subpkg("OptimizationLBFGSB")
95-
dev_subpkg("OptimizationMOI")
96-
dev_subpkg("OptimizationOptimJL")
97-
dev_subpkg("OptimizationOptimisers")
93+
dev_subpkg(["OptimizationBase", "OptimizationLBFGSB", "OptimizationMOI", "OptimizationOptimJL", "OptimizationOptimisers"])
9894
elseif GROUP == "OptimizationBase"
99-
dev_subpkg("OptimizationLBFGSB")
100-
dev_subpkg("OptimizationManopt")
95+
dev_subpkg(["OptimizationLBFGSB", "OptimizationManopt"])
10196
elseif GROUP == "OptimizationAuglag"
102-
dev_subpkg("OptimizationOptimisers")
97+
dev_subpkg(["OptimizationBase", "OptimizationOptimisers"])
98+
elseif GROUP == "OptimizationBBO"
99+
dev_subpkg(["OptimizationBase"])
100+
elseif GROUP == "OptimizationCMAEvolutionStrategy"
101+
dev_subpkg(["OptimizationBase"])
102+
elseif GROUP == "OptimizationEvolutionary"
103+
dev_subpkg(["OptimizationBase"])
104+
elseif GROUP == "OptimizationGCMAES"
105+
dev_subpkg(["OptimizationBase"])
106+
elseif GROUP == "OptimizationLBFGSB"
107+
dev_subpkg(["OptimizationBase"])
108+
elseif GROUP == "OptimizationIpopt"
109+
dev_subpkg(["OptimizationBase"])
110+
elseif GROUP == "OptimizationMadNLP"
111+
dev_subpkg(["OptimizationBase"])
112+
elseif GROUP == "OptimizationManopt"
113+
dev_subpkg(["OptimizationBase"])
114+
elseif GROUP == "OptimizationMetaheuristics"
115+
dev_subpkg(["OptimizationBase"])
116+
elseif GROUP == "OptimizationMOI"
117+
dev_subpkg(["OptimizationBase"])
103118
elseif GROUP == "OptimizationMultistartOptimization"
104-
dev_subpkg("OptimizationNLopt")
119+
dev_subpkg(["OptimizationBase", "OptimizationNLopt"])
120+
elseif GROUP == "OptimizationNLopt"
121+
dev_subpkg(["OptimizationBase"])
122+
elseif GROUP == "OptimizationNOMAD"
123+
dev_subpkg(["OptimizationBase"])
124+
elseif GROUP == "OptimizationODE"
125+
dev_subpkg(["OptimizationBase"])
126+
elseif GROUP == "OptimizationOptimJL"
127+
dev_subpkg(["OptimizationBase"])
128+
elseif GROUP == "OptimizationOptimisers"
129+
dev_subpkg(["OptimizationBase"])
130+
elseif GROUP == "OptimizationPRIMA"
131+
dev_subpkg(["OptimizationBase"])
132+
elseif GROUP == "OptimizationPyCMA"
133+
dev_subpkg(["OptimizationBase"])
134+
elseif GROUP == "OptimizationQuadDIRECT"
135+
dev_subpkg(["OptimizationBase"])
136+
elseif GROUP == "OptimizationSciPy"
137+
dev_subpkg(["OptimizationBase"])
138+
elseif GROUP == "OptimizationSophia"
139+
dev_subpkg(["OptimizationBase"])
140+
elseif GROUP == "OptimizationSpeedMapping"
141+
dev_subpkg(["OptimizationBase"])
105142
elseif GROUP == "GPU" || GROUP == "OptimizationPolyalgorithms"
106-
# special case
107-
Pkg.develop([PackageSpec(path = "lib/OptimizationOptimJL"), PackageSpec(path = "lib/OptimizationOptimisers")])
143+
dev_subpkg(["OptimizationBase", "OptimizationOptimJL", "OptimizationOptimisers"])
108144
elseif GROUP == "OptimizationNLPModels"
109-
dev_subpkg("OptimizationMOI")
110-
dev_subpkg("OptimizationOptimJL")
111-
dev_subpkg("OptimizationLBFGSB")
145+
dev_subpkg(["OptimizationBase", "OptimizationMOI", "OptimizationOptimJL", "OptimizationLBFGSB"])
112146
end
113147
end
114148

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.DS_Store
22
Manifest.toml
3+
Manifest-v*.toml
34
/dev/
45
/docs/build/
5-
.vscode
6+
.vscode

lib/OptimizationAuglag/Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ OptimizationOptimisers = "42dfb2eb-d2b4-4451-abcd-913932933ac1"
1515
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1616

1717
[sources]
18+
OptimizationBase = {path = "../OptimizationBase"}
1819
OptimizationOptimisers = {path = "../OptimizationOptimisers"}
1920

2021
[compat]

lib/OptimizationBBO/Project.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
1111
[extras]
1212
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1313

14+
[sources]
15+
OptimizationBase = {path = "../OptimizationBase"}
16+
1417
[compat]
1518
julia = "1.10"
1619
BlackBoxOptim = "0.6"

lib/OptimizationCMAEvolutionStrategy/Project.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
1111
[extras]
1212
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1313

14+
[sources]
15+
OptimizationBase = {path = "../OptimizationBase"}
16+
1417
[compat]
1518
CMAEvolutionStrategy = "0.2"
1619
julia = "1.10"

lib/OptimizationEvolutionary/Project.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
1212
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1313
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
1414

15+
[sources]
16+
OptimizationBase = {path = "../OptimizationBase"}
17+
1518
[compat]
1619
julia = "1.10"
1720
OptimizationBase = "4"

lib/OptimizationGCMAES/Project.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ GCMAES = "4aa9d100-eb0f-11e8-15f1-25748831eb3b"
1212
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
1313
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1414

15+
[sources]
16+
OptimizationBase = {path = "../OptimizationBase"}
17+
1518
[compat]
1619
julia = "1.10"
1720
OptimizationBase = "4"

lib/OptimizationIpopt/Project.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ SymbolicIndexingInterface = "0.3.40"
2121
Zygote = "0.7"
2222
julia = "1.10"
2323

24+
[sources]
25+
OptimizationBase = {path = "../OptimizationBase"}
26+
2427
[extras]
2528
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
2629
ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"

lib/OptimizationLBFGSB/Project.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ MLUtils = "f1d291b0-491e-4a28-83b9-f70985020b54"
1414
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1515
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
1616

17+
[sources]
18+
OptimizationBase = {path = "../OptimizationBase"}
19+
1720
[compat]
1821
DocStringExtensions = "0.9.5"
1922
ForwardDiff = "1.0.1"

lib/OptimizationMOI/Project.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
2525
NLopt = "76087f3c-5699-56af-9a33-bf431cd00edd"
2626
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
2727

28+
[sources]
29+
OptimizationBase = {path = "../OptimizationBase"}
30+
2831
[compat]
2932
HiGHS = "1"
3033
OptimizationBase = "3, 4"

0 commit comments

Comments
 (0)