Skip to content

Commit e01bfe4

Browse files
committed
Update CI builds to satisfy minimum compiler requirements
1 parent 85f7241 commit e01bfe4

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

.jenkins/continuous.groovy

+6-6
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ pipeline {
3737

3838
stage('Build') {
3939
parallel {
40-
stage('CUDA-11.5.2-NVCC-CUDA-AWARE-MPI') {
40+
stage('CUDA-12.0.0-NVCC-CUDA-AWARE-MPI') {
4141
agent {
4242
dockerfile {
4343
filename "Dockerfile"
4444
dir "docker"
45-
additionalBuildArgs '--build-arg BASE=nvidia/cuda:11.5.2-devel-ubuntu20.04 --build-arg KOKKOS_VERSION=4.3.00 --build-arg KOKKOS_OPTIONS="-DCMAKE_CXX_EXTENSIONS=OFF -DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_VOLTA70=ON" --build-arg CUDA_AWARE_MPI=1'
45+
additionalBuildArgs '--build-arg BASE=nvidia/cuda:12.0.0-devel-ubuntu22.04 --build-arg KOKKOS_VERSION=4.3.00 --build-arg KOKKOS_OPTIONS="-DCMAKE_CXX_EXTENSIONS=OFF -DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_VOLTA70=ON" --build-arg CUDA_AWARE_MPI=1'
4646
args '-v /tmp/ccache:/tmp/ccache --env NVIDIA_VISIBLE_DEVICES=${NVIDIA_VISIBLE_DEVICES}'
4747
label 'NVIDIA_Tesla_V100-PCIE-32GB && nvidia-docker'
4848
}
@@ -98,12 +98,12 @@ pipeline {
9898
}
9999
}
100100
}
101-
stage('CUDA-11.7.1-NVCC') {
101+
stage('CUDA-12.8.0-NVCC') {
102102
agent {
103103
dockerfile {
104104
filename "Dockerfile"
105105
dir "docker"
106-
additionalBuildArgs '--build-arg BASE=nvidia/cuda:11.7.1-devel-ubuntu20.04 --build-arg KOKKOS_VERSION=4.4.00 --build-arg KOKKOS_OPTIONS="-DCMAKE_CXX_EXTENSIONS=OFF -DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_OPENMP=ON -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_VOLTA70=ON"'
106+
additionalBuildArgs '--build-arg BASE=nvidia/cuda:12.8.0-devel-ubuntu22.04 --build-arg KOKKOS_VERSION=4.4.00 --build-arg KOKKOS_OPTIONS="-DCMAKE_CXX_EXTENSIONS=OFF -DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_OPENMP=ON -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_VOLTA70=ON"'
107107
args '-v /tmp/ccache:/tmp/ccache --env NVIDIA_VISIBLE_DEVICES=${NVIDIA_VISIBLE_DEVICES}'
108108
label 'NVIDIA_Tesla_V100-PCIE-32GB && nvidia-docker'
109109
}
@@ -158,12 +158,12 @@ pipeline {
158158
}
159159
}
160160
}
161-
stage('CUDA-11.0.3-Clang') {
161+
stage('CUDA-12.0.1-Clang') {
162162
agent {
163163
dockerfile {
164164
filename "Dockerfile"
165165
dir "docker"
166-
additionalBuildArgs '--build-arg BASE=nvidia/cuda:11.0.3-devel-ubuntu18.04 --build-arg KOKKOS_VERSION="4.3.00" --build-arg KOKKOS_OPTIONS="-DCMAKE_CXX_EXTENSIONS=OFF -DCMAKE_CXX_COMPILER=clang++ -DKokkos_ENABLE_THREADS=ON -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_VOLTA70=ON -DCMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu"'
166+
additionalBuildArgs '--build-arg BASE=nvidia/cuda:12.0.1-devel-ubuntu18.04 --build-arg KOKKOS_VERSION="4.3.00" --build-arg KOKKOS_OPTIONS="-DCMAKE_CXX_EXTENSIONS=OFF -DCMAKE_CXX_COMPILER=clang++ -DKokkos_ENABLE_THREADS=ON -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_VOLTA70=ON -DCMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu"'
167167
args '-v /tmp/ccache:/tmp/ccache --env NVIDIA_VISIBLE_DEVICES=${NVIDIA_VISIBLE_DEVICES}'
168168
label 'NVIDIA_Tesla_V100-PCIE-32GB && nvidia-docker'
169169
}

.jenkins/nightly.groovy

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ pipeline {
88

99
stage('Build') {
1010
parallel {
11-
stage('CUDA-11.7.1') {
11+
stage('CUDA-12.4.1') {
1212
agent {
1313
docker {
14-
image 'nvidia/cuda:11.7.1-devel-ubuntu22.04'
14+
image 'nvidia/cuda:12.4.1-devel-ubuntu22.04'
1515
label 'NVIDIA_Tesla_V100-PCIE-32GB && nvidia-docker'
1616
}
1717
}
1818
environment {
1919
CTEST_OPTIONS = '--timeout 180 --no-compress-output -T Test'
20-
CMAKE_OPTIONS = '-D CMAKE_BUILD_TYPE=Release -D CMAKE_CXX_STANDARD=17 -D CMAKE_CXX_EXTENSIONS=OFF'
20+
CMAKE_OPTIONS = '-D CMAKE_BUILD_TYPE=Release -D CMAKE_CXX_STANDARD=20 -D CMAKE_CXX_EXTENSIONS=OFF'
2121
}
2222
steps {
2323
sh 'apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git cmake libboost-program-options-dev libboost-test-dev libbenchmark-dev'
@@ -48,16 +48,16 @@ pipeline {
4848
}
4949
}
5050
}
51-
stage('CUDA-12.2.0-MPI') {
51+
stage('CUDA-12.2.2-MPI') {
5252
agent {
5353
docker {
54-
image 'nvidia/cuda:12.2.0-devel-ubuntu22.04'
54+
image 'nvidia/cuda:12.2.2-devel-ubuntu22.04'
5555
label 'NVIDIA_Tesla_V100-PCIE-32GB && nvidia-docker'
5656
}
5757
}
5858
environment {
5959
CTEST_OPTIONS = '--timeout 180 --no-compress-output -T Test'
60-
CMAKE_OPTIONS = '-D CMAKE_BUILD_TYPE=Release -D CMAKE_CXX_STANDARD=17 -D CMAKE_CXX_EXTENSIONS=OFF'
60+
CMAKE_OPTIONS = '-D CMAKE_BUILD_TYPE=Release -D CMAKE_CXX_STANDARD=20 -D CMAKE_CXX_EXTENSIONS=OFF'
6161
}
6262
steps {
6363
sh 'apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git cmake libboost-program-options-dev libboost-test-dev libbenchmark-dev libopenmpi-dev'
@@ -98,7 +98,7 @@ pipeline {
9898
}
9999
environment {
100100
CTEST_OPTIONS = '--timeout 180 --no-compress-output -T Test'
101-
CMAKE_OPTIONS = '-D CMAKE_BUILD_TYPE=Release -D CMAKE_CXX_STANDARD=17 -D CMAKE_CXX_EXTENSIONS=OFF -DCMAKE_CXX_COMPILER=hipcc -DCMAKE_PREFIX_PATH=/opt/rocm'
101+
CMAKE_OPTIONS = '-D CMAKE_BUILD_TYPE=Release -D CMAKE_CXX_STANDARD=20 -D CMAKE_CXX_EXTENSIONS=OFF -DCMAKE_CXX_COMPILER=hipcc -DCMAKE_PREFIX_PATH=/opt/rocm'
102102
}
103103
steps {
104104
sh 'apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git cmake libboost-program-options-dev libboost-test-dev libbenchmark-dev'

docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BASE=nvidia/cuda:11.0.3-devel-ubuntu18.04
1+
ARG BASE=nvidia/cuda:12.0.0-devel-ubuntu22.04
22
FROM $BASE
33

44
ARG NPROCS=4

docker/Dockerfile.sycl

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ RUN SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
128128

129129
# Install Kokkos
130130
ARG KOKKOS_VERSION=4.3.00
131-
ARG KOKKOS_OPTIONS="-DKokkos_ENABLE_SYCL=ON -DCMAKE_CXX_FLAGS=-Wno-unknown-cuda-version -DKokkos_ENABLE_UNSUPPORTED_ARCHS=ON -DKokkos_ARCH_VOLTA70=ON -DKOKKOS_IMPL_SYCL_DEVICE_GLOBAL_SUPPORTED=0 -DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_FLAGS=-w"
131+
ARG KOKKOS_OPTIONS="-DKokkos_ENABLE_SYCL=ON -DCMAKE_CXX_FLAGS=-Wno-unknown-cuda-version -DKokkos_ENABLE_UNSUPPORTED_ARCHS=ON -DKokkos_ARCH_VOLTA70=ON -DKOKKOS_IMPL_SYCL_DEVICE_GLOBAL_SUPPORTED=0 -DCMAKE_CXX_STANDARD=20 -DCMAKE_CXX_FLAGS=-w"
132132
ENV KOKKOS_DIR=/opt/kokkos
133133
RUN . /opt/intel/oneapi/setvars.sh --include-intel-llvm && \
134134
KOKKOS_URL=https://github.com/kokkos/kokkos/archive/${KOKKOS_VERSION}.tar.gz && \

docker/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
arborx_dev:
1313
build:
1414
args:
15-
- BASE=nvidia/cuda:11.5.2-devel-ubuntu20.04
15+
- BASE=nvidia/cuda:12.2.2-devel-ubuntu22.04
1616
- KOKKOS_VERSION=4.2.00
17-
- KOKKOS_OPTIONS=-DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_OPENMP=ON -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_SNB=ON -DKokkos_ARCH_VOLTA70=ON
17+
- KOKKOS_OPTIONS=-DCMAKE_CXX_STANDARD=20 -DKokkos_ENABLE_OPENMP=ON -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_SNB=ON -DKokkos_ARCH_VOLTA70=ON
1818
```

0 commit comments

Comments
 (0)