Bump version to 0.5.1 that is python 3.5 compatible (#2089)

* Bump version to 0.5.1 that is python 3.5 compatible

* more fixes to setup.py

* update minimum python version to 3.5

* address comments

* fix tqdm issue

* bump up pyro-api version

.travis.yml

@@ -39,7 +39,7 @@ jobs:
     include:
         - stage: lint
           name: lint
-          python: 3.6
+          python: 3.5
           before_install: pip install flake8 nbstripout nbformat
           install:
           script:
@@ -48,36 +48,36 @@ jobs:
               #  git diff-index --quiet HEAD
         - stage: auxiliary modules
           name: docs
-          python: 3.6
+          python: 3.5
           script:
               - pip install -r docs/requirements.txt
               - make docs
               - make doctest
         - name: perf
-          python: 3.6
+          python: 3.5
           script:
               - pip install -e .[profile]
               - pytest -vs --benchmark-disable tests/perf/test_benchmark.py
         - name: profiler
-          python: 3.6
+          python: 3.5
           script:
               - pip install -e .[profile]
               - python -m profiler.distributions
         - stage: unit test
           name: unit
-          python: 3.6
+          python: 3.5
           script: pytest -vs --cov=pyro --cov-config .coveragerc --stage unit --durations 20
         - name: examples
-          python: 3.6
+          python: 3.5
           script:
               - CI=1 pytest -vs --cov=pyro --cov-config .coveragerc --stage test_examples --durations 10
               - grep -l smoke_test tutorial/source/*.ipynb | xargs grep -L 'smoke_test = False' \
                   | CI=1 xargs pytest -vx --nbval-lax --current-env
         - name: integration batch_1
-          python: 3.6
+          python: 3.5
           script: pytest -vs --cov=pyro --cov-config .coveragerc --stage integration_batch_1 --durations 10
         - name: integration batch_2
-          python: 3.6
+          python: 3.5
           script: pytest -vs --cov=pyro --cov-config .coveragerc --stage integration_batch_2 --durations 10
 
 after_success:

docs/requirements.txt

@@ -5,5 +5,5 @@ graphviz>=0.8
 numpy>=1.7
 observations>=0.1.4
 opt_einsum>=2.3.2
-pyro-api>=0.1.0
-tqdm>=4.31
+pyro-api>=0.1.1
+tqdm>=4.36

docs/source/conf.py

@@ -204,4 +204,4 @@ def setup(app):
 
 # @jpchen's hack to get rtd builder to install latest pytorch
 if 'READTHEDOCS' in os.environ:
-    os.system('pip install torch==1.2.0+cpu -f https://download.pytorch.org/whl/torch_stable.html')
+    os.system('pip install torch==1.3.0+cpu -f https://download.pytorch.org/whl/torch_stable.html')

examples/air/main.py

@@ -245,7 +245,7 @@ def per_param_optim_args(module_name, param_name):
 
 
 if __name__ == '__main__':
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.1')
     parser = argparse.ArgumentParser(description="Pyro AIR example", argument_default=argparse.SUPPRESS)
     parser.add_argument('-n', '--num-steps', type=int, default=int(1e8),
                         help='number of optimization steps to take')

examples/baseball.py

@@ -359,7 +359,7 @@ def main(args):
 
 
 if __name__ == "__main__":
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.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)

examples/bayesian_regression.py

@@ -137,7 +137,7 @@ def main(args):
 
 
 if __name__ == '__main__':
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.1')
     parser = argparse.ArgumentParser(description="parse args")
     parser.add_argument('-n', '--num-epochs', default=1000, type=int)
     parser.add_argument('-b', '--batch-size', default=N, type=int)

examples/contrib/autoname/mixture.py

@@ -72,7 +72,7 @@ def main(args):
 
 
 if __name__ == '__main__':
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.1')
     parser = argparse.ArgumentParser(description="parse args")
     parser.add_argument('-n', '--num-epochs', default=200, type=int)
     parser.add_argument('--jit', action='store_true')

examples/contrib/autoname/scoping_mixture.py

@@ -64,7 +64,7 @@ def main(args):
 
 
 if __name__ == "__main__":
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.1')
     parser = argparse.ArgumentParser(description="parse args")
     parser.add_argument('-n', '--num-epochs', default=200, type=int)
     args = parser.parse_args()

examples/contrib/autoname/tree_data.py

@@ -102,7 +102,7 @@ def main(args):
 
 
 if __name__ == '__main__':
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.1')
     parser = argparse.ArgumentParser(description="parse args")
     parser.add_argument('-n', '--num-epochs', default=100, type=int)
     args = parser.parse_args()

examples/contrib/gp/sv-dkl.py

@@ -162,7 +162,7 @@ def main(args):
 
 
 if __name__ == '__main__':
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.1')
     parser = argparse.ArgumentParser(description='Pyro GP MNIST Example')
     parser.add_argument('--data-dir', type=str, default=None, metavar='PATH',
                         help='default directory to cache MNIST data')

examples/contrib/oed/ab_test.py

@@ -112,7 +112,7 @@ def main(num_vi_steps, num_bo_steps, seed):
 
 
 if __name__ == "__main__":
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.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)

examples/dmm/dmm.py

@@ -433,7 +433,7 @@ def do_evaluation():
 
 # parse command-line arguments and execute the main method
 if __name__ == '__main__':
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.1')
 
     parser = argparse.ArgumentParser(description="parse args")
     parser.add_argument('-n', '--num-epochs', type=int, default=5000)

examples/eight_schools/mcmc.py

@@ -40,7 +40,7 @@ def main(args):
 
 
 if __name__ == '__main__':
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.1')
     parser = argparse.ArgumentParser(description='Eight Schools MCMC')
     parser.add_argument('--num-samples', type=int, default=1000,
                         help='number of MCMC samples (default: 1000)')

examples/eight_schools/svi.py

@@ -72,7 +72,7 @@ def main(args):
 
 
 if __name__ == '__main__':
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.1')
     parser = argparse.ArgumentParser(description='Eight Schools SVI')
     parser.add_argument('--lr', type=float, default=0.01,
                         help='learning rate (default: 0.01)')

examples/hmm.py

@@ -626,7 +626,7 @@ def main(args):
 
 
 if __name__ == '__main__':
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.1')
     parser = argparse.ArgumentParser(description="MAP Baum-Welch learning Bach Chorales")
     parser.add_argument("-m", "--model", default="1", type=str,
                         help="one of: {}".format(", ".join(sorted(models.keys()))))

examples/inclined_plane.py

@@ -121,7 +121,7 @@ def main(args):
 
 
 if __name__ == '__main__':
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.1')
     parser = argparse.ArgumentParser(description="parse args")
     parser.add_argument('-n', '--num-samples', default=500, type=int)
     args = parser.parse_args()

examples/lda.py

@@ -135,7 +135,7 @@ def main(args):
 
 
 if __name__ == '__main__':
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.1')
     parser = argparse.ArgumentParser(description="Amortized Latent Dirichlet Allocation")
     parser.add_argument("-t", "--num-topics", default=8, type=int)
     parser.add_argument("-w", "--num-words", default=1024, type=int)

examples/lkj.py

@@ -46,7 +46,7 @@ def main(args):
 
 
 if __name__ == "__main__":
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.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)

examples/minipyro.py

@@ -62,7 +62,7 @@ def guide(data):
 
 
 if __name__ == "__main__":
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.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)

examples/rsa/generics.py

@@ -154,7 +154,7 @@ def main(args):
 
 
 if __name__ == "__main__":
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.1')
     parser = argparse.ArgumentParser(description="parse args")
     parser.add_argument('-n', '--num-samples', default=10, type=int)
     args = parser.parse_args()

examples/rsa/hyperbole.py

@@ -151,7 +151,7 @@ def main(args):
 
 
 if __name__ == "__main__":
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.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)

examples/rsa/schelling.py

@@ -73,7 +73,7 @@ def main(args):
 
 
 if __name__ == '__main__':
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.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)

examples/rsa/schelling_false.py

@@ -86,7 +86,7 @@ def main(args):
 
 
 if __name__ == '__main__':
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.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)

examples/rsa/semantic_parsing.py

@@ -337,7 +337,7 @@ def is_all_qud(world):
 
 
 if __name__ == "__main__":
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.1')
     parser = argparse.ArgumentParser(description="parse args")
     parser.add_argument('-n', '--num-samples', default=10, type=int)
     args = parser.parse_args()

examples/sparse_gamma_def.py

@@ -231,7 +231,7 @@ def main(args):
 
 
 if __name__ == '__main__':
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.1')
     # parse command line arguments
     parser = argparse.ArgumentParser(description="parse args")
     parser.add_argument('-n', '--num-epochs', default=1500, type=int, help='number of training epochs')

examples/sparse_regression.py

@@ -306,7 +306,7 @@ def main(args):
 
 
 if __name__ == '__main__':
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.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)

examples/vae/ss_vae_M2.py

@@ -380,7 +380,7 @@ def main(args):
               "-sup 3000 -zd 50 -hl 500 -lr 0.00042 -b1 0.95 -bs 200 -log ./tmp.log"
 
 if __name__ == "__main__":
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.1')
 
     parser = argparse.ArgumentParser(description="SS-VAE\n{}".format(EXAMPLE_RUN))
 

examples/vae/vae.py

@@ -198,7 +198,7 @@ def main(args):
 
 
 if __name__ == '__main__':
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.1')
     # parse command line arguments
     parser = argparse.ArgumentParser(description="parse args")
     parser.add_argument('-n', '--num-epochs', default=101, type=int, help='number of training epochs')

examples/vae/vae_comparison.py

@@ -243,7 +243,7 @@ def main(args):
 
 
 if __name__ == '__main__':
-    assert pyro.__version__.startswith('0.5.0')
+    assert pyro.__version__.startswith('0.5.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)

pyro/__init__.py

@@ -5,7 +5,7 @@
                              param, plate, plate_stack, random_module, sample, validation_enabled)
 from pyro.util import set_rng_seed
 
-version_prefix = '0.5.0'
+version_prefix = '0.5.1'
 
 # Get the __version__ string from the auto-generated _version.py file, if exists.
 try:

pyro/infer/mcmc/logger.py

@@ -58,9 +58,7 @@ def __init__(self, warmup_steps, num_samples, min_width=80, max_width=120,
         # Disable progress bar in "CI"
         # (see https://github.com/travis-ci/travis-ci/issues/1337).
         disable = disable or "CI" in os.environ or "PYTEST_XDIST_WORKER" in os.environ
-        bar_format = None
-        if not ipython_env:
-            bar_format = "{l_bar}{bar}| {n_fmt}/{total_fmt} [{elapsed}, {rate_fmt}{postfix}]"
+        bar_format = "{l_bar}{bar}| {n_fmt}/{total_fmt} [{elapsed}, {rate_fmt}{postfix}]"
         pbar_cls = tqdm_nb if num_bars > 1 and ipython_env else tqdm
         self.progress_bars = []
         for i in range(num_bars):