Merge pull request #361 from LLNL/release/3.0.0

Release version 3.0.0

.gitignore

@@ -1,2 +1,7 @@
-build-*
+*build*
+*install*
 *.swp
+CMakeFiles
+*.tar.gz
+.vscode
+.devcontainer

.gitlab-ci.yml

@@ -1,58 +1,87 @@
 ##############################################################################
-# Copyright (c) 2016-19, Lawrence Livermore National Security, LLC and Umpire
+# Copyright (c) 2016-20, Lawrence Livermore National Security, LLC and Umpire
 # project contributors. See the COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (MIT)
 ##############################################################################
 
-variables:
-  GIT_SUBMODULE_STRATEGY: recursive
-  BUILD_QUARTZ_ALLOC_NAME: umpire_ci_$CI_COMMIT_SHORT_SHA
-  BUILD_ROOT: $CI_BUILDS_DIR/umpire_$CI_COMMIT_REF_SLUG
+###############################################################################
+# General GitLab pipelines configurations for supercomputers and Linux clusters
+# at Lawrence Livermore National Laboratory (LLNL).
+#
+# This entire pipeline is LLNL-specific
+# #############################################################################
 
-before_script:
-  - date
+# We define the following GitLab pipeline variables:
+#
+# GIT_SUBMODULE_STRATEGY:
+# Tells Gitlab to recursively update the submodules when cloning umpire
+#
+# ALLOC_NAME:
+# On LLNL's quartz, 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.
+#
+# BUILD_ROOT:
+# The path to the shared resources between all jobs. The BUILD_ROOT is unique to
+# the pipeline, preventing any form of concurrency with other pipelines. This
+# also means that the BUILD_ROOT directory will never be cleaned.
+# TODO: add a clean-up mechanism
 
-after_script:
-  - date
+variables:
+  GIT_SUBMODULE_STRATEGY: recursive
+  ALLOC_NAME: ${CI_PROJECT_NAME}_ci_${CI_PIPELINE_ID}
+  BUILD_ROOT: ${CI_BUILDS_DIR}/${CI_PROJECT_NAME}/${CI_COMMIT_REF_SLUG}_${CI_PIPELINE_ID}
 
-# There are no tests for now
+# Normally, stages are blocking in Gitlab. However, using the keyword "needs" we
+# can express dependencies between job that break the ordering of stages, in
+# favor of a DAG.
+# In practice q_*, l_* and b_* stages are independently run and start immediately.
 stages:
-  - allocate_resources
-  - build
-  - test
-  - release_resources
+  - q_allocate_resources
+  - q_build
+  - q_test
+  - q_release_resources
+  - l_build_and_test
+  - b_build_and_test
+
+# This is the rules that drives the activation of "advanced" jobs. All advanced
+# jobs will share this through a template mechanism.
+.advanced_pipeline:
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "develop" || $ALL_TARGETS == "ON"' #run only if ...
 
-# This is not a job, but contains project specific build commands
-# If an allocation exist with the name defined in this pipeline, the job will use it
+# These are also templates (.name) that define project specific build commands.
+# If an allocation exist with the name defined in this pipeline, the job will
+# use it (slurm specific).
 .build_toss_3_x86_64_ib_script:
   script:
-    - echo ${BUILD_QUARTZ_ALLOC_NAME}
-    - export JOBID=$(squeue -h --name=${BUILD_QUARTZ_ALLOC_NAME} --format=%A)
+    - echo ${ALLOC_NAME}
+    - export JOBID=$(squeue -h --name=${ALLOC_NAME} --format=%A)
     - echo ${JOBID}
     - srun $( [[ -n "${JOBID}" ]] && echo "--jobid=${JOBID}" ) -t 10 -N 1 -n 1 -c 4 scripts/gitlab/build_and_test.sh --build-only
 
-# This is not a job, but contains project specific build commands
 .test_toss_3_x86_64_ib_script:
   script:
-    - echo ${BUILD_QUARTZ_ALLOC_NAME}
-    - export JOBID=$(squeue -h --name=${BUILD_QUARTZ_ALLOC_NAME} --format=%A)
+    - echo ${ALLOC_NAME}
+    - export JOBID=$(squeue -h --name=${ALLOC_NAME} --format=%A)
     - echo ${JOBID}
     - srun $( [[ -n "${JOBID}" ]] && echo "--jobid=${JOBID}" ) -t 10 -N 1 -n 1 -c 4 scripts/gitlab/build_and_test.sh --test-only
 
