diff --git a/conda-envs/environment-dev-py37.yml b/conda-envs/environment-dev-py37.yml index 87290b1712..0054d7788a 100644 --- a/conda-envs/environment-dev-py37.yml +++ b/conda-envs/environment-dev-py37.yml @@ -4,7 +4,7 @@ channels: - conda-forge - defaults dependencies: -- aeppl=0.0.15 +- aeppl>=0.0.17 - aesara>=2.2.6 - arviz>=0.11.4 - cachetools>=4.2.1 diff --git a/conda-envs/environment-dev-py38.yml b/conda-envs/environment-dev-py38.yml index 10739e52ee..63d7fa1fd1 100644 --- a/conda-envs/environment-dev-py38.yml +++ b/conda-envs/environment-dev-py38.yml @@ -4,7 +4,7 @@ channels: - conda-forge - defaults dependencies: -- aeppl=0.0.15 +- aeppl>=0.0.17 - aesara>=2.2.6 - arviz>=0.11.4 - cachetools>=4.2.1 diff --git a/conda-envs/environment-dev-py39.yml b/conda-envs/environment-dev-py39.yml index 1c1a029ef9..b9ba50f49e 100644 --- a/conda-envs/environment-dev-py39.yml +++ b/conda-envs/environment-dev-py39.yml @@ -4,7 +4,7 @@ channels: - conda-forge - defaults dependencies: -- aeppl=0.0.15 +- aeppl>=0.0.17 - aesara>=2.2.6 - arviz>=0.11.4 - cachetools>=4.2.1 diff --git a/conda-envs/environment-test-py37.yml b/conda-envs/environment-test-py37.yml index a7dc3a65bf..c5a4a14b47 100644 --- a/conda-envs/environment-test-py37.yml +++ b/conda-envs/environment-test-py37.yml @@ -4,7 +4,7 @@ channels: - conda-forge - defaults dependencies: -- aeppl=0.0.15 +- aeppl>=0.0.17 - aesara>=2.2.6 - arviz>=0.11.4 - cachetools>=4.2.1 diff --git a/conda-envs/environment-test-py38.yml b/conda-envs/environment-test-py38.yml index bb44562f6b..5a2b1ee762 100644 --- a/conda-envs/environment-test-py38.yml +++ b/conda-envs/environment-test-py38.yml @@ -4,7 +4,7 @@ channels: - conda-forge - defaults dependencies: -- aeppl==0.0.15 +- aeppl>=0.0.17 - aesara>=2.2.6 - arviz>=0.11.4 - cachetools>=4.2.1 diff --git a/conda-envs/environment-test-py39.yml b/conda-envs/environment-test-py39.yml index 0cdabf0e3b..942c05c03d 100644 --- a/conda-envs/environment-test-py39.yml +++ b/conda-envs/environment-test-py39.yml @@ -4,7 +4,7 @@ channels: - conda-forge - defaults dependencies: -- aeppl=0.0.15 +- aeppl>=0.0.17 - aesara>=2.2.6 - arviz>=0.11.4 - cachetools diff --git a/conda-envs/windows-environment-dev-py38.yml b/conda-envs/windows-environment-dev-py38.yml index 393f5a74ac..13f173df5d 100644 --- a/conda-envs/windows-environment-dev-py38.yml +++ b/conda-envs/windows-environment-dev-py38.yml @@ -4,7 +4,7 @@ channels: - defaults dependencies: # base dependencies (see install guide for Windows) -- aeppl=0.0.15 +- aeppl>=0.0.17 - aesara>=2.2.6 - arviz>=0.11.4 - cachetools>=4.2.1 diff --git a/conda-envs/windows-environment-test-py38.yml b/conda-envs/windows-environment-test-py38.yml index 5a1f3629c2..cf6fa461bd 100644 --- a/conda-envs/windows-environment-test-py38.yml +++ b/conda-envs/windows-environment-test-py38.yml @@ -4,7 +4,7 @@ channels: - defaults dependencies: # base dependencies (see install guide for Windows) -- aeppl=0.0.15 +- aeppl>=0.0.17 - aesara>=2.2.6 - arviz>=0.11.2 - cachetools diff --git a/pymc/tests/sampler_fixtures.py b/pymc/tests/sampler_fixtures.py index 0b1555d964..ce5f4f0490 100644 --- a/pymc/tests/sampler_fixtures.py +++ b/pymc/tests/sampler_fixtures.py @@ -11,9 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import sys - -import aesara import aesara.tensor as at import arviz as az import numpy as np @@ -41,15 +38,6 @@ def test_var(self): samples = self.samples[varname] npt.assert_allclose(expected, samples.var(0), self.rtol, self.atol) - IS_LINUX = sys.platform == "linux" - IS_FLOAT32 = aesara.config.floatX == "float32" - from pymc.tests.test_posteriors import TestSliceUniform - - if IS_LINUX and IS_FLOAT32 and isinstance(self, TestSliceUniform): - raise AssertionError( - "Temporarily fail this test for specific subsytems. See: https://github.com/pymc-devs/pymc/pull/4887#issuecomment-946506545" - ) - class KnownCDF: ks_thin = 5 diff --git a/pymc/tests/test_posteriors.py b/pymc/tests/test_posteriors.py index 2f9db10551..8122588a23 100644 --- a/pymc/tests/test_posteriors.py +++ b/pymc/tests/test_posteriors.py @@ -12,16 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import sys - -import aesara import pytest from pymc.tests import sampler_fixtures as sf -IS_LINUX = sys.platform == "linux" -IS_FLOAT32 = aesara.config.floatX == "float32" - class TestNUTSUniform(sf.NutsFixture, sf.UniformFixture): n_samples = 10000 @@ -43,10 +37,6 @@ class TestMetropolisUniform(sf.MetropolisFixture, sf.UniformFixture): atol = 0.05 -@pytest.mark.xfail( - condition=IS_FLOAT32 and IS_LINUX, - reason="Test fails on linux float32 systems. See https://github.com/pymc-devs/pymc/issues/5088", -) class TestSliceUniform(sf.SliceFixture, sf.UniformFixture): n_samples = 10000 tune = 1000 diff --git a/pymc/tests/test_sampling.py b/pymc/tests/test_sampling.py index 57653028ac..6978128872 100644 --- a/pymc/tests/test_sampling.py +++ b/pymc/tests/test_sampling.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import sys import unittest.mock as mock from contextlib import ExitStack as does_not_raise @@ -39,9 +38,6 @@ from pymc.tests.helpers import SeededTest from pymc.tests.models import simple_init -IS_LINUX = sys.platform == "linux" -IS_FLOAT32 = aesara.config.floatX == "float32" - class TestInitNuts(SeededTest): def setup_method(self): @@ -705,10 +701,6 @@ def test_model_shared_variable(self): assert post_pred["obs"].shape == (samples, 3) npt.assert_allclose(post_pred["p"], expected_p) - @pytest.mark.xfail( - condition=IS_FLOAT32 and IS_LINUX, - reason="Test fails on linux float32 systems. See https://github.com/pymc-devs/pymc/issues/5088", - ) def test_deterministic_of_observed(self): rng = np.random.RandomState(8442) @@ -716,9 +708,9 @@ def test_deterministic_of_observed(self): meas_in_2 = pm.aesaraf.floatX(5 + 4 * rng.randn(10)) nchains = 2 with pm.Model(rng_seeder=rng) as model: - mu_in_1 = pm.Normal("mu_in_1", 0, 1) + mu_in_1 = pm.Normal("mu_in_1", 0, 2) sigma_in_1 = pm.HalfNormal("sd_in_1", 1) - mu_in_2 = pm.Normal("mu_in_2", 0, 1) + mu_in_2 = pm.Normal("mu_in_2", 0, 2) sigma_in_2 = pm.HalfNormal("sd__in_2", 1) in_1 = pm.Normal("in_1", mu_in_1, sigma_in_1, observed=meas_in_1) diff --git a/pymc/tests/test_transforms.py b/pymc/tests/test_transforms.py index dbad75c8d8..8fafd50e9e 100644 --- a/pymc/tests/test_transforms.py +++ b/pymc/tests/test_transforms.py @@ -221,7 +221,9 @@ def transform_params(z=a, y=b): close_to_logical(vals < b, True, tol) -@pytest.mark.xfail(reason="This test produces infinite values using aeppl") +@pytest.mark.skipif( + aesara.config.floatX == "float32", reason="Test is designed for 64bit precision" +) def test_interval_near_boundary(): lb = -1.0 ub = 1e-7 diff --git a/requirements-dev.txt b/requirements-dev.txt index 62b4d78eb8..28dbe3c25a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,7 +1,7 @@ # This file is auto-generated by scripts/generate_pip_deps_from_conda.py, do not modify. # See that file for comments about the need/usage of each dependency. -aeppl==0.0.15 +aeppl>=0.0.17 aesara>=2.2.6 arviz>=0.11.4 cachetools>=4.2.1 diff --git a/requirements.txt b/requirements.txt index 799e934d5f..d80b9c8a46 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -aeppl==0.0.15 +aeppl>=0.0.17 aesara>=2.2.6 arviz>=0.11.4 cachetools>=4.2.1