Bump Pytensor dependency

pymc-devs · Sep 14, 2023 · f77372c · f77372c
1 parent ec64d40
commit f77372c
Show file tree

Hide file tree

Showing 33 changed files with 33 additions and 33 deletions.
diff --git a/conda-envs/environment-dev.yml b/conda-envs/environment-dev.yml
@@ -14,7 +14,7 @@ dependencies:
 - numpy>=1.15.0
 - pandas>=0.24.0
 - pip
-- pytensor>=2.15.0,<2.16
+- pytensor>=2.16.1,<2.17
 - python-graphviz
 - networkx
 - scipy>=1.4.1

diff --git a/conda-envs/environment-docs.yml b/conda-envs/environment-docs.yml
@@ -12,7 +12,7 @@ dependencies:
 - numpy>=1.15.0
 - pandas>=0.24.0
 - pip
-- pytensor>=2.15.0,<2.16
+- pytensor>=2.16.1,<2.17
 - python-graphviz
 - scipy>=1.4.1
 - typing-extensions>=3.7.4

diff --git a/conda-envs/environment-test.yml b/conda-envs/environment-test.yml
@@ -17,7 +17,7 @@ dependencies:
 - numpy>=1.15.0
 - pandas>=0.24.0
 - pip
-- pytensor>=2.15.0,<2.16
+- pytensor>=2.16.1,<2.17
 - python-graphviz
 - networkx
 - scipy>=1.4.1

diff --git a/conda-envs/windows-environment-dev.yml b/conda-envs/windows-environment-dev.yml
@@ -14,7 +14,7 @@ dependencies:
 - numpy>=1.15.0
 - pandas>=0.24.0
 - pip
-- pytensor>=2.15.0,<2.16
+- pytensor>=2.16.1,<2.17
 - python-graphviz
 - networkx
 - scipy>=1.4.1

diff --git a/conda-envs/windows-environment-test.yml b/conda-envs/windows-environment-test.yml
@@ -17,7 +17,7 @@ dependencies:
 - numpy>=1.15.0
 - pandas>=0.24.0
 - pip
-- pytensor>=2.15.0,<2.16
+- pytensor>=2.16.1,<2.17
 - python-graphviz
 - networkx
 - scipy>=1.4.1

diff --git a/pymc/data.py b/pymc/data.py
@@ -32,7 +32,7 @@
 from pytensor.tensor.random.basic import IntegersRV
 from pytensor.tensor.subtensor import AdvancedSubtensor
 from pytensor.tensor.type import TensorType
-from pytensor.tensor.var import TensorConstant, TensorVariable
+from pytensor.tensor.variable import TensorConstant, TensorVariable
 
 import pymc as pm
 

diff --git a/pymc/distributions/bound.py b/pymc/distributions/bound.py
@@ -18,7 +18,7 @@
 
 from pytensor.tensor import as_tensor_variable
 from pytensor.tensor.random.op import RandomVariable
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 
 from pymc.distributions.continuous import BoundedContinuous, bounded_cont_transform
 from pymc.distributions.dist_math import check_parameters

diff --git a/pymc/distributions/continuous.py b/pymc/distributions/continuous.py
@@ -54,7 +54,7 @@
     vonmises,
 )
 from pytensor.tensor.random.op import RandomVariable
-from pytensor.tensor.var import TensorConstant
+from pytensor.tensor.variable import TensorConstant
 
 from pymc.logprob.abstract import _logcdf_helper, _logprob_helper
 from pymc.logprob.basic import icdf

