Unverified Commit 9d741ef7 by Tianqi Chen Committed by GitHub

[CI][DOCKER] Update ci-gpu torch1.4 and onnx1.6 (#4826)

parent b88de43d
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# under the License. # under the License.
# CI docker GPU env # CI docker GPU env
# tag: v0.56 # tag: v0.60
FROM nvidia/cuda:10.0-cudnn7-devel-ubuntu16.04 FROM nvidia/cuda:10.0-cudnn7-devel-ubuntu16.04
# Base scripts # Base scripts
...@@ -87,8 +87,6 @@ RUN bash /install/ubuntu_install_caffe2.sh ...@@ -87,8 +87,6 @@ RUN bash /install/ubuntu_install_caffe2.sh
COPY install/ubuntu_install_dgl.sh /install/ubuntu_install_dgl.sh COPY install/ubuntu_install_dgl.sh /install/ubuntu_install_dgl.sh
RUN bash /install/ubuntu_install_dgl.sh RUN bash /install/ubuntu_install_dgl.sh
RUN pip3 install "Pillow<7"
COPY install/ubuntu_install_vulkan.sh /install/ubuntu_install_vulkan.sh COPY install/ubuntu_install_vulkan.sh /install/ubuntu_install_vulkan.sh
RUN bash /install/ubuntu_install_vulkan.sh RUN bash /install/ubuntu_install_vulkan.sh
......
...@@ -94,4 +94,3 @@ ${DOCKER_BINARY} run --rm --pid=host\ ...@@ -94,4 +94,3 @@ ${DOCKER_BINARY} run --rm --pid=host\
${DOCKER_IMAGE_NAME}\ ${DOCKER_IMAGE_NAME}\
bash --login /docker/with_the_same_user \ bash --login /docker/with_the_same_user \
${COMMAND[@]} ${COMMAND[@]}
...@@ -79,8 +79,14 @@ if [ "$#" -lt 1 ] || [ ! -e "${SCRIPT_DIR}/Dockerfile.${CONTAINER_TYPE}" ]; then ...@@ -79,8 +79,14 @@ if [ "$#" -lt 1 ] || [ ! -e "${SCRIPT_DIR}/Dockerfile.${CONTAINER_TYPE}" ]; then
fi fi
# Use nvidia-docker if the container is GPU. # Use nvidia-docker if the container is GPU.
if [[ "${CONTAINER_TYPE}" == *"gpu"* ]]; then if [[ "${DOCKER_IMAGE_NAME}" == *"gpu"* ]]; then
if ! type "nvidia-docker" 1> /dev/null 2> /dev/null
then
DOCKER_BINARY="docker"
CUDA_ENV=" --gpus all "${CUDA_ENV}
else
DOCKER_BINARY="nvidia-docker" DOCKER_BINARY="nvidia-docker"
fi
else else
DOCKER_BINARY="docker" DOCKER_BINARY="docker"
fi fi
...@@ -143,6 +149,7 @@ ${DOCKER_BINARY} run --rm --pid=host \ ...@@ -143,6 +149,7 @@ ${DOCKER_BINARY} run --rm --pid=host \
-e "CI_BUILD_UID=$(id -u)" \ -e "CI_BUILD_UID=$(id -u)" \
-e "CI_BUILD_GROUP=$(id -g -n)" \ -e "CI_BUILD_GROUP=$(id -g -n)" \
-e "CI_BUILD_GID=$(id -g)" \ -e "CI_BUILD_GID=$(id -g)" \
${CUDA_ENV}\
${CI_DOCKER_EXTRA_PARAMS[@]} \ ${CI_DOCKER_EXTRA_PARAMS[@]} \
${DOCKER_IMG_NAME} \ ${DOCKER_IMG_NAME} \
bash --login docker/with_the_same_user \ bash --login docker/with_the_same_user \
......
...@@ -21,11 +21,11 @@ set -u ...@@ -21,11 +21,11 @@ set -u
set -o pipefail set -o pipefail
# fix to certain version for now # fix to certain version for now
pip3 install onnx==1.5.0 pip3 install onnx==1.6.0
pip3 install onnxruntime==1.0.0 pip3 install onnxruntime==1.0.0
# torch depends on a number of other packages, but unhelpfully, does # torch depends on a number of other packages, but unhelpfully, does
# not expose that in the wheel!!! # not expose that in the wheel!!!
pip3 install future pip3 install future
pip3 install torch==1.2.0 torchvision==0.4.0 pip3 install torch==1.4.0 torchvision==0.5.0
...@@ -35,3 +35,6 @@ rm -f /usr/bin/python3 && ln -s /usr/bin/python3.6 /usr/bin/python3 ...@@ -35,3 +35,6 @@ rm -f /usr/bin/python3 && ln -s /usr/bin/python3.6 /usr/bin/python3
# Install pip # Install pip
cd /tmp && wget -q https://bootstrap.pypa.io/get-pip.py && python2 get-pip.py && python3.6 get-pip.py cd /tmp && wget -q https://bootstrap.pypa.io/get-pip.py && python2 get-pip.py && python3.6 get-pip.py
# Pin pip version
pip3 install pip==19.3.1
...@@ -21,4 +21,4 @@ set -u ...@@ -21,4 +21,4 @@ set -u
set -o pipefail set -o pipefail
# install libraries for python package on ubuntu # install libraries for python package on ubuntu
pip3 install pylint==1.9.4 six numpy pytest cython decorator scipy tornado typed_ast pytest mypy orderedset antlr4-python3-runtime attrs requests "Pillow<7" packaging pip3 install pylint==1.9.4 six numpy pytest cython decorator scipy tornado typed_ast pytest mypy orderedset antlr4-python3-runtime attrs requests Pillow packaging
...@@ -20,4 +20,4 @@ set -e ...@@ -20,4 +20,4 @@ set -e
set -u set -u
set -o pipefail set -o pipefail
pip3 install sphinx sphinx-gallery sphinx_rtd_theme sphinx_autodoc_annotation matplotlib Image commonmark>=0.7.3 docutils>=0.11 pip3 install sphinx sphinx-gallery==0.4.0 sphinx_rtd_theme sphinx_autodoc_annotation matplotlib Image commonmark>=0.7.3 docutils>=0.11
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment