From 5072b48495d213e68a277d1524ba79d724269f58 Mon Sep 17 00:00:00 2001 From: atalman Date: Mon, 10 Jul 2023 12:21:19 -0700 Subject: [PATCH] Add CUDA_VERSION env variable to manywheel builds --- manywheel/Dockerfile | 7 ++++--- manywheel/Dockerfile_2014 | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/manywheel/Dockerfile b/manywheel/Dockerfile index d3e9ad2ef..988b763eb 100644 --- a/manywheel/Dockerfile +++ b/manywheel/Dockerfile @@ -8,6 +8,7 @@ FROM centos:7 as base ENV LC_ALL en_US.UTF-8 ENV LANG en_US.UTF-8 ENV LANGUAGE en_US.UTF-8 +ENV CUDA_VERSION=${BASE_CUDA_VERSION} ARG DEVTOOLSET_VERSION=9 RUN yum install -y wget curl perl util-linux xz bzip2 git patch which perl zlib-devel @@ -52,7 +53,7 @@ ADD ./common/install_cpython.sh /build_scripts/install_cpython.sh RUN bash build_scripts/build.sh && rm -r build_scripts FROM base as cuda -ARG BASE_CUDA_VERSION=10.2 +ARG BASE_CUDA_VERSION=11.8 # Install CUDA ADD ./common/install_cuda.sh install_cuda.sh RUN bash ./install_cuda.sh ${BASE_CUDA_VERSION} && rm install_cuda.sh @@ -63,7 +64,7 @@ ADD ./common/install_mkl.sh install_mkl.sh RUN bash ./install_mkl.sh && rm install_mkl.sh FROM base as magma -ARG BASE_CUDA_VERSION=10.2 +ARG BASE_CUDA_VERSION=11.8 # Install magma ADD ./common/install_magma.sh install_magma.sh RUN bash ./install_magma.sh ${BASE_CUDA_VERSION} && rm install_magma.sh @@ -129,7 +130,7 @@ COPY --from=libpng /usr/local/lib/libpng* /usr/local/ COPY --from=libpng /usr/local/lib/pkgconfig /usr/local/lib/pkgconfig FROM common as cpu_final -ARG BASE_CUDA_VERSION=10.1 +ARG BASE_CUDA_VERSION=11.8 ARG DEVTOOLSET_VERSION=9 RUN yum install -y yum-utils centos-release-scl RUN yum-config-manager --enable rhel-server-rhscl-7-rpms diff --git a/manywheel/Dockerfile_2014 b/manywheel/Dockerfile_2014 index 2f9a7528e..7f382e15c 100644 --- a/manywheel/Dockerfile_2014 +++ b/manywheel/Dockerfile_2014 @@ -1,12 +1,13 @@ # syntax = docker/dockerfile:experimental ARG ROCM_VERSION=3.7 -ARG BASE_CUDA_VERSION=10.2 +ARG BASE_CUDA_VERSION=11.8 ARG GPU_IMAGE=nvidia/cuda:${BASE_CUDA_VERSION}-devel-centos7 FROM quay.io/pypa/manylinux2014_x86_64 as base ENV LC_ALL en_US.UTF-8 ENV LANG en_US.UTF-8 ENV LANGUAGE en_US.UTF-8 +ENV CUDA_VERSION=${BASE_CUDA_VERSION} RUN yum install -y wget curl perl util-linux xz bzip2 git patch which perl zlib-devel RUN yum install -y yum-utils centos-release-scl @@ -35,7 +36,7 @@ RUN rm -rf /opt/python/cp33-cp33m /opt/_internal/cpython-3.3.6 RUN rm -rf /opt/python/cp34-cp34m /opt/_internal/cpython-3.4.6 FROM base as cuda -ARG BASE_CUDA_VERSION=10.2 +ARG BASE_CUDA_VERSION=11.8 # Install CUDA ADD ./common/install_cuda.sh install_cuda.sh RUN bash ./install_cuda.sh ${BASE_CUDA_VERSION} && rm install_cuda.sh @@ -46,7 +47,7 @@ ADD ./common/install_mkl.sh install_mkl.sh RUN bash ./install_mkl.sh && rm install_mkl.sh FROM base as magma -ARG BASE_CUDA_VERSION=10.2 +ARG BASE_CUDA_VERSION=11.8 # Install magma ADD ./common/install_magma.sh install_magma.sh RUN bash ./install_magma.sh ${BASE_CUDA_VERSION} && rm install_magma.sh @@ -112,7 +113,7 @@ COPY --from=libpng /usr/local/lib/pkgconfig /usr/local/ COPY --from=jni /usr/local/include/jni.h /usr/local/include/jni.h FROM common as cpu_final -ARG BASE_CUDA_VERSION=10.2 +ARG BASE_CUDA_VERSION=11.8 RUN yum install -y yum-utils centos-release-scl RUN yum-config-manager --enable rhel-server-rhscl-7-rpms RUN yum install -y devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-gcc-gfortran devtoolset-7-binutils