saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-05-31 23:27:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update CI build docker images (#7386)

Browse source 
Update CI build docker images: delete ubuntu 16.04 support.
This commit is contained in:
Changming Sun 2021-04-21 13:18:34 -07:00 committed by GitHub
parent 09313d9e1f
commit 65b2b87f83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 6 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/ci_build/github/azure-pipelines/orttraining-linux-gpu-ortmodule-distributed-test-ci-pipeline.yml
View file

@ -14,7 +14,7 @@ jobs:
- template: templates/run-docker-build-steps.yml
parameters:
RunDockerBuildArgs: |
-o ubuntu16.04 -d gpu -r $(Build.BinariesDirectory) \
-o ubuntu18.04 -d gpu -r $(Build.BinariesDirectory) \
-t onnxruntime_ortmodule_distributed_tests_image \
-x " \
--config RelWithDebInfo \

2
tools/ci_build/github/azure-pipelines/orttraining-linux-gpu-ortmodule-test-ci-pipeline.yml
View file

@ -14,7 +14,7 @@ jobs:
- template: templates/run-docker-build-steps.yml
parameters:
RunDockerBuildArgs: |
-o ubuntu16.04 -d gpu -r $(Build.BinariesDirectory) \
-o ubuntu18.04 -d gpu -r $(Build.BinariesDirectory) \
-t onnxruntime_ortmodule_tests_image \
-x " \
--config RelWithDebInfo \

4
tools/ci_build/github/linux/docker/Dockerfile.ubuntu
View file

@ -1,4 +1,4 @@
ARG OS_VERSION=16.04
ARG OS_VERSION=18.04
FROM ubuntu:${OS_VERSION}
ARG PYTHON_VERSION=3.6
@ -8,8 +8,6 @@ RUN /tmp/scripts/install_ubuntu.sh -p $PYTHON_VERSION && /tmp/scripts/install_de
WORKDIR /root
ENV LD_LIBRARY_PATH /usr/local/openblas/lib:$LD_LIBRARY_PATH
ARG BUILD_UID=1000
ARG BUILD_USER=onnxruntimedev
RUN adduser --gecos 'onnxruntime Build User' --disabled-password $BUILD_USER --uid $BUILD_UID

2
tools/ci_build/github/linux/docker/Dockerfile.ubuntu_for_android
View file

@ -7,8 +7,6 @@ RUN /tmp/scripts/install_ubuntu.sh -p $PYTHON_VERSION && /tmp/scripts/install_de
WORKDIR /root
ENV LD_LIBRARY_PATH /usr/local/openblas/lib:$LD_LIBRARY_PATH
ARG BUILD_UID=1000
ARG BUILD_USER=onnxruntimedev
RUN adduser --gecos 'onnxruntime Build User' --disabled-password $BUILD_USER --uid $BUILD_UID

2
tools/ci_build/github/linux/docker/Dockerfile.ubuntu_gpu
View file

@ -1,4 +1,4 @@
FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu16.04
FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu18.04
ARG PYTHON_VERSION=3.6
ARG INSTALL_DEPS_EXTRA_ARGS

2
tools/ci_build/github/linux/docker/Dockerfile.ubuntu_tensorrt
View file

@ -22,8 +22,6 @@ RUN _CUDNN_VERSION=$(echo $CUDNN_VERSION | cut -d. -f1-2) && \
ln -s /etc/alternatives/libcudnn_so /usr/local/cudnn-$_CUDNN_VERSION/cuda/lib64/libcudnn.so && \
ln -s /usr/local/cudnn{-$_CUDNN_VERSION,}
ENV LD_LIBRARY_PATH /usr/local/openblas/lib:$LD_LIBRARY_PATH
ARG BUILD_USER=onnxruntimedev
ARG BUILD_UID=1000
WORKDIR /home/$BUILD_USER

52
tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh
View file

@ -22,7 +22,7 @@ SYS_LONG_BIT=$(getconf LONG_BIT)
#see: https://docs.microsoft.com/en-us/dotnet/core/linux-prerequisites?tabs=netcore21
if [ "$OS_VERSION" = "16.04" ]; then
if [ "$OS_VERSION" = "18.04" ]; then
PACKAGE_LIST="autotools-dev \
automake \
build-essential \
@ -39,40 +39,6 @@ if [ "$OS_VERSION" = "16.04" ]; then
gfortran \
python3-dev \
language-pack-en \
libopenblas-dev \
liblttng-ust0 \
libcurl3 \
libssl1.0.0 \
libkrb5-3 \
libicu55 \
libtinfo-dev \
libtool \
openssh-server \
aria2 \
bzip2 \
unzip \
zip \
rsync libunwind8 libpng16-dev libexpat1-dev \
python3-setuptools python3-numpy python3-wheel python python3-pip python3-pytest \
openjdk-8-jdk"
elif [ "$OS_VERSION" = "18.04" ]; then
PACKAGE_LIST="autotools-dev \
automake \
build-essential \
git apt-transport-https apt-utils \
ca-certificates \
pkg-config \
wget \
zlib1g \
zlib1g-dev \
libssl-dev \
curl libcurl4-openssl-dev \
autoconf \
sudo \
gfortran \
python3-dev \
language-pack-en \
libopenblas-dev \
liblttng-ust0 \
libcurl4 \
libssl1.0.0 \
@ -105,7 +71,6 @@ else # ubuntu20.04
gfortran \
python3-dev \
language-pack-en \
libopenblas-dev \
liblttng-ust0 \
libcurl4 \
libssl1.1 \
@ -141,20 +106,7 @@ if [ "$SYS_LONG_BIT" = "64" ]; then
fi
if [ "$OS_VERSION" = "16.04" ]; then
if [ "$PYTHON_VER" != "3.5" ]; then
add-apt-repository -y ppa:deadsnakes/ppa
apt-get update
apt-get install -y --no-install-recommends \
python${PYTHON_VER} \
python${PYTHON_VER}-dev
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VER} 1
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.5 2
update-alternatives --set python3 /usr/bin/python${PYTHON_VER}
#TODO: the old one(/usr/bin/pip3) should be uninstalled first. Because the one will be
#put at /usr/local/. Then there will be two pips.
/usr/bin/python${PYTHON_VER} -m pip install --upgrade --force-reinstall pip==19.0.3
fi
exit 1
elif [ "$OS_VERSION" = "18.04" ]; then
if [ "$PYTHON_VER" != "3.6" ]; then
add-apt-repository -y ppa:deadsnakes/ppa