From 630d805ecbeed75cc9557fb3f6d8b88b80515b37 Mon Sep 17 00:00:00 2001 From: Ricardo Vieira Date: Tue, 20 May 2025 10:45:27 +0200 Subject: [PATCH 1/2] Bump PyTensor dependency pin --- conda-envs/environment-alternative-backends.yml | 2 +- conda-envs/environment-dev.yml | 2 +- conda-envs/environment-docs.yml | 2 +- conda-envs/environment-test.yml | 2 +- conda-envs/windows-environment-dev.yml | 2 +- conda-envs/windows-environment-test.yml | 2 +- requirements-dev.txt | 2 +- requirements.txt | 2 +- tests/sampling/test_mcmc.py | 4 ---- 9 files changed, 8 insertions(+), 12 deletions(-) diff --git a/conda-envs/environment-alternative-backends.yml b/conda-envs/environment-alternative-backends.yml index 1b575a1994..5030e7bacf 100644 --- a/conda-envs/environment-alternative-backends.yml +++ b/conda-envs/environment-alternative-backends.yml @@ -22,7 +22,7 @@ dependencies: - numpyro>=0.8.0 - pandas>=0.24.0 - pip -- pytensor>=2.30.2,<2.31 +- pytensor>=2.31.2,<2.32 - python-graphviz - networkx - rich>=13.7.1 diff --git a/conda-envs/environment-dev.yml b/conda-envs/environment-dev.yml index 24da9d3966..e161b66e1f 100644 --- a/conda-envs/environment-dev.yml +++ b/conda-envs/environment-dev.yml @@ -12,7 +12,7 @@ dependencies: - numpy>=1.25.0 - pandas>=0.24.0 - pip -- pytensor>=2.30.2,<2.31 +- pytensor>=2.31.2,<2.32 - python-graphviz - networkx - scipy>=1.4.1 diff --git a/conda-envs/environment-docs.yml b/conda-envs/environment-docs.yml index 34f648b0f3..67e6673af2 100644 --- a/conda-envs/environment-docs.yml +++ b/conda-envs/environment-docs.yml @@ -11,7 +11,7 @@ dependencies: - numpy>=1.25.0 - pandas>=0.24.0 - pip -- pytensor>=2.30.2,<2.31 +- pytensor>=2.31.2,<2.32 - python-graphviz - rich>=13.7.1 - scipy>=1.4.1 diff --git a/conda-envs/environment-test.yml b/conda-envs/environment-test.yml index f855163a6e..2230d08e77 100644 --- a/conda-envs/environment-test.yml +++ b/conda-envs/environment-test.yml @@ -14,7 +14,7 @@ dependencies: - pandas>=0.24.0 - pip - polyagamma -- pytensor>=2.30.2,<2.31 +- pytensor>=2.31.2,<2.32 - python-graphviz - networkx - rich>=13.7.1 diff --git a/conda-envs/windows-environment-dev.yml b/conda-envs/windows-environment-dev.yml index d3df2b8a46..daf0398147 100644 --- a/conda-envs/windows-environment-dev.yml +++ b/conda-envs/windows-environment-dev.yml @@ -12,7 +12,7 @@ dependencies: - numpy>=1.25.0 - pandas>=0.24.0 - pip -- pytensor>=2.30.2,<2.31 +- pytensor>=2.31.2,<2.32 - python-graphviz - networkx - rich>=13.7.1 diff --git a/conda-envs/windows-environment-test.yml b/conda-envs/windows-environment-test.yml index 4d070f3f9a..7c9c28b70f 100644 --- a/conda-envs/windows-environment-test.yml +++ b/conda-envs/windows-environment-test.yml @@ -15,7 +15,7 @@ dependencies: - pandas>=0.24.0 - pip - polyagamma -- pytensor>=2.30.2,<2.31 +- pytensor>=2.31.2,<2.32 - python-graphviz - networkx - rich>=13.7.1 diff --git a/requirements-dev.txt b/requirements-dev.txt index 534503c249..840f3d8063 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -16,7 +16,7 @@ numpydoc pandas>=0.24.0 polyagamma pre-commit>=2.8.0 -pytensor>=2.30.2,<2.31 +pytensor>=2.31.2,<2.32 pytest-cov>=2.5 pytest>=3.0 rich>=13.7.1 diff --git a/requirements.txt b/requirements.txt index c278ad6917..c1ca979dd1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ cachetools>=4.2.1 cloudpickle numpy>=1.25.0 pandas>=0.24.0 -pytensor>=2.30.2,<2.31 +pytensor>=2.31.2,<2.32 rich>=13.7.1 scipy>=1.4.1 threadpoolctl>=3.1.0,<4.0.0 diff --git a/tests/sampling/test_mcmc.py b/tests/sampling/test_mcmc.py index 409ab6ff86..090b76130b 100644 --- a/tests/sampling/test_mcmc.py +++ b/tests/sampling/test_mcmc.py @@ -526,7 +526,6 @@ def test_partial_trace_with_trace_unsupported(): pm.sample(trace=[a]) -@pytest.mark.xfail(condition=(pytensor.config.floatX == "float32"), reason="Fails on float32") class TestNamedSampling: def test_shared_named(self): G_var = shared(value=np.atleast_2d(1.0), shape=(1, None), name="G") @@ -537,7 +536,6 @@ def test_shared_named(self): mu=np.atleast_2d(0), tau=np.atleast_2d(1e20), size=(1, 1), - initval=np.atleast_2d(0), ) theta = pm.Normal( "theta", mu=pt.dot(G_var, theta0), tau=np.atleast_2d(1e20), size=(1, 1) @@ -553,7 +551,6 @@ def test_shared_unnamed(self): mu=np.atleast_2d(0), tau=np.atleast_2d(1e20), size=(1, 1), - initval=np.atleast_2d(0), ) theta = pm.Normal( "theta", mu=pt.dot(G_var, theta0), tau=np.atleast_2d(1e20), size=(1, 1) @@ -569,7 +566,6 @@ def test_constant_named(self): mu=np.atleast_2d(0), tau=np.atleast_2d(1e20), size=(1, 1), - initval=np.atleast_2d(0), ) theta = pm.Normal( "theta", mu=pt.dot(G_var, theta0), tau=np.atleast_2d(1e20), size=(1, 1) From 03139d6c3ef3a5820e32aa609778446524cb545b Mon Sep 17 00:00:00 2001 From: Ricardo Vieira Date: Tue, 27 May 2025 15:16:03 +0200 Subject: [PATCH 2/2] Mypy is failing with new numpy dtype type-hints --- scripts/run_mypy.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/run_mypy.py b/scripts/run_mypy.py index ccce06736c..409e255d75 100755 --- a/scripts/run_mypy.py +++ b/scripts/run_mypy.py @@ -44,6 +44,7 @@ pymc/model/transform/conditioning.py pymc/pytensorf.py pymc/sampling/jax.py +pymc/sampling/mcmc.py """