From ccab8165ebfca437c4640ef2d72a3279c4b10324 Mon Sep 17 00:00:00 2001
From: Changming Sun <chasun@microsoft.com>
Date: Fri, 7 Jun 2019 15:48:52 -0700
Subject: [PATCH] Delete scripts/install_ubuntu_x86.sh (#1189)

* Delete scripts/install_ubuntu_x86.sh to reduce duplicated code
---
 .../github/linux/docker/Dockerfile.ubuntu_x86 |  2 +-
 .../linux/docker/scripts/install_deps.sh      | 10 +---
 .../linux/docker/scripts/install_deps_x86.sh  |  6 +-
 .../linux/docker/scripts/install_ubuntu.sh    | 31 ++++++----
 .../docker/scripts/install_ubuntu_x86.sh      | 59 -------------------
 5 files changed, 26 insertions(+), 82 deletions(-)
 delete mode 100755 tools/ci_build/github/linux/docker/scripts/install_ubuntu_x86.sh

diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_x86 b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_x86
index 738e080eec..828f8e7505 100644
--- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_x86
+++ b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_x86
@@ -5,7 +5,7 @@ ARG PYTHON_VERSION=3.5
 
 ADD scripts /tmp/scripts
 ENV PATH="/opt/cmake/bin:${PATH}"
-RUN /tmp/scripts/install_ubuntu_x86.sh -p ${PYTHON_VERSION} && /tmp/scripts/install_deps_x86.sh && rm -rf /tmp/scripts
+RUN /tmp/scripts/install_ubuntu.sh -p ${PYTHON_VERSION} && /tmp/scripts/install_deps_x86.sh && rm -rf /tmp/scripts
 
 WORKDIR /root
 ENV LD_LIBRARY_PATH /usr/local/openblas/lib:$LD_LIBRARY_PATH
diff --git a/tools/ci_build/github/linux/docker/scripts/install_deps.sh b/tools/ci_build/github/linux/docker/scripts/install_deps.sh
index 27795bcd0f..06a54d74e8 100755
--- a/tools/ci_build/github/linux/docker/scripts/install_deps.sh
+++ b/tools/ci_build/github/linux/docker/scripts/install_deps.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 set -e
-#install ninja
-aria2c -q -d /tmp https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip
-unzip -oq /tmp/ninja-linux.zip -d /usr/bin
-rm -f /tmp/ninja-linux.zip
 #install protobuf
 mkdir -p /tmp/src
 mkdir -p /opt/cmake
@@ -21,9 +17,9 @@ for build_type in 'Debug' 'Relwithdebinfo'; do
   pushd .
   mkdir build_$build_type
   cd build_$build_type
-  /opt/cmake/bin/cmake -G Ninja ../cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=$PB_LIBDIR  -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_POSITION_INDEPENDENT_CODE=ON -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=$build_type
-  ninja
-  ninja install
+  /opt/cmake/bin/cmake ../cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=$PB_LIBDIR  -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_POSITION_INDEPENDENT_CODE=ON -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=$build_type
+  make -j`nproc`
+  make install
   popd
 done
 export ONNX_ML=1
diff --git a/tools/ci_build/github/linux/docker/scripts/install_deps_x86.sh b/tools/ci_build/github/linux/docker/scripts/install_deps_x86.sh
index f88361410c..7f27798900 100755
--- a/tools/ci_build/github/linux/docker/scripts/install_deps_x86.sh
+++ b/tools/ci_build/github/linux/docker/scripts/install_deps_x86.sh
@@ -18,9 +18,9 @@ for build_type in 'Debug' 'Relwithdebinfo'; do
   pushd .
   mkdir build_$build_type
   cd build_$build_type
-  cmake -G Ninja ../cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=$PB_LIBDIR  -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_POSITION_INDEPENDENT_CODE=ON -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=$build_type
-  ninja
-  ninja install
+  cmake ../cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=$PB_LIBDIR  -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_POSITION_INDEPENDENT_CODE=ON -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=$build_type
+  make -j`nproc`
+  make install
   popd
 done
 export ONNX_ML=1
diff --git a/tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh b/tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh
index e8e6111418..b15c67a1c6 100755
--- a/tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh
+++ b/tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh
@@ -10,6 +10,8 @@ done
 PYTHON_VER=${PYTHON_VER:=3.5}
 DEBIAN_FRONTEND=noninteractive
 
+SYS_LONG_BIT=$(getconf LONG_BIT)
+
 apt-get update && apt-get install -y software-properties-common
 add-apt-repository ppa:deadsnakes/ppa
 apt-get update && apt-get install -y --no-install-recommends \
@@ -47,14 +49,16 @@ apt-get update && apt-get install -y --no-install-recommends \
 locale-gen en_US.UTF-8
 update-locale LANG=en_US.UTF-8
 
-OS_VER=`lsb_release -r -s`
-mkdir -p /tmp/dotnet
-aria2c -q -d /tmp/dotnet https://packages.microsoft.com/config/ubuntu/${OS_VER}/packages-microsoft-prod.deb
-dpkg -i /tmp/dotnet/packages-microsoft-prod.deb
-apt-get install -y apt-transport-https
-apt-get update
-apt-get install -y dotnet-sdk-2.2
-rm -rf /tmp/dotnet || true
+#Install dotnet-sdk
+if [ $SYS_LONG_BIT = "64" ]; then
+  OS_VER=`lsb_release -r -s`
+  mkdir -p /tmp/dotnet
+  aria2c -q -d /tmp/dotnet https://packages.microsoft.com/config/ubuntu/${OS_VER}/packages-microsoft-prod.deb
+  dpkg -i /tmp/dotnet/packages-microsoft-prod.deb
+  apt-get update
+  apt-get install -y dotnet-sdk-2.2
+  rm -rf /tmp/dotnet
+fi
 
 if [ $PYTHON_VER!="3.5" ]; then
     apt-get install -y --no-install-recommends \
@@ -70,7 +74,10 @@ fi
 /usr/bin/python${PYTHON_VER} -m pip install --upgrade --force-reinstall requests==2.21.0
 rm -rf /var/lib/apt/lists/*
 
-mkdir -p /tmp/azcopy
-aria2c -q -d /tmp/azcopy -o azcopy.tar.gz https://aka.ms/downloadazcopylinux64
-tar -xf /tmp/azcopy/azcopy.tar.gz -C /tmp/azcopy
-/tmp/azcopy/install.sh
+#Install azcopy
+if [ $SYS_LONG_BIT = "64" ]; then
+  mkdir -p /tmp/azcopy
+  aria2c -q -d /tmp/azcopy -o azcopy.tar.gz https://aka.ms/downloadazcopy-v10-linux
+  tar --strip 1 -xf /tmp/azcopy/azcopy.tar.gz -C /tmp/azcopy
+  cp /tmp/azcopy/azcopy /usr/bin
+fi
diff --git a/tools/ci_build/github/linux/docker/scripts/install_ubuntu_x86.sh b/tools/ci_build/github/linux/docker/scripts/install_ubuntu_x86.sh
deleted file mode 100755
index 6ba1975078..0000000000
--- a/tools/ci_build/github/linux/docker/scripts/install_ubuntu_x86.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-set -e
-while getopts p: parameter_Option
-do case "${parameter_Option}"
-in
-p) PYTHON_VER=${OPTARG};;
-esac
-done
-
-PYTHON_VER=${PYTHON_VER:=3.5}
-DEBIAN_FRONTEND=noninteractive
-
-apt-get update && apt-get install -y software-properties-common
-add-apt-repository ppa:deadsnakes/ppa
-apt-get update && apt-get install -y --no-install-recommends \
-        autotools-dev \
-        build-essential \
-        git apt-transport-https \
-        ca-certificates \
-        pkg-config \
-        wget \
-        zlib1g \
-        zlib1g-dev \
-        libssl-dev \
-        curl \
-        autoconf \
-        sudo \
-        gfortran \
-        python3-dev \
-        language-pack-en \
-        libopenblas-dev \
-        liblttng-ust0 \
-        libcurl3 \
-        libssl1.0.0 \
-        libkrb5-3 \
-        libicu55 \
-        aria2 \
-        bzip2 \
-        unzip \
-        zip \
-        rsync libunwind8 libpng16-dev \
-        python3-setuptools python3-numpy python3-wheel python python3-pip python3-pytest \
-        re2c \
-        ninja-build
-
-locale-gen en_US.UTF-8
-update-locale LANG=en_US.UTF-8
-
-if [ $PYTHON_VER!="3.5" ]; then
-    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}
-fi
-
-/usr/bin/python${PYTHON_VER} -m pip install --upgrade --force-reinstall numpy==1.15.0
-rm -rf /var/lib/apt/lists/*