Rename scalar/basic_scipy to scalar/math

aesara/gpuarray/elemwise.py

@@ -10,7 +10,7 @@ from aesara.graph.utils import MethodNotDefined
 from aesara.link.c.interface import HideC
 from aesara.scalar import Composite, Scalar
 from aesara.scalar.basic import complex_types, upgrade_to_float_no_complex
-from aesara.scalar.basic_scipy import Erfcinv, Erfinv
+from aesara.scalar.math import Erfcinv, Erfinv
 from aesara.tensor.elemwise import CAReduceDtype, DimShuffle, Elemwise
 
 

aesara/gpuarray/opt.py

@@ -163,7 +163,7 @@ from aesara.ifelse import IfElse
 from aesara.link.c.basic import CLinker
 from aesara.misc.ordered_set import OrderedSet
 from aesara.scalar.basic import Cast, Pow, Scalar, log, neg, true_div
-from aesara.scalar.basic_scipy import Erfcinv, Erfinv
+from aesara.scalar.math import Erfcinv, Erfinv
 from aesara.scan.op import Scan
 from aesara.scan.opt import ScanInplaceOptimizer
 from aesara.tensor.basic import (

aesara/link/numba/dispatch.py

@@ -35,7 +35,7 @@ from aesara.scalar.basic import (
     ScalarOp,
     Second,
 )
-from aesara.scalar.basic_scipy import Softplus
+from aesara.scalar.math import Softplus
 from aesara.tensor.basic import (
     Alloc,
     AllocDiag,

aesara/scalar/__init__.py

 from .basic import *
-from .basic_scipy import *
+from .math import *

tests/link/test_numba.py

@@ -8,7 +8,7 @@ import pytest
 
 import aesara.scalar as aes
 import aesara.scalar.basic as aesb
-import aesara.scalar.basic_scipy as aes_sci
+import aesara.scalar.math as aesm
 import aesara.tensor as aet
 import aesara.tensor.basic as aetb
 import aesara.tensor.math as aem
@@ -1816,7 +1816,7 @@ def test_LogSoftmax(x, exc):
     ],
 )
 def test_Softplus(x, exc):
-    g = aes_sci.Softplus(aes.upgrade_to_float)(x)
+    g = aesm.Softplus(aes.upgrade_to_float)(x)
     g_fg = FunctionGraph(outputs=[g])
 
     cm = contextlib.suppress() if exc is None else pytest.warns(exc)

tests/scalar/test_basic_scipy.py → tests/scalar/test_math.py

@@ -3,7 +3,7 @@ import numpy as np
 import aesara.tensor as aet
 from aesara.graph.fg import FunctionGraph
 from aesara.link.c.basic import CLinker
-from aesara.scalar.basic_scipy import gammainc, gammaincc, gammal, gammau
+from aesara.scalar.math import gammainc, gammaincc, gammal, gammau
 
 
 def test_gammainc_nan():

tests/tensor/test_math_opt.py

@@ -2670,7 +2670,7 @@ class TestLocalSwitchSink:
 
 
 @pytest.mark.skipif(
-    config.cxx == "" and not aes.basic_scipy.imported_scipy_special,
+    config.cxx == "" and not aes.math.imported_scipy_special,
     reason="erf need a c++ compiler or scipy",
 )
 class TestLocalErf:
@@ -2762,7 +2762,7 @@ class TestLocalErf:
 
 
 @pytest.mark.skipif(
-    config.cxx == "" and not aes.basic_scipy.imported_scipy_special,
+    config.cxx == "" and not aes.math.imported_scipy_special,
     reason="erf need a c++ compiler or scipy",
 )
 class TestLocalErfc: