Skip to content

Commit

Permalink
Move GPU CI pipelines from old daint to new daint
Browse files Browse the repository at this point in the history
  • Loading branch information
msimberg committed Sep 10, 2024
1 parent b7d8f22 commit d11f8c2
Show file tree
Hide file tree
Showing 9 changed files with 64 additions and 78 deletions.
12 changes: 6 additions & 6 deletions .gitlab/includes/clang14_cuda11_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ include:

.variables_clang14_cuda11_config:
variables:
SPACK_ARCH: linux-ubuntu22.04-haswell
SPACK_ARCH: linux-ubuntu22.04-neoverse_v2
COMPILER: [email protected]
CXXSTD: 17
GPU_TARGET: '60'
GPU_TARGET: '90'
SPACK_SPEC: "pika@main arch=$SPACK_ARCH %${COMPILER} +cuda cuda_arch=${GPU_TARGET} malloc=system
cxxstd=$CXXSTD +valgrind ^[email protected] ^[email protected] +allow-unsupported-compilers ^[email protected] ^valgrind ~mpi"
# PIKA_WITH_CXX_LAMBDA_CAPTURE_DECLTYPE is OFF to test the fallback implementation of PIKA_FORWARD.
Expand All @@ -28,25 +28,25 @@ include:
clang14_cuda11_spack_compiler_image:
extends:
- .variables_clang14_cuda11_config
- .compiler_image_template_rosa
- .compiler_image_template_gh200

clang14_cuda11_spack_image:
needs: [clang14_cuda11_spack_compiler_image]
extends:
- .variables_clang14_cuda11_config
- .dependencies_image_template_rosa
- .dependencies_image_template_gh200

clang14_cuda11_build:
needs: [clang14_cuda11_spack_image]
extends:
- .variables_clang14_cuda11_config
- .build_template_rosa
- .build_template_gh200

.clang14_cuda11_test_common:
needs: [clang14_cuda11_build]
extends:
- .variables_clang14_cuda11_config
- .test_common_gpu_daint_cuda
- .test_common_gh200
- .test_template

clang14_cuda11_test_release:
Expand Down
16 changes: 2 additions & 14 deletions .gitlab/includes/common_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,7 @@ variables:
variables:
SLURM_PARTITION: normal

.test_common_gpu_daint_cuda:
.test_common_gh200:
extends:
- .container-runner-daint-gpu
- .test_common
variables:
SLURM_PARTITION: normal

.test_common_gpu_clariden_cuda:
extends:
- .container-runner-clariden-a100
- .test_common

.test_common_gpu_clariden_hip:
extends:
- .container-runner-clariden-mi200
- .container-runner-daint-gh200
- .test_common
6 changes: 3 additions & 3 deletions .gitlab/includes/common_spack_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ base_spack_image_x86_64:
reports:
dotenv: compiler.env

.compiler_image_template_santis:
.compiler_image_template_gh200:
needs: [base_spack_image_aarch64]
extends: [.container-builder-cscs-gh200, .compiler_image_template]

Expand All @@ -74,7 +74,7 @@ base_spack_image_x86_64:
reports:
dotenv: dependencies.env

.dependencies_image_template_santis:
.dependencies_image_template_gh200:
extends: [.container-builder-cscs-gh200, .dependencies_image_template]

.dependencies_image_template_rosa:
Expand Down Expand Up @@ -109,7 +109,7 @@ base_spack_image_x86_64:
reports:
dotenv: "$DOTENV_FILE"

.build_template_santis:
.build_template_gh200:
extends: [.container-builder-cscs-gh200, .build_template]

.build_template_rosa:
Expand Down
40 changes: 19 additions & 21 deletions .gitlab/includes/gcc12_cuda12_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ include:

.variables_gcc12_cuda12_config:
variables:
SPACK_ARCH: linux-ubuntu22.04-haswell
SPACK_ARCH: linux-ubuntu22.04-neoverse_v2
COMPILER: [email protected]
CXXSTD: 17
GPU_TARGET: "60"
Expand All @@ -24,33 +24,31 @@ include:
gcc12_cuda12_spack_compiler_image:
extends:
- .variables_gcc12_cuda12_config
- .compiler_image_template_rosa
- .compiler_image_template_gh200

gcc12_cuda12_spack_image:
needs: [gcc12_cuda12_spack_compiler_image]
extends:
- .variables_gcc12_cuda12_config
- .dependencies_image_template_rosa
- .dependencies_image_template_gh200

gcc12_cuda12_build:
needs: [gcc12_cuda12_spack_image]
extends:
- .variables_gcc12_cuda12_config
- .build_template_rosa

## Test step currently commented as the cuda driver is too old on clariden:
## https://github.com/pika-org/pika/issues/884
#.gcc12_cuda12_test_common:
# needs: [gcc12_cuda12_build]
# extends:
# - .variables_gcc12_cuda12_config
# - .test_common_gpu_daint_cuda
# - .test_template
#
#gcc12_cuda12_test_release:
# extends: [.gcc12_cuda12_test_common]
# image: $PERSIST_IMAGE_NAME_RELEASE
#
#gcc12_cuda12_test_debug:
# extends: [.gcc12_cuda12_test_common]
# image: $PERSIST_IMAGE_NAME_DEBUG
- .build_template_gh200

.gcc12_cuda12_test_common:
needs: [gcc12_cuda12_build]
extends:
- .variables_gcc12_cuda12_config
- .test_common_gh200
- .test_template

gcc12_cuda12_test_release:
extends: [.gcc12_cuda12_test_common]
image: $PERSIST_IMAGE_NAME_RELEASE

