Merge pull request rfeinman#10 from calvinmccarter/master

Enable import of _status_message for scipy >= 1.8.0
kelvin34501 · Mar 30, 2022 · 72ae847 · 72ae847
2 parents c6b54ae + 4397f2c
commit 72ae847
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/torchmin/bfgs.py b/torchmin/bfgs.py
@@ -2,11 +2,14 @@
 import torch
 from torch import Tensor
 from scipy.optimize import OptimizeResult
-from scipy.optimize.optimize import _status_message
 
 from .function import ScalarFunction
 from .line_search import strong_wolfe
 
+try:
+    from scipy.optimize.optimize import _status_message
+except ImportError:
+    from scipy.optimize._optimize import _status_message
 
 class HessianUpdateStrategy(ABC):
     def __init__(self):

diff --git a/torchmin/cg.py b/torchmin/cg.py
@@ -1,10 +1,13 @@
 import torch
 from scipy.optimize import OptimizeResult
-from scipy.optimize.optimize import _status_message
 
 from .function import ScalarFunction
 from .line_search import strong_wolfe
 
+try:
+    from scipy.optimize.optimize import _status_message
+except ImportError:
+    from scipy.optimize._optimize import _status_message
 
 dot = lambda u,v: torch.dot(u.view(-1), v.view(-1))
 

diff --git a/torchmin/newton.py b/torchmin/newton.py
@@ -1,12 +1,16 @@
 from scipy.optimize import OptimizeResult
-from scipy.optimize.optimize import _status_message
 from scipy.sparse.linalg import eigsh
 from torch import Tensor
 import torch
 
 from .function import ScalarFunction
 from .line_search import strong_wolfe
 
+try:
+    from scipy.optimize.optimize import _status_message
+except ImportError:
+    from scipy.optimize._optimize import _status_message
+
 _status_message['cg_warn'] = "Warning: CG iterations didn't converge. The " \
                              "Hessian is not positive definite."
 

diff --git a/torchmin/trustregion/base.py b/torchmin/trustregion/base.py
@@ -9,11 +9,16 @@
 from abc import ABC, abstractmethod
 import torch
 from torch.linalg import norm
-from scipy.optimize.optimize import OptimizeResult, _status_message
+from scipy.optimize import OptimizeResult
 
 from ..function import ScalarFunction
 from ..optim.minimizer import Minimizer
 
+try:
+    from scipy.optimize.optimize import _status_message
+except ImportError:
+    from scipy.optimize._optimize import _status_message
+
 status_messages = (
     _status_message['success'],
     _status_message['maxiter'],