Merge pull request #111 from tomMoral/FIX_adapt_numpy2.0

openopt · Jul 3, 2024 · c0d5d46 · c0d5d46
2 parents 5423537 + cfb16a7
commit c0d5d46
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/copt/constraint.py b/copt/constraint.py
@@ -76,7 +76,7 @@ def __call__(self, x):
         if np.abs(x).sum() <= self.alpha:
             return 0
         else:
-            return np.infty
+            return np.inf
 
     def prox(self, x, step_size=None):
         """Projection onto the L-infinity ball.

diff --git a/copt/proximal_gradient.py b/copt/proximal_gradient.py
@@ -121,7 +121,7 @@ def _prox(x, _):
         prox = _prox
 
     success = False
-    certificate = np.NaN
+    certificate = np.nan
 
     func_and_grad = utils.build_func_grad(jac, fun, args, eps)
 

diff --git a/copt/splitting.py b/copt/splitting.py
@@ -288,7 +288,7 @@ def prox_2_conj(x, ss):
         ss_ratio = tau / sigma
 
     fk, grad_fk = f_grad(x)
-    norm_incr = np.infty
+    norm_incr = np.inf
     x_next = x.copy()
 
     for it in range(max_iter):

diff --git a/copt/utils.py b/copt/utils.py
@@ -35,7 +35,7 @@ def wrapper(*args, **kwargs):
 def build_func_grad(jac, fun, args, eps):
     if not callable(jac):
         if bool(jac):
-            fun = optimize.optimize.MemoizeJac(fun)
+            fun = optimize._optimize.MemoizeJac(fun)
             jac = fun.derivative
         elif jac == "2-point":
             jac = None