From f4b5b1b42eebce31c845a41fa5d346bba32ef653 Mon Sep 17 00:00:00 2001 From: Philipp Moritz Date: Thu, 20 Jun 2019 16:40:27 -0700 Subject: [PATCH 1/3] fix tensorflow-1.14 in jenkins --- docker/examples/Dockerfile | 2 +- docker/tune_test/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/examples/Dockerfile b/docker/examples/Dockerfile index 6883c5a64a0e..d51d8ca2017f 100644 --- a/docker/examples/Dockerfile +++ b/docker/examples/Dockerfile @@ -5,7 +5,7 @@ FROM ray-project/deploy # This updates numpy to 1.14 and mutes errors from other libraries RUN conda install -y numpy RUN apt-get install -y zlib1g-dev -RUN pip install gym[atari] opencv-python-headless tensorflow lz4 keras pytest-timeout smart_open +RUN pip install gym[atari] opencv-python-headless tensorflow lz4 keras pytest-timeout smart_open --ignore-installed RUN pip install -U h5py # Mutes FutureWarnings RUN pip install --upgrade bayesian-optimization RUN pip install --upgrade git+git://github.com/hyperopt/hyperopt.git diff --git a/docker/tune_test/Dockerfile b/docker/tune_test/Dockerfile index 6e098d5218f6..bd5900b4d2e6 100644 --- a/docker/tune_test/Dockerfile +++ b/docker/tune_test/Dockerfile @@ -7,7 +7,7 @@ FROM ray-project/base-deps RUN pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev1-cp27-cp27mu-manylinux1_x86_64.whl boto3 # We install this after the latest wheels -- this should not override the latest wheels. RUN apt-get install -y zlib1g-dev -RUN pip install gym[atari]==0.10.11 opencv-python-headless tensorflow lz4 keras pytest-timeout smart_open +RUN pip install gym[atari]==0.10.11 opencv-python-headless tensorflow lz4 keras pytest-timeout smart_open --ignore-installed RUN pip install --upgrade bayesian-optimization RUN pip install --upgrade git+git://github.com/hyperopt/hyperopt.git RUN pip install --upgrade sigopt From f48c4fad52f794bd5937751abcb510fed5d3c83a Mon Sep 17 00:00:00 2001 From: Philipp Moritz Date: Thu, 20 Jun 2019 17:55:57 -0700 Subject: [PATCH 2/3] different fix --- docker/examples/Dockerfile | 4 +++- docker/tune_test/Dockerfile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docker/examples/Dockerfile b/docker/examples/Dockerfile index d51d8ca2017f..093116e6d55c 100644 --- a/docker/examples/Dockerfile +++ b/docker/examples/Dockerfile @@ -5,7 +5,9 @@ FROM ray-project/deploy # This updates numpy to 1.14 and mutes errors from other libraries RUN conda install -y numpy RUN apt-get install -y zlib1g-dev -RUN pip install gym[atari] opencv-python-headless tensorflow lz4 keras pytest-timeout smart_open --ignore-installed +# The following is needed to support TensorFlow 1.14 +RUN conda install -y -c anaconda wrapt=1.11.1 +RUN pip install gym[atari] opencv-python-headless tensorflow lz4 keras pytest-timeout smart_open RUN pip install -U h5py # Mutes FutureWarnings RUN pip install --upgrade bayesian-optimization RUN pip install --upgrade git+git://github.com/hyperopt/hyperopt.git diff --git a/docker/tune_test/Dockerfile b/docker/tune_test/Dockerfile index bd5900b4d2e6..d24938e249f4 100644 --- a/docker/tune_test/Dockerfile +++ b/docker/tune_test/Dockerfile @@ -7,7 +7,9 @@ FROM ray-project/base-deps RUN pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev1-cp27-cp27mu-manylinux1_x86_64.whl boto3 # We install this after the latest wheels -- this should not override the latest wheels. RUN apt-get install -y zlib1g-dev -RUN pip install gym[atari]==0.10.11 opencv-python-headless tensorflow lz4 keras pytest-timeout smart_open --ignore-installed +# The following is needed to support TensorFlow 1.14 +RUN conda install -y -c anaconda wrapt=1.11.1 +RUN pip install gym[atari]==0.10.11 opencv-python-headless tensorflow lz4 keras pytest-timeout smart_open RUN pip install --upgrade bayesian-optimization RUN pip install --upgrade git+git://github.com/hyperopt/hyperopt.git RUN pip install --upgrade sigopt From e5db32f9f4398552916adfbb9be9b2f0c26b5b2c Mon Sep 17 00:00:00 2001 From: Philipp Moritz Date: Thu, 20 Jun 2019 22:42:48 -0700 Subject: [PATCH 3/3] update --- docker/examples/Dockerfile | 2 +- docker/tune_test/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/examples/Dockerfile b/docker/examples/Dockerfile index 093116e6d55c..04df50a822fa 100644 --- a/docker/examples/Dockerfile +++ b/docker/examples/Dockerfile @@ -6,7 +6,7 @@ FROM ray-project/deploy RUN conda install -y numpy RUN apt-get install -y zlib1g-dev # The following is needed to support TensorFlow 1.14 -RUN conda install -y -c anaconda wrapt=1.11.1 +RUN conda remove -y --force wrapt RUN pip install gym[atari] opencv-python-headless tensorflow lz4 keras pytest-timeout smart_open RUN pip install -U h5py # Mutes FutureWarnings RUN pip install --upgrade bayesian-optimization diff --git a/docker/tune_test/Dockerfile b/docker/tune_test/Dockerfile index d24938e249f4..41ef63390266 100644 --- a/docker/tune_test/Dockerfile +++ b/docker/tune_test/Dockerfile @@ -8,7 +8,7 @@ RUN pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8. # We install this after the latest wheels -- this should not override the latest wheels. RUN apt-get install -y zlib1g-dev # The following is needed to support TensorFlow 1.14 -RUN conda install -y -c anaconda wrapt=1.11.1 +RUN conda remove -y --force wrapt RUN pip install gym[atari]==0.10.11 opencv-python-headless tensorflow lz4 keras pytest-timeout smart_open RUN pip install --upgrade bayesian-optimization RUN pip install --upgrade git+git://github.com/hyperopt/hyperopt.git