Rename module pytensor.tensor.var to pytensor.tensor.variable

purna135 · ricardoV94 · commit 6d3c75683e51 · 2023-09-01T12:51:25.000+02:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
               pytensor/graph/op\.py|
               pytensor/compile/nanguardmode\.py|
               pytensor/graph/rewriting/basic\.py|
-              pytensor/tensor/var\.py|
+              pytensor/tensor/variable\.py|
           )$
       - id: check-merge-conflict
   - repo: https://github.com/asottile/pyupgrade
diff --git a/pytensor/link/basic.py b/pytensor/link/basic.py
@@ -30,7 +30,7 @@
         OutputStorageType,
         StorageMapType,
     )
-    from pytensor.tensor.var import TensorVariable
+    from pytensor.tensor.variable import TensorVariable
 
 
 ThunkAndContainersType = Tuple["BasicThunkType", List["Container"], List["Container"]]
diff --git a/pytensor/link/jax/dispatch/subtensor.py b/pytensor/link/jax/dispatch/subtensor.py
@@ -33,7 +33,7 @@
 
 def subtensor_assert_indices_jax_compatible(node, idx_list):
     from pytensor.graph.basic import Constant
-    from pytensor.tensor.var import TensorVariable
+    from pytensor.tensor.variable import TensorVariable
 
     ilist = indices_from_subtensor(node.inputs[1:], idx_list)
     for idx in ilist:
diff --git a/pytensor/scan/op.py b/pytensor/scan/op.py
@@ -82,7 +82,7 @@
 from pytensor.tensor.math import minimum
 from pytensor.tensor.shape import Shape_i
 from pytensor.tensor.type import TensorType, integer_dtypes
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 
 
 # Logging function for sending warning or info
diff --git a/pytensor/scan/rewriting.py b/pytensor/scan/rewriting.py
@@ -69,7 +69,7 @@
     get_slice_elements,
     set_subtensor,
 )
-from pytensor.tensor.var import TensorConstant, get_unique_constant_value
+from pytensor.tensor.variable import TensorConstant, get_unique_constant_value
 
 
 list_opt_slice = [
diff --git a/pytensor/scan/utils.py b/pytensor/scan/utils.py
@@ -21,7 +21,7 @@
 from pytensor.graph.utils import TestValueError
 from pytensor.tensor.basic import AllocEmpty, cast
 from pytensor.tensor.subtensor import set_subtensor
-from pytensor.tensor.var import TensorConstant
+from pytensor.tensor.variable import TensorConstant
 
 
 if TYPE_CHECKING:
diff --git a/pytensor/sparse/basic.py b/pytensor/sparse/basic.py
@@ -51,7 +51,11 @@
 from pytensor.tensor.type import continuous_dtypes as tensor_continuous_dtypes
 from pytensor.tensor.type import discrete_dtypes as tensor_discrete_dtypes
 from pytensor.tensor.type import iscalar, ivector, scalar, tensor, vector
-from pytensor.tensor.var import TensorConstant, TensorVariable, _tensor_py_operators
+from pytensor.tensor.variable import (
+    TensorConstant,
+    TensorVariable,
+    _tensor_py_operators,
+)
 
 
 sparse_formats = ["csc", "csr"]
diff --git a/pytensor/tensor/__init__.py b/pytensor/tensor/__init__.py
@@ -146,7 +146,7 @@ def _get_vector_length_Constant(op: Union[Op, Variable], var: Constant) -> int:
 from pytensor.tensor.subtensor import *  # noqa
 from pytensor.tensor.type import *  # noqa
 from pytensor.tensor.type_other import *  # noqa
-from pytensor.tensor.var import TensorConstant, TensorVariable  # noqa
+from pytensor.tensor.variable import TensorConstant, TensorVariable  # noqa
 
 # Allow accessing numpy constants from pytensor.tensor
 from numpy import e, euler_gamma, inf, infty, nan, newaxis, pi  # noqa
diff --git a/pytensor/tensor/basic.py b/pytensor/tensor/basic.py
@@ -62,7 +62,7 @@
     uint_dtypes,
     values_eq_approx_always_true,
 )
