Replace floor_div with floor_divide

Author: sudarsan2k5

README.md

@@ -70,7 +70,7 @@ d = a/a + (M + a).dot(v)
 aesara.dprint(d)
 # Elemwise{add,no_inplace} [id A] ''
 #  |InplaceDimShuffle{x} [id B] ''
-#  | |Elemwise{true_div,no_inplace} [id C] ''
+#  | |Elemwise{true_divide,no_inplace} [id C] ''
 #  |   |a [id D]
 #  |   |a [id D]
 #  |dot [id E] ''

aesara/scalar/basic.py

@@ -797,7 +797,7 @@ def __truediv__(self, other):
         return true_divide(self, other)
 
     def __floordiv__(self, other):
-        return int_div(self, other)
+        return floor_divide(self, other)
 
     def __mod__(self, other):
         return mod_check(self, other)
@@ -2133,8 +2133,7 @@ def grad(self, inputs, g_output):
         return [inp.zeros_like(dtype=config.floatX) for inp in inputs]
 
 
-floor_divide = IntDiv(upcast_out, name="int_div")
-
+floor_divide = IntDiv(upcast_out, name="floor_divide")
 
 int_div = floor_divide
 
@@ -2871,7 +2870,7 @@ def c_code(self, node, name, inputs, outputs, sub):
 pprint.assign(sub, printing.OperatorPrinter("-", -2, "left"))
 pprint.assign(neg, printing.OperatorPrinter("-", 0, "either"))
 pprint.assign(true_divide, printing.OperatorPrinter("/", -1, "left"))
-pprint.assign(int_div, printing.OperatorPrinter("//", -1, "left"))
+pprint.assign(floor_divide, printing.OperatorPrinter("//", -1, "left"))
 pprint.assign(pow, printing.OperatorPrinter("**", 1, "right"))
 pprint.assign(mod, printing.OperatorPrinter("%", -1, "left"))
 

aesara/tensor/elemwise.py

@@ -327,7 +327,7 @@ class Elemwise(OpenMPOp):
     the second input is completed along the first dimension to match the first input
     -``Elemwise(true_divide)(np.random.random(10, 5), np.random.random(10, 1))``: same but along the
     second dimension
-    -``Elemwise(int_div)(np.random.random((1, 5)), np.random.random((10, 1)))``:
+    -``Elemwise(floor_div)(np.random.random((1, 5)), np.random.random((10, 1)))``:
     the output has size ``(10, 5)``.
     -``Elemwise(log)(np.random.random((3, 4, 5)))``
 

aesara/tensor/inplace.py

@@ -368,12 +368,12 @@ def mul_inplace(a, b):
 
 
 @scalar_elemwise
-def true_div_inplace(a, b):
+def true_divide_inplace(a, b):
     """elementwise division (inplace on `a`)"""
 
 
 @scalar_elemwise
-def int_div_inplace(a, b):
+def floor_divide_inplace(a, b):
     """elementwise division (inplace on `a`)"""
 
 
@@ -401,8 +401,8 @@ def hyp2f1_inplace(a, b, c, z):
 pprint.assign(mul_inplace, printing.OperatorPrinter("*=", -1, "either"))
 pprint.assign(sub_inplace, printing.OperatorPrinter("-=", -2, "left"))
 pprint.assign(neg_inplace, printing.OperatorPrinter("-=", 0, "either"))
-pprint.assign(true_div_inplace, printing.OperatorPrinter("/=", -1, "left"))
-pprint.assign(int_div_inplace, printing.OperatorPrinter("//=", -1, "left"))
+pprint.assign(true_divide_inplace, printing.OperatorPrinter("/=", -1, "left"))
+pprint.assign(floor_divide_inplace, printing.OperatorPrinter("//=", -1, "left"))
 pprint.assign(pow_inplace, printing.OperatorPrinter("**=", 1, "right"))
 
 

aesara/tensor/math.py

@@ -1800,13 +1800,13 @@ def true_divide(a, b):
 
 
 @scalar_elemwise
-def int_div(a, b):
+def floor_divide(a, b):
     """elementwise [floor] division (inverse of multiplication)"""
     # see decorator for function body
 
 
 # floor_divide and int_div are the same thing
-floor_divide = int_div
+int_div = floor_divide
 
 
 def ceil_intdiv(a, b):
@@ -1824,7 +1824,7 @@ def ceil_intdiv(a, b):
 
     # We cast for the case when a and b are uint*; otherwise, neq will
     # force their upcast to int.
