From bd0c6442d20cbec16bdb33681395fcb7290d42e5 Mon Sep 17 00:00:00 2001 From: Peixin Date: Wed, 28 Dec 2022 22:32:32 +0800 Subject: [PATCH] Default build image use cuda 11.8 (#847) * Default build image use cuda 11.8 Signed-off-by: Peixin Li * fix invalid comments Signed-off-by: Peixin Li --- build/run-in-docker | 2 +- ci/Dockerfile | 9 ++++++--- ci/Jenkinsfile.premerge | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/build/run-in-docker b/build/run-in-docker index 6d0c5da0e79..a45973f4e30 100755 --- a/build/run-in-docker +++ b/build/run-in-docker @@ -24,7 +24,7 @@ set -e SCRIPTDIR=$(cd $(dirname $0); pwd) REPODIR=$SCRIPTDIR/.. -CUDA_VERSION=${CUDA_VERSION:-11.5.0} +CUDA_VERSION=${CUDA_VERSION:-11.8.0} DOCKER_CMD=${DOCKER_CMD:-docker} DOCKER_BUILD_EXTRA_ARGS=${DOCKER_BUILD_EXTRA_ARGS:-""} DOCKER_RUN_EXTRA_ARGS=${DOCKER_RUN_EXTRA_ARGS:-""} diff --git a/ci/Dockerfile b/ci/Dockerfile index 14f1e16cec7..b3eb909f3f8 100755 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -17,11 +17,11 @@ ### # Build the image for spark-rapids-jni development environment. # -# Arguments: CUDA_VERSION=11.5.0 +# Arguments: CUDA_VERSION=11.8.0 # ### -ARG CUDA_VERSION=11.5.0 -FROM gpuci/cuda:$CUDA_VERSION-devel-centos7 +ARG CUDA_VERSION=11.8.0 +FROM nvidia/cuda:$CUDA_VERSION-devel-centos7 ARG DEVTOOLSET_VERSION=9 ### Install basic requirements RUN yum install -y centos-release-scl @@ -68,3 +68,6 @@ RUN cd /usr/local && wget --quiet https://boostorg.jfrog.io/artifactory/main/rel ./b2 install --prefix=/usr/local --with-filesystem --with-system && \ cd /usr/local && \ rm -rf boost_1_79_0 + +# disable cuda container constraints to allow running w/ elder drivers on data-center GPUs +ENV NVIDIA_DISABLE_REQUIRE="true" diff --git a/ci/Jenkinsfile.premerge b/ci/Jenkinsfile.premerge index 4272cfdc7c5..f1f8e847ee3 100644 --- a/ci/Jenkinsfile.premerge +++ b/ci/Jenkinsfile.premerge @@ -30,7 +30,7 @@ import ipp.blossom.* def githubHelper // blossom github helper def TEMP_IMAGE_BUILD = true -def IMAGE_PREMERGE = "${common.ARTIFACTORY_NAME}/sw-spark-docker/plugin-jni:centos7-cuda11.5.0-blossom" +def IMAGE_PREMERGE = "${common.ARTIFACTORY_NAME}/sw-spark-docker/plugin-jni:centos7-cuda11.8.0-blossom" def cpuImage = pod.getCPUYAML(IMAGE_PREMERGE) def PREMERGE_DOCKERFILE = 'ci/Dockerfile' def PREMERGE_TAG @@ -149,7 +149,7 @@ pipeline { } if (TEMP_IMAGE_BUILD) { - PREMERGE_TAG = "centos7-cuda11.5.0-blossom-dev-${BUILD_TAG}" + PREMERGE_TAG = "centos7-cuda11.8.0-blossom-dev-${BUILD_TAG}" IMAGE_PREMERGE = "${ARTIFACTORY_NAME}/sw-spark-docker-local/plugin-jni:${PREMERGE_TAG}" docker.build(IMAGE_PREMERGE, "-f ${PREMERGE_DOCKERFILE} -t $IMAGE_PREMERGE .") uploadDocker(IMAGE_PREMERGE)