-# Butte uses a very different job allocation system, building on login nodes is recommended
+# Lassen and Butte use a different job scheduler (spectrum lsf) that does not
+# allow pre-allocation the same way slurm does.
 .build_blueos_3_ppc64le_ib_script:
   script:
-    - lalloc 1 scripts/gitlab/build_and_test.sh
+    - lalloc 1 -W 10 scripts/gitlab/build_and_test.sh
 
 .build_blueos_3_ppc64le_ib_p9_script:
   extends: .build_blueos_3_ppc64le_ib_script
 
 
 # This is where jobs are included
 include:
-  - local: .gitlab/ci/build_quartz.yml
-  - local: .gitlab/ci/build_butte.yml
-  - local: .gitlab/ci/build_lassen.yml
+  - local: .gitlab/quartz.yml
+  - local: .gitlab/lassen.yml
+  - local: .gitlab/butte.yml
 
 

.gitlab/butte.yml

@@ -0,0 +1,99 @@
+##############################################################################
+# Copyright (c) 2016-20, Lawrence Livermore National Security, LLC and Umpire
+# project contributors. See the COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (MIT)
+##############################################################################
+
+####
+# Shared configuration of jobs for butte
+.on_butte:
+  variables:
+  tags:
+    - shell
+    - butte
+  rules:
+    - if: '$ON_BUTTE != "ON"' #run except if ...
+      when: never
+    - when: on_success
+  allow_failure: true
+
+.build_and_test_on_butte:
+  stage: b_build_and_test
+  extends: [.build_blueos_3_ppc64le_ib_script, .on_butte]
+  needs: []
+
+# Note: .build_and_test_on_butte_advanced inherits from
+# .build_and_test_on_butte and .advanced_pileline.
+# In particular, the rules section will be merged. Careful when changing rules.
+.build_and_test_on_butte_advanced:
+  extends: [.build_and_test_on_butte, .advanced_pipeline]
+  allow_failure: true
+
+####
+# All butte build jobs
+
+clang_3_9_1 (build and test on butte):
+  variables:
+    CONFIGURATION: "clang_3_9_1"
+  extends: .build_and_test_on_butte_advanced
+
+gcc_4_9_3 (build and test on butte):
+  variables:
+    CONFIGURATION: "gcc_4_9_3"
+  extends: .build_and_test_on_butte
+
+clang_4_0_0 (build and test on butte):
+  variables:
+    CONFIGURATION: "clang_4_0_0"
+  extends: .build_and_test_on_butte
+
+clang_coral_2017_06_29 (build and test on butte):
+  variables:
+    CONFIGURATION: "clang_coral_2017_06_29"
+  extends: .build_and_test_on_butte_advanced
+
+clang_coral_2017_08_31 (build and test on butte):
+  variables:
+    CONFIGURATION: "clang_coral_2017_08_31"
+  extends: .build_and_test_on_butte_advanced
+
+clang_coral_2017_09_06 (build and test on butte):
+  variables:
+    CONFIGURATION: "clang_coral_2017_09_06"
+  extends: .build_and_test_on_butte_advanced
+
+clang_coral_2017_09_18 (build and test on butte):
+  variables:
+    CONFIGURATION: "clang_coral_2017_09_18"
+  extends: .build_and_test_on_butte
+
+nvcc_gcc_4_9_3 (build and test on butte):
+  variables:
+    CONFIGURATION: "nvcc_gcc_4_9_3"
+  extends: .build_and_test_on_butte
+
+nvcc_clang_coral_2017_06_29 (build and test on butte):
+  variables:
+    CONFIGURATION: "nvcc_clang_coral_2017_06_29"
+  extends: .build_and_test_on_butte_advanced
+
+nvcc_clang_coral_2017_08_31 (build and test on butte):
+  variables:
+    CONFIGURATION: "nvcc_clang_coral_2017_08_31"
+  extends: .build_and_test_on_butte_advanced
+
+nvcc_clang_coral_2017_09_06 (build and test on butte):
+  variables:
+    CONFIGURATION: "nvcc_clang_coral_2017_09_06"
+  extends: .build_and_test_on_butte_advanced
+
+nvcc_clang_coral_2017_09_18 (build and test on butte):
+  variables:
+    CONFIGURATION: "nvcc_clang_coral_2017_09_18"
+  extends: .build_and_test_on_butte
+
+nvcc_xl-beta-2017.09.13 (build and test on butte):
+  variables:
+    CONFIGURATION: "nvcc_xl-beta-2017.09.13"
+  extends: .build_and_test_on_butte