Skip to content

SciPy Riesz map fix #230

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

SciPy Riesz map fix #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions pyadjoint/optimization/optimization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from functools import partial

import numpy as np

from ..reduced_functional import ReducedFunctional
Expand Down Expand Up @@ -59,8 +61,8 @@ def minimize_scipy_generic(rf_np, method, bounds=None, **kwargs):
m = [p.tape_value() for p in rf_np.controls]
m_global = rf_np.obj_to_array(m)
J = rf_np.__call__
dJ = lambda m: rf_np.derivative()
H = lambda x, p: rf_np.hessian(p)
dJ = lambda m: rf_np.derivative(apply_riesz=False)
H = lambda x, p: rf_np.hessian(p, apply_riesz=False)

if "options" not in kwargs:
kwargs["options"] = {}
Expand Down Expand Up @@ -153,8 +155,8 @@ def minimize_custom(rf_np, bounds=None, **kwargs):
m_global = rf_np.obj_to_array(m)
J = rf_np.__call__

dJ = lambda m: rf_np.derivative(m)
H = rf_np.hessian
dJ = partial(rf_np.derivative, apply_riesz=False)
H = partial(rf_np.hessian, apply_riesz=False)
Comment on lines +158 to +159
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't fixed this, but I think this is wrong? We want to discard the control value supplied by SciPy here.


if bounds is not None:
bounds = serialise_bounds(rf_np, bounds)
Expand Down
12 changes: 0 additions & 12 deletions pyadjoint/reduced_functional_numpy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,6 @@ def get_global(self, m):

@no_annotations
def derivative(self, adj_input=1.0, apply_riesz=True):

if not apply_riesz:
raise ValueError(
"ReducedFunctionalNumpy only returns primal gradients."
)

dJdm = self.rf.derivative(adj_input=adj_input,
apply_riesz=apply_riesz)
dJdm = Enlist(dJdm)
Expand All @@ -80,12 +74,6 @@ def derivative(self, adj_input=1.0, apply_riesz=True):

@no_annotations
def hessian(self, m_dot_array, apply_riesz=True):

if not apply_riesz:
raise ValueError(
"ReducedFunctionalNumpy only returns primal gradients."
)

# Calling derivative is needed, see i.e. examples/stokes-shape-opt
self.derivative()
m_copies = [control.copy_data() for control in self.controls]
Expand Down