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

.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

pytensor/link/basic.py

@@ -30,7 +30,7 @@ if TYPE_CHECKING:
         OutputStorageType,
         StorageMapType,
     )
-    from pytensor.tensor.var import TensorVariable
+    from pytensor.tensor.variable import TensorVariable
 
 
 ThunkAndContainersType = Tuple["BasicThunkType", List["Container"], List["Container"]]

pytensor/link/jax/dispatch/subtensor.py

@@ -33,7 +33,7 @@ slice length.
 
 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:

pytensor/scan/op.py

@@ -82,7 +82,7 @@ from pytensor.tensor.basic import as_tensor_variable
 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

pytensor/scan/rewriting.py

@@ -69,7 +69,7 @@ from pytensor.tensor.subtensor import (
     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 = [

pytensor/scan/utils.py

@@ -21,7 +21,7 @@ from pytensor.graph.type import HasDataType
 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:

pytensor/sparse/basic.py

@@ -51,7 +51,11 @@ from pytensor.tensor.type import TensorType
 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"]

pytensor/tensor/__init__.py

@@ -146,7 +146,7 @@ from pytensor.tensor.sort import argsort, argtopk, sort, topk, topk_and_argtopk
 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

pytensor/tensor/basic.py

@@ -62,7 +62,7 @@ from pytensor.tensor.type import (
     uint_dtypes,
     values_eq_approx_always_true,
 )
-from pytensor.tensor.var import (
+from pytensor.tensor.variable import (
     TensorConstant,
     TensorVariable,
     get_unique_constant_value,

pytensor/tensor/conv/abstract_conv.py

@@ -29,7 +29,7 @@ from pytensor.tensor.basic import (
     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__)

pytensor/tensor/elemwise.py

@@ -29,7 +29,7 @@ from pytensor.tensor.type import (
     float_dtypes,
     lvector,
 )
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 from pytensor.utils import uniq
 
 

pytensor/tensor/extra_ops.py

@@ -35,7 +35,7 @@ from pytensor.tensor.math import sum as at_sum
 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
 
 

pytensor/tensor/fourier.py

@@ -16,7 +16,7 @@ from pytensor.tensor.math import exp, lt, outer, tensordot
 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):

pytensor/tensor/math.py

@@ -40,7 +40,7 @@ from pytensor.tensor.type import (
 )
 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:

pytensor/tensor/nlinalg.py

+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"):

pytensor/tensor/random/op.py

@@ -21,7 +21,7 @@ from pytensor.tensor.random.utils import normalize_size_param, params_broadcast_
 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):

pytensor/tensor/random/utils.py

@@ -14,7 +14,7 @@ from pytensor.tensor.extra_ops import broadcast_to
 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:

pytensor/tensor/rewriting/basic.py

@@ -72,7 +72,7 @@ from pytensor.tensor.math import eq
 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
 
 

pytensor/tensor/rewriting/elemwise.py

@@ -39,7 +39,7 @@ from pytensor.tensor.rewriting.basic import (
     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):

pytensor/tensor/rewriting/jax.py

@@ -6,7 +6,7 @@ from pytensor.tensor.elemwise import DimShuffle
 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])

pytensor/tensor/rewriting/math.py

@@ -101,7 +101,7 @@ from pytensor.tensor.type import (
     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):

pytensor/tensor/rewriting/subtensor.py

@@ -81,7 +81,7 @@ from pytensor.tensor.subtensor import (
 )
 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):

pytensor/tensor/shape.py

@@ -19,7 +19,7 @@ from pytensor.tensor import get_vector_length
 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]

pytensor/tensor/sharedvar.py

@@ -6,7 +6,7 @@ from pytensor.compile import SharedVariable, shared_constructor
 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):

pytensor/tensor/slinalg.py

@@ -16,7 +16,7 @@ from pytensor.tensor import math as atm
 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:

pytensor/tensor/type.py

@@ -18,7 +18,7 @@ from pytensor.utils import apply_across_args
 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")