-from pytensor.tensor.var import (
+from pytensor.tensor.variable import (
     TensorConstant,
     TensorVariable,
     get_unique_constant_value,
diff --git a/pytensor/tensor/conv/abstract_conv.py b/pytensor/tensor/conv/abstract_conv.py
@@ -29,7 +29,7 @@
     get_underlying_scalar_constant_value,
 )
 from pytensor.tensor.exceptions import NotScalarConstantError
-from pytensor.tensor.var import TensorConstant, TensorVariable
+from pytensor.tensor.variable import TensorConstant, TensorVariable
 
 
 _logger = logging.getLogger(__name__)
diff --git a/pytensor/tensor/elemwise.py b/pytensor/tensor/elemwise.py
@@ -29,7 +29,7 @@
     float_dtypes,
     lvector,
 )
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 from pytensor.utils import uniq
 
 
diff --git a/pytensor/tensor/extra_ops.py b/pytensor/tensor/extra_ops.py
@@ -35,7 +35,7 @@
 from pytensor.tensor.math import switch
 from pytensor.tensor.subtensor import advanced_inc_subtensor1, set_subtensor
 from pytensor.tensor.type import TensorType, dvector, int_dtypes, integer_dtypes, vector
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 from pytensor.utils import LOCAL_BITWIDTH, PYTHON_INT_BITWIDTH
 
 
diff --git a/pytensor/tensor/fourier.py b/pytensor/tensor/fourier.py
@@ -16,7 +16,7 @@
 from pytensor.tensor.shape import shape
 from pytensor.tensor.subtensor import set_subtensor
 from pytensor.tensor.type import TensorType, integer_dtypes
-from pytensor.tensor.var import TensorConstant
+from pytensor.tensor.variable import TensorConstant
 
 
 class Fourier(Op):
diff --git a/pytensor/tensor/math.py b/pytensor/tensor/math.py
@@ -40,7 +40,7 @@
 )
 from pytensor.tensor.type_other import NoneConst
 from pytensor.tensor.utils import as_list
-from pytensor.tensor.var import TensorConstant, _tensor_py_operators
+from pytensor.tensor.variable import TensorConstant, _tensor_py_operators
 
 
 if TYPE_CHECKING:
diff --git a/pytensor/tensor/nlinalg.py b/pytensor/tensor/nlinalg.py
@@ -1,5 +1,6 @@
+import typing
 from functools import partial
-from typing import Tuple
+from typing import Callable, Tuple
 
 import numpy as np
 