gcc12_cuda12_test_debug:
extends: [.gcc12_cuda12_test_common]
image: $PERSIST_IMAGE_NAME_DEBUG
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ include:
- local: '.gitlab/includes/common_pipeline.yml'
- local: '.gitlab/includes/common_spack_pipeline.yml'

.variables_gcc13_santis_config:
.variables_gcc13_gh200_config:
variables:
SPACK_ARCH: linux-ubuntu22.04-neoverse_v2
COMPILER: [email protected]
Expand All @@ -19,22 +19,22 @@ include:
CMAKE_FLAGS: "-DPIKA_WITH_CXX_STANDARD=$CXXSTD -DPIKA_WITH_MALLOC=system \
-DPIKA_WITH_STDEXEC=ON -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON"

gcc13_santis_spack_compiler_image:
gcc13_gh200_spack_compiler_image:
extends:
- .variables_gcc13_santis_config
- .compiler_image_template_santis
- .variables_gcc13_gh200_config
- .compiler_image_template_gh200
allow_failure: true

gcc13_santis_spack_image:
needs: [gcc13_santis_spack_compiler_image]
gcc13_gh200_spack_image:
needs: [gcc13_gh200_spack_compiler_image]
extends:
- .variables_gcc13_santis_config
- .dependencies_image_template_santis
- .variables_gcc13_gh200_config
- .dependencies_image_template_gh200
allow_failure: true

gcc13_santis_build:
needs: [gcc13_santis_spack_image]
gcc13_gh200_build:
needs: [gcc13_gh200_spack_image]
extends:
- .variables_gcc13_santis_config
- .build_template_santis
- .variables_gcc13_gh200_config
- .build_template_gh200
allow_failure: true
10 changes: 5 additions & 5 deletions .gitlab/includes/gcc9_cuda11_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ include:

.variables_gcc9_cuda11_config:
variables:
SPACK_ARCH: linux-ubuntu22.04-haswell
SPACK_ARCH: linux-ubuntu22.04-neoverse_v2
COMPILER: [email protected]
CXXSTD: 17
GPU_TARGET: '60'
Expand All @@ -22,25 +22,25 @@ include:
gcc9_cuda11_spack_compiler_image:
extends:
- .variables_gcc9_cuda11_config
- .compiler_image_template_rosa
- .compiler_image_template_gh200

gcc9_cuda11_spack_image:
needs: [gcc9_cuda11_spack_compiler_image]
extends:
- .variables_gcc9_cuda11_config
- .dependencies_image_template_rosa
- .dependencies_image_template_gh200

gcc9_cuda11_build:
needs: [gcc9_cuda11_spack_image]
extends:
- .variables_gcc9_cuda11_config
- .build_template_rosa
- .build_template_gh200

.gcc9_cuda11_test_common:
needs: [gcc9_cuda11_build]
extends:
- .variables_gcc9_cuda11_config
- .test_common_gpu_daint_cuda
- .test_common_gh200
- .test_template

gcc9_cuda11_test_release:
Expand Down
29 changes: 13 additions & 16 deletions .gitlab/includes/nvhpc24_7_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,16 @@ nvhpc24_7_build:
- .variables_nvhpc24_7_config
- .build_template_rosa

# The test step is disabled until maintenance is over. Pulling the image on compute nodes is too
# slow, and the image is too big.
# .nvhpc24_7_test_common:
# needs: [nvhpc24_7_build]
# extends:
# - .variables_nvhpc24_7_config
# - .test_common_gpu_daint_cuda
# - .test_template
#
# nvhpc24_7_test_release:
# extends: [.nvhpc24_7_test_common]
# image: $PERSIST_IMAGE_NAME_RELEASE
#
# nvhpc24_7_test_debug:
# extends: [.nvhpc24_7_test_common]
# image: $PERSIST_IMAGE_NAME_DEBUG
needs: [nvhpc24_7_build]
extends:
- .variables_nvhpc24_7_config
- .test_common_gh200
- .test_template

nvhpc24_7_test_release:
extends: [.nvhpc24_7_test_common]
image: $PERSIST_IMAGE_NAME_RELEASE

nvhpc24_7_test_debug:
extends: [.nvhpc24_7_test_common]
image: $PERSIST_IMAGE_NAME_DEBUG
2 changes: 1 addition & 1 deletion .gitlab/pipelines_on_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ include:
- local: '.gitlab/includes/gcc12_pipeline.yml'
- local: '.gitlab/includes/gcc12_cuda12_pipeline.yml'
- local: '.gitlab/includes/gcc12_hip5_pipeline.yml'
- local: '.gitlab/includes/gcc13_santis_pipeline.yml'
- local: '.gitlab/includes/gcc13_gh200_pipeline.yml'
- local: '.gitlab/includes/gcc14_pipeline.yml'
- local: '.gitlab/includes/clang11_pipeline.yml'
- local: '.gitlab/includes/clang12_pipeline.yml'
Expand Down
3 changes: 3 additions & 0 deletions .gitlab/pipelines_on_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ include:
- local: '.gitlab/includes/clang14_cuda11_pipeline.yml'
- local: '.gitlab/includes/gcc12_hip6_pipeline.yml'
- local: '.gitlab/includes/sloc.yml'
# TODO: move to on_merge before merging
- local: '.gitlab/includes/gcc9_cuda11_pipeline.yml'
- local: '.gitlab/includes/gcc12_cuda12_pipeline.yml'

0 comments on commit d11f8c2

Please sign in to comment.