Remove custom compilers

CONTRIBUTING.md

@@ -84,8 +84,6 @@ RUN source activate base \
       -c conda-forge \
       cudatoolkit=${CUDA_VER} \
       conda-forge::blas \
-      libgcc-ng=${LIB_NG_VERSION} \
-      libstdcxx-ng=${LIB_NG_VERSION} \
       python=${PYTHON_VERSION} \
       #TODO: Add additional conda packages here
     && conda clean -afy \
@@ -109,28 +107,6 @@ If you can include all of the conda dependencies in the image, building the actu
 Example: `gpuci/rapidsai:0.15-cuda10.1-devel-ubuntu18.04-py3.6`
 
 
-### How can I use gcc7 in centos7 images?
-
-Simply include this snippet in a Dockerfile.centos7 file. You can use the same template above, replacing the 'Set environment section'
-
-```
-ARG CENTOS7_GCC7_URL=https://gpuci.s3.us-east-2.amazonaws.com/builds/gcc7.tgz
-
-# Update environment for gcc/g++ builds
-ENV GCC7_DIR=/usr/local/gcc7
-ENV CC=${GCC7_DIR}/bin/gcc
-ENV CXX=${GCC7_DIR}/bin/g++
-ENV CUDAHOSTCXX=${GCC7_DIR}/bin/g++
-ENV LD_LIBRARY_PATH=${GCC7_DIR}/lib64:$CONDA_PREFIX:$LD_LIBRARY_PATH
-ENV PATH=${GCC7_DIR}/bin:$PATH
-
-# Install gcc7 from prebuilt tarball
-RUN wget --quiet ${CENTOS7_GCC7_URL} -O /gcc7.tgz \
-    && tar xzvf /gcc7.tgz \
-    && rm -f /gcc7.tgz
-```
-
-
 ### How do create the driver image?
 
 You don't need to do anything! By providing a `ubuntu16.04` image following the tag scheme above, gpuCI can automatically extend your image and add the drivers.

README.md

