Skip to content

Commit

Permalink
Fix numpy 1.25 deprecation warnings (#372)
Browse files Browse the repository at this point in the history
* fix deprecation warnings

* adding disallow_deprecations to tests

* address comments
  • Loading branch information
eirikurj authored Dec 18, 2023
1 parent 82bbb68 commit c233e8f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/test_real.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ cd tests
# we have to copy over the coveragerc file to make sure it's in the
# same directory where codecov is run
cp ../.coveragerc .
testflo --pre_announce -v --coverage --coverpkg pyoptsparse $EXTRA_FLAGS
testflo --pre_announce --disallow_deprecations -v --coverage --coverpkg pyoptsparse $EXTRA_FLAGS
9 changes: 6 additions & 3 deletions pyoptsparse/pyOpt_solution.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Standard Python modules
import copy

# External modules
import numpy as np

# Local modules
from .pyOpt_optimization import Optimization

Expand Down Expand Up @@ -49,9 +52,9 @@ def __init__(self, optProb, xStar, fStar, lambdaStar, optInform, info):
i += 1

# Now set the f-values
if isinstance(fStar, float) or len(fStar) == 1:
self.objectives[list(self.objectives.keys())[0]].value = float(fStar)
fStar = float(fStar)
if isinstance(fStar, np.ndarray) and len(fStar) == 1:
self.objectives[list(self.objectives.keys())[0]].value = fStar.item()
fStar = fStar.item()
else:
for f_name, f in self.objectives.items():
f.value = fStar[f_name]
Expand Down

0 comments on commit c233e8f

Please sign in to comment.