Skip to content

Commit d5ee2b9

Browse files
Merge branch 'master' of https://github.com/SciML/Optimization.jl into refactor-sophia
2 parents 0b58195 + 2a90ec0 commit d5ee2b9

File tree

50 files changed

+4983
-73
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+4983
-73
lines changed

.github/workflows/CI.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ jobs:
4242
version:
4343
- '1'
4444
- 'lts'
45-
- 'pre'
4645
steps:
4746
- uses: actions/checkout@v4
4847
- uses: julia-actions/setup-julia@v2

Project.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ Logging = "1.10"
4141
LoggingExtras = "0.4, 1"
4242
Lux = "1.12.4"
4343
MLUtils = "0.4"
44-
ModelingToolkit = "9"
44+
ModelingToolkit = "10"
45+
Mooncake = "0.4.138"
4546
Optim = ">= 1.4.1"
4647
OptimizationBase = "2"
4748
OptimizationMOI = "0.5"
@@ -55,7 +56,7 @@ Random = "1.10"
5556
Reexport = "1.2"
5657
ReverseDiff = "1"
5758
SafeTestsets = "0.1"
58-
SciMLBase = "2.39.0"
59+
SciMLBase = "2.82"
5960
SciMLSensitivity = "7"
6061
SparseArrays = "1.10"
6162
SparseDiffTools = "2"
@@ -99,9 +100,10 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
99100
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
100101
Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c"
101102
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
103+
Mooncake = "da2b9cff-9c12-43a0-ae48-6db2b0edb7d6"
102104

103105
[targets]
104106
test = ["Aqua", "BenchmarkTools", "Boltz", "ComponentArrays", "DiffEqFlux", "Enzyme", "FiniteDiff", "Flux", "ForwardDiff",
105107
"Ipopt", "IterTools", "Lux", "MLUtils", "ModelingToolkit", "Optim", "OptimizationMOI", "OptimizationOptimJL", "OptimizationOptimisers",
106108
"OrdinaryDiffEqTsit5", "Pkg", "Random", "ReverseDiff", "SafeTestsets", "SciMLSensitivity", "SparseArrays", "SparseDiffTools",
107-
"Symbolics", "Test", "Tracker", "Zygote"]
109+
"Symbolics", "Test", "Tracker", "Zygote", "Mooncake"]

docs/src/API/ad.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ The choices for the auto-AD fill-ins with quick descriptions are:
99
- `AutoFiniteDiff()`: Finite differencing, not optimal but always applicable
1010
- `AutoModelingToolkit()`: The fastest choice for large scalar optimizations
1111
- `AutoEnzyme()`: Highly performant AD choice for type stable and optimized code
12+
- `AutoMooncake()`: Like Zygote and ReverseDiff, but supports GPU and mutating code
1213

1314
## Automatic Differentiation Choice API
1415

@@ -22,4 +23,5 @@ OptimizationBase.AutoZygote
2223
OptimizationBase.AutoTracker
2324
OptimizationBase.AutoModelingToolkit
2425
OptimizationBase.AutoEnzyme
26+
OptimizationBase.AutoMooncake
2527
```

lib/OptimizationBBO/Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
1010

1111
[compat]
1212
BlackBoxOptim = "0.6"
13-
Optimization = "4"
13+
Optimization = "4.4"
1414
Reexport = "1.2"
15-
julia = "1"
15+
julia = "1.10"
1616

1717
[extras]
1818
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

lib/OptimizationBase/LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2024 Vaibhav Dixit <[email protected]> and contributors
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

lib/OptimizationBase/Project.toml

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name = "OptimizationBase"
2+
uuid = "bca83a33-5cc9-4baa-983d-23429ab6bcbb"
3+
authors = ["Vaibhav Dixit <[email protected]> and contributors"]
4+
version = "2.11.0"
5+
6+
[deps]
7+
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
8+
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
9+
DifferentiationInterface = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63"
10+
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
11+
FastClosures = "9aa1b823-49e4-5ca5-8b0f-3971ec8bab6a"
12+
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
13+
PDMats = "90014a1f-27ba-587c-ab20-58faa44d9150"
14+
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
15+
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
16+
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
17+
SparseConnectivityTracer = "9f842d2f-2579-4b1d-911e-f412cf18a3f5"
18+
SparseMatrixColorings = "0a514795-09f3-496d-8182-132a7b665d35"
19+
20+
[weakdeps]
21+
Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9"
22+
FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41"
23+
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
24+
MLDataDevices = "7e8f7934-dd98-4c1a-8fe8-92b47a384d40"
25+
MLUtils = "f1d291b0-491e-4a28-83b9-f70985020b54"
26+
ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
27+
ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
28+
SymbolicAnalysis = "4297ee4d-0239-47d8-ba5d-195ecdf594fe"
29+
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
30+
31+
[extensions]
32+
OptimizationEnzymeExt = "Enzyme"
33+
OptimizationFiniteDiffExt = "FiniteDiff"
34+
OptimizationForwardDiffExt = "ForwardDiff"
35+
OptimizationMLDataDevicesExt = "MLDataDevices"
36+
OptimizationMLUtilsExt = "MLUtils"
37+
OptimizationMTKExt = "ModelingToolkit"
38+
OptimizationReverseDiffExt = "ReverseDiff"
39+
OptimizationSymbolicAnalysisExt = "SymbolicAnalysis"
40+
OptimizationZygoteExt = "Zygote"
41+
42+
[compat]
43+
ADTypes = "1.9"
44+
ArrayInterface = "7.6"
45+
DifferentiationInterface = "0.7"
46+
DocStringExtensions = "0.9"
47+
Enzyme = "0.13.2"
48+
FastClosures = "0.3"
49+
FiniteDiff = "2.12"
50+
ForwardDiff = "0.10.26, 1"
51+
LinearAlgebra = "1.9, 1.10"
52+
MLDataDevices = "1"
53+
MLUtils = "0.4"
54+
ModelingToolkit = "9, 10"
55+
PDMats = "0.11"
56+
Reexport = "1.2"
57+
ReverseDiff = "1.14"
58+
SciMLBase = "2"
59+
SparseConnectivityTracer = "0.6, 1"
60+
SparseMatrixColorings = "0.4"
61+
SymbolicAnalysis = "0.3"
62+
Zygote = "0.6.67, 0.7"
63+
julia = "1.10"
64+
65+
[extras]
66+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
67+
68+
[targets]
69+
test = ["Test"]

0 commit comments

Comments
 (0)