diff --git a/pymc/distributions/distribution.py b/pymc/distributions/distribution.py
@@ -35,7 +35,7 @@
 from pytensor.tensor.random.rewriting import local_subtensor_rv_lift
 from pytensor.tensor.random.utils import normalize_size_param
 from pytensor.tensor.rewriting.shape import ShapeFeature
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 from typing_extensions import TypeAlias
 
 from pymc.distributions.shape_utils import (

diff --git a/pymc/distributions/shape_utils.py b/pymc/distributions/shape_utils.py
@@ -31,7 +31,7 @@
 from pytensor.raise_op import Assert
 from pytensor.tensor.random.op import RandomVariable
 from pytensor.tensor.shape import SpecifyShape
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 from typing_extensions import TypeAlias
 
 from pymc.model import modelcontext

diff --git a/pymc/distributions/simulator.py b/pymc/distributions/simulator.py
@@ -20,7 +20,7 @@
 
 from pytensor.graph.op import Apply, Op
 from pytensor.tensor.random.op import RandomVariable
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 from scipy.spatial import cKDTree
 
 from pymc.distributions.distribution import Distribution, _moment

diff --git a/pymc/gp/cov.py b/pymc/gp/cov.py
@@ -25,7 +25,7 @@
 
 from pytensor.graph.basic import Variable
 from pytensor.tensor.sharedvar import TensorSharedVariable
-from pytensor.tensor.var import TensorConstant, TensorVariable
+from pytensor.tensor.variable import TensorConstant, TensorVariable
 
 __all__ = [
     "Constant",

diff --git a/pymc/gp/util.py b/pymc/gp/util.py
@@ -18,7 +18,7 @@
 import pytensor.tensor as pt
 
 from pytensor.compile import SharedVariable
-from pytensor.tensor.var import TensorConstant
+from pytensor.tensor.variable import TensorConstant
 from scipy.cluster.vq import kmeans
 
 # Avoid circular dependency when importing modelcontext

diff --git a/pymc/initial_point.py b/pymc/initial_point.py
@@ -22,7 +22,7 @@
 
 from pytensor.graph.basic import Variable
 from pytensor.graph.fg import FunctionGraph
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 
 from pymc.logprob.transforms import RVTransform
 from pymc.pytensorf import compile_pymc, find_rng_nodes, replace_rng_nodes, reseed_rngs

diff --git a/pymc/logprob/basic.py b/pymc/logprob/basic.py
@@ -52,7 +52,7 @@
 )
 from pytensor.graph.op import compute_test_value
 from pytensor.graph.rewriting.basic import GraphRewriter, NodeRewriter
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 from typing_extensions import TypeAlias
 
 from pymc.logprob.abstract import (

diff --git a/pymc/logprob/censoring.py b/pymc/logprob/censoring.py
@@ -45,7 +45,7 @@
 from pytensor.scalar.basic import Ceil, Clip, Floor, RoundHalfToEven
 from pytensor.scalar.basic import clip as scalar_clip
 from pytensor.tensor.math import ceil, clip, floor, round_half_to_even
-from pytensor.tensor.var import TensorConstant
+from pytensor.tensor.variable import TensorConstant
 
 from pymc.logprob.abstract import MeasurableElemwise, _logcdf, _logprob
 from pymc.logprob.rewriting import PreserveRVMappings, measurable_ir_rewrites_db

diff --git a/pymc/logprob/mixture.py b/pymc/logprob/mixture.py
@@ -63,7 +63,7 @@
 )
 from pytensor.tensor.type import TensorType
 from pytensor.tensor.type_other import NoneConst, NoneTypeT, SliceConstant, SliceType
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 
 from pymc.logprob.abstract import (
     MeasurableElemwise,

diff --git a/pymc/logprob/order.py b/pymc/logprob/order.py
@@ -47,7 +47,7 @@
 from pytensor.tensor.exceptions import NotScalarConstantError
 from pytensor.tensor.math import Max
 from pytensor.tensor.random.op import RandomVariable
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 
 from pymc.logprob.abstract import (
     MeasurableVariable,

diff --git a/pymc/logprob/rewriting.py b/pymc/logprob/rewriting.py
@@ -80,7 +80,7 @@
     IncSubtensor,
     Subtensor,
 )
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 
 from pymc.logprob.abstract import MeasurableVariable
 from pymc.logprob.utils import DiracDelta, indices_from_subtensor

diff --git a/pymc/logprob/scan.py b/pymc/logprob/scan.py
@@ -50,7 +50,7 @@
 from pytensor.scan.utils import ScanArgs
 from pytensor.tensor.random.type import RandomType
 from pytensor.tensor.subtensor import Subtensor, indices_from_subtensor
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 from pytensor.updates import OrderedUpdates
 
 from pymc.logprob.abstract import MeasurableVariable, _logprob

diff --git a/pymc/logprob/transforms.py b/pymc/logprob/transforms.py
@@ -110,7 +110,7 @@
     tanh,
     true_div,
 )
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 
 from pymc.logprob.abstract import (
     MeasurableElemwise,

diff --git a/pymc/logprob/utils.py b/pymc/logprob/utils.py
@@ -61,7 +61,7 @@
 from pytensor.link.c.type import CType
 from pytensor.raise_op import CheckAndRaise
 from pytensor.tensor.random.op import RandomVariable
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 
 from pymc.logprob.abstract import MeasurableVariable, _logprob
 from pymc.util import makeiter

diff --git a/pymc/model/core.py b/pymc/model/core.py
@@ -50,7 +50,7 @@
 from pytensor.tensor.random.op import RandomVariable
 from pytensor.tensor.random.type import RandomType
 from pytensor.tensor.sharedvar import ScalarSharedVariable
-from pytensor.tensor.var import TensorConstant, TensorVariable
+from pytensor.tensor.variable import TensorConstant, TensorVariable
 from typing_extensions import Self
 
 from pymc.blocking import DictToArrayBijection, RaveledVars

diff --git a/pymc/model_graph.py b/pymc/model_graph.py
@@ -24,7 +24,7 @@
 from pytensor.tensor.elemwise import Elemwise
 from pytensor.tensor.random.op import RandomVariable
 from pytensor.tensor.shape import Shape
-from pytensor.tensor.var import TensorConstant, TensorVariable
+from pytensor.tensor.variable import TensorConstant, TensorVariable
 
 import pymc as pm
 

diff --git a/pymc/pytensorf.py b/pymc/pytensorf.py
@@ -60,7 +60,7 @@
 from pytensor.tensor.rewriting.shape import ShapeFeature
 from pytensor.tensor.sharedvar import SharedVariable, TensorSharedVariable
 from pytensor.tensor.subtensor import AdvancedIncSubtensor, AdvancedIncSubtensor1
-from pytensor.tensor.var import TensorConstant, TensorVariable
+from pytensor.tensor.variable import TensorConstant, TensorVariable
 
 from pymc.exceptions import NotConstantValueError
 from pymc.logprob.transforms import RVTransform

diff --git a/pymc/variational/approximations.py b/pymc/variational/approximations.py
@@ -20,7 +20,7 @@
 from pytensor import tensor as pt
 from pytensor.graph.basic import Variable
 from pytensor.graph.replace import graph_replace
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 
 import pymc as pm
 

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -18,7 +18,7 @@ numpydoc
 pandas>=0.24.0
 polyagamma
 pre-commit>=2.8.0
-pytensor>=2.15.0,<2.16
+pytensor>=2.16.1,<2.17
 pytest-cov>=2.5
 pytest>=3.0
 scipy>=1.4.1

diff --git a/requirements.txt b/requirements.txt
@@ -4,6 +4,6 @@ cloudpickle
 fastprogress>=0.2.0
 numpy>=1.15.0
 pandas>=0.24.0
-pytensor>=2.15.0,<2.16
+pytensor>=2.16.1,<2.17
 scipy>=1.4.1
 typing-extensions>=3.7.4
diff --git a/tests/distributions/test_transform.py b/tests/distributions/test_transform.py
@@ -20,7 +20,7 @@
 import pytensor.tensor as pt
 import pytest
 
-from pytensor.tensor.var import TensorConstant
+from pytensor.tensor.variable import TensorConstant
 
 import pymc as pm
 import pymc.distributions.transforms as tr

diff --git a/tests/model/test_core.py b/tests/model/test_core.py
@@ -36,7 +36,7 @@
 from pytensor.tensor import TensorVariable
 from pytensor.tensor.random.op import RandomVariable
 from pytensor.tensor.sharedvar import ScalarSharedVariable
-from pytensor.tensor.var import TensorConstant
+from pytensor.tensor.variable import TensorConstant
 
 import pymc as pm
 

diff --git a/tests/test_data.py b/tests/test_data.py
@@ -23,7 +23,7 @@
 import pytest
 
 from pytensor import shared
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 
 import pymc as pm
 

diff --git a/tests/test_model_graph.py b/tests/test_model_graph.py
@@ -19,7 +19,7 @@
 import pytest
 
 from pytensor.compile.sharedvalue import SharedVariable
-from pytensor.tensor.var import TensorConstant
+from pytensor.tensor.variable import TensorConstant
 
 import pymc as pm
 

diff --git a/tests/test_pytensorf.py b/tests/test_pytensorf.py
@@ -32,7 +32,7 @@
 from pytensor.tensor.random.var import RandomStateSharedVariable
 from pytensor.tensor.slinalg import Cholesky
 from pytensor.tensor.subtensor import AdvancedIncSubtensor, AdvancedIncSubtensor1
-from pytensor.tensor.var import TensorVariable
+from pytensor.tensor.variable import TensorVariable
 
 import pymc as pm