@@ -299,7 +300,7 @@ class Eigh(Eig):
 
     """
 
-    _numop = staticmethod(np.linalg.eigh)
+    _numop = typing.cast(Callable, staticmethod(np.linalg.eigh))
     __props__ = ("UPLO",)
 
     def __init__(self, UPLO="L"):
diff --git a/pytensor/tensor/random/op.py b/pytensor/tensor/random/op.py
@@ -21,7 +21,7 @@
 from pytensor.tensor.shape import shape_tuple
 from pytensor.tensor.type import TensorType, all_dtypes
 from pytensor.tensor.type_other import NoneConst
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 
 
 class RandomVariable(Op):
diff --git a/pytensor/tensor/random/utils.py b/pytensor/tensor/random/utils.py
@@ -14,7 +14,7 @@
 from pytensor.tensor.math import maximum
 from pytensor.tensor.shape import specify_shape
 from pytensor.tensor.type import int_dtypes
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 
 
 if TYPE_CHECKING:
diff --git a/pytensor/tensor/rewriting/basic.py b/pytensor/tensor/rewriting/basic.py
@@ -72,7 +72,7 @@
 from pytensor.tensor.shape import Shape_i, shape_padleft
 from pytensor.tensor.sort import TopKOp
 from pytensor.tensor.type import DenseTensorType, TensorType
-from pytensor.tensor.var import TensorConstant, TensorVariable
+from pytensor.tensor.variable import TensorConstant, TensorVariable
 from pytensor.utils import NoDuplicateOptWarningFilter
 
 
diff --git a/pytensor/tensor/rewriting/elemwise.py b/pytensor/tensor/rewriting/elemwise.py
@@ -39,7 +39,7 @@
     register_specialize,
 )
 from pytensor.tensor.shape import shape_padleft
-from pytensor.tensor.var import TensorConstant, get_unique_constant_value
+from pytensor.tensor.variable import TensorConstant, get_unique_constant_value
 
 
 class InplaceElemwiseOptimizer(GraphRewriter):
diff --git a/pytensor/tensor/rewriting/jax.py b/pytensor/tensor/rewriting/jax.py
@@ -6,7 +6,7 @@
 from pytensor.tensor.math import Sum
 from pytensor.tensor.shape import Reshape
 from pytensor.tensor.subtensor import AdvancedIncSubtensor, AdvancedSubtensor
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 
 
 @node_rewriter([AdvancedIncSubtensor])
diff --git a/pytensor/tensor/rewriting/math.py b/pytensor/tensor/rewriting/math.py
@@ -101,7 +101,7 @@
     values_eq_approx_remove_inf_nan,
     values_eq_approx_remove_nan,
 )
-from pytensor.tensor.var import TensorConstant, get_unique_constant_value
+from pytensor.tensor.variable import TensorConstant, get_unique_constant_value
 
 
 def scalarconsts_rest(inputs, elemwise=True, only_process_constants=False):
diff --git a/pytensor/tensor/rewriting/subtensor.py b/pytensor/tensor/rewriting/subtensor.py
@@ -81,7 +81,7 @@
 )
 from pytensor.tensor.type import TensorType
 from pytensor.tensor.type_other import NoneTypeT, SliceConstant, SliceType
-from pytensor.tensor.var import TensorConstant, TensorVariable
+from pytensor.tensor.variable import TensorConstant, TensorVariable
 
 
 def register_useless(lopt, *tags, **kwargs):
diff --git a/pytensor/tensor/shape.py b/pytensor/tensor/shape.py
@@ -19,7 +19,7 @@
 from pytensor.tensor.exceptions import NotScalarConstantError
 from pytensor.tensor.type import DenseTensorType, TensorType, int_dtypes, tensor
 from pytensor.tensor.type_other import NoneConst
-from pytensor.tensor.var import TensorConstant, TensorVariable
+from pytensor.tensor.variable import TensorConstant, TensorVariable
 
 
 ShapeValueType = Union[None, np.integer, int, Variable]
diff --git a/pytensor/tensor/sharedvar.py b/pytensor/tensor/sharedvar.py
@@ -6,7 +6,7 @@
 from pytensor.misc.safe_asarray import _asarray
 from pytensor.tensor import _get_vector_length
 from pytensor.tensor.type import TensorType
-from pytensor.tensor.var import _tensor_py_operators
+from pytensor.tensor.variable import _tensor_py_operators
 
 
 def load_shared_variable(val):
diff --git a/pytensor/tensor/slinalg.py b/pytensor/tensor/slinalg.py
@@ -16,7 +16,7 @@
 from pytensor.tensor.nlinalg import matrix_dot
 from pytensor.tensor.shape import reshape
 from pytensor.tensor.type import matrix, tensor, vector
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 
 
 if TYPE_CHECKING:
diff --git a/pytensor/tensor/type.py b/pytensor/tensor/type.py
@@ -18,7 +18,7 @@
 if TYPE_CHECKING:
     from numpy.typing import DTypeLike
 
-    from pytensor.tensor.var import TensorVariable
+    from pytensor.tensor.variable import TensorVariable
 
 
 _logger = logging.getLogger("pytensor.tensor.type")
diff --git a/pytensor/tensor/var.py b/pytensor/tensor/var.py
diff --git a/pytensor/tensor/variable.py b/pytensor/tensor/variable.py
diff --git a/pytensor/typed_list/basic.py b/pytensor/typed_list/basic.py
diff --git a/scripts/mypy-failing.txt b/scripts/mypy-failing.txt
diff --git a/tests/graph/test_basic.py b/tests/graph/test_basic.py
diff --git a/tests/link/test_vm.py b/tests/link/test_vm.py
diff --git a/tests/tensor/rewriting/test_math.py b/tests/tensor/rewriting/test_math.py
diff --git a/tests/tensor/test_basic.py b/tests/tensor/test_basic.py
diff --git a/tests/tensor/test_shape.py b/tests/tensor/test_shape.py
diff --git a/tests/tensor/test_variable.py b/tests/tensor/test_variable.py
diff --git a/tests/typed_list/test_basic.py b/tests/typed_list/test_basic.py

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`OutputStorageType,`
`31`	`31`	`StorageMapType,`
`32`	`32`	`)`
`33`		`- from pytensor.tensor.var import TensorVariable`
	`33`	`+ from pytensor.tensor.variable import TensorVariable`
`34`	`34`
`35`	`35`
`36`	`36`	`ThunkAndContainersType = Tuple["BasicThunkType", List["Container"], List["Container"]]`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@`
`69`	`69`	`get_slice_elements,`
`70`	`70`	`set_subtensor,`
`71`	`71`	`)`
`72`		`-from pytensor.tensor.var import TensorConstant, get_unique_constant_value`
	`72`	`+from pytensor.tensor.variable import TensorConstant, get_unique_constant_value`
`73`	`73`
`74`	`74`
`75`	`75`	`list_opt_slice = [`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@`
`62`	`62`	`uint_dtypes,`
`63`	`63`	`values_eq_approx_always_true,`
`64`	`64`	`)`
`65`		`-from pytensor.tensor.var import (`
	`65`	`+from pytensor.tensor.variable import (`
`66`	`66`	`TensorConstant,`
`67`	`67`	`TensorVariable,`
`68`	`68`	`get_unique_constant_value,`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`get_underlying_scalar_constant_value,`
`30`	`30`	`)`
`31`	`31`	`from pytensor.tensor.exceptions import NotScalarConstantError`
`32`		`-from pytensor.tensor.var import TensorConstant, TensorVariable`
	`32`	`+from pytensor.tensor.variable import TensorConstant, TensorVariable`
`33`	`33`
`34`	`34`
`35`	`35`	`_logger = logging.getLogger(__name__)`