Change xfail to skipif as outcome is not consistent (#1487)

* Change xfail to skipif as outcome is not consistent

* skipif for all tests using nuts_pymc sampler

Author: gmoss13

tests/inference_on_device_test.py

@@ -6,6 +6,7 @@
 import sys
 from typing import Tuple, Union
 
+import pymc
 import pytest
 import torch
 import torch.distributions.transforms as torch_tf
@@ -76,10 +77,10 @@
             "nuts_pymc",
             marks=(
                 pytest.mark.mcmc,
-                pytest.mark.xfail(
-                    condition=sys.version_info >= (3, 10),
-                    reason="Fails with pymc>=5.20.1 and python>=3.10",
-                    raises=TypeError,
+                pytest.mark.skipif(
+                    condition=sys.version_info >= (3, 10)
+                    and pymc.__version__ >= "5.20.1",
+                    reason="Inconsistent behaviour with pymc>=5.20.1 and python>=3.10",
                 ),
             ),
         ),

tests/linearGaussian_snle_test.py

@@ -3,6 +3,9 @@
 
 from __future__ import annotations
 
+import sys
+
+import pymc
 import pytest
 import torch
 from torch import eye, ones, zeros
@@ -393,7 +396,18 @@ def simulator(theta):
         pytest.param("slice_np", "uniform", marks=pytest.mark.mcmc),
         pytest.param("slice_np_vectorized", "gaussian", marks=pytest.mark.mcmc),
         pytest.param("slice_np_vectorized", "uniform", marks=pytest.mark.mcmc),
-        pytest.param("nuts_pymc", "gaussian", marks=pytest.mark.mcmc),
+        pytest.param(
+            "nuts_pymc",
+            "gaussian",
+            marks=(
+                pytest.mark.mcmc,
+                pytest.mark.skipif(
+                    condition=sys.version_info >= (3, 10)
+                    and pymc.__version__ >= "5.20.1",
+                    reason="Inconsistent behaviour with pymc>=5.20.1 and python>=3.10",
+                ),
+            ),
+        ),
         pytest.param("nuts_pyro", "uniform", marks=pytest.mark.mcmc),
         pytest.param("hmc_pymc", "gaussian", marks=pytest.mark.mcmc),
         ("rejection", "uniform"),

tests/linearGaussian_snre_test.py

@@ -3,6 +3,9 @@
 
 from __future__ import annotations
 
+import sys
+
+import pymc
 import pytest
 from torch import eye, ones, zeros
 from torch.distributions import MultivariateNormal
@@ -317,7 +320,18 @@ def simulator(theta):
         pytest.param("slice_np", "uniform", marks=pytest.mark.mcmc),
         pytest.param("slice_np_vectorized", "gaussian", marks=pytest.mark.mcmc),
         pytest.param("slice_np_vectorized", "uniform", marks=pytest.mark.mcmc),
-        pytest.param("nuts_pymc", "gaussian", marks=pytest.mark.mcmc),
+        pytest.param(
+            "nuts_pymc",
+            "gaussian",
+            marks=(
+                pytest.mark.mcmc,
+                pytest.mark.skipif(
+                    condition=sys.version_info >= (3, 10)
+                    and pymc.__version__ >= "5.20.1",
+                    reason="Inconsistent behaviour with pymc>=5.20.1 and python>=3.10",
+                ),
+            ),
+        ),
         pytest.param("nuts_pyro", "uniform", marks=pytest.mark.mcmc),
         pytest.param("hmc_pyro", "gaussian", marks=pytest.mark.mcmc),
         ("rejection", "uniform"),

tests/mcmc_test.py

@@ -6,6 +6,7 @@
 import sys
 
 import numpy as np
+import pymc
 import pytest
 import torch
 from torch import eye, ones, zeros
@@ -187,11 +188,9 @@ def lp_f(x, track_gradients=True):
         "hmc_pyro",
         pytest.param(
             "nuts_pymc",
-            marks=pytest.mark.xfail(
-                condition=sys.version_info >= (3, 10),
-                reason="Fails with pymc>=5.20.1 and python>=3.10",
-                strict=True,
-                raises=TypeError,
+            marks=pytest.mark.skipif(
+                condition=sys.version_info >= (3, 10) and pymc.__version__ >= "5.20.1",
+                reason="Inconsistent behaviour with pymc>=5.20.1 and python>=3.10",
             ),
         ),
         "hmc_pymc",

tests/posterior_sampler_test.py

@@ -5,6 +5,7 @@
 
 import sys
 
+import pymc
 import pytest
 from pyro.infer.mcmc import MCMC
 from torch import Tensor, eye, zeros
@@ -29,10 +30,9 @@
         "hmc_pyro",
         pytest.param(
             "nuts_pymc",
-            marks=pytest.mark.xfail(
-                condition=sys.version_info >= (3, 10),
-                reason="Fails with pymc>=5.20.1 and python>=3.10",
-                raises=TypeError,
+            marks=pytest.mark.skipif(
+                condition=sys.version_info >= (3, 10) and pymc.__version__ >= "5.20.1",
+                reason="Inconsistent behaviour with pymc>=5.20.1 and python>=3.10",
             ),
         ),
         "hmc_pymc",