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
13 changes: 1 addition & 12 deletions .gitlab/custom-jobs-and-variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,11 @@

# We define the following GitLab pipeline variables:
variables:
# On LLNL's ruby, this pipeline creates only one allocation shared among jobs
# On LLNL's machines, this pipeline creates only one allocation shared among jobs
# in order to save time and resources. This allocation has to be uniquely named
# so that we are sure to retrieve it and avoid collisions.
ALLOC_NAME: ${CI_PROJECT_NAME}_ci_${CI_PIPELINE_ID}

# Ruby
# Arguments for top level allocation
RUBY_SHARED_ALLOC: "--exclusive --reservation=ci --time=7 --nodes=1"
# Arguments for job level allocation
# Note: We repeat the reservation, necessary when jobs are manually re-triggered.
RUBY_JOB_ALLOC: "--overlap --reservation=ci --nodes=1"
# Project specific variants for ruby
PROJECT_RUBY_VARIANTS: "~shared +raja tests=basic "
# Project specific deps for ruby
PROJECT_RUBY_DEPS: "^raja~examples~exercises "

# Dane
# Arguments for top level allocation
DANE_SHARED_ALLOC: "--exclusive --reservation=ci --time=7 --nodes=1"
Expand Down
33 changes: 0 additions & 33 deletions .gitlab/jobs/ruby.yml

This file was deleted.

14 changes: 0 additions & 14 deletions .gitlab/subscribed-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,33 +37,19 @@ generate-job-lists:
RADIUSS_JOBS_PATH: "scripts/radiuss-spack-configs/gitlab/radiuss-jobs"
LOCAL_JOBS_PATH: ".gitlab/jobs"
script:
- cat ${RADIUSS_JOBS_PATH}/ruby.yml ${LOCAL_JOBS_PATH}/ruby.yml > ruby-jobs.yml
- cat ${RADIUSS_JOBS_PATH}/dane.yml ${LOCAL_JOBS_PATH}/dane.yml > dane-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
- cat ${RADIUSS_JOBS_PATH}/tuolumne.yml ${LOCAL_JOBS_PATH}/tuolumne.yml > tuolumne-jobs.yml
artifacts:
paths:
- ruby-jobs.yml
- dane-jobs.yml
- lassen-jobs.yml
- corona-jobs.yml
- tioga-jobs.yml
- tuolumne-jobs.yml

# RUBY
ruby-up-check:
variables:
CI_MACHINE: "ruby"
extends: [.machine-check]

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

# DANE
dane-up-check:
variables:
Expand Down
12 changes: 6 additions & 6 deletions docs/sphinx/developer/uberenv.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,20 @@ Vetted specs
$ ls -c1 .gitlab/*jobs.yml
.gitlab/lassen-jobs.yml
.gitlab/ruby-jobs.yml
.gitlab/dane-jobs.yml
CI contains jobs for ruby.
CI contains jobs for dane.

.. code-block:: bash
$ git grep -h "SPEC" .gitlab/ruby-jobs.yml | grep "gcc"
$ git grep -h "SPEC" .gitlab/dane-jobs.yml | grep "gcc"
SPEC: "%gcc@4.9.3"
SPEC: "%gcc@6.1.0"
SPEC: "%gcc@7.1.0"
SPEC: "%gcc@7.3.0"
SPEC: "%gcc@8.1.0"
We now have a list of the specs vetted on ``ruby``/``toss_3_x86_64_ib``.
We now have a list of the specs vetted on ``dane``/``toss_3_x86_64_ib``.

.. note::
In practice, one should check if the job is not *allowed to fail*, or even deactivated.
Expand All @@ -66,7 +66,7 @@ In CHAI, the Spack configuration for MacOS contains the default compilers depend
Using Uberenv to generate the host-config file
----------------------------------------------

We have seen that we can safely use `gcc@8.1.0` on ruby. Let us ask for the default configuration first, and then ask for RAJA support and link to develop version of RAJA:
We have seen that we can safely use `gcc@8.1.0` on dane. Let us ask for the default configuration first, and then ask for RAJA support and link to develop version of RAJA:

.. code-block:: bash
Expand All @@ -77,7 +77,7 @@ Each will generate a CMake cache file, e.g.:

.. code-block:: bash
hc-ruby-toss_3_x86_64_ib-clang@9.0.0-fjcjwd6ec3uen5rh6msdqujydsj74ubf.cmake
hc-dane-toss_3_x86_64_ib-clang@9.0.0-fjcjwd6ec3uen5rh6msdqujydsj74ubf.cmake
Using host-config files to build CHAI
-------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions scripts/gitlab/build_and_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ then
timed_message "Cleaning working directory"

# Map CPU core allocations
declare -A core_counts=(["lassen"]=40 ["ruby"]=28 ["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)

# If building, then delete everything first
# NOTE: 'cmake --build . -j core_counts' attempts to reduce individual build resources.
Expand All @@ -224,7 +224,7 @@ then
# Shared allocation: Allows build_and_test.sh to run within a sub-allocation (see CI config).
# Use /dev/shm: Prevent MPI tests from running on a node where the build dir doesn't exist.
cmake_options=""
if [[ "${truehostname}" == "ruby" || "${truehostname}" == "poodle" ]]
if [[ "${truehostname}" == "dane" || "${truehostname}" == "poodle" ]]
then
cmake_options="-DBLT_MPI_COMMAND_APPEND:STRING=--overlap"
fi
Expand Down