pytensor/typed_list/basic.py

@@ -8,7 +8,7 @@ from pytensor.graph.op import Op
 from pytensor.link.c.op import COp
 from pytensor.tensor.type import scalar
 from pytensor.tensor.type_other import SliceType
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 from pytensor.typed_list.type import TypedListType
 
 

scripts/mypy-failing.txt

@@ -32,4 +32,5 @@ pytensor/tensor/slinalg.py
 pytensor/tensor/subtensor.py
 pytensor/tensor/type.py
 pytensor/tensor/type_other.py
-pytensor/tensor/var.py
+pytensor/tensor/variable.py
\ No newline at end of file
+pytensor/tensor/nlinalg.py
\ No newline at end of file

tests/graph/test_basic.py

@@ -33,7 +33,7 @@ from pytensor.graph.type import Type
 from pytensor.tensor.math import max_and_argmax
 from pytensor.tensor.type import TensorType, iscalars, matrix, scalars, vector
 from pytensor.tensor.type_other import NoneConst
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 from tests.graph.utils import MyInnerGraphOp
 
 

tests/link/test_vm.py

@@ -18,7 +18,7 @@ from pytensor.link.utils import map_storage
 from pytensor.link.vm import VM, Loop, Stack, VMLinker
 from pytensor.tensor.math import cosh, tanh
 from pytensor.tensor.type import lscalar, scalar, scalars, vector, vectors
-from pytensor.tensor.var import TensorConstant
+from pytensor.tensor.variable import TensorConstant
 from tests import unittest_tools as utt
 
 

tests/tensor/rewriting/test_math.py

@@ -125,7 +125,7 @@ from pytensor.tensor.type import (
     vectors,
     zscalar,
 )
-from pytensor.tensor.var import TensorConstant
+from pytensor.tensor.variable import TensorConstant
 from tests import unittest_tools as utt
 
 

tests/tensor/test_basic.py

@@ -125,7 +125,7 @@ from pytensor.tensor.type import (
     vectors,
     wvector,
 )
-from pytensor.tensor.var import TensorConstant
+from pytensor.tensor.variable import TensorConstant
 from pytensor.utils import PYTHON_INT_BITWIDTH
 from tests import unittest_tools as utt
 from tests.tensor.utils import (

tests/tensor/test_shape.py

@@ -47,7 +47,7 @@ from pytensor.tensor.type import (
     vector,
 )
 from pytensor.tensor.type_other import NoneConst
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 from pytensor.typed_list import make_list
 from tests import unittest_tools as utt
 from tests.graph.utils import MyType2

tests/tensor/test_var.py → tests/tensor/test_variable.py

@@ -29,7 +29,7 @@ from pytensor.tensor.type import (
     tensor3,
 )
 from pytensor.tensor.type_other import MakeSlice, NoneConst
-from pytensor.tensor.var import (
+from pytensor.tensor.variable import (
     DenseTensorConstant,
     DenseTensorVariable,
     TensorConstant,
@@ -405,3 +405,15 @@ class TestTensorInstanceMethods:
         assert_array_equal(X.take(indices, 1).eval({X: x}), x.take(indices, 1))
         # Test equivalent advanced indexing
         assert_array_equal(X[:, indices].eval({X: x}), x[:, indices])
+
+
+def test_deprecated_import():
+    with pytest.warns(
+        DeprecationWarning,
+        match="The module 'pytensor.tensor.var' has been deprecated.",
+    ):
+        import pytensor.tensor.var as _var
+
+        # Make sure the deprecated import provides access to 'variable' module
+        assert hasattr(_var, "TensorVariable")
+        assert hasattr(_var, "TensorConstant")

tests/typed_list/test_basic.py

@@ -13,7 +13,7 @@ from pytensor.tensor.type import (
     vector,
 )
 from pytensor.tensor.type_other import SliceType
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 from pytensor.typed_list.basic import (
     Append,
     Count,