Skip to content

Commit 7c351a6

Browse files
rem multistartopt from docs project fro now
1 parent f29d5d8 commit 7c351a6

File tree

5 files changed

+9
-11
lines changed

5 files changed

+9
-11
lines changed

.github/workflows/Documentation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616
with:
1717
version: '1'
1818
- name: Install dependencies
19-
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(vcat(PackageSpec(path = pwd()), [PackageSpec(path = joinpath("lib", dir)) for dir in readdir("lib") if dir !== "OptimizationQuadDIRECT"])); Pkg.instantiate()'
19+
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(vcat(PackageSpec(path = pwd()), [PackageSpec(path = joinpath("lib", dir)) for dir in readdir("lib") if (dir !== "OptimizationQuadDIRECT" && dir !== "OptimizationMultistartOptimization")])); Pkg.instantiate()'
2020
- name: Build and deploy
2121
env:
2222
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # For authentication with GitHub Actions token
2323
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # For authentication with SSH deploy key
2424
run: julia --project=docs/ --code-coverage=user docs/make.jl
2525
- uses: julia-actions/julia-processcoverage@v1
2626
with:
27-
directories: src,lib/OptimizationBBO/src,lib/OptimizationCMAEvolutionStrategy/src,lib/OptimizationEvolutionary/src,lib/OptimizationFlux/src,lib/OptimizationGCMAES/src,lib/OptimizationMOI/src,lib/OptimizationMetaheuristics/src,lib/OptimizationMultistartOptimization/src,lib/OptimizationNLopt/src,lib/OptimizationNOMAD/src,lib/OptimizationOptimJL/src,lib/OptimizationOptimisers/src,lib/OptimizationPolyalgorithms/src,lib/OptimizationQuadDIRECT/src,lib/OptimizationSpeedMapping/src
27+
directories: src,lib/OptimizationBBO/src,lib/OptimizationCMAEvolutionStrategy/src,lib/OptimizationEvolutionary/src,lib/OptimizationGCMAES/src,lib/OptimizationMOI/src,lib/OptimizationMetaheuristics/src,lib/OptimizationMultistartOptimization/src,lib/OptimizationNLopt/src,lib/OptimizationNOMAD/src,lib/OptimizationOptimJL/src,lib/OptimizationOptimisers/src,lib/OptimizationPolyalgorithms/src,lib/OptimizationQuadDIRECT/src,lib/OptimizationSpeedMapping/src
2828
- uses: codecov/codecov-action@v4
2929
with:
3030
file: lcov.info

docs/Project.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ OptimizationGCMAES = "6f0a0517-dbc2-4a7a-8a20-99ae7f27e911"
2424
OptimizationMOI = "fd9f6733-72f4-499f-8506-86b2bdd0dea1"
2525
OptimizationManopt = "e57b7fff-7ee7-4550-b4f0-90e9476e9fb6"
2626
OptimizationMetaheuristics = "3aafef2f-86ae-4776-b337-85a36adf0b55"
27-
OptimizationMultistartOptimization = "e4316d97-8bbb-4fd3-a7d8-3851d2a72823"
2827
OptimizationNLPModels = "064b21be-54cf-11ef-1646-cdfee32b588f"
2928
OptimizationNLopt = "4e6fcdb7-1186-4e1f-a706-475e75c168bb"
3029
OptimizationNOMAD = "2cab0595-8222-4775-b714-9828e6a9e01b"
@@ -67,7 +66,6 @@ OptimizationGCMAES = "0.3"
6766
OptimizationMOI = "0.5"
6867
OptimizationManopt = "0.0.4"
6968
OptimizationMetaheuristics = "0.3"
70-
OptimizationMultistartOptimization = "0.3"
7169
OptimizationNLPModels = "0.0.2"
7270
OptimizationNLopt = "0.3"
7371
OptimizationNOMAD = "0.3"

docs/src/optimization_packages/multistartoptimization.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ constraint equations. However, lower and upper constraints set by `lb` and `ub`
3131

3232
The Rosenbrock function can be optimized using `MultistartOptimization.TikTak()` with 100 initial points and the local method `NLopt.LD_LBFGS()` as follows:
3333

34-
```@example MultiStart
34+
```julia
3535
using Optimization, OptimizationMultistartOptimization, OptimizationNLopt
3636
rosenbrock(x, p) = (p[1] - x[1])^2 + p[2] * (x[2] - x[1]^2)^2
3737
x0 = zeros(2)
@@ -43,7 +43,7 @@ sol = solve(prob, MultistartOptimization.TikTak(100), NLopt.LD_LBFGS())
4343

4444
You can use any `Optimization` optimizers you like. The global method of the `MultistartOptimization` is a positional argument and followed by the local method. For example, we can perform a multistartoptimization with LBFGS as the optimizer using either the `NLopt.jl` or `Optim.jl` implementation as follows. Moreover, this interface allows you to access and adjust all the optimizer settings as you normally would:
4545

46-
```@example MultiStart
46+
```julia
4747
using OptimizationOptimJL
4848
f = OptimizationFunction(rosenbrock, Optimization.AutoForwardDiff())
4949
prob = Optimization.OptimizationProblem(f, x0, p, lb = [-1.0, -1.0], ub = [1.0, 1.0])

docs/src/optimization_packages/optimization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,4 @@ optf = OptimizationFunction(loss, AutoZygote())
8989
prob = OptimizationProblem(optf, ps_ca, data)
9090
9191
res = Optimization.solve(prob, Optimization.Sophia(), callback = callback)
92-
```
92+
```

docs/src/tutorials/minibatch.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ k = 10
6767
train_loader = MLUtils.DataLoader((ode_data, t), batchsize = k)
6868
6969
numEpochs = 300
70-
l1 = loss_adjoint(pp, train_loader.data[1], train_loader.data[2])[1]
70+
l1 = loss_adjoint(pp, train_loader.data)[1]
7171
7272
optfun = OptimizationFunction(
7373
loss_adjoint,
7474
Optimization.AutoZygote())
75-
optprob = OptimizationProblem(optfun, pp)
75+
optprob = OptimizationProblem(optfun, ps_ca, train_loader)
7676
using IterTools: ncycle
77-
res1 = Optimization.solve(optprob, Optimisers.ADAM(0.05), ncycle(train_loader, numEpochs),
78-
callback = callback)
77+
res1 = Optimization.solve(
78+
optprob, Optimisers.ADAM(0.05); callback = callback, epochs = 1000)
7979
```

0 commit comments

Comments
 (0)