Bump PyTensor dependency

Author: ricardoV94

conda-envs/environment-dev.yml

@@ -14,7 +14,7 @@ dependencies:
 - numpy>=1.15.0
 - pandas>=0.24.0
 - pip
-- pytensor>=2.14.1,<2.15
+- pytensor>=2.15.0,<2.16
 - python-graphviz
 - networkx
 - scipy>=1.4.1

conda-envs/environment-docs.yml

@@ -12,7 +12,7 @@ dependencies:
 - numpy>=1.15.0
 - pandas>=0.24.0
 - pip
-- pytensor>=2.14.1,<2.15
+- pytensor>=2.15.0,<2.16
 - python-graphviz
 - scipy>=1.4.1
 - typing-extensions>=3.7.4

conda-envs/environment-test.yml

@@ -17,7 +17,7 @@ dependencies:
 - numpy>=1.15.0
 - pandas>=0.24.0
 - pip
-- pytensor>=2.14.1,<2.15
+- pytensor>=2.15.0,<2.16
 - python-graphviz
 - networkx
 - scipy>=1.4.1

conda-envs/windows-environment-dev.yml

@@ -14,7 +14,7 @@ dependencies:
 - numpy>=1.15.0
 - pandas>=0.24.0
 - pip
-- pytensor>=2.14.1,<2.15
+- pytensor>=2.15.0,<2.16
 - python-graphviz
 - networkx
 - scipy>=1.4.1

conda-envs/windows-environment-test.yml

@@ -17,7 +17,7 @@ dependencies:
 - numpy>=1.15.0
 - pandas>=0.24.0
 - pip
-- pytensor>=2.14.1,<2.15
+- pytensor>=2.15.0,<2.16
 - python-graphviz
 - networkx
 - scipy>=1.4.1

pymc/logprob/rewriting.py

@@ -66,8 +66,8 @@
     SequenceDB,
     TopoDB,
 )
+from pytensor.tensor.basic import Alloc
 from pytensor.tensor.elemwise import DimShuffle, Elemwise
-from pytensor.tensor.extra_ops import BroadcastTo
 from pytensor.tensor.random.rewriting import local_subtensor_rv_lift
 from pytensor.tensor.rewriting.basic import register_canonicalize
 from pytensor.tensor.rewriting.shape import ShapeFeature
@@ -283,7 +283,7 @@ def request_measurable(self, vars: Sequence[Variable]) -> List[Variable]:
 
 
 @register_canonicalize
-@node_rewriter((Elemwise, BroadcastTo, DimShuffle) + subtensor_ops)
+@node_rewriter((Elemwise, Alloc, DimShuffle) + subtensor_ops)
 def local_lift_DiracDelta(fgraph, node):
     r"""Lift basic `Op`\s through `DiracDelta`\s."""
 

pymc/logprob/tensor.py

@@ -41,9 +41,8 @@
 from pytensor import tensor as pt
 from pytensor.graph.op import compute_test_value
 from pytensor.graph.rewriting.basic import node_rewriter
-from pytensor.tensor.basic import Join, MakeVector
+from pytensor.tensor.basic import Alloc, Join, MakeVector
 from pytensor.tensor.elemwise import DimShuffle
-from pytensor.tensor.extra_ops import BroadcastTo
 from pytensor.tensor.random.op import RandomVariable
 from pytensor.tensor.random.rewriting import (
     local_dimshuffle_rv_lift,
@@ -59,9 +58,9 @@
 from pymc.logprob.utils import check_potential_measurability
 
 
-@node_rewriter([BroadcastTo])
+@node_rewriter([Alloc])
 def naive_bcast_rv_lift(fgraph, node):
-    """Lift a ``BroadcastTo`` through a ``RandomVariable`` ``Op``.
+    """Lift an ``Alloc`` through a ``RandomVariable`` ``Op``.
 
     XXX: This implementation simply broadcasts the ``RandomVariable``'s
     parameters, which won't always work (e.g. multivariate distributions).
@@ -73,7 +72,7 @@ def naive_bcast_rv_lift(fgraph, node):
     """
 
     if not (
-        isinstance(node.op, BroadcastTo)
+        isinstance(node.op, Alloc)
         and node.inputs[0].owner
         and isinstance(node.inputs[0].owner.op, RandomVariable)
     ):
@@ -93,7 +92,7 @@ def naive_bcast_rv_lift(fgraph, node):
         return None
 
     if not bcast_shape:
-        # The `BroadcastTo` is broadcasting a scalar to a scalar (i.e. doing nothing)
+        # The `Alloc` is broadcasting a scalar to a scalar (i.e. doing nothing)
         assert rv_var.ndim == 0
         return [rv_var]
 

requirements-dev.txt

@@ -18,7 +18,7 @@ numpydoc
 pandas>=0.24.0
 polyagamma
 pre-commit>=2.8.0
-pytensor>=2.14.1,<2.15
+pytensor>=2.15.0,<2.16
 pytest-cov>=2.5
 pytest>=3.0
 scipy>=1.4.1

requirements.txt

@@ -4,6 +4,6 @@ cloudpickle
 fastprogress>=0.2.0
 numpy>=1.15.0
 pandas>=0.24.0
-pytensor>=2.14.1,<2.15
+pytensor>=2.15.0,<2.16
 scipy>=1.4.1
 typing-extensions>=3.7.4

tests/logprob/test_tensor.py

@@ -42,7 +42,7 @@
 from pytensor.graph import RewriteDatabaseQuery
 from pytensor.graph.rewriting.basic import in2out
 from pytensor.graph.rewriting.utils import rewrite_graph
-from pytensor.tensor.extra_ops import BroadcastTo
+from pytensor.tensor.basic import Alloc
 from scipy import stats as st
 
 from pymc.logprob.basic import conditional_logp, logp
@@ -52,12 +52,12 @@
 
 
 def test_naive_bcast_rv_lift():
-    r"""Make sure `naive_bcast_rv_lift` can handle useless scalar `BroadcastTo`\s."""
+    r"""Make sure `naive_bcast_rv_lift` can handle useless scalar `Alloc`\s."""
     X_rv = pt.random.normal()
-    Z_at = BroadcastTo()(X_rv, ())
+    Z_at = Alloc()(X_rv, *())
 
     # Make sure we're testing what we intend to test
-    assert isinstance(Z_at.owner.op, BroadcastTo)
+    assert isinstance(Z_at.owner.op, Alloc)
 
     res = rewrite_graph(Z_at, custom_rewrite=in2out(naive_bcast_rv_lift), clone=False)
     assert res is X_rv

tests/logprob/test_utils.py

@@ -180,8 +180,8 @@ def test_dirac_delta():
 @pytest.mark.parametrize(
     "dist_params, obs",
     [
-        ((np.array(0, dtype=np.float64),), np.array([0, 0.5, 1, -1], dtype=np.float64)),
-        ((np.array([0, 0], dtype=np.int64),), np.array(0, dtype=np.int64)),
+        ((np.array([0, 0, 0, 0], dtype=np.float64),), np.array([0, 0.5, 1, -1], dtype=np.float64)),
+        ((np.array(0, dtype=np.int64),), np.array(0, dtype=np.int64)),
     ],
 )
 def test_dirac_delta_logprob(dist_params, obs):