From 427d7a4d3af091157fc217c76cd6370ca9f87ff2 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Mon, 19 Feb 2024 11:53:26 +0100 Subject: [PATCH] squash! ci: add g++-10 and gcc-10 to the main-cuda This commit updates the full-cuda.Dockerfile and server-cuda.Dockerfile. Signed-off-by: Daniel Bevenius --- .devops/full-cuda.Dockerfile | 6 +++++- .devops/server-cuda.Dockerfile | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.devops/full-cuda.Dockerfile b/.devops/full-cuda.Dockerfile index 77a9ddc14..aff6fbe2b 100644 --- a/.devops/full-cuda.Dockerfile +++ b/.devops/full-cuda.Dockerfile @@ -11,8 +11,12 @@ FROM ${BASE_CUDA_DEV_CONTAINER} as build # Unless otherwise specified, we make a fat build. ARG CUDA_DOCKER_ARCH=all +# Install gcc-10 and g++-10 to work around and issue CUDA 11.7.1 and gcc-11 RUN apt-get update && \ - apt-get install -y build-essential python3 python3-pip git + apt-get install -y build-essential python3 python3-pip git g++-10 gcc-10 + +RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 && \ + update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100 COPY requirements.txt requirements.txt COPY requirements requirements diff --git a/.devops/server-cuda.Dockerfile b/.devops/server-cuda.Dockerfile index 4f83904bc..e3678f896 100644 --- a/.devops/server-cuda.Dockerfile +++ b/.devops/server-cuda.Dockerfile @@ -11,8 +11,13 @@ FROM ${BASE_CUDA_DEV_CONTAINER} as build # Unless otherwise specified, we make a fat build. ARG CUDA_DOCKER_ARCH=all +# Install gcc-10 and g++-10 to work around and issue CUDA 11.7.1 and gcc-11 RUN apt-get update && \ apt-get install -y build-essential git + apt-get install -y build-essential git g++-10 gcc-10 + +RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 && \ + update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100 WORKDIR /app