Merge pull request #300 from LLNL/release/2.0.0

Release/2.0.0

.github/workflows/push.yml

@@ -0,0 +1,14 @@
+on: push
+name: Code checks
+jobs:
+  staticAnalysis:
+    name: Static Analysis
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Static Analysis
+      uses: ./.github/actions/static-analysis
+    - name: Check CHANGELOG
+      uses: ./.github/actions/bin/diff-check
+      with:
+        args: CHANGELOG.md

.gitlab-ci.yml

@@ -8,6 +8,7 @@
 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
 
 before_script:
   - date
@@ -24,22 +25,34 @@ stages:
 
 # 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
-.build_quartz_script:
+.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 ${JOBID}
-    - srun $( [[ -n "${JOBID}" ]] && echo "--jobid=${JOBID}" ) -t 10 -N 1 -n 1 -c 4 scripts/gitlab/build.sh
+    - 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 ${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
-.build_butte_script:
+.build_blueos_3_ppc64le_ib_script:
   script:
-    - lalloc 1 scripts/gitlab/build.sh
+    - lalloc 1 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
 
 

.gitlab/ci/build_butte.yml

@@ -14,9 +14,10 @@
     - shell
     - butte
   stage: build
-  extends: .build_butte_script
-  except:
-    - /_bnone/
+  extends: .build_blueos_3_ppc64le_ib_script
+  only:
+    variables:
+      - $UMPIRE_CI_BUTTE == "ON"
   allow_failure: true
 
 ####

.gitlab/ci/build_lassen.yml

@@ -0,0 +1,100 @@
+##############################################################################
+# Copyright (c) 2016-19, Lawrence Livermore National Security, LLC and Umpire
+# project contributors. See the COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (MIT)
+##############################################################################
+
+####
+# This is the share configuration of jobs for lassen
+
+.build_lassen:
+  variables:
+  tags:
+    - shell
+    - lassen
+  stage: build
+  extends: .build_blueos_3_ppc64le_ib_p9_script
+  except:
+    refs:
+      - /_lnone/
+    variables:
+      - $UMPIRE_CI_LASSEN == "OFF"
+
+####
+# Here are all lassen build jobs
+
+build_lassen_clang_3_9_1:
+  variables:
+    COMPILER: "clang_3_9_1"
+  extends: .build_lassen
+
+build_lassen_gcc_4_9_3:
+  variables:
+    COMPILER: "gcc_4_9_3"
+  extends: .build_lassen
+
+build_lassen_clang_4_0_0:
+  variables:
+    COMPILER: "clang_4_0_0"
+  extends: .build_lassen
+
+build_lassen_clang_coral_2017_06_29:
+  variables:
+    COMPILER: "clang_coral_2017_06_29"
+  extends: .build_lassen
+  allow_failure: true
+
+build_lassen_clang_coral_2017_08_31:
+  variables:
+    COMPILER: "clang_coral_2017_08_31"
+  extends: .build_lassen
+  allow_failure: true
+
+build_lassen_clang_coral_2017_09_06:
+  variables:
+    COMPILER: "clang_coral_2017_09_06"
+  extends: .build_lassen
+  allow_failure: true
+
+build_lassen_clang_coral_2017_09_18:
+  variables:
+    COMPILER: "clang_coral_2017_09_18"
+  extends: .build_lassen
+  allow_failure: true
+
+build_lassen_nvcc_gcc_4_9_3:
+  variables:
+    COMPILER: "nvcc_gcc_4_9_3"
+  extends: .build_lassen
+
+build_lassen_nvcc_clang_coral_2017_06_29:
+  variables:
+    COMPILER: "nvcc_clang_coral_2017_06_29"
+  extends: .build_lassen
+  allow_failure: true
+
+build_lassen_nvcc_clang_coral_2017_08_31:
+  variables:
+    COMPILER: "nvcc_clang_coral_2017_08_31"
+  extends: .build_lassen
+  allow_failure: true
+
+build_lassen_nvcc_clang_coral_2017_09_06:
+  variables:
+    COMPILER: "nvcc_clang_coral_2017_09_06"
+  extends: .build_lassen
+  allow_failure: true
+
+build_lassen_nvcc_clang_coral_2017_09_18:
+  variables:
+    COMPILER: "nvcc_clang_coral_2017_09_18"
+  extends: .build_lassen
+  allow_failure: true
+
+build_lassen_nvcc_xl-beta-2017.09.13:
+  variables:
+    COMPILER: "nvcc_xl-beta-2017.09.13"
+  extends: .build_lassen
+  allow_failure: true
+

.gitlab/ci/build_quartz.yml

@@ -10,23 +10,33 @@
 
 ####
 # In pre-build phase, allocate a node for builds
-allocate_resources_build_quartz:
+.quartz_common:
   tags:
     - shell
     - quartz
+  except:
+    refs:
+      - /_qnone/
+    variables:
+      - $UMPIRE_CI_QUARTZ == "OFF"
+
+####
+# In pre-build phase, allocate a node for builds
+allocate_resources_build_quartz:
+  variables:
+    GIT_STRATEGY: none
+  extends: .quartz_common
   stage: allocate_resources
   script:
     - salloc -N 1 -c 36 -p pdebug -t 10 --no-shell --job-name=${BUILD_QUARTZ_ALLOC_NAME}
-  except:
-    - /_qnone/
 
 ####
 # In post-build phase, deallocate resources
 # Note : make sure this is run even on build phase failure
 release_resources_build_quartz:
-  tags:
-    - shell
-    - quartz
+  variables:
+    GIT_STRATEGY: none
+  extends: .quartz_common
   stage: release_resources
   script:
     - export JOBID=$(squeue -h --name=${BUILD_QUARTZ_ALLOC_NAME} --format=%A)
@@ -43,7 +53,20 @@ release_resources_build_quartz:
     - shell
     - quartz
   stage: build
-  extends: .build_quartz_script
+  extends: .build_toss_3_x86_64_ib_script
+  except:
+    - /_qnone/
+
+####
+# Generic qwartz job, extending test script
+.test_quartz:
+  variables:
+    CLUSTER: "toss_3_x86_64_ib"
+  tags:
+    - shell
+    - quartz
+  stage: test
+  extends: .test_toss_3_x86_64_ib_script
   except:
     - /_qnone/
 
@@ -108,3 +131,78 @@ build_quartz_pgi_18_5:
     COMPILER: "pgi_18_5"
   extends: .build_quartz
   allow_failure: true
+
+
+
+
+####
+# Here are all quartz tests jobs
+
+test_quartz_clang_3_9_1:
+  variables:
+    COMPILER: "clang_3_9_1"
+  extends: .test_quartz
+  needs: ["build_quartz_clang_3_9_1"]
+
+test_quartz_gcc_4_9_3:
+  variables:
+    COMPILER: "gcc_4_9_3"
+  extends: .test_quartz
+  needs: ["build_quartz_gcc_4_9_3"]
+
+test_quartz_clang_4_0_0:
+  variables:
+    COMPILER: "clang_4_0_0"
+  extends: .test_quartz
+  needs: ["build_quartz_clang_4_0_0"]
+
+test_quartz_cudatoolkit_9_1:
+  variables:
+    COMPILER: "cudatoolkit_9_1"
+  extends: .test_quartz
+  needs: ["build_quartz_cudatoolkit_9_1"]
+
+test_quartz_gcc_6_1_0:
+  variables:
+    COMPILER: "gcc_6_1_0"
+  extends: .test_quartz
+  needs: ["build_quartz_gcc_6_1_0"]
+
+test_quartz_gcc_7_1_0:
+  variables:
+    COMPILER: "gcc_7_1_0"
+  extends: .test_quartz
+  needs: ["build_quartz_gcc_7_1_0"]
+
+test_quartz_icpc_16_0_4:
+  variables:
+    COMPILER: "icpc_16_0_4"
+  extends: .test_quartz
+  needs: ["build_quartz_icpc_16_0_4"]
+  allow_failure: true
+
+test_quartz_icpc_17_0_2:
+  variables:
+    COMPILER: "icpc_17_0_2"
+  extends: .test_quartz
+  needs: ["build_quartz_icpc_17_0_2"]
+
+test_quartz_icpc_18_0_0:
+  variables:
+    COMPILER: "icpc_18_0_0"
+  extends: .test_quartz
+  needs: ["build_quartz_icpc_18_0_0"]
+
+test_quartz_pgi_17_10:
+  variables:
+    COMPILER: "pgi_17_10"
+  extends: .test_quartz
+  needs: ["build_quartz_pgi_17_10"]
+  allow_failure: true
+
+test_quartz_pgi_18_5:
+  variables:
+    COMPILER: "pgi_18_5"
+  extends: .test_quartz
+  needs: ["build_quartz_pgi_18_5"]
+  allow_failure: true

.gitlab/conf/host-configs/blueos_3_ppc64le_ib/clang_9_0_0.cmake

@@ -0,0 +1,10 @@
+##############################################################################
+# Copyright (c) 2016-19, Lawrence Livermore National Security, LLC and Umpire
+# project contributors. See the COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (MIT)
+##############################################################################
+set(CMAKE_CXX_COMPILER "/usr/tce/packages/clang/clang-9.0.0/bin/clang++" CACHE PATH "")
+set(CMAKE_C_COMPILER "/usr/tce/packages/clang/clang-9.0.0/bin/clang" CACHE PATH "")
+set(CMAKE_Fortran_COMPILER "/usr/tce/packages/xl/xl-2019.08.20/bin/xlf2003" CACHE PATH "")
+set(BLT_EXE_LINKER_FLAGS "-Wl,-rpath,/usr/tce/packages/xl/xl-2019.08.20/lib" CACHE STRING "")

.gitlab/conf/host-configs/blueos_3_ppc64le_ib/clang_default.cmake

@@ -0,0 +1,10 @@
+##############################################################################
+# Copyright (c) 2016-19, Lawrence Livermore National Security, LLC and Umpire
+# project contributors. See the COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (MIT)
+##############################################################################
+set(CMAKE_CXX_COMPILER "clang++" CACHE PATH "")
+set(CMAKE_C_COMPILER "clang" CACHE PATH "")
+set(CMAKE_Fortran_COMPILER "/usr/tce/packages/xl/xl-2019.08.20/bin/xlf2003" CACHE PATH "")
+set(BLT_EXE_LINKER_FLAGS "-Wl,-rpath,/usr/tce/packages/xl/xl-2019.08.20/lib" CACHE STRING "")

scripts/gitlab/build.sh → .gitlab/conf/host-configs/blueos_3_ppc64le_ib/gcc_8_3_1.cmake

@@ -1,20 +1,10 @@
-#!/bin/bash
 ##############################################################################
 # Copyright (c) 2016-19, Lawrence Livermore National Security, LLC and Umpire
 # project contributors. See the COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (MIT)
 ##############################################################################
+set(CMAKE_CXX_COMPILER "/usr/tce/packages/gcc/gcc-8.3.1/bin/g++" CACHE PATH "")
+set(CMAKE_C_COMPILER "/usr/tce/packages/gcc/gcc-8.3.1/bin/gcc" CACHE PATH "")
+set(CMAKE_Fortran_COMPILER "/usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran" CACHE PATH "")
 
-BUILD_DIRECTORY="build_${SYS_TYPE}_${COMPILER}"
-CCONF="host-configs/${SYS_TYPE}/${COMPILER}.cmake" 
-
-rm -rf ${BUILD_DIRECTORY} 2>/dev/null
-mkdir ${BUILD_DIRECTORY} && cd ${BUILD_DIRECTORY}
-
-cmake \
-  -C ../.gitlab/conf/${CCONF} \
-  -C ../${CCONF} \
-  ..
-cmake --build . -j 4
-make test

.gitlab/conf/host-configs/blueos_3_ppc64le_ib/gcc_4_9_3.cmake → .gitlab/conf/host-configs/blueos_3_ppc64le_ib/gcc_default.cmake

@@ -4,7 +4,7 @@
 #
 # SPDX-License-Identifier: (MIT)
 ##############################################################################
-set(CMAKE_CXX_COMPILER "/usr/tcetmp/bin/g++" CACHE PATH "")
-set(CMAKE_C_COMPILER "/usr/tcetmp/bin/gcc" CACHE PATH "")
-set(CMAKE_Fortran_COMPILER "/usr/tcetmp/bin/gfortran" CACHE PATH "")
+set(CMAKE_CXX_COMPILER "g++" CACHE PATH "")
+set(CMAKE_C_COMPILER "gcc" CACHE PATH "")
+set(CMAKE_Fortran_COMPILER "gfortran" CACHE PATH "")