Skip to content

Commit

Permalink
Update CI builds to satisfy minimum compiler requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
@aprokop
aprokop committed Feb 8, 2025
1 parent 85f7241 commit e01bfe4
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
12 changes: 6 additions & 6 deletions .jenkins/continuous.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ pipeline {

stage('Build') {
parallel {
stage('CUDA-11.5.2-NVCC-CUDA-AWARE-MPI') {
stage('CUDA-12.0.0-NVCC-CUDA-AWARE-MPI') {
agent {
dockerfile {
filename "Dockerfile"
dir "docker"
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'
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'
args '-v /tmp/ccache:/tmp/ccache --env NVIDIA_VISIBLE_DEVICES=${NVIDIA_VISIBLE_DEVICES}'
label 'NVIDIA_Tesla_V100-PCIE-32GB && nvidia-docker'
}
Expand Down Expand Up @@ -98,12 +98,12 @@ pipeline {
}
}
}
stage('CUDA-11.7.1-NVCC') {
stage('CUDA-12.8.0-NVCC') {
agent {
dockerfile {
filename "Dockerfile"
dir "docker"
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"'
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"'
args '-v /tmp/ccache:/tmp/ccache --env NVIDIA_VISIBLE_DEVICES=${NVIDIA_VISIBLE_DEVICES}'
label 'NVIDIA_Tesla_V100-PCIE-32GB && nvidia-docker'
}
Expand Down Expand Up @@ -158,12 +158,12 @@ pipeline {
}
}
}
stage('CUDA-11.0.3-Clang') {
stage('CUDA-12.0.1-Clang') {
agent {
dockerfile {
filename "Dockerfile"
dir "docker"
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"'
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"'
args '-v /tmp/ccache:/tmp/ccache --env NVIDIA_VISIBLE_DEVICES=${NVIDIA_VISIBLE_DEVICES}'
label 'NVIDIA_Tesla_V100-PCIE-32GB && nvidia-docker'
}
Expand Down
14 changes: 7 additions & 7 deletions .jenkins/nightly.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ pipeline {

stage('Build') {
parallel {
stage('CUDA-11.7.1') {
stage('CUDA-12.4.1') {
agent {
docker {
image 'nvidia/cuda:11.7.1-devel-ubuntu22.04'
image 'nvidia/cuda:12.4.1-devel-ubuntu22.04'
label 'NVIDIA_Tesla_V100-PCIE-32GB && nvidia-docker'
}
}
environment {
CTEST_OPTIONS = '--timeout 180 --no-compress-output -T Test'
CMAKE_OPTIONS = '-D CMAKE_BUILD_TYPE=Release -D CMAKE_CXX_STANDARD=17 -D CMAKE_CXX_EXTENSIONS=OFF'
CMAKE_OPTIONS = '-D CMAKE_BUILD_TYPE=Release -D CMAKE_CXX_STANDARD=20 -D CMAKE_CXX_EXTENSIONS=OFF'
}
steps {
sh 'apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git cmake libboost-program-options-dev libboost-test-dev libbenchmark-dev'
Expand Down Expand Up @@ -48,16 +48,16 @@ pipeline {
}
}
}
stage('CUDA-12.2.0-MPI') {
stage('CUDA-12.2.2-MPI') {
agent {
docker {
image 'nvidia/cuda:12.2.0-devel-ubuntu22.04'
image 'nvidia/cuda:12.2.2-devel-ubuntu22.04'
label 'NVIDIA_Tesla_V100-PCIE-32GB && nvidia-docker'
}
}
environment {
CTEST_OPTIONS = '--timeout 180 --no-compress-output -T Test'
CMAKE_OPTIONS = '-D CMAKE_BUILD_TYPE=Release -D CMAKE_CXX_STANDARD=17 -D CMAKE_CXX_EXTENSIONS=OFF'
CMAKE_OPTIONS = '-D CMAKE_BUILD_TYPE=Release -D CMAKE_CXX_STANDARD=20 -D CMAKE_CXX_EXTENSIONS=OFF'
}
steps {
sh 'apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git cmake libboost-program-options-dev libboost-test-dev libbenchmark-dev libopenmpi-dev'
Expand Down Expand Up @@ -98,7 +98,7 @@ pipeline {
}
environment {
CTEST_OPTIONS = '--timeout 180 --no-compress-output -T Test'
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'
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'
}
steps {
sh 'apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git cmake libboost-program-options-dev libboost-test-dev libbenchmark-dev'
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE=nvidia/cuda:11.0.3-devel-ubuntu18.04
ARG BASE=nvidia/cuda:12.0.0-devel-ubuntu22.04
FROM $BASE

ARG NPROCS=4
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.sycl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ RUN SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \

# Install Kokkos
ARG KOKKOS_VERSION=4.3.00
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"
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"
ENV KOKKOS_DIR=/opt/kokkos
RUN . /opt/intel/oneapi/setvars.sh --include-intel-llvm && \
KOKKOS_URL=https://github.com/kokkos/kokkos/archive/${KOKKOS_VERSION}.tar.gz && \
Expand Down
4 changes: 2 additions & 2 deletions docker/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
arborx_dev:
build:
args:
- BASE=nvidia/cuda:11.5.2-devel-ubuntu20.04
- BASE=nvidia/cuda:12.2.2-devel-ubuntu22.04
- KOKKOS_VERSION=4.2.00
- KOKKOS_OPTIONS=-DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_OPENMP=ON -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_SNB=ON -DKokkos_ARCH_VOLTA70=ON
- KOKKOS_OPTIONS=-DCMAKE_CXX_STANDARD=20 -DKokkos_ENABLE_OPENMP=ON -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_SNB=ON -DKokkos_ARCH_VOLTA70=ON
```

0 comments on commit e01bfe4

Please sign in to comment.