From d58b00b3bbce279a976cd8be9d55c88f3654f2e6 Mon Sep 17 00:00:00 2001 From: Fritz Obermeyer Date: Thu, 24 Mar 2022 09:57:58 -0400 Subject: [PATCH] Bump version to 1.8.1 (#3054) * Bump pyro and funsor versions * run scripts/update_version.py * Revert "remove xfails (#3048)" This reverts commit 0c3be048fbedd7989768beba15dd6d481a267445. --- examples/air/main.py | 2 +- examples/baseball.py | 2 +- examples/contrib/autoname/mixture.py | 2 +- examples/contrib/autoname/scoping_mixture.py | 2 +- examples/contrib/autoname/tree_data.py | 2 +- examples/contrib/cevae/synthetic.py | 2 +- examples/contrib/epidemiology/regional.py | 2 +- examples/contrib/epidemiology/sir.py | 2 +- examples/contrib/forecast/bart.py | 2 +- examples/contrib/funsor/hmm.py | 2 +- examples/contrib/gp/sv-dkl.py | 2 +- examples/contrib/oed/ab_test.py | 2 +- examples/contrib/timeseries/gp_models.py | 2 +- examples/cvae/main.py | 2 +- examples/dmm.py | 2 +- examples/eight_schools/mcmc.py | 2 +- examples/eight_schools/svi.py | 2 +- examples/hmm.py | 2 +- examples/inclined_plane.py | 2 +- examples/lda.py | 2 +- examples/lkj.py | 2 +- examples/minipyro.py | 2 +- examples/neutra.py | 2 +- examples/rsa/generics.py | 2 +- examples/rsa/hyperbole.py | 2 +- examples/rsa/schelling.py | 2 +- examples/rsa/schelling_false.py | 2 +- examples/rsa/semantic_parsing.py | 2 +- examples/scanvi/scanvi.py | 2 +- examples/sir_hmc.py | 2 +- examples/sparse_gamma_def.py | 2 +- examples/sparse_regression.py | 2 +- examples/svi_horovod.py | 2 +- examples/toy_mixture_model_discrete_enumeration.py | 2 +- examples/vae/ss_vae_M2.py | 2 +- examples/vae/vae.py | 2 +- examples/vae/vae_comparison.py | 2 +- pyro/__init__.py | 2 +- setup.py | 2 +- tests/contrib/funsor/test_enum_funsor.py | 11 +++++++++++ tutorial/source/air.ipynb | 2 +- tutorial/source/bayesian_regression.ipynb | 2 +- tutorial/source/bayesian_regression_ii.ipynb | 2 +- tutorial/source/bo.ipynb | 2 +- tutorial/source/dirichlet_process_mixture.ipynb | 2 +- tutorial/source/easyguide.ipynb | 2 +- tutorial/source/ekf.ipynb | 2 +- tutorial/source/enumeration.ipynb | 2 +- tutorial/source/epi_intro.ipynb | 2 +- tutorial/source/forecasting_dlm.ipynb | 2 +- tutorial/source/forecasting_i.ipynb | 2 +- tutorial/source/forecasting_ii.ipynb | 2 +- tutorial/source/forecasting_iii.ipynb | 2 +- tutorial/source/gmm.ipynb | 2 +- tutorial/source/gp.ipynb | 2 +- tutorial/source/gplvm.ipynb | 2 +- tutorial/source/intro_long.ipynb | 2 +- tutorial/source/jit.ipynb | 2 +- tutorial/source/model_rendering.ipynb | 2 +- tutorial/source/modules.ipynb | 2 +- tutorial/source/prodlda.ipynb | 2 +- tutorial/source/stable.ipynb | 2 +- tutorial/source/svi_part_i.ipynb | 2 +- tutorial/source/svi_part_iii.ipynb | 2 +- tutorial/source/tensor_shapes.ipynb | 2 +- tutorial/source/tracking_1d.ipynb | 2 +- tutorial/source/vae.ipynb | 2 +- 67 files changed, 77 insertions(+), 66 deletions(-) diff --git a/examples/air/main.py b/examples/air/main.py index 067dbc1600..55f062495a 100644 --- a/examples/air/main.py +++ b/examples/air/main.py @@ -272,7 +272,7 @@ def per_param_optim_args(param_name): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser( description="Pyro AIR example", argument_default=argparse.SUPPRESS ) diff --git a/examples/baseball.py b/examples/baseball.py index 30d6164c4f..02da563027 100644 --- a/examples/baseball.py +++ b/examples/baseball.py @@ -392,7 +392,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="Baseball batting average using HMC") parser.add_argument("-n", "--num-samples", nargs="?", default=200, type=int) parser.add_argument("--num-chains", nargs="?", default=4, type=int) diff --git a/examples/contrib/autoname/mixture.py b/examples/contrib/autoname/mixture.py index e512a7a98d..dab2a10b40 100644 --- a/examples/contrib/autoname/mixture.py +++ b/examples/contrib/autoname/mixture.py @@ -74,7 +74,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="parse args") parser.add_argument("-n", "--num-epochs", default=200, type=int) parser.add_argument("--jit", action="store_true") diff --git a/examples/contrib/autoname/scoping_mixture.py b/examples/contrib/autoname/scoping_mixture.py index 2630987ca1..0701ff00ae 100644 --- a/examples/contrib/autoname/scoping_mixture.py +++ b/examples/contrib/autoname/scoping_mixture.py @@ -71,7 +71,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="parse args") parser.add_argument("-n", "--num-epochs", default=200, type=int) args = parser.parse_args() diff --git a/examples/contrib/autoname/tree_data.py b/examples/contrib/autoname/tree_data.py index 72bfe58059..88495e430c 100644 --- a/examples/contrib/autoname/tree_data.py +++ b/examples/contrib/autoname/tree_data.py @@ -104,7 +104,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="parse args") parser.add_argument("-n", "--num-epochs", default=100, type=int) args = parser.parse_args() diff --git a/examples/contrib/cevae/synthetic.py b/examples/contrib/cevae/synthetic.py index 50d2d22f90..5b49e57824 100644 --- a/examples/contrib/cevae/synthetic.py +++ b/examples/contrib/cevae/synthetic.py @@ -86,7 +86,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser( description="Causal Effect Variational Autoencoder" ) diff --git a/examples/contrib/epidemiology/regional.py b/examples/contrib/epidemiology/regional.py index ddccc92a66..46566fd561 100644 --- a/examples/contrib/epidemiology/regional.py +++ b/examples/contrib/epidemiology/regional.py @@ -166,7 +166,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser( description="Regional compartmental epidemiology modeling using HMC" ) diff --git a/examples/contrib/epidemiology/sir.py b/examples/contrib/epidemiology/sir.py index c805f202f5..5891cac1f7 100644 --- a/examples/contrib/epidemiology/sir.py +++ b/examples/contrib/epidemiology/sir.py @@ -334,7 +334,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser( description="Compartmental epidemiology modeling using HMC" ) diff --git a/examples/contrib/forecast/bart.py b/examples/contrib/forecast/bart.py index 06e80c8d37..ba65a70745 100644 --- a/examples/contrib/forecast/bart.py +++ b/examples/contrib/forecast/bart.py @@ -165,7 +165,7 @@ def transform(pred, truth): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="Bart Ridership Forecasting Example") parser.add_argument("--train-window", default=2160, type=int) parser.add_argument("--test-window", default=336, type=int) diff --git a/examples/contrib/funsor/hmm.py b/examples/contrib/funsor/hmm.py index 95a11892a6..caa67a8efc 100644 --- a/examples/contrib/funsor/hmm.py +++ b/examples/contrib/funsor/hmm.py @@ -819,7 +819,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser( description="MAP Baum-Welch learning Bach Chorales" ) diff --git a/examples/contrib/gp/sv-dkl.py b/examples/contrib/gp/sv-dkl.py index 27d80647b3..0ed1427594 100644 --- a/examples/contrib/gp/sv-dkl.py +++ b/examples/contrib/gp/sv-dkl.py @@ -193,7 +193,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="Pyro GP MNIST Example") parser.add_argument( "--data-dir", diff --git a/examples/contrib/oed/ab_test.py b/examples/contrib/oed/ab_test.py index e17cc7982f..67115d75ad 100644 --- a/examples/contrib/oed/ab_test.py +++ b/examples/contrib/oed/ab_test.py @@ -125,7 +125,7 @@ def main(num_vi_steps, num_bo_steps, seed): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="A/B test experiment design using VI") parser.add_argument("-n", "--num-vi-steps", nargs="?", default=5000, type=int) parser.add_argument("--num-bo-steps", nargs="?", default=5, type=int) diff --git a/examples/contrib/timeseries/gp_models.py b/examples/contrib/timeseries/gp_models.py index 3229ec87ff..5e55019c98 100644 --- a/examples/contrib/timeseries/gp_models.py +++ b/examples/contrib/timeseries/gp_models.py @@ -186,7 +186,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="contrib.timeseries example usage") parser.add_argument("-n", "--num-steps", default=300, type=int) parser.add_argument("-s", "--seed", default=0, type=int) diff --git a/examples/cvae/main.py b/examples/cvae/main.py index 4d9763dd06..0f4acc6e9e 100644 --- a/examples/cvae/main.py +++ b/examples/cvae/main.py @@ -87,7 +87,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") # parse command line arguments parser = argparse.ArgumentParser(description="parse args") parser.add_argument( diff --git a/examples/dmm.py b/examples/dmm.py index b59e07fec9..9c6ab2ff75 100644 --- a/examples/dmm.py +++ b/examples/dmm.py @@ -571,7 +571,7 @@ def do_evaluation(): # parse command-line arguments and execute the main method if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="parse args") parser.add_argument("-n", "--num-epochs", type=int, default=5000) diff --git a/examples/eight_schools/mcmc.py b/examples/eight_schools/mcmc.py index 031582299b..f16ae063fc 100644 --- a/examples/eight_schools/mcmc.py +++ b/examples/eight_schools/mcmc.py @@ -43,7 +43,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="Eight Schools MCMC") parser.add_argument( "--num-samples", diff --git a/examples/eight_schools/svi.py b/examples/eight_schools/svi.py index 4fa4368287..af14d4db09 100644 --- a/examples/eight_schools/svi.py +++ b/examples/eight_schools/svi.py @@ -81,7 +81,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="Eight Schools SVI") parser.add_argument( "--lr", type=float, default=0.01, help="learning rate (default: 0.01)" diff --git a/examples/hmm.py b/examples/hmm.py index 419a13b819..3cbbfdc758 100644 --- a/examples/hmm.py +++ b/examples/hmm.py @@ -734,7 +734,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser( description="MAP Baum-Welch learning Bach Chorales" ) diff --git a/examples/inclined_plane.py b/examples/inclined_plane.py index e1c4163670..c2cfb71b41 100644 --- a/examples/inclined_plane.py +++ b/examples/inclined_plane.py @@ -145,7 +145,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="parse args") parser.add_argument("-n", "--num-samples", default=500, type=int) args = parser.parse_args() diff --git a/examples/lda.py b/examples/lda.py index 5d9cc63925..88230e5398 100644 --- a/examples/lda.py +++ b/examples/lda.py @@ -149,7 +149,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser( description="Amortized Latent Dirichlet Allocation" ) diff --git a/examples/lkj.py b/examples/lkj.py index d0447b431d..0363041ae6 100644 --- a/examples/lkj.py +++ b/examples/lkj.py @@ -56,7 +56,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="Demonstrate the use of an LKJ Prior") parser.add_argument("--num-samples", nargs="?", default=200, type=int) parser.add_argument("--n", nargs="?", default=500, type=int) diff --git a/examples/minipyro.py b/examples/minipyro.py index c81988e662..086267ece4 100644 --- a/examples/minipyro.py +++ b/examples/minipyro.py @@ -65,7 +65,7 @@ def guide(data): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="Mini Pyro demo") parser.add_argument("-b", "--backend", default="minipyro") parser.add_argument("-n", "--num-steps", default=1001, type=int) diff --git a/examples/neutra.py b/examples/neutra.py index 2ced14184c..cbd2071e62 100644 --- a/examples/neutra.py +++ b/examples/neutra.py @@ -232,7 +232,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser( description="Example illustrating NeuTra Reparametrizer" ) diff --git a/examples/rsa/generics.py b/examples/rsa/generics.py index ae16395435..7a1fd7da85 100644 --- a/examples/rsa/generics.py +++ b/examples/rsa/generics.py @@ -177,7 +177,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="parse args") parser.add_argument("-n", "--num-samples", default=10, type=int) args = parser.parse_args() diff --git a/examples/rsa/hyperbole.py b/examples/rsa/hyperbole.py index 462d93b6fc..c1270e0ac1 100644 --- a/examples/rsa/hyperbole.py +++ b/examples/rsa/hyperbole.py @@ -217,7 +217,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="parse args") parser.add_argument("-n", "--num-samples", default=10, type=int) parser.add_argument("--price", default=10000, type=int) diff --git a/examples/rsa/schelling.py b/examples/rsa/schelling.py index fec5f1dc23..de3877ad74 100644 --- a/examples/rsa/schelling.py +++ b/examples/rsa/schelling.py @@ -79,7 +79,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="parse args") parser.add_argument("-n", "--num-samples", default=10, type=int) parser.add_argument("--depth", default=2, type=int) diff --git a/examples/rsa/schelling_false.py b/examples/rsa/schelling_false.py index 78badb819d..cdab585bc2 100644 --- a/examples/rsa/schelling_false.py +++ b/examples/rsa/schelling_false.py @@ -96,7 +96,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="parse args") parser.add_argument("-n", "--num-samples", default=10, type=int) parser.add_argument("--depth", default=3, type=int) diff --git a/examples/rsa/semantic_parsing.py b/examples/rsa/semantic_parsing.py index 71210b2adb..092380349e 100644 --- a/examples/rsa/semantic_parsing.py +++ b/examples/rsa/semantic_parsing.py @@ -351,7 +351,7 @@ def is_all_qud(world): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="parse args") parser.add_argument("-n", "--num-samples", default=10, type=int) args = parser.parse_args() diff --git a/examples/scanvi/scanvi.py b/examples/scanvi/scanvi.py index 3ddd7e404b..a0b57b75bb 100644 --- a/examples/scanvi/scanvi.py +++ b/examples/scanvi/scanvi.py @@ -407,7 +407,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") # Parse command line arguments parser = argparse.ArgumentParser( description="single-cell ANnotation using Variational Inference" diff --git a/examples/sir_hmc.py b/examples/sir_hmc.py index 83b9727c57..690ab142fb 100644 --- a/examples/sir_hmc.py +++ b/examples/sir_hmc.py @@ -633,7 +633,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="SIR epidemiology modeling using HMC") parser.add_argument("-p", "--population", default=10, type=int) parser.add_argument("-m", "--min-observations", default=3, type=int) diff --git a/examples/sparse_gamma_def.py b/examples/sparse_gamma_def.py index b9c39ad890..2e7163f10d 100644 --- a/examples/sparse_gamma_def.py +++ b/examples/sparse_gamma_def.py @@ -269,7 +269,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") # parse command line arguments parser = argparse.ArgumentParser(description="parse args") parser.add_argument( diff --git a/examples/sparse_regression.py b/examples/sparse_regression.py index 0dcfb79fec..09988feff8 100644 --- a/examples/sparse_regression.py +++ b/examples/sparse_regression.py @@ -364,7 +364,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="Krylov KIT") parser.add_argument("--num-data", type=int, default=750) parser.add_argument("--num-steps", type=int, default=1000) diff --git a/examples/svi_horovod.py b/examples/svi_horovod.py index 8d2df18116..393d944f15 100644 --- a/examples/svi_horovod.py +++ b/examples/svi_horovod.py @@ -154,7 +154,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="Distributed training via Horovod") parser.add_argument("-o", "--outfile") parser.add_argument("-s", "--size", default=1000000, type=int) diff --git a/examples/toy_mixture_model_discrete_enumeration.py b/examples/toy_mixture_model_discrete_enumeration.py index 26782ff073..656803663a 100644 --- a/examples/toy_mixture_model_discrete_enumeration.py +++ b/examples/toy_mixture_model_discrete_enumeration.py @@ -133,7 +133,7 @@ def get_true_pred_CPDs(CPD, posterior_param): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="Toy mixture model") parser.add_argument("-n", "--num-steps", default=4000, type=int) parser.add_argument("-o", "--num-obs", default=10000, type=int) diff --git a/examples/vae/ss_vae_M2.py b/examples/vae/ss_vae_M2.py index ffda5a84a1..7fdf1f5ae2 100644 --- a/examples/vae/ss_vae_M2.py +++ b/examples/vae/ss_vae_M2.py @@ -433,7 +433,7 @@ def main(args): ) if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="SS-VAE\n{}".format(EXAMPLE_RUN)) diff --git a/examples/vae/vae.py b/examples/vae/vae.py index 39d3fb9e5f..d1e9410348 100644 --- a/examples/vae/vae.py +++ b/examples/vae/vae.py @@ -216,7 +216,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") # parse command line arguments parser = argparse.ArgumentParser(description="parse args") parser.add_argument( diff --git a/examples/vae/vae_comparison.py b/examples/vae/vae_comparison.py index c9c7375dba..c804e0acb7 100644 --- a/examples/vae/vae_comparison.py +++ b/examples/vae/vae_comparison.py @@ -262,7 +262,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.8.0") + assert pyro.__version__.startswith("1.8.1") parser = argparse.ArgumentParser(description="VAE using MNIST dataset") parser.add_argument("-n", "--num-epochs", nargs="?", default=10, type=int) parser.add_argument("--batch_size", nargs="?", default=128, type=int) diff --git a/pyro/__init__.py b/pyro/__init__.py index d4ad1ef492..3d1a9fb9d3 100644 --- a/pyro/__init__.py +++ b/pyro/__init__.py @@ -26,7 +26,7 @@ from pyro.util import set_rng_seed # After changing this, run scripts/update_version.py -version_prefix = "1.8.0" +version_prefix = "1.8.1" # Get the __version__ string from the auto-generated _version.py file, if exists. try: diff --git a/setup.py b/setup.py index f4cd4cd1ec..7b44fa7522 100644 --- a/setup.py +++ b/setup.py @@ -140,7 +140,7 @@ "funsor": [ # This must be a released version when Pyro is released. # "funsor[torch] @ git+git://github.com/pyro-ppl/funsor.git@7bb52d0eae3046d08a20d1b288544e1a21b4f461", - "funsor[torch]==0.4.2", + "funsor[torch]==0.4.3", ], }, python_requires=">=3.7", diff --git a/tests/contrib/funsor/test_enum_funsor.py b/tests/contrib/funsor/test_enum_funsor.py index e8dbc60c69..1dd6915610 100644 --- a/tests/contrib/funsor/test_enum_funsor.py +++ b/tests/contrib/funsor/test_enum_funsor.py @@ -264,6 +264,7 @@ def guide(): _check_loss_and_grads(hand_loss, auto_loss) +@pytest.mark.xfail(reason="https://github.com/pyro-ppl/pyro/issues/3046") @pytest.mark.parametrize("scale", [1, 10]) @pytest.mark.parametrize( "num_samples,num_masked", [(2, 2), (3, 2)], ids=["batch", "masked"] @@ -498,6 +499,7 @@ def hand_guide(data): _check_loss_and_grads(hand_loss, auto_loss) +@pytest.mark.xfail(reason="https://github.com/pyro-ppl/pyro/issues/3046") @pytest.mark.parametrize("scale", [1, 10]) @pytest.mark.parametrize( "outer_obs,inner_obs", [(False, True), (True, False), (True, True)] @@ -640,6 +642,7 @@ def guide_iplate(): _check_loss_and_grads(expected_loss, actual_loss) +@pytest.mark.xfail(reason="https://github.com/pyro-ppl/pyro/issues/3046") @pytest.mark.parametrize("enumerate1", ["parallel", "sequential"]) @pyroapi.pyro_backend(_PYRO_BACKEND) def test_elbo_enumerate_plate_6(enumerate1): @@ -702,6 +705,7 @@ def guide(): _check_loss_and_grads(expected_loss, actual_loss) +@pytest.mark.xfail(reason="https://github.com/pyro-ppl/pyro/issues/3046") @pytest.mark.parametrize("scale", [1, 10]) @pyroapi.pyro_backend(_PYRO_BACKEND) def test_elbo_enumerate_plate_7(scale): @@ -873,6 +877,7 @@ def guide(): _check_loss_and_grads(hand_loss, auto_loss) +@pytest.mark.xfail(reason="https://github.com/pyro-ppl/pyro/issues/3046") @pytest.mark.parametrize("scale", [1, 10]) @pyroapi.pyro_backend(_PYRO_BACKEND) def test_elbo_enumerate_plates_2(scale): @@ -929,6 +934,7 @@ def guide(): _check_loss_and_grads(hand_loss, auto_loss) +@pytest.mark.xfail(reason="https://github.com/pyro-ppl/pyro/issues/3046") @pytest.mark.parametrize("scale", [1, 10]) @pyroapi.pyro_backend(_PYRO_BACKEND) def test_elbo_enumerate_plates_3(scale): @@ -981,6 +987,7 @@ def guide(): _check_loss_and_grads(hand_loss, auto_loss) +@pytest.mark.xfail(reason="https://github.com/pyro-ppl/pyro/issues/3046") @pytest.mark.parametrize("scale", [1, 10]) @pyroapi.pyro_backend(_PYRO_BACKEND) def test_elbo_enumerate_plates_4(scale): @@ -1040,6 +1047,7 @@ def guide(data): _check_loss_and_grads(hand_loss, auto_loss) +@pytest.mark.xfail(reason="https://github.com/pyro-ppl/pyro/issues/3046") @pytest.mark.parametrize("scale", [1, 10]) @pyroapi.pyro_backend(_PYRO_BACKEND) def test_elbo_enumerate_plates_5(scale): @@ -1103,6 +1111,7 @@ def guide(): _check_loss_and_grads(hand_loss, auto_loss) +@pytest.mark.xfail(reason="https://github.com/pyro-ppl/pyro/issues/3046") @pytest.mark.parametrize("scale", [1, 10]) @pyroapi.pyro_backend(_PYRO_BACKEND) def test_elbo_enumerate_plates_6(scale): @@ -1241,6 +1250,7 @@ def guide(data): elbo.differentiable_loss(model_plate_plate, guide, data) +@pytest.mark.xfail(reason="https://github.com/pyro-ppl/pyro/issues/3046") @pytest.mark.parametrize("scale", [1, 10]) @pyroapi.pyro_backend(_PYRO_BACKEND) def test_elbo_enumerate_plates_7(scale): @@ -1393,6 +1403,7 @@ def guide(data): _check_loss_and_grads(loss_iplate_iplate, loss_plate_plate) +@pytest.mark.xfail(reason="https://github.com/pyro-ppl/pyro/issues/3046") @pytest.mark.parametrize("guide_scale", [1]) @pytest.mark.parametrize("model_scale", [1]) @pytest.mark.parametrize( diff --git a/tutorial/source/air.ipynb b/tutorial/source/air.ipynb index ddbba3f727..0966e04558 100644 --- a/tutorial/source/air.ipynb +++ b/tutorial/source/air.ipynb @@ -41,7 +41,7 @@ "import numpy as np\n", "\n", "smoke_test = ('CI' in os.environ)\n", - "assert pyro.__version__.startswith('1.8.0')" + "assert pyro.__version__.startswith('1.8.1')" ] }, { diff --git a/tutorial/source/bayesian_regression.ipynb b/tutorial/source/bayesian_regression.ipynb index d25eebea20..b8c7ee2195 100644 --- a/tutorial/source/bayesian_regression.ipynb +++ b/tutorial/source/bayesian_regression.ipynb @@ -69,7 +69,7 @@ "\n", "# for CI testing\n", "smoke_test = ('CI' in os.environ)\n", - "assert pyro.__version__.startswith('1.8.0')\n", + "assert pyro.__version__.startswith('1.8.1')\n", "pyro.set_rng_seed(1)\n", "\n", "\n", diff --git a/tutorial/source/bayesian_regression_ii.ipynb b/tutorial/source/bayesian_regression_ii.ipynb index fcb888e636..ab42a317b6 100644 --- a/tutorial/source/bayesian_regression_ii.ipynb +++ b/tutorial/source/bayesian_regression_ii.ipynb @@ -44,7 +44,7 @@ "import pyro.optim as optim\n", "\n", "pyro.set_rng_seed(1)\n", - "assert pyro.__version__.startswith('1.8.0')" + "assert pyro.__version__.startswith('1.8.1')" ] }, { diff --git a/tutorial/source/bo.ipynb b/tutorial/source/bo.ipynb index f60f3d2b40..52dcedd73d 100644 --- a/tutorial/source/bo.ipynb +++ b/tutorial/source/bo.ipynb @@ -54,7 +54,7 @@ "import pyro\n", "import pyro.contrib.gp as gp\n", "\n", - "assert pyro.__version__.startswith('1.8.0')\n", + "assert pyro.__version__.startswith('1.8.1')\n", "pyro.set_rng_seed(1)" ] }, diff --git a/tutorial/source/dirichlet_process_mixture.ipynb b/tutorial/source/dirichlet_process_mixture.ipynb index 7ca10304b3..a3e8f3b19c 100644 --- a/tutorial/source/dirichlet_process_mixture.ipynb +++ b/tutorial/source/dirichlet_process_mixture.ipynb @@ -76,7 +76,7 @@ "from pyro.infer import Predictive, SVI, Trace_ELBO\n", "from pyro.optim import Adam\n", "\n", - "assert pyro.__version__.startswith('1.8.0')\n", + "assert pyro.__version__.startswith('1.8.1')\n", "pyro.set_rng_seed(0)" ] }, diff --git a/tutorial/source/easyguide.ipynb b/tutorial/source/easyguide.ipynb index 28dbb55c04..999d2de174 100644 --- a/tutorial/source/easyguide.ipynb +++ b/tutorial/source/easyguide.ipynb @@ -44,7 +44,7 @@ "from torch.distributions import constraints\n", "\n", "smoke_test = ('CI' in os.environ)\n", - "assert pyro.__version__.startswith('1.8.0')" + "assert pyro.__version__.startswith('1.8.1')" ] }, { diff --git a/tutorial/source/ekf.ipynb b/tutorial/source/ekf.ipynb index 3820229d6f..5ece56dfe8 100644 --- a/tutorial/source/ekf.ipynb +++ b/tutorial/source/ekf.ipynb @@ -98,7 +98,7 @@ "from pyro.contrib.tracking.measurements import PositionMeasurement\n", "\n", "smoke_test = ('CI' in os.environ)\n", - "assert pyro.__version__.startswith('1.8.0')" + "assert pyro.__version__.startswith('1.8.1')" ] }, { diff --git a/tutorial/source/enumeration.ipynb b/tutorial/source/enumeration.ipynb index bd53501f87..b7e7d8df12 100644 --- a/tutorial/source/enumeration.ipynb +++ b/tutorial/source/enumeration.ipynb @@ -50,7 +50,7 @@ "from pyro.ops.indexing import Vindex\n", "\n", "smoke_test = ('CI' in os.environ)\n", - "assert pyro.__version__.startswith('1.8.0')\n", + "assert pyro.__version__.startswith('1.8.1')\n", "pyro.set_rng_seed(0)" ] }, diff --git a/tutorial/source/epi_intro.ipynb b/tutorial/source/epi_intro.ipynb index 950859bdf1..44a2c3f3b2 100644 --- a/tutorial/source/epi_intro.ipynb +++ b/tutorial/source/epi_intro.ipynb @@ -58,7 +58,7 @@ "from pyro.contrib.epidemiology import CompartmentalModel, binomial_dist, infection_dist\n", "\n", "%matplotlib inline\n", - "assert pyro.__version__.startswith('1.8.0')\n", + "assert pyro.__version__.startswith('1.8.1')\n", "torch.set_default_dtype(torch.double) # Required for MCMC inference.\n", "smoke_test = ('CI' in os.environ)" ] diff --git a/tutorial/source/forecasting_dlm.ipynb b/tutorial/source/forecasting_dlm.ipynb index cb7c81a19e..17c947dbef 100644 --- a/tutorial/source/forecasting_dlm.ipynb +++ b/tutorial/source/forecasting_dlm.ipynb @@ -46,7 +46,7 @@ "from pyro.ops.stats import quantile\n", "\n", "%matplotlib inline\n", - "assert pyro.__version__.startswith('1.8.0')\n", + "assert pyro.__version__.startswith('1.8.1')\n", "\n", "pyro.set_rng_seed(20200928)\n", "\n", diff --git a/tutorial/source/forecasting_i.ipynb b/tutorial/source/forecasting_i.ipynb index ff2ae7cb41..e62b53fb14 100644 --- a/tutorial/source/forecasting_i.ipynb +++ b/tutorial/source/forecasting_i.ipynb @@ -47,7 +47,7 @@ "import matplotlib.pyplot as plt\n", "\n", "%matplotlib inline\n", - "assert pyro.__version__.startswith('1.8.0')\n", + "assert pyro.__version__.startswith('1.8.1')\n", "pyro.set_rng_seed(20200221)" ] }, diff --git a/tutorial/source/forecasting_ii.ipynb b/tutorial/source/forecasting_ii.ipynb index 2670a8466c..f9d8d33cd3 100644 --- a/tutorial/source/forecasting_ii.ipynb +++ b/tutorial/source/forecasting_ii.ipynb @@ -40,7 +40,7 @@ "import matplotlib.pyplot as plt\n", "\n", "%matplotlib inline\n", - "assert pyro.__version__.startswith('1.8.0')\n", + "assert pyro.__version__.startswith('1.8.1')\n", "pyro.set_rng_seed(20200305)" ] }, diff --git a/tutorial/source/forecasting_iii.ipynb b/tutorial/source/forecasting_iii.ipynb index bb306840a2..98494c5b77 100644 --- a/tutorial/source/forecasting_iii.ipynb +++ b/tutorial/source/forecasting_iii.ipynb @@ -40,7 +40,7 @@ "import matplotlib.pyplot as plt\n", "\n", "%matplotlib inline\n", - "assert pyro.__version__.startswith('1.8.0')\n", + "assert pyro.__version__.startswith('1.8.1')\n", "pyro.set_rng_seed(20200305)" ] }, diff --git a/tutorial/source/gmm.ipynb b/tutorial/source/gmm.ipynb index 50bb745ab8..4b197ea9a8 100644 --- a/tutorial/source/gmm.ipynb +++ b/tutorial/source/gmm.ipynb @@ -41,7 +41,7 @@ "from pyro.infer import SVI, TraceEnum_ELBO, config_enumerate, infer_discrete\n", "\n", "smoke_test = ('CI' in os.environ)\n", - "assert pyro.__version__.startswith('1.8.0')" + "assert pyro.__version__.startswith('1.8.1')" ] }, { diff --git a/tutorial/source/gp.ipynb b/tutorial/source/gp.ipynb index 589117f3b4..687156a189 100644 --- a/tutorial/source/gp.ipynb +++ b/tutorial/source/gp.ipynb @@ -69,7 +69,7 @@ "\n", "\n", "smoke_test = \"CI\" in os.environ # ignore; used to check code integrity in the Pyro repo\n", - "assert pyro.__version__.startswith(\"1.8.0\")\n", + "assert pyro.__version__.startswith('1.8.1')\n", "pyro.set_rng_seed(0)" ] }, diff --git a/tutorial/source/gplvm.ipynb b/tutorial/source/gplvm.ipynb index 2767ade83c..1a42a5be39 100644 --- a/tutorial/source/gplvm.ipynb +++ b/tutorial/source/gplvm.ipynb @@ -39,7 +39,7 @@ "import pyro.ops.stats as stats\n", "\n", "smoke_test = ('CI' in os.environ) # ignore; used to check code integrity in the Pyro repo\n", - "assert pyro.__version__.startswith('1.8.0')\n", + "assert pyro.__version__.startswith('1.8.1')\n", "pyro.set_rng_seed(1)" ] }, diff --git a/tutorial/source/intro_long.ipynb b/tutorial/source/intro_long.ipynb index 69aa29295f..2ab8438e10 100644 --- a/tutorial/source/intro_long.ipynb +++ b/tutorial/source/intro_long.ipynb @@ -108,7 +108,7 @@ "outputs": [], "source": [ "smoke_test = ('CI' in os.environ)\n", - "assert pyro.__version__.startswith('1.8.0')\n", + "assert pyro.__version__.startswith('1.8.1')\n", "\n", "pyro.enable_validation(True)\n", "pyro.set_rng_seed(1)\n", diff --git a/tutorial/source/jit.ipynb b/tutorial/source/jit.ipynb index c405870e9c..1643eba442 100644 --- a/tutorial/source/jit.ipynb +++ b/tutorial/source/jit.ipynb @@ -48,7 +48,7 @@ "from pyro.optim import Adam\n", "\n", "smoke_test = ('CI' in os.environ)\n", - "assert pyro.__version__.startswith('1.8.0')" + "assert pyro.__version__.startswith('1.8.1')" ] }, { diff --git a/tutorial/source/model_rendering.ipynb b/tutorial/source/model_rendering.ipynb index 940b04541a..63eb278bb3 100644 --- a/tutorial/source/model_rendering.ipynb +++ b/tutorial/source/model_rendering.ipynb @@ -25,7 +25,7 @@ "import pyro.distributions.constraints as constraints\n", "\n", "smoke_test = ('CI' in os.environ)\n", - "assert pyro.__version__.startswith('1.8.0')" + "assert pyro.__version__.startswith('1.8.1')" ] }, { diff --git a/tutorial/source/modules.ipynb b/tutorial/source/modules.ipynb index f12fb2d5c2..af6bb29081 100644 --- a/tutorial/source/modules.ipynb +++ b/tutorial/source/modules.ipynb @@ -61,7 +61,7 @@ "from pyro.optim import Adam\n", "\n", "smoke_test = ('CI' in os.environ)\n", - "assert pyro.__version__.startswith('1.8.0')" + "assert pyro.__version__.startswith('1.8.1')" ] }, { diff --git a/tutorial/source/prodlda.ipynb b/tutorial/source/prodlda.ipynb index cd64ecbdef..5856315b01 100644 --- a/tutorial/source/prodlda.ipynb +++ b/tutorial/source/prodlda.ipynb @@ -70,7 +70,7 @@ "from pyro.infer import MCMC, NUTS\n", "import torch\n", "\n", - "assert pyro.__version__.startswith('1.8.0')\n", + "assert pyro.__version__.startswith('1.8.1')\n", "# Enable smoke test - run the notebook cells on CI.\n", "smoke_test = 'CI' in os.environ" ] diff --git a/tutorial/source/stable.ipynb b/tutorial/source/stable.ipynb index 063ca76723..f2f47fc6c5 100644 --- a/tutorial/source/stable.ipynb +++ b/tutorial/source/stable.ipynb @@ -62,7 +62,7 @@ "from pyro.ops.tensor_utils import convolve\n", "\n", "%matplotlib inline\n", - "assert pyro.__version__.startswith('1.8.0')\n", + "assert pyro.__version__.startswith('1.8.1')\n", "smoke_test = ('CI' in os.environ)" ] }, diff --git a/tutorial/source/svi_part_i.ipynb b/tutorial/source/svi_part_i.ipynb index c633599b59..ad458124d7 100644 --- a/tutorial/source/svi_part_i.ipynb +++ b/tutorial/source/svi_part_i.ipynb @@ -260,7 +260,7 @@ "smoke_test = ('CI' in os.environ)\n", "n_steps = 2 if smoke_test else 2000\n", "\n", - "assert pyro.__version__.startswith('1.8.0')\n", + "assert pyro.__version__.startswith('1.8.1')\n", "\n", "# clear the param store in case we're in a REPL\n", "pyro.clear_param_store()\n", diff --git a/tutorial/source/svi_part_iii.ipynb b/tutorial/source/svi_part_iii.ipynb index cfd4e5c3e1..9d96af9259 100644 --- a/tutorial/source/svi_part_iii.ipynb +++ b/tutorial/source/svi_part_iii.ipynb @@ -283,7 +283,7 @@ "from pyro.infer import SVI, TraceGraph_ELBO\n", "import sys\n", "\n", - "assert pyro.__version__.startswith('1.8.0')\n", + "assert pyro.__version__.startswith('1.8.1')\n", "\n", "# this is for running the notebook in our testing framework\n", "smoke_test = ('CI' in os.environ)\n", diff --git a/tutorial/source/tensor_shapes.ipynb b/tutorial/source/tensor_shapes.ipynb index 9d421371bb..3ec5479c37 100644 --- a/tutorial/source/tensor_shapes.ipynb +++ b/tutorial/source/tensor_shapes.ipynb @@ -59,7 +59,7 @@ "from pyro.optim import Adam\n", "\n", "smoke_test = ('CI' in os.environ)\n", - "assert pyro.__version__.startswith('1.8.0')\n", + "assert pyro.__version__.startswith('1.8.1')\n", "\n", "# We'll ue this helper to check our models are correct.\n", "def test_model(model, guide, loss):\n", diff --git a/tutorial/source/tracking_1d.ipynb b/tutorial/source/tracking_1d.ipynb index 6b298e58ac..8789aeb1b4 100644 --- a/tutorial/source/tracking_1d.ipynb +++ b/tutorial/source/tracking_1d.ipynb @@ -30,7 +30,7 @@ "from pyro.optim import Adam\n", "\n", "%matplotlib inline\n", - "assert pyro.__version__.startswith('1.8.0')\n", + "assert pyro.__version__.startswith('1.8.1')\n", "smoke_test = ('CI' in os.environ)" ] }, diff --git a/tutorial/source/vae.ipynb b/tutorial/source/vae.ipynb index cf1ea350d3..2aabb77748 100644 --- a/tutorial/source/vae.ipynb +++ b/tutorial/source/vae.ipynb @@ -115,7 +115,7 @@ "metadata": {}, "outputs": [], "source": [ - "assert pyro.__version__.startswith('1.8.0')\n", + "assert pyro.__version__.startswith('1.8.1')\n", "pyro.distributions.enable_validation(False)\n", "pyro.set_rng_seed(0)\n", "# Enable smoke test - run the notebook cells on CI.\n",