Skip to content

Commit

Permalink
Update RADIUSS Shared CI: add poodle machine
Browse files Browse the repository at this point in the history
  • Loading branch information
adrienbernede committed Oct 30, 2023
1 parent 58be0db commit 9524c8d
Show file tree
Hide file tree
Showing 6 changed files with 82 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ stages:
include:
- local: '.gitlab/custom-jobs-and-variables.yml'
- project: 'radiuss/radiuss-shared-ci'
ref: 'v2023.09.0'
ref: 'v2023.10.0'
file: 'pipelines/${CI_MACHINE}.yml'
- artifact: '${CI_MACHINE}-jobs.yml'
job: 'generate-job-lists'
Expand All @@ -82,7 +82,7 @@ stages:
include:
# [Optional] checks preliminary to running the actual CI test
#- project: 'radiuss/radiuss-shared-ci'
# ref: 'v2023.09.0'
# ref: 'v2023.10.0'
# file: '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 ruby
PROJECT_RUBY_DEPS: ""

# Poodle
# Arguments for top level allocation
POODLE_SHARED_ALLOC: "--exclusive --partition=pdebug --time=15 --nodes=1"
# Arguments for job level allocation
POODLE_JOB_ALLOC: "--overlap --time=14 --nodes=1"
# Project specific variants for poodle
PROJECT_POODLE_VARIANTS: "~shared +fortran +tools tests=basic"
# Project specific deps for poodle
PROJECT_POODLE_DEPS: ""

# Corona
# Arguments for top level allocation
CORONA_SHARED_ALLOC: "--exclusive --time-limit=15m --nodes=1"
Expand Down
53 changes: 53 additions & 0 deletions .gitlab/jobs/poodle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
###############################################################################
# Copyright (c) 2022-23, Lawrence Livermore National Security, LLC and RADIUSS
# project contributors. See the COPYRIGHT file for details.
#
# SPDX-License-Identifier: (MIT)
###############################################################################

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

# Allow failure due to compiler internal error building wrapfumpire.f
intel_2022_1_0:
variables:
SPEC: "${PROJECT_RUBY_VARIANTS} %[email protected] ${PROJECT_RUBY_DEPS}"
extends: .job_on_poodle
allow_failure: true

############
# Extra jobs
############
# We do not recommend using ${PROJECT_<MACHINE>_VARIANTS} and
# ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is not reason not to fully
# describe the spec here.

gcc_10_3_1_numa:
variables:
SPEC: "~shared +fortran +numa +tools tests=basic %[email protected]"
extends: .job_on_poodle

clang_14_0_6_gcc_10_3_1_sqlite_experimental:
variables:
SPEC: "~shared +sqlite_experimental +tools tests=basic %[email protected]"
extends: .job_on_poodle

# Develop builds against specific tpl version.
clang_14_0_6_gcc_10_3_1_tpls:
variables:
SPEC: "~shared +fortran +tools tests=basic %[email protected]"
extends: .job_on_poodle

gcc_10_3_1_tpls:
variables:
SPEC: "~shared +fortran +tools tests=basic %[email protected]"
extends: .job_on_poodle

gcc_10_3_1_ipc_no_mpi:
variables:
SPEC: "~shared +ipc_shmem tests=basic %[email protected]"
extends: .job_on_poodle
12 changes: 2 additions & 10 deletions .gitlab/jobs/ruby.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################################
# Copyright (c) 2022, Lawrence Livermore National Security, LLC and RADIUSS
# Copyright (c) 2022-23, Lawrence Livermore National Security, LLC and RADIUSS
# project contributors. See the COPYRIGHT file for details.
#
# SPDX-License-Identifier: (MIT)
Expand All @@ -15,7 +15,7 @@
# Allow failure due to compiler internal error building wrapfumpire.f
intel_2022_1_0:
variables:
SPEC: "~shared +fortran +tools tests=basic %[email protected]"
SPEC: "${PROJECT_RUBY_VARIANTS} %[email protected] ${PROJECT_RUBY_DEPS}"
extends: .job_on_ruby
allow_failure: true

Expand Down Expand Up @@ -51,11 +51,3 @@ gcc_10_3_1_ipc_no_mpi:
variables:
SPEC: "~shared +ipc_shmem tests=basic %[email protected]"
extends: .job_on_ruby

# Oneapi is not available on ruby@toss4 (rhel8)
## We deactivate this job as it is known to fail with Umpire: needs gcc toolchain.
#intel_2022_1_0:
# variables:
# ON_RUBY: "OFF"
# SPEC: "${PROJECT_RUBY_VARIANTS} %[email protected] ${PROJECT_RUBY_DEPS}"
# extends: .job_on_ruby
14 changes: 14 additions & 0 deletions .gitlab/subscribed-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,14 @@ generate-job-lists:
LOCAL_JOBS_PATH: ".gitlab/jobs"
script:
- cat ${RADIUSS_JOBS_PATH}/ruby.yml ${LOCAL_JOBS_PATH}/ruby.yml > ruby-jobs.yml
- cat ${RADIUSS_JOBS_PATH}/poodle.yml ${LOCAL_JOBS_PATH}/poodle.yml > poodle-jobs.yml
- cat ${RADIUSS_JOBS_PATH}/lassen.yml ${LOCAL_JOBS_PATH}/lassen.yml > lassen-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
artifacts:
paths:
- ruby-jobs.yml
- poodle-jobs.yml
- lassen-jobs.yml
- corona-jobs.yml
- tioga-jobs.yml
Expand All @@ -60,6 +62,18 @@ ruby-build-and-test:
needs: [ruby-up-check, generate-job-lists]
extends: [.build-and-test]

# POODLE
poodle-up-check:
variables:
CI_MACHINE: "poodle"
extends: [.machine-check]

poodle-build-and-test:
variables:
CI_MACHINE: "poodle"
needs: [poodle-up-check, generate-job-lists]
extends: [.build-and-test]

# CORONA
corona-up-check:
variables:
Expand Down

0 comments on commit 9524c8d

Please sign in to comment.