-    div = int_div(a, b)
+    div = floor_divide(a, b)
     ret = cast(neq(a % b, 0), div.dtype) + div
     assert ret.dtype == aes.upcast(
         div.owner.inputs[0].type.dtype, div.owner.inputs[1].type.dtype
@@ -1877,7 +1877,7 @@ def clip(x, min, max):
 pprint.assign(sub, printing.OperatorPrinter("-", -2, "left"))
 pprint.assign(neg, printing.OperatorPrinter("-", 0, "either"))
 pprint.assign(true_divide, printing.OperatorPrinter("/", -1, "left"))
-pprint.assign(int_div, printing.OperatorPrinter("//", -1, "left"))
+pprint.assign(floor_divide, printing.OperatorPrinter("//", -1, "left"))
 pprint.assign(pow, printing.OperatorPrinter("**", 1, "right"))
 
 

aesara/tensor/rewriting/math.py

@@ -56,8 +56,8 @@
     erfc,
     exp,
     expm1,
+    floor_divide,
     ge,
-    int_div,
     isinf,
     le,
     log,
@@ -568,7 +568,7 @@ def local_mul_switch_sink(fgraph, node):
 
 
 @register_canonicalize
-@node_rewriter([true_divide, int_div])
+@node_rewriter([true_divide, floor_divide])
 def local_div_switch_sink(fgraph, node):
     """
     This rewrite makes the following changes in the graph:
@@ -584,7 +584,7 @@ def local_div_switch_sink(fgraph, node):
     See `local_mul_switch_sink` for more details.
 
     """
-    if node.op != true_divide and node.op != int_div:
+    if node.op != true_divide and node.op != floor_divide:
         return False
     op = node.op
     if node.inputs[0].owner and node.inputs[0].owner.op == switch:
@@ -1939,10 +1939,10 @@ def local_mul_to_sqr(fgraph, node):
 
 
 @register_canonicalize
-@node_rewriter([int_div])
+@node_rewriter([floor_divide])
 def local_intdiv_by_one(fgraph, node):
     """x // 1 -> x"""
-    if node.op in [int_div]:
+    if node.op in [floor_divide]:
         if isinstance(node.inputs[1], TensorConstant) and np.all(
             node.inputs[1].value == 1
         ):
@@ -1951,7 +1951,7 @@ def local_intdiv_by_one(fgraph, node):
 
 @register_canonicalize
 @register_specialize
-@node_rewriter([int_div, true_divide])
+@node_rewriter([floor_divide, true_divide])
 def local_zero_div(fgraph, node):
     """0 / x -> 0"""
     if isinstance(node.op, Elemwise) and isinstance(

tests/scalar/test_basic.py

@@ -356,8 +356,8 @@ def _test_binary(binary_op, x_range, y_range):
                 assert outi.dtype == outf.dtype, "incorrect dtype"
                 assert np.allclose(outi, outf), "insufficient precision"
 
-    def test_true_div(self):
-        # true_div's upcast policy is not exactly "upgrade_to_float",
+    def test_true_divide(self):
+        # true_divide's upcast policy is not exactly "upgrade_to_float",
         # so the test is a little bit different
         x_range = list(range(-127, 128))
         y_range = list(range(-127, 0)) + list(range(1, 127))
@@ -547,3 +547,15 @@ def test_deprecations():
 
     with pytest.deprecated_call():
         from aesara.scalar import Scalar  # noqa: F401 F811
+
+    with pytest.deprecated_call():
+        from aesara.scalar.basic import floor_div  # noqa: F401 F811
+
+    with pytest.deprecated_call():
+        from aesara.scalar import floor_div  # noqa: F401 F811
+
+    with pytest.deprecated_call():
+        from aesara.scalar.basic import int_div  # noqa: F401 F811
+
+    with pytest.deprecated_call():
+        from aesara.scalar import int_div  # noqa: F401 F811

tests/tensor/rewriting/test_basic.py

@@ -40,7 +40,6 @@
     floor_divide,
     ge,
     gt,
-    int_div,
     le,
     log,
     lt,
@@ -1084,7 +1083,6 @@ class TestLocalMergeSwitchSameCond:
             sub,
             mul,
             true_divide,
-            int_div,
             floor_divide,
             minimum,
             maximum,

tests/tensor/rewriting/test_elemwise.py

@@ -28,7 +28,7 @@
     dot,
     eq,
     exp,
-    int_div,
+    floor_divide,
     invert,
     iround,
     log,
@@ -627,7 +627,7 @@ def my_init(dtype="float64", num=0):
                 "float32",
             ),
             (
-                fx - int_div(ix * 100, iy * 1000),
+                fx - floor_divide(ix * 100, iy * 1000),
                 (fx, ix, iy),
                 (fxv, ixv, iyv),
                 1,

tests/tensor/rewriting/test_math.py

@@ -58,7 +58,6 @@
     floor_divide,
     ge,
     gt,
-    int_div,
     invert,
     iround,
     le,
@@ -1447,7 +1446,7 @@ def my_init(shp, dtype="float64", num=0):
                 "float32",
             ),
             (
-                fx - int_div(ix * 100, iy * 1000),
+                fx - floor_divide(ix * 100, iy * 1000),
                 (fx, ix, iy),
                 (fxv, ixv, iyv),
                 1,
@@ -3133,7 +3132,6 @@ def test_elemwise(self):
             sub,
             mul,
             true_divide,
-            int_div,
             floor_divide,
             minimum,
             maximum,
@@ -3951,7 +3949,7 @@ def test3(self):
 
 
 @pytest.mark.parametrize("t", [scalar, ivector, ftensor4])
-@pytest.mark.parametrize("op", [int_div, true_divide])
+@pytest.mark.parametrize("op", [floor_divide, true_divide])
 def test_local_zero_div(t, op):
     """Test the canonicalization ``0/x -> 0``."""
     x = t("x")