Skip to content

Commit

Permalink
Update default gcc to 11 and support cuda 12 build (NVIDIA#989)
Browse files Browse the repository at this point in the history
* Update gcc 11 to support both cuda 11 and 12 build

Signed-off-by: Peixin Li <pxli@nyu.edu>

* fix conflict CUDA_VERSION within cuda image

* add comment

* fix copyright

Signed-off-by: Peixin Li <pxli@nyu.edu>

* update cudf submodule to include gcc11 update

Signed-off-by: Peixin Li <pxli@nyu.edu>

---------

Signed-off-by: Peixin Li <pxli@nyu.edu>
  • Loading branch information
pxLi authored Mar 7, 2023
1 parent d8d00e8 commit 5079c0b
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 11 deletions.
4 changes: 2 additions & 2 deletions build/run-in-docker
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

#
# Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -74,4 +74,4 @@ $DOCKER_CMD run $DOCKER_GPU_OPTS $DOCKER_RUN_EXTRA_ARGS -u $(id -u):$(id -g) --r
-e VERBOSE \
$DOCKER_OPTS \
$SPARK_IMAGE_NAME \
scl enable devtoolset-9 "$RUN_CMD"
scl enable devtoolset-11 "$RUN_CMD"
4 changes: 2 additions & 2 deletions ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -22,7 +22,7 @@
###
ARG CUDA_VERSION=11.8.0
FROM nvidia/cuda:$CUDA_VERSION-devel-centos7
ARG DEVTOOLSET_VERSION=9
ARG DEVTOOLSET_VERSION=11
### Install basic requirements
RUN yum install -y centos-release-scl
RUN yum install -y devtoolset-${DEVTOOLSET_VERSION} rh-python38 epel-release
Expand Down
4 changes: 2 additions & 2 deletions ci/Jenkinsfile.premerge
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/local/env groovy
/*
* Copyright (c) 2022, NVIDIA CORPORATION.
* Copyright (c) 2022-2023, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -211,7 +211,7 @@ pipeline {
container('gpu') {
timeout(time: 3, unit: 'HOURS') { // step only timeout for test run
common.resolveIncompatibleDriverIssue(this)
sh 'scl enable devtoolset-9 "ci/premerge-build.sh"'
sh 'scl enable devtoolset-11 "ci/premerge-build.sh"'
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions ci/nightly-build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -22,11 +22,13 @@ nvidia-smi
git submodule update --init --recursive

MVN="mvn -Dmaven.wagon.http.retryHandler.count=3 -B"
# cuda11 or cuda12
CUDA_VER=${CUDA_VER:-cuda`nvcc --version | sed -n 's/^.*release \([0-9]\+\)\..*$/\1/p'`}
PARALLEL_LEVEL=${PARALLEL_LEVEL:-4}
USE_GDS=${USE_GDS:-ON}
${MVN} clean package ${MVN_MIRROR} \
-Psource-javadoc \
-DCPP_PARALLEL_LEVEL=${PARALLEL_LEVEL} \
-Dlibcudf.build.configure=true \
-DUSE_GDS=${USE_GDS} -Dtest=*,!CuFileTest,!CudaFatalTest \
-DBUILD_TESTS=ON
-DBUILD_TESTS=ON -Dcuda.version=$CUDA_VER
4 changes: 2 additions & 2 deletions ci/submodule-sync.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -18,7 +18,7 @@
# NOTE:
# this script is for jenkins only, and should not be used for local development
# run with ci/Dockerfile in jenkins:
# scl enable devtoolset-9 rh-python38 "ci/submodule-sync.sh"
# scl enable devtoolset-11 rh-python38 "ci/submodule-sync.sh"

set -ex

Expand Down

0 comments on commit 5079c0b

Please sign in to comment.