diff --git a/ci/jenkins_tests/perf_integration_tests/run_perf_integration.sh b/ci/jenkins_tests/perf_integration_tests/run_perf_integration.sh index 7962b2107..f25d32df2 100755 --- a/ci/jenkins_tests/perf_integration_tests/run_perf_integration.sh +++ b/ci/jenkins_tests/perf_integration_tests/run_perf_integration.sh @@ -9,7 +9,7 @@ pushd "$ROOT_DIR" python -m pip install pytest-benchmark -pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev1-cp27-cp27mu-manylinux1_x86_64.whl +pip install -U https://ray-wheels.s3-us-west-2.amazonaws.com/latest/ray-0.8.0.dev1-cp36-cp36m-manylinux1_x86_64.whl python -m pytest --benchmark-autosave --benchmark-min-rounds=10 --benchmark-columns="min, max, mean" $ROOT_DIR/../../../python/ray/tests/perf_integration_tests/test_perf_integration.py pushd $ROOT_DIR/../../../python diff --git a/ci/jenkins_tests/run_tune_tests.sh b/ci/jenkins_tests/run_tune_tests.sh index 6154fe70d..84e7e7fe9 100755 --- a/ci/jenkins_tests/run_tune_tests.sh +++ b/ci/jenkins_tests/run_tune_tests.sh @@ -78,9 +78,9 @@ $SUPPRESS_OUTPUT docker run --rm --shm-size=${SHM_SIZE} --memory=${MEMORY_SIZE} --smoke-test # Runs only on Python3 -# docker run --rm --shm-size=${SHM_SIZE} --memory=${MEMORY_SIZE} $DOCKER_SHA \ -# python3 /ray/python/ray/tune/examples/nevergrad_example.py \ -# --smoke-test +$SUPPRESS_OUTPUT docker run --rm --shm-size=${SHM_SIZE} --memory=${MEMORY_SIZE} $DOCKER_SHA \ + python /ray/python/ray/tune/examples/nevergrad_example.py \ + --smoke-test $SUPPRESS_OUTPUT docker run --rm --shm-size=${SHM_SIZE} --memory=${MEMORY_SIZE} $DOCKER_SHA \ python /ray/python/ray/tune/examples/tune_mnist_keras.py \ diff --git a/docker/base-deps/Dockerfile b/docker/base-deps/Dockerfile index c21430c62..db8f28c85 100644 --- a/docker/base-deps/Dockerfile +++ b/docker/base-deps/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update \ && apt-get clean \ && echo 'export PATH=/opt/conda/bin:$PATH' > /etc/profile.d/conda.sh \ && wget \ - --quiet 'https://repo.continuum.io/archive/Anaconda2-5.2.0-Linux-x86_64.sh' \ + --quiet 'https://repo.continuum.io/archive/Anaconda3-5.2.0-Linux-x86_64.sh' \ -O /tmp/anaconda.sh \ && /bin/bash /tmp/anaconda.sh -b -p /opt/conda \ && rm /tmp/anaconda.sh \ diff --git a/docker/examples/Dockerfile b/docker/examples/Dockerfile index 04df50a82..bafcdf35e 100644 --- a/docker/examples/Dockerfile +++ b/docker/examples/Dockerfile @@ -12,6 +12,7 @@ RUN pip install -U h5py # Mutes FutureWarnings RUN pip install --upgrade bayesian-optimization RUN pip install --upgrade git+git://github.com/hyperopt/hyperopt.git RUN pip install --upgrade sigopt -# RUN pip install --upgrade nevergrad +RUN pip install --upgrade nevergrad RUN pip install --upgrade scikit-optimize +RUN pip install -U pytest-remotedata>=0.3.1 RUN conda install pytorch-cpu torchvision-cpu -c pytorch diff --git a/docker/stress_test/Dockerfile b/docker/stress_test/Dockerfile index 1d174ed72..376fe5340 100644 --- a/docker/stress_test/Dockerfile +++ b/docker/stress_test/Dockerfile @@ -4,7 +4,7 @@ FROM ray-project/base-deps # We install ray and boto3 to enable the ray autoscaler as # a test runner. -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 +RUN pip install -U https://ray-wheels.s3-us-west-2.amazonaws.com/latest/ray-0.8.0.dev1-cp36-cp36m-manylinux1_x86_64.whl boto3 RUN mkdir -p /root/.ssh/ # We port the source code in so that we run the most up-to-date stress tests. diff --git a/docker/tune_test/Dockerfile b/docker/tune_test/Dockerfile index 41ef63390..1d252a62f 100644 --- a/docker/tune_test/Dockerfile +++ b/docker/tune_test/Dockerfile @@ -4,7 +4,7 @@ FROM ray-project/base-deps # We install ray and boto3 to enable the ray autoscaler as # a test runner. -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 +RUN pip install -U https://ray-wheels.s3-us-west-2.amazonaws.com/latest/ray-0.8.0.dev1-cp36-cp36m-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 # The following is needed to support TensorFlow 1.14 @@ -13,8 +13,9 @@ RUN pip install gym[atari]==0.10.11 opencv-python-headless tensorflow lz4 keras RUN pip install --upgrade bayesian-optimization RUN pip install --upgrade git+git://github.com/hyperopt/hyperopt.git RUN pip install --upgrade sigopt -# RUN pip install --upgrade nevergrad +RUN pip install --upgrade nevergrad RUN pip install --upgrade scikit-optimize +RUN pip install -U pytest-remotedata>=0.3.1 RUN conda install pytorch-cpu torchvision-cpu -c pytorch # RUN mkdir -p /root/.ssh/ @@ -22,6 +23,6 @@ RUN conda install pytorch-cpu torchvision-cpu -c pytorch # We port the source code in so that we run the most up-to-date stress tests. ADD ray.tar /ray ADD git-rev /ray/git-rev -RUN python /ray/python/ray/rllib/setup-rllib-dev.py --yes +RUN python /ray/python/ray/setup-dev.py --yes WORKDIR /ray