@@ -78,35 +78,6 @@ The images below are used for `conda` builds and GPU tests in gpuCI, see the
 [diagram](#image-flow-diagram) above for more context. They are ordered by their
 dependencies.
 
-### Supporting Image - `gcc7` From-Source Build for CentOS 7
-
-A supplemental image that is sourced for CentOS 7 images is `gpuci/builds-gcc7`.
-This is due to `gcc4` being the standard `gcc` in CentOS 7. With this image we
-pre-build `gcc7.3` and then use the following to pull the pre-built files into
-an image:
-
-```
-# Install gcc7 from prebuilt tarball
-wget --quiet https://gpuci.s3.us-east-2.amazonaws.com/builds/gcc7.tgz -O /gcc7.tgz \
-    && tar xzvf /gcc7.tgz \
-    && rm -f /gcc7.tgz
-```
-
-- Repo location
-  - [`gpuci/builds-gcc7`](https://hub.docker.com/r/gpuci/builds-gcc7/tags)
-- Dockerfile
-  - [`Dockerfile.centos7`](builds-gcc7/Dockerfile.centos7)
-- Base Image
-  - `FROM nvidia/cuda:${CUDA_VER}-${CUDA_TYPE}-${LINUX_VER}`
-- Purpose
-  - Builds gcc7 from source on CentOS 7
-  - Used by CentOS 7 images during `gpuci/miniforge-cuda` build to install gcc7 without building
-- Tags - `${CUDA_VER}-${CUDA_TYPE}-${LINUX_VER}`
-  - Supports these options
-    - `${CUDA_VER}` - `10.2`
-    - `${CUDA_TYPE}` - `devel`
-    - `${LINUX_VER}` - `centos7`
-
 ### GPU Test Images
 
 The `gpuci/rapidsai` images serve different purposes based on their `IMAGE_TYPE`

rapidsai-l4t/Dockerfile

@@ -11,10 +11,7 @@ ARG PYTHON_VER=3.7
 # Capture argument used for FROM
 ARG CUDA_VER
 
-# Update environment for gcc/g++ builds
-ENV CC=/usr/bin/gcc
-ENV CXX=/usr/bin/g++
-ENV CUDAHOSTCXX=/usr/bin/g++
+# Update environment
 ENV CUDA_HOME=/usr/local/cuda
 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/cuda/lib64:/usr/local/lib
 ENV NVCC=/usr/local/cuda/bin/nvcc
@@ -32,19 +29,6 @@ SHELL ["/bin/bash", "-c"]
 # Add a condarc for channels and override settings
 COPY .condarc /opt/conda/.condarc
 
-# Install gcc7 - 7.5.0 to bring build stack in line with conda-forge
-RUN apt-get update \
-    && apt-get install -y software-properties-common \
-    && add-apt-repository -y ppa:ubuntu-toolchain-r/test \
-    && apt-get update \
-    && apt-get install -y gcc-7 g++-7 \
-    && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 7 \
-    && update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 7 \
-    && update-alternatives --set gcc /usr/bin/gcc-7 \
-    && update-alternatives --set g++ /usr/bin/g++-7 \
-    && gcc --version \
-    && g++ --version
-
 # Update and add pkgs for gpuci builds
 RUN apt-get update -y --fix-missing \
     && apt-get -qq install apt-utils -y --no-install-recommends \

rapidsai/devel-centos.Dockerfile

@@ -8,20 +8,15 @@ ARG RAPIDS_VER=0.15
 ARG PYTHON_VER=3.7
 
 # Optional arguments
-ARG GCC9_URL=https://gpuci.s3.us-east-2.amazonaws.com/builds/gcc9.tgz
 ARG BINUTILS_DIR=/usr/local/binutils
 
 # Capture argument used for FROM
 ARG CUDA_VER
 
-# Update environment for gcc/g++ builds
-ENV GCC9_DIR=/usr/local/gcc9
-ENV CC=${GCC9_DIR}/bin/gcc
-ENV CXX=${GCC9_DIR}/bin/g++
-ENV CUDAHOSTCXX=${GCC9_DIR}/bin/g++
+# Update environment
 ENV CUDA_HOME=/usr/local/cuda
-ENV LD_LIBRARY_PATH=${GCC9_DIR}/lib64:$LD_LIBRARY_PATH:/usr/local/cuda/lib64:/usr/local/lib
-ENV PATH=${GCC9_DIR}/bin:${BINUTILS_DIR}/bin:/usr/lib64/openmpi/bin:$PATH
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/cuda/lib64:/usr/local/lib
+ENV PATH=${BINUTILS_DIR}/bin:/usr/lib64/openmpi/bin:$PATH
 ENV NVCC=/usr/local/cuda/bin/nvcc
 ENV CUDAToolkit_ROOT=/usr/local/cuda
 ENV CUDACXX=/usr/local/cuda/bin/nvcc
@@ -37,11 +32,6 @@ ENV CONDARC=/opt/conda/.condarc
 # Enables "source activate conda"
 SHELL ["/bin/bash", "-c"]
 
-# Install gcc9 from prebuilt tarball
-RUN wget --quiet ${GCC9_URL} -O /gcc9.tgz \
-    && tar xzvf /gcc9.tgz \
-    && rm -f /gcc9.tgz
-
 ARG BINUTILS_VER=2.37
 # Build binutils
 RUN mkdir -p /usr/local/src/binutils/build ${BINUTILS_DIR} \

rapidsai/devel-centos.arm64.Dockerfile

@@ -7,20 +7,13 @@ FROM ${FROM_IMAGE}:${CUDA_VER}-devel-${LINUX_VER}
 ARG RAPIDS_VER=0.15
 ARG PYTHON_VER=3.7
 
-# Optional arguments
-ARG GCC9_URL=https://gpuci.s3.us-east-2.amazonaws.com/builds/gcc9-arm64.tgz
-
 # Capture argument used for FROM
 ARG CUDA_VER
 
-# Update environment for gcc/g++ builds
-ENV GCC9_DIR=/usr/local/gcc9
-ENV CC=${GCC9_DIR}/bin/gcc
-ENV CXX=${GCC9_DIR}/bin/g++
-ENV CUDAHOSTCXX=${GCC9_DIR}/bin/g++
+# Update environment
 ENV CUDA_HOME=/usr/local/cuda
-ENV LD_LIBRARY_PATH=${GCC9_DIR}/lib64:$LD_LIBRARY_PATH:/usr/local/cuda/lib64:/usr/local/lib
-ENV PATH=${GCC9_DIR}/bin:/usr/lib64/openmpi/bin:$PATH
+ENV LD_LIBRARY_PATH=:$LD_LIBRARY_PATH:/usr/local/cuda/lib64:/usr/local/lib
+ENV PATH=/usr/lib64/openmpi/bin:$PATH
 ENV NVCC=/usr/local/cuda/bin/nvcc
 ENV CUDAToolkit_ROOT=/usr/local/cuda
 ENV CUDACXX=/usr/local/cuda/bin/nvcc
@@ -100,11 +93,6 @@ RUN gpuci_conda_retry install -y -n rapids --freeze-installed \
       rapids-build-env=${RAPIDS_VER} \
       rapids-notebook-env=${RAPIDS_VER}
 
-# Install gcc9 from prebuilt tarball
-RUN gpuci_retry wget --quiet ${GCC9_URL} -O /gcc9.tgz \
-    && tar xzvf /gcc9.tgz \
-    && rm -f /gcc9.tgz
-
 # Clean up pkgs to reduce image size and chmod for all users
 RUN chmod -R ugo+w /opt/conda \
     && conda clean -tipy \

rapidsai/devel.Dockerfile

@@ -10,10 +10,7 @@ ARG PYTHON_VER=3.7
 # Capture argument used for FROM
 ARG CUDA_VER
 
-# Update environment for gcc/g++ builds
-ENV CC=/usr/bin/gcc
-ENV CXX=/usr/bin/g++
-ENV CUDAHOSTCXX=/usr/bin/g++
+# Update environment
 ENV CUDA_HOME=/usr/local/cuda
 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/cuda/lib64:/usr/local/lib
 ENV NVCC=/usr/local/cuda/bin/nvcc
@@ -34,19 +31,6 @@ SHELL ["/bin/bash", "-c"]
 # Add a condarc for channels and override settings
 COPY .condarc /opt/conda/.condarc
 
-# Install gcc9
-RUN apt-get update \
-    && apt-get install -y software-properties-common \
-    && add-apt-repository -y ppa:ubuntu-toolchain-r/test \
-    && apt-get update \
-    && apt-get install -y gcc-9 g++-9 libstdc++6 \
-    && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9 \
-    && update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 9 \
-    && update-alternatives --set gcc /usr/bin/gcc-9 \
-    && update-alternatives --set g++ /usr/bin/g++-9 \
-    && gcc --version \
-    && g++ --version
-
 # Update and add pkgs for gpuci builds
 RUN apt-get update -y --fix-missing \
     && apt-get -qq install apt-utils -y --no-install-recommends \
@@ -59,9 +43,6 @@ RUN apt-get update -y --fix-missing \
       tzdata \
       vim \
       zlib1g-dev \
-      cpp-9 \
-      gcc-9 \
-      gfortran-9 \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*