Adding gcc4 conda builds (#2283)

* Changes without centos changes

* Changes for protobuf 3.5 and gcc 4.8

* Changing 3.4.1 back to 3.5.1

* Preventing installing two versions of setuptools

* Fixing setuptools bug

3 files changed, 16 insertions, 33 deletions

diff --git a/docker/jenkins/common/install_anaconda.sh b/docker/jenkins/common/install_anaconda.sh
index df456acf60..d90e9cb41a 100755
--- a/docker/jenkins/common/install_anaconda.sh
+++ b/docker/jenkins/common/install_anaconda.sh
@@ -6,28 +6,15 @@ set -ex
 export LANG=C.UTF-8
 export LC_ALL=C.UTF-8
 
-# Install needed packages
-# This also needs build-essentials but that should be installed already
-apt-get update --fix-missing
-apt-get install -y wget
+# Pick correct Anaconda package
+CONDA_PKG_NAME="Anaconda${ANACONDA_VERSION}-5.0.1-Linux-x86_64.sh"
+CONDA_PKG_URL="https://repo.continuum.io/archive/${CONDA_PKG_NAME}"
 
 # Install anaconda
 echo 'export PATH=/opt/conda/bin:$PATH' > /etc/profile.d/conda.sh
-case "$ANACONDA_VERSION" in
-  2*)
-    wget https://repo.continuum.io/archive/Anaconda2-5.0.1-Linux-x86_64.sh -O ~/anaconda.sh
-  ;;
-  3*)
-    wget https://repo.continuum.io/archive/Anaconda3-5.0.1-Linux-x86_64.sh -O ~/anaconda.sh
-  ;;
-  *)
-    echo "Invalid ANACONDA_VERSION..."
-    echo $ANACONDA_VERSION
-    exit 1
-  ;;
-esac
-/bin/bash ~/anaconda.sh -b -p /opt/conda
-rm ~/anaconda.sh
+curl -LO "$CONDA_PKG_URL"
+/bin/bash "$CONDA_PKG_NAME" -b -p /opt/conda
+rm "$CONDA_PKG_NAME"
 
 export PATH="/opt/conda/bin:$PATH"
 echo 'export PATH=/opt/conda/bin:$PATH' > ~/.bashrc
diff --git a/docker/jenkins/common/install_nccl.sh b/docker/jenkins/common/install_nccl.sh
index bd7344f4db..3488eabc41 100755
--- a/docker/jenkins/common/install_nccl.sh
+++ b/docker/jenkins/common/install_nccl.sh
@@ -30,15 +30,9 @@ if [ -n "$NCCL_UBUNTU_VER" ]; then
   apt-get install -y wget
   dpkg -i "${NCCL_DEB}"
 
-  if [ ${CUDA_VERSION:0:3} == 9.1 ]; then
-    # For 9.1 because 2.1.2 for 9.1 does not exist, we will stil use 2.1.4.
-    NCCL_LIB_VERSION="2.1.4-1+cuda${CUDA_VERSION:0:3}"
-  else
-    # Actually installing takes into account CUDA version.
-    # Version 2.1.4 exports symbols it shouldn't, causing a ton of tests to fail.
-    # We pin this to 2.1.2 until this is solved and NVIDIA releases a new version.
-    NCCL_LIB_VERSION="2.1.2-1+cuda${CUDA_VERSION:0:3}"
-  fi
+  # On March 8, 2018 Nvidia began recommending version 2.1.15
+  NCCL_LIB_VERSION="2.1.15-1+cuda${CUDA_VERSION:0:3}"
+
   apt update
-  apt install libnccl2=$NCCL_LIB_VERSION libnccl-dev=$NCCL_LIB_VERSION
+  apt install -y libnccl2=$NCCL_LIB_VERSION libnccl-dev=$NCCL_LIB_VERSION
 fi
diff --git a/docker/jenkins/common/install_python.sh b/docker/jenkins/common/install_python.sh
index 75fc5e660e..50cfb0edfc 100755
--- a/docker/jenkins/common/install_python.sh
+++ b/docker/jenkins/common/install_python.sh
@@ -122,10 +122,12 @@ pushd pip-9.0.1
 popd
 rm -rf pip-9.0.1*
 
-# Upgrade setuptools
-# setuptools 38.5.2 seems to be buggy, see error in
-# https://ci.pytorch.org/jenkins/job/caffe2-docker/job/py3.6-gcc5-ubuntu16.04/35/consoleFull
-pip install -U pip setuptools!=38.5.2
+if [ -z "${INSTALL_SETUPTOOLS}" ]; then
+  # Upgrade setuptools
+  # setuptools 38.5.2 seems to be buggy, see error in
+  # https://ci.pytorch.org/jenkins/job/caffe2-docker/job/py3.6-gcc5-ubuntu16.04/35/consoleFull
+  pip install -U pip setuptools!=38.5.2
+fi
 
 # tornado 5.0 requires Python 2.7.9+ or 3.4+
 if [[ $($PYTHON -c 'import sys; print(int(sys.version_info <= (2, 7, 9) or sys.version_info <= (3, 4)))' == 1) ]]; then