Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ stages:
include:
- local: '.gitlab/custom-jobs-and-variables.yml'
- project: 'radiuss/radiuss-shared-ci'
ref: 'v2025.09.0'
ref: 'v2025.09.1'
file: 'pipelines/${CI_MACHINE}.yml'
- artifact: '${CI_MACHINE}-jobs.yml'
job: 'generate-job-lists'
Expand All @@ -90,7 +90,7 @@ include:
file: 'id_tokens.yml'
# [Optional] checks preliminary to running the actual CI test
#- project: 'radiuss/radiuss-shared-ci'
# ref: 'v2025.09.0'
# ref: 'v2025.09.1'
# file: 'utilities/preliminary-ignore-draft-pr.yml'
# pipelines subscribed by the project
- local: '.gitlab/subscribed-pipelines.yml'
10 changes: 10 additions & 0 deletions .gitlab/custom-jobs-and-variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ variables:
# Project specific deps for dane
PROJECT_DANE_DEPS: "^umpire~c~shared ^raja~examples~exercises~tests ^chai~shared~examples "

# Matrix
# Arguments for top level allocation
MATRIX_SHARED_ALLOC: "--exclusive --partition=pdebug --time=10 --nodes=1"
# Arguments for job level allocation
MATRIX_JOB_ALLOC: "--partition=pdebug --overlap --nodes=1"
# Project specific variants for matrix
PROJECT_MATRIX_VARIANTS: "+cuda cuda_arch=75"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought matrix used 90 as the architecture?

# Project specific deps for matrix
PROJECT_MATRIX_DEPS: "^umpire~c~shared ^raja~examples~exercises~tests ^chai~shared~examples "

# Corona
# Arguments for top level allocation
CORONA_SHARED_ALLOC: "--exclusive --time-limit=20m --nodes=1"
Expand Down
27 changes: 27 additions & 0 deletions .gitlab/jobs/matrix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
###############################################################################
# Copyright (c) 2020-25, Lawrence Livermore National Security, LLC and CARE
# project contributors. See the CARE LICENSE file for details.
#
# SPDX-License-Identifier: BSD-3-Clause
###############################################################################

# Override reproducer section to define project specific variables.
.matrix_reproducer_vars:
script:
- !reference [.reproducer_vars, script]

########################
# Overridden shared jobs
########################
# We duplicate the shared jobs description and add necessary changes for this
# project. We keep ${PROJECT_<MACHINE>_VARIANTS} and ${PROJECT_<MACHINE>_DEPS}
# So that the comparison with the original job is easier.

# No overridden jobs so far.

############
# Extra jobs
############
# We do not recommend using ${PROJECT_<MACHINE>_VARIANTS} and
# ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
# describe the spec here.
27 changes: 25 additions & 2 deletions .gitlab/subscribed-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
###############################################################################
# Copyright (c) 2020-25, Lawrence Livermore National Security, LLC and CARE
# project contributors. See the CARE LICENSE file for details.
# Copyright (c) 2020-25, Lawrence Livermore National Security, LLC and CARE project contributors. See the CARE LICENSE file for details.
#
# SPDX-License-Identifier: BSD-3-Clause
###############################################################################
Expand Down Expand Up @@ -38,12 +37,14 @@ generate-job-lists:
LOCAL_JOBS_PATH: ".gitlab/jobs"
script:
- cat ${RADIUSS_JOBS_PATH}/dane.yml ${LOCAL_JOBS_PATH}/dane.yml > dane-jobs.yml
- cat ${RADIUSS_JOBS_PATH}/matrix.yml ${LOCAL_JOBS_PATH}/matrix.yml > matrix-jobs.yml
- cat ${RADIUSS_JOBS_PATH}/corona.yml ${LOCAL_JOBS_PATH}/corona.yml > corona-jobs.yml
- cat ${RADIUSS_JOBS_PATH}/tioga.yml ${LOCAL_JOBS_PATH}/tioga.yml > tioga-jobs.yml
- cat ${RADIUSS_JOBS_PATH}/tuolumne.yml ${LOCAL_JOBS_PATH}/tuolumne.yml > tuolumne-jobs.yml
artifacts:
paths:
- dane-jobs.yml
- matrix-jobs.yml
- corona-jobs.yml
- tioga-jobs.yml
- tuolumne-jobs.yml
Expand All @@ -70,6 +71,28 @@ dane-build-and-test:
when: never
- when: on_success

# MATRIX
matrix-up-check:
variables:
CI_MACHINE: "matrix"
extends: [.machine-check]
rules:
# Runs except if we explicitly deactivate matrix by variable.
- if: '$ON_MATRIX == "OFF"'
when: never
- when: on_success

matrix-build-and-test:
variables:
CI_MACHINE: "matrix"
needs: [matrix-up-check, generate-job-lists]
extends: [.build-and-test]
rules:
# Runs except if we explicitly deactivate matrix by variable.
- if: '$ON_MATRIX == "OFF"'
when: never
- when: on_success

# CORONA
corona-up-check:
variables:
Expand Down
2 changes: 1 addition & 1 deletion scripts/gitlab/build_and_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ then
timed_message "Cleaning working directory"

# Map CPU core allocations
declare -A core_counts=(["lassen"]=40 ["poodle"]=28 ["dane"]=28 ["corona"]=32 ["rzansel"]=48 ["tioga"]=32 ["tuolumne"]=48)
declare -A core_counts=(["lassen"]=40 ["poodle"]=28 ["dane"]=28 ["corona"]=32 ["rzansel"]=48 ["tioga"]=32 ["tuolumne"]=48 ["matrix"]=48)

# If building, then delete everything first
# NOTE: 'cmake --build . -j core_counts' attempts to reduce individual build resources.
Expand Down