diff --git a/.travis.yml b/.travis.yml index 45f2cf8b68..60a3707986 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,11 @@ cache: install: - pip install -U pip - - pip install torch_nightly==1.0.0.dev20181206 -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html - - pip install torchvision --no-dependencies + - if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then + pip install http://download.pytorch.org/whl/cpu/torch-1.0.0-cp27-cp27mu-linux_x86_64.whl; + else + pip install http://download.pytorch.org/whl/cpu/torch-1.0.0-cp36-cp36m-linux_x86_64.whl; + fi - pip install .[test] - pip freeze diff --git a/README.md b/README.md index 7fd284c51f..4f386064a8 100644 --- a/README.md +++ b/README.md @@ -28,20 +28,12 @@ For more information, check out our [blog post](http://eng.uber.com/pyro). ### Installing a stable Pyro release -First install [PyTorch](http://pytorch.org/). - -Install via pip: +**Install using pip:** -**Python 2.7.\*:** ```sh pip install pyro-ppl ``` -**Python 3.5:** -```sh -pip3 install pyro-ppl -``` - **Install from source:** ```sh git clone git@github.com:uber/pyro.git @@ -62,18 +54,6 @@ Make sure that the models come from the same release version of the [Pyro source For recent features you can install Pyro from source. -To install a compatible version of PyTorch, use the PyTorch nightly -[build](https://pytorch.org/). We recommend pinning to the specific -nightly build below that has been well tested. - -```sh -build_ver=1.0.0.dev20181127 # <---- a well-tested PyTorch build -pip install torch_nightly==${build_ver} -f \ - https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html -``` - -Finally install Pyro using pip or from source as shown below. - **Install using pip:** ```sh diff --git a/setup.py b/setup.py index f82f1d25fb..bec7eae202 100644 --- a/setup.py +++ b/setup.py @@ -56,8 +56,7 @@ 'matplotlib>=1.3', 'observations>=0.1.4', 'pillow', - # TODO: uncomment on release; using torch-nightly build - # 'torchvision', + 'torchvision', 'visdom>=0.1.4', 'pandas', 'seaborn', @@ -85,8 +84,7 @@ 'numpy>=1.7', 'opt_einsum>=2.3.0', 'six>=1.10.0', - # TODO: uncomment on release; using torch-nightly build - # 'torch>=0.4.1', + 'torch>=1.0.0', 'tqdm>=4.28', ], extras_require={ @@ -96,7 +94,6 @@ 'pytest==3.7', 'pytest-cov', 'scipy>=0.19.0', - 'ipython<=6.5.0', # https://github.com/jupyter/jupyter_console/issues/158 ], 'profile': ['prettytable', 'pytest-benchmark', 'snakeviz'], 'dev': EXTRAS_REQUIRE + [ @@ -109,7 +106,6 @@ 'pypandoc', 'pytest==3.7', 'pytest-xdist', - 'ipython<=6.5.0', # https://github.com/jupyter/jupyter_console/issues/158 'scipy>=0.19.0', 'sphinx', 'sphinx_rtd_theme',