Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump dependencies. #309

Merged
merged 11 commits into from
Oct 25, 2023
Merged

Bump dependencies. #309

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ceeb71f
Bump dependencies.
kellertuer Oct 24, 2023
6a0f8a1
Move ARC CG subsolver to the main module, update Changelog.
kellertuer Oct 24, 2023
7398908
Update Changelog.md
kellertuer Oct 24, 2023
14376a4
Loosen dependencies for docs and tutorials, since this version is not…
kellertuer Oct 24, 2023
b37dde4
Merge branch 'kellertuer/bump-dependencies' of github.com:JuliaManifo…
kellertuer Oct 24, 2023
b135acf
Bump dependencies and add a `exclude-tutorials` option for the docs, …
kellertuer Oct 24, 2023
3755b92
Add the recent changes also to the Changelog.
kellertuer Oct 24, 2023
165e30f
Add a workflow that makes sure we do not forget to add an entry to Ch…
kellertuer Oct 24, 2023
c214d7e
Apply suggestions from code review
kellertuer Oct 24, 2023
d556d3f
Add Changelog to docs.
kellertuer Oct 25, 2023
b83e291
Merge branch 'kellertuer/bump-dependencies' of github.com:JuliaManifo…
kellertuer Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "Manopt"
uuid = "0fc0a36d-df90-57f3-8f93-d78a9fc72bb5"
authors = ["Ronny Bergmann <manopt@ronnybergmann.net>"]
version = "0.4.39"
version = "0.4.40"

[deps]
ColorSchemes = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
Expand Down Expand Up @@ -40,8 +40,8 @@ Colors = "0.11.2, 0.12"
DataStructures = "0.17, 0.18"
LRUCache = "1.4"
ManifoldDiff = "0.2, 0.3.3"
Manifolds = "0.8.75"
ManifoldsBase = "0.14.10"
Manifolds = "0.9"
ManifoldsBase = "0.15"
PolynomialRoots = "1"
Requires = "0.5, 1"
julia = "1.6"
Expand Down
4 changes: 2 additions & 2 deletions docs/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
BenchmarkTools = "1.3"
CondaPkg = "0.2"
Documenter = "0.27"
kellertuer marked this conversation as resolved.
Show resolved Hide resolved
Manifolds = "0.8.75"
ManifoldsBase = "0.13, 0.14"
Manifolds = "0.9"
ManifoldsBase = "0.15"
2 changes: 1 addition & 1 deletion docs/src/tutorials/HowToDebug.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ There is two more advanced variants that can be used. The first is a tuple of a

We can for example change the way the `:ϵ` is printed by adding a format string
and use [`DebugCost`](@ref)`()` which is equivalent to using `:Cost`.
Especially with the format change, the lines are more consistent in length.
Especially with the format change, the lines are more coniststent in length.
kellertuer marked this conversation as resolved.
Show resolved Hide resolved

``` julia
p2 = exact_penalty_method(
Expand Down
10 changes: 5 additions & 5 deletions ext/ManoptManifoldsExt/ARC_CG.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
function set_manopt_parameter!(M::TangentSpaceAtPoint, ::Val{:p}, v)
function set_manopt_parameter!(M::TangentSpace, ::Val{:p}, v)
M.point .= v
return M
end
function (f::Manopt.AdaptiveRegularizationCubicCost)(M::TangentSpaceAtPoint, X)
function (f::Manopt.AdaptiveRegularizationCubicCost)(M::TangentSpace, X)
## (33) in Agarwal et al.
return get_cost(base_manifold(M), f.mho, M.point) +
inner(base_manifold(M), M.point, X, f.X) +
Expand All @@ -14,19 +14,19 @@ function (f::Manopt.AdaptiveRegularizationCubicCost)(M::TangentSpaceAtPoint, X)
) +
f.σ / 3 * norm(base_manifold(M), M.point, X)^3
end
function (grad_f::Manopt.AdaptiveRegularizationCubicGrad)(M::TangentSpaceAtPoint, X)
function (grad_f::Manopt.AdaptiveRegularizationCubicGrad)(M::TangentSpace, X)
# (37) in Agarwal et
return grad_f.X +
get_hessian(base_manifold(M), grad_f.mho, M.point, X) +
grad_f.σ * norm(base_manifold(M), M.point, X) * X
end
function (grad_f::Manopt.AdaptiveRegularizationCubicGrad)(M::TangentSpaceAtPoint, Y, X)
function (grad_f::Manopt.AdaptiveRegularizationCubicGrad)(M::TangentSpace, Y, X)
get_hessian!(base_manifold(M), Y, grad_f.mho, M.point, X)
Y .= Y + grad_f.X + grad_f.σ * norm(base_manifold(M), M.point, X) * X
return Y
end
function (c::StopWhenFirstOrderProgress)(
dmp::AbstractManoptProblem{<:TangentSpaceAtPoint},
dmp::AbstractManoptProblem{<:TangentSpace},
ams::AbstractManoptSolverState,
i::Int,
)
kellertuer marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
2 changes: 1 addition & 1 deletion test/solvers/test_adaptive_regularization_with_cubics.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ include("../utils/example_tasks.jl")
Hess_f(M, p, X) = -A * X + p * p' * A * X + X * p' * A * p

p0 = Matrix{Float64}(I, n, n)[:, 1:k]
M2 = TangentSpaceAtPoint(M, p0)
M2 = TangentSpace(M, p0)

mho = ManifoldHessianObjective(f, grad_f, Hess_f)
g = AdaptiveRegularizationCubicCost(M2, mho)
Expand Down
4 changes: 2 additions & 2 deletions tutorials/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ FiniteDifferences = "0.12"
IJulia = "1"
LRUCache = "1.4"
ManifoldDiff = "0.3"
Manifolds = "0.8.75"
ManifoldsBase = "0.14.5"
Manifolds = "0.9"
ManifoldsBase = "0.15"
Manopt = "0.4.22"
Plots = "1.38"
Loading