From 9f67c43deab7f33216b426843292e5c5ce73df78 Mon Sep 17 00:00:00 2001 From: Fritz Obermeyer Date: Tue, 6 Jul 2021 16:40:56 -0700 Subject: [PATCH] Bump to version 1.7.0 (#2897) * Bump version to 1.7.0 * Pin funsor to a released version * Fix update_version.py * Update tutorial versions * Update tutorial versions * Use fehiepsis fix for update_version.py * Apply update_version.py --- 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 +- scripts/update_version.py | 9 ++++++--- setup.py | 3 ++- 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/jit.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 +- 65 files changed, 71 insertions(+), 67 deletions(-) diff --git a/examples/air/main.py b/examples/air/main.py index 53f0484c40..ca01c3e843 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.6.0") + assert pyro.__version__.startswith("1.7.0") parser = argparse.ArgumentParser( description="Pyro AIR example", argument_default=argparse.SUPPRESS ) diff --git a/examples/baseball.py b/examples/baseball.py index 52db4ef11a..1fbc2f7639 100644 --- a/examples/baseball.py +++ b/examples/baseball.py @@ -391,7 +391,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.6.0") + assert pyro.__version__.startswith("1.7.0") 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 6690713d33..ecff7f8ad6 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 a64b86f8c0..40ecab0584 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 c6dd5044f5..16fec3773d 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 80c2747b2b..e7fdb137b0 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.6.0") + assert pyro.__version__.startswith("1.7.0") parser = argparse.ArgumentParser( description="Causal Effect Variational Autoencoder" ) diff --git a/examples/contrib/epidemiology/regional.py b/examples/contrib/epidemiology/regional.py index 720f8bef88..03c92e0d8e 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 817a892d6f..eb8d4daa03 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.6.0") + assert pyro.__version__.startswith("1.7.0") parser = argparse.ArgumentParser( description="Compartmental epidemiology modeling using HMC" ) diff --git a/examples/contrib/forecast/bart.py b/examples/contrib/forecast/bart.py index 2e3c452426..3c4b30e5b8 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 0a36ac6e82..aac6fad61f 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 c27f7dbbde..86532ebcba 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 835ac49012..ee9b7387a3 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 0d7e3236f4..52b35b0ed4 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 0c65ab95ef..35b8d8c60e 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.6.0") + assert pyro.__version__.startswith("1.7.0") # parse command line arguments parser = argparse.ArgumentParser(description="parse args") parser.add_argument( diff --git a/examples/dmm.py b/examples/dmm.py index c58cbe63b0..6085418413 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 b7ae265f51..c0ab766b91 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 063a99a587..11a0cb1b18 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 5700065b09..762dd52464 100644 --- a/examples/hmm.py +++ b/examples/hmm.py @@ -734,7 +734,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.6.0") + assert pyro.__version__.startswith("1.7.0") parser = argparse.ArgumentParser( description="MAP Baum-Welch learning Bach Chorales" ) diff --git a/examples/inclined_plane.py b/examples/inclined_plane.py index b8614e9132..f50e2a4641 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 9a58c0a06c..836e37832c 100644 --- a/examples/lda.py +++ b/examples/lda.py @@ -149,7 +149,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.6.0") + assert pyro.__version__.startswith("1.7.0") parser = argparse.ArgumentParser( description="Amortized Latent Dirichlet Allocation" ) diff --git a/examples/lkj.py b/examples/lkj.py index 003deca463..9d6bbf4e47 100644 --- a/examples/lkj.py +++ b/examples/lkj.py @@ -56,7 +56,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.6.0") + assert pyro.__version__.startswith("1.7.0") 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 2ac0706e48..a0ecc48e87 100644 --- a/examples/minipyro.py +++ b/examples/minipyro.py @@ -65,7 +65,7 @@ def guide(data): if __name__ == "__main__": - assert pyro.__version__.startswith("1.6.0") + assert pyro.__version__.startswith("1.7.0") 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 046bac18d5..b2aa04c704 100644 --- a/examples/neutra.py +++ b/examples/neutra.py @@ -232,7 +232,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.6.0") + assert pyro.__version__.startswith("1.7.0") parser = argparse.ArgumentParser( description="Example illustrating NeuTra Reparametrizer" ) diff --git a/examples/rsa/generics.py b/examples/rsa/generics.py index 2482a51220..17a78c6e31 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 22236e334d..46179e9ab3 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 64628f397c..c0212f9649 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 fd3c770796..3d66c0ffec 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 d8b656063a..87d82d76fa 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 05c5e1203d..c457e5ec69 100644 --- a/examples/scanvi/scanvi.py +++ b/examples/scanvi/scanvi.py @@ -403,7 +403,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.6.0") + assert pyro.__version__.startswith("1.7.0") # 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 6acd511358..b2aac07b57 100644 --- a/examples/sir_hmc.py +++ b/examples/sir_hmc.py @@ -639,7 +639,7 @@ def main(args): if __name__ == "__main__": - assert pyro.__version__.startswith("1.6.0") + assert pyro.__version__.startswith("1.7.0") 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 9a729c7257..ca819ff9f9 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.6.0") + assert pyro.__version__.startswith("1.7.0") # 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 1bd2600e8d..166bec43f3 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 bb3aac9995..271a0d3e0f 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 9959392e02..cbc709ac85 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 e70f3a84b0..fa0c04ea5c 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.6.0") + assert pyro.__version__.startswith("1.7.0") parser = argparse.ArgumentParser(description="SS-VAE\n{}".format(EXAMPLE_RUN)) diff --git a/examples/vae/vae.py b/examples/vae/vae.py index cca12d7a1c..069ec32490 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.6.0") + assert pyro.__version__.startswith("1.7.0") # 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 88f96e2360..9f7e85e15a 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.6.0") + assert pyro.__version__.startswith("1.7.0") 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 9cfd2a7d78..d0b5e7e3fd 100644 --- a/pyro/__init__.py +++ b/pyro/__init__.py @@ -25,7 +25,7 @@ from pyro.util import set_rng_seed # After changing this, run scripts/update_version.py -version_prefix = "1.6.0" +version_prefix = "1.7.0" # Get the __version__ string from the auto-generated _version.py file, if exists. try: diff --git a/scripts/update_version.py b/scripts/update_version.py index 82361b9d11..1b95080b32 100644 --- a/scripts/update_version.py +++ b/scripts/update_version.py @@ -21,12 +21,15 @@ filenames.sort() # Update version string. -pattern = re.compile("assert pyro.__version__.startswith\\('[^']*'\\)") -text = f"assert pyro.__version__.startswith({new_version})" +pattern1 = re.compile('assert pyro.__version__.startswith\\("[^"]*"\\)') +pattern2 = re.compile("assert pyro.__version__.startswith\\('[^']*'\\)") +text1 = f"assert pyro.__version__.startswith({new_version})" +text2 = text1.replace('"', "'") for filename in filenames: with open(filename) as f: old_text = f.read() - new_text = pattern.sub(text, old_text) + new_text = pattern1.sub(text1, old_text) + new_text = pattern2.sub(text2, new_text) if new_text != old_text: print("updating {}".format(filename)) with open(filename, "w") as f: diff --git a/setup.py b/setup.py index a09ec11dc0..7947ed6af9 100644 --- a/setup.py +++ b/setup.py @@ -135,7 +135,8 @@ "horovod": ["horovod[pytorch]>=0.19"], "funsor": [ # This must be a released version when Pyro is released. - "funsor[torch] @ git+git://github.com/pyro-ppl/funsor.git@383e7a6d05c9d5de9646d23698891e10c4cba927", + # "funsor[torch] @ git+git://github.com/pyro-ppl/funsor.git@383e7a6d05c9d5de9646d23698891e10c4cba927", + "funsor[torch]==0.4.1", ], }, python_requires=">=3.6", diff --git a/tutorial/source/air.ipynb b/tutorial/source/air.ipynb index cd16cb0b2c..a3ac1857e8 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.6.0')" + "assert pyro.__version__.startswith('1.7.0')" ] }, { diff --git a/tutorial/source/bayesian_regression.ipynb b/tutorial/source/bayesian_regression.ipynb index d9f40e4c24..0ac72ace3c 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.6.0')\n", + "assert pyro.__version__.startswith('1.7.0')\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 1d77149a12..af0e79866e 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.6.0')" + "assert pyro.__version__.startswith('1.7.0')" ] }, { diff --git a/tutorial/source/bo.ipynb b/tutorial/source/bo.ipynb index d9387e202a..e362219f97 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.6.0')\n", + "assert pyro.__version__.startswith('1.7.0')\n", "pyro.set_rng_seed(1)" ] }, diff --git a/tutorial/source/dirichlet_process_mixture.ipynb b/tutorial/source/dirichlet_process_mixture.ipynb index 824e41e2c0..ea85af8cbd 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.6.0')\n", + "assert pyro.__version__.startswith('1.7.0')\n", "pyro.set_rng_seed(0)" ] }, diff --git a/tutorial/source/easyguide.ipynb b/tutorial/source/easyguide.ipynb index a4f3798f79..2a2f766775 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.6.0')" + "assert pyro.__version__.startswith('1.7.0')" ] }, { diff --git a/tutorial/source/ekf.ipynb b/tutorial/source/ekf.ipynb index 5d8e423c64..fae12e7335 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.6.0')" + "assert pyro.__version__.startswith('1.7.0')" ] }, { diff --git a/tutorial/source/enumeration.ipynb b/tutorial/source/enumeration.ipynb index 5a77ac670b..d5f6f70ab5 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.6.0')\n", + "assert pyro.__version__.startswith('1.7.0')\n", "pyro.set_rng_seed(0)" ] }, diff --git a/tutorial/source/epi_intro.ipynb b/tutorial/source/epi_intro.ipynb index 909a893f0b..c0aade6aae 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.6.0')\n", + "assert pyro.__version__.startswith('1.7.0')\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 ea028a938d..cb472e5456 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.6.0')\n", + "assert pyro.__version__.startswith('1.7.0')\n", "\n", "pyro.set_rng_seed(20200928)\n", "\n", diff --git a/tutorial/source/forecasting_i.ipynb b/tutorial/source/forecasting_i.ipynb index 8084d4b505..597102252a 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.6.0')\n", + "assert pyro.__version__.startswith('1.7.0')\n", "pyro.set_rng_seed(20200221)" ] }, diff --git a/tutorial/source/forecasting_ii.ipynb b/tutorial/source/forecasting_ii.ipynb index abf15de593..56b3cd9504 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.6.0')\n", + "assert pyro.__version__.startswith('1.7.0')\n", "pyro.set_rng_seed(20200305)" ] }, diff --git a/tutorial/source/forecasting_iii.ipynb b/tutorial/source/forecasting_iii.ipynb index 7dfa4bfdd3..55fcae81f0 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.6.0')\n", + "assert pyro.__version__.startswith('1.7.0')\n", "pyro.set_rng_seed(20200305)" ] }, diff --git a/tutorial/source/gmm.ipynb b/tutorial/source/gmm.ipynb index fa5c73ce54..b403e5b08a 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.6.0')" + "assert pyro.__version__.startswith('1.7.0')" ] }, { diff --git a/tutorial/source/gp.ipynb b/tutorial/source/gp.ipynb index 7a731c9397..1d0587b1e6 100644 --- a/tutorial/source/gp.ipynb +++ b/tutorial/source/gp.ipynb @@ -60,7 +60,7 @@ "import pyro.distributions as dist\n", "\n", "smoke_test = ('CI' in os.environ) # ignore; used to check code integrity in the Pyro repo\n", - "assert pyro.__version__.startswith('1.6.0')\n", + "assert pyro.__version__.startswith('1.7.0')\n", "pyro.set_rng_seed(0)" ] }, diff --git a/tutorial/source/gplvm.ipynb b/tutorial/source/gplvm.ipynb index a4eed13948..4e774bc4c8 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.6.0')\n", + "assert pyro.__version__.startswith('1.7.0')\n", "pyro.set_rng_seed(1)" ] }, diff --git a/tutorial/source/jit.ipynb b/tutorial/source/jit.ipynb index 5d1f2b573a..230499b8a3 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.6.0')" + "assert pyro.__version__.startswith('1.7.0')" ] }, { diff --git a/tutorial/source/modules.ipynb b/tutorial/source/modules.ipynb index 17e1442f87..3163e97f5b 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.6.0')" + "assert pyro.__version__.startswith('1.7.0')" ] }, { diff --git a/tutorial/source/prodlda.ipynb b/tutorial/source/prodlda.ipynb index ce0bc82f47..95691f512a 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.6.0')\n", + "assert pyro.__version__.startswith('1.7.0')\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 d4c3eda773..a357df84d8 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.6.0')\n", + "assert pyro.__version__.startswith('1.7.0')\n", "smoke_test = ('CI' in os.environ)" ] }, diff --git a/tutorial/source/svi_part_i.ipynb b/tutorial/source/svi_part_i.ipynb index c028134e21..e45d15cc41 100644 --- a/tutorial/source/svi_part_i.ipynb +++ b/tutorial/source/svi_part_i.ipynb @@ -264,7 +264,7 @@ "smoke_test = ('CI' in os.environ)\n", "n_steps = 2 if smoke_test else 2000\n", "\n", - "assert pyro.__version__.startswith('1.6.0')\n", + "assert pyro.__version__.startswith('1.7.0')\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 2c9b631c7d..62e51624f3 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.6.0')\n", + "assert pyro.__version__.startswith('1.7.0')\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 a74f48c7eb..4294921cbc 100644 --- a/tutorial/source/tensor_shapes.ipynb +++ b/tutorial/source/tensor_shapes.ipynb @@ -54,7 +54,7 @@ "from pyro.optim import Adam\n", "\n", "smoke_test = ('CI' in os.environ)\n", - "assert pyro.__version__.startswith('1.6.0')\n", + "assert pyro.__version__.startswith('1.7.0')\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 508792bd99..a3d5da2193 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.6.0')\n", + "assert pyro.__version__.startswith('1.7.0')\n", "smoke_test = ('CI' in os.environ)" ] }, diff --git a/tutorial/source/vae.ipynb b/tutorial/source/vae.ipynb index 14ae0147d1..ff2fc99451 100644 --- a/tutorial/source/vae.ipynb +++ b/tutorial/source/vae.ipynb @@ -115,7 +115,7 @@ "metadata": {}, "outputs": [], "source": [ - "assert pyro.__version__.startswith('1.6.0')\n", + "assert pyro.__version__.startswith('1.7.0')\n", "pyro.distributions.enable_validation(False)\n", "pyro.set_rng_seed(0)\n", "# Enable smoke test - run the notebook cells on CI.\n",