Handle scipy 1.15 changes related to derivative function used in be…

…nchmarking problems (#707)

* Add packaging module dependency to handle version numbers

* Import derivative wrt scipy version

* Fix derivative import

* Fix typos

doc/requirements.txt

@@ -1,4 +1,5 @@
 Cython
+packaging
 numpy
 scipy
 scikit-learn

requirements.txt

@@ -1,6 +1,7 @@
 Cython
+packaging
 numpy
-scipy < 1.15
+scipy
 scikit-learn
 pyDOE3
 numba           # JIT compiler

setup.py

@@ -112,6 +112,7 @@
         "smt.kernels",
     ],
     install_requires=[
+        "packaging",
         "scikit-learn",
         "pyDOE3",
         "scipy",

smt/problems/torsion_vibration.py

@@ -16,7 +16,7 @@
 """
 
 import numpy as np
-from scipy.misc import derivative
+from smt.utils.misc import SCIPY_DERIVATIVE
 
 from smt.problems.problem import Problem
 
@@ -91,7 +91,7 @@ def wraps(x):
                 args[var] = x
                 return func(*args)
 
-            return derivative(wraps, point[var], dx=1e-6)
+            return SCIPY_DERIVATIVE(wraps, point[var], dx=1e-6)
 
         def func(x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14):
             K1 = np.pi * x2 * x0 / (32 * x1)

smt/problems/water_flow.py

@@ -14,7 +14,7 @@
 """
 
 import numpy as np
-from scipy.misc import derivative
+from smt.utils.misc import SCIPY_DERIVATIVE
 
 from smt.problems.problem import Problem
 
@@ -57,7 +57,7 @@ def wraps(x):
                 args[var] = x
                 return func(*args)
 
-            return derivative(wraps, point[var], dx=1e-6)
+            return SCIPY_DERIVATIVE(wraps, point[var], dx=1e-6)
 
         def func(x0, x1, x2, x3, x4, x5, x6, x7):
             return (

smt/problems/water_flow_lfidelity.py

@@ -8,7 +8,7 @@
 """
 
 import numpy as np
-from scipy.misc import derivative
+from smt.utils.misc import SCIPY_DERIVATIVE
 
 from smt.problems.problem import Problem
 
@@ -51,7 +51,7 @@ def wraps(x):
                 args[var] = x
                 return func(*args)
 
-            return derivative(wraps, point[var], dx=1e-6)
+            return SCIPY_DERIVATIVE(wraps, point[var], dx=1e-6)
 
         def func(x0, x1, x2, x3, x4, x5, x6, x7):
             return (

smt/problems/welded_beam.py

@@ -14,7 +14,7 @@
 """
 
 import numpy as np
-from scipy.misc import derivative
+from smt.utils.misc import SCIPY_DERIVATIVE
 
 from smt.problems.problem import Problem
 
@@ -55,7 +55,7 @@ def wraps(x):
                 args[var] = x
                 return func(*args)
 
-            return derivative(wraps, point[var], dx=1e-6)
+            return SCIPY_DERIVATIVE(wraps, point[var], dx=1e-6)
 
         def func(x0, x1, x2):
             tau1 = 6000 / (np.sqrt(2) * x1 * x2)

smt/problems/wing_weight.py

@@ -14,7 +14,7 @@
 """
 
 import numpy as np
-from scipy.misc import derivative
+from smt.utils.misc import SCIPY_DERIVATIVE
 
 from smt.problems.problem import Problem
 
@@ -61,7 +61,7 @@ def wraps(x):
                 args[var] = x
                 return func(*args)
 
-            return derivative(wraps, point[var], dx=1e-6)
+            return SCIPY_DERIVATIVE(wraps, point[var], dx=1e-6)
 
         def func(x0, x1, x2, x3, x4, x5, x6, x7, x8, x9):
             return (

smt/utils/misc.py

@@ -9,6 +9,17 @@
 
 import numpy as np
 
+import scipy
+from packaging.version import Version
+
+# Since scipy 1.15, derivative function has moved from scipy.misc to scipy.differentiate
+# As derivative is used by several benchmarking problems, we initialize a constant
+# once here as a proxy of the derivative function wrt the installed scipy version
+if Version(scipy.__version__) >= Version("1.15"):
+    SCIPY_DERIVATIVE = scipy.differentiate.derivative
+else:
+    SCIPY_DERIVATIVE = scipy.misc.derivative
+
 
 def standardization(X, y):
     """