Merge pull request #916 from LLNL/v0.7.0-rc

V0.7.0 rc
LLNL · Sep 1, 2022 · ea51581 · ea51581
2 parents ee240d3 + 551e1ea
commit ea51581
Show file tree

Hide file tree

Showing 1,078 changed files with 57,291 additions and 17,533 deletions.
diff --git a/.github/workflows/docker_build_tpls.yml b/.github/workflows/docker_build_tpls.yml
@@ -11,7 +11,7 @@ jobs:
     name: Builds a docker image and extracts generated hostconfigs
     strategy:
       matrix:
-        compiler: [clang-10, gcc-8]
+        compiler: [clang-10, gcc-11]
     env:
       REPO: axom/tpls
       HOSTCONFIG_LOC: /home/axom/export_hostconfig

diff --git a/.github/workflows/test_windows_tpls.yml b/.github/workflows/test_windows_tpls.yml
@@ -22,10 +22,10 @@ jobs:
         include:
         - arch: "x64"
           triplet: "x64-windows"
-          msvc:    "201964"
+          msvc:    "202264"
         - arch: "x86"
           triplet: "x86-windows"
-          msvc:    "2019"
+          msvc:    "2022"
 
     steps:
     - name: Checkout repo w/ submodules

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+
 build-
 install-
 .cproject
@@ -17,3 +18,5 @@ tpl_dirs_summary.json
 uberenv_libs
 *_build*
 .idea
+*.opendb
+scripts/make_local_branch_from_fork_pr.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2021, Lawrence Livermore National Security, LLC and
+# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and
 # other Axom Project Developers. See the top-level LICENSE file for details.
 #
 # SPDX-License-Identifier: (BSD-3-Clause)
@@ -32,7 +32,7 @@ stages:
     - ASSIGN_ID=$(if [[ -n "${JOBID}" ]]; then echo "--jobid=${JOBID}"; fi)
     # BUILD + TEST
     - echo -e "\e[0Ksection_start:$(date +%s):src_build_and_test\r\e[0KSource Build and Test ${CI_PROJECT_NAME}"
-    - ${ALLOC_COMMAND} ${ASSIGN_ID} python3 scripts/llnl_scripts/build_src.py -v --host-config ${HOST_CONFIG} --extra-cmake-options '-DENABLE_DOCS=OFF ${EXTRA_CMAKE_OPTIONS}' --build-type ${BUILD_TYPE:-Debug}
+    - ${ALLOC_COMMAND} ${ASSIGN_ID} python3 scripts/llnl_scripts/build_src.py -v --host-config ${HOST_CONFIG} --extra-cmake-options '-DENABLE_DOCS=OFF ${EXTRA_CMAKE_OPTIONS}' --build-type ${BUILD_TYPE:-Debug} ${EXTRA_OPTIONS}
     - echo -e "\e[0Ksection_end:$(date +%s):src_build_and_test\r\e[0K"
   artifacts:
     paths:
@@ -57,3 +57,4 @@ stages:
 include:
   - local: .gitlab/build_ruby.yml
   - local: .gitlab/build_lassen.yml
+  - local: .gitlab/build_tioga.yml
diff --git a/.gitlab/build_lassen.yml b/.gitlab/build_lassen.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2021, Lawrence Livermore National Security, LLC and
+# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and
 # other Axom Project Developers. See the top-level LICENSE file for details.
 #
 # SPDX-License-Identifier: (BSD-3-Clause)
@@ -19,7 +19,7 @@
 # Load required CUDA module
 .with_cuda:
   before_script:
-    - module load cuda/10.1.243
+    - module load cuda/11.0.2
 
 ####
 # Template
@@ -39,15 +39,15 @@
 
 ####
 # PR Build jobs
-lassen-clang_8_0_1_nvcc_xlf-src:
+lassen-clang_8_0_1_cuda-src:
   variables:
-    COMPILER: "clang@8.0.1_nvcc_xlf"
+    COMPILER: "clang@8.0.1_cuda"
     HOST_CONFIG: "lassen-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
   extends: [.src_build_on_lassen, .with_cuda]
 
-lassen-clang_9_0_0_upstream_xlf-src:
+lassen-clang_9_0_0-src:
   variables:
-    COMPILER: "clang@9.0.0_upstream_xlf"
+    COMPILER: "clang@9.0.0"
     HOST_CONFIG: "lassen-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
   extends: [.src_build_on_lassen]
 
@@ -57,31 +57,31 @@ lassen-gcc_7_3_1-src:
     HOST_CONFIG: "lassen-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
   extends: [.src_build_on_lassen]
 
-lassen-xl_16_1_1-src:
+lassen-xl_16_1_1_11_cuda-src:
   variables:
-    COMPILER: "xl@16.1.1_coral"
+    COMPILER: "xl@16.1.1.11_cuda"
     HOST_CONFIG: "lassen-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
   extends: [.src_build_on_lassen]
 
-lassen-xl_16_1_1_nvcc-src:
+lassen-xl_16_1_1_12-src:
   variables:
-    COMPILER: "xl@16.1.1_nvcc"
+    COMPILER: "xl@16.1.1.12"
     HOST_CONFIG: "lassen-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
   extends: [.src_build_on_lassen, .with_cuda]
 
 
 ####
 # Full Build jobs
-lassen-clang_8_0_1_nvcc_xlf-full:
+lassen-clang_8_0_1_cuda-full:
   variables:
-    COMPILER: "clang@8.0.1_nvcc_xlf"
+    COMPILER: "clang@8.0.1"
     SPEC: "%${COMPILER}+mfem+cuda~openmp"
     EXTRA_SPEC: "cuda_arch=70"
   extends: [.full_build_on_lassen, .with_cuda]
 
-lassen-clang_9_0_0_upstream_xlf-full:
+lassen-clang_9_0_0-full:
   variables:
-    COMPILER: "clang@9.0.0_upstream_xlf"
+    COMPILER: "clang@9.0.0"
     SPEC: "%${COMPILER}+mfem~openmp"
   extends: [.full_build_on_lassen]
 
@@ -91,15 +91,15 @@ lassen-gcc_7_3_1-full:
     SPEC: "%${COMPILER}+mfem"
   extends: [.full_build_on_lassen]
 
-lassen-xl_16_1_1_coral-full:
+lassen-xl_16_1_1_11_cuda-full:
   variables:
-    COMPILER: "xl@16.1.1_coral"
-    SPEC: "%${COMPILER}+mfem~openmp~cpp14"
-  extends: [.full_build_on_lassen]
-
-lassen-xl_16_1_1_nvcc-full:
-  variables:
-    COMPILER: "xl@16.1.1_nvcc"
+    COMPILER: "xl@16.1.1.11"
     SPEC: "%${COMPILER}+mfem+cuda~openmp~cpp14"
     EXTRA_SPEC: "cuda_arch=70"
   extends: [.full_build_on_lassen, .with_cuda]
+
+lassen-xl_16_1_1_12-full:
+  variables:
+    COMPILER: "xl@16.1.1.12"
+    SPEC: "%${COMPILER}+mfem~openmp~cpp14"
+  extends: [.full_build_on_lassen]
diff --git a/.gitlab/build_ruby.yml b/.gitlab/build_ruby.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2021, Lawrence Livermore National Security, LLC and
+# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and
 # other Axom Project Developers. See the top-level LICENSE file for details.
 #
 # SPDX-License-Identifier: (BSD-3-Clause)
@@ -77,25 +77,18 @@ ruby-clang_9_0_0-src:
     HOST_CONFIG: "ruby-toss_3_x86_64_ib-${COMPILER}.cmake"
   extends: .src_build_on_ruby
 
-ruby-gcc_8_1_0-src:
+ruby-gcc_8_3_1-src:
   variables:
-    COMPILER: "gcc@8.1.0"
+    COMPILER: "gcc@8.3.1"
     HOST_CONFIG: "ruby-toss_3_x86_64_ib-${COMPILER}.cmake"
   extends: .src_build_on_ruby
 
-ruby-gcc_8_1_no_fortran-src:
+ruby-gcc_8_1_0_no_fortran-src:
   variables:
-    COMPILER: "gcc@8.1_no_fortran"
-    HOST_CONFIG: "ruby-toss_3_x86_64_ib-${COMPILER}.cmake"
+    COMPILER: "gcc@8.1.0"
+    HOST_CONFIG: "ruby-toss_3_x86_64_ib-${COMPILER}_nofortran.cmake"
   extends: .src_build_on_ruby
 
-# disabled due to time limit
-# ruby-intel_18_0_2-src:
-#   variables:
-#     COMPILER: "intel@18.0.2"
-#     HOST_CONFIG: "ruby-toss_3_x86_64_ib-${COMPILER}.cmake"
-#   extends: .src_build_on_ruby
-
 # disabled due to time limit
 # ruby-intel_19_0_4-src:
 #   variables:
@@ -118,24 +111,18 @@ ruby-clang_9_0_0-full:
     SPEC: "%${COMPILER}+mfem"
   extends: .full_build_on_ruby
 
-ruby-gcc_8_1_0-full:
+ruby-gcc_8_3_1-full:
   variables:
-    COMPILER: "gcc@8.1.0"
+    COMPILER: "gcc@8.3.1"
     SPEC: "%${COMPILER}+mfem"
   extends: .full_build_on_ruby
 
-ruby-gcc_8_1_no_fortran-full:
+ruby-gcc_8_1_0_no_fortran-full:
   variables:
-    COMPILER: "gcc@8.1_no_fortran"
+    COMPILER: "gcc@8.1.0"
     SPEC: "%${COMPILER}~fortran+mfem"
   extends: .full_build_on_ruby
 
-ruby-intel_18_0_2-full:
-  variables:
-    COMPILER: "intel@18.0.2"
-    SPEC: "%${COMPILER}+mfem~cpp14"
-  extends: .full_build_on_ruby
-
 ruby-intel_19_0_4-full:
   variables:
     COMPILER: "intel@19.0.4"

diff --git a/.gitlab/build_rzansel.yml b/.gitlab/build_rzansel.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2021, Lawrence Livermore National Security, LLC and
+# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and
 # other Axom Project Developers. See the top-level LICENSE file for details.
 #
 # SPDX-License-Identifier: (BSD-3-Clause)

diff --git a/.gitlab/build_rzgenie.yml b/.gitlab/build_rzgenie.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2021, Lawrence Livermore National Security, LLC and
+# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and
 # other Axom Project Developers. See the top-level LICENSE file for details.
 #
 # SPDX-License-Identifier: (BSD-3-Clause)
@@ -43,13 +43,6 @@ rzgenie-gcc_8_1_0-src:
     HOST_CONFIG: "rzgenie-toss_3_x86_64_ib-${COMPILER}.cmake"
   extends: .src_build_on_rzgenie
 
-# disabled due to time limit
-# rzgenie-intel_18_0_2-src:
-#   variables:
-#     COMPILER: "intel@18.0.2"
-#     HOST_CONFIG: "rzgenie-toss_3_x86_64_ib-${COMPILER}.cmake"
-#   extends: .src_build_on_rzgenie
-
 rzgenie-intel_19_0_4-src:
   variables:
     COMPILER: "intel@19.0.4"
@@ -83,12 +76,6 @@ rzgenie-gcc_8_1_no_fortran-full:
     SPEC: "%${COMPILER}~fortran+mfem"
   extends: .full_build_on_rzgenie
 
-rzgenie-intel_18_0_2-full:
-  variables:
-    COMPILER: "intel@18.0.2"
-    SPEC: "%${COMPILER}+mfem~cpp14"
-  extends: .full_build_on_rzgenie
-
 rzgenie-intel_19_0_4-full:
   variables:
     COMPILER: "intel@19.0.4"

diff --git a/.gitlab/build_tioga.yml b/.gitlab/build_tioga.yml
@@ -0,0 +1,51 @@
+# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and
+# other Axom Project Developers. See the top-level LICENSE file for details.
+#
+# SPDX-License-Identifier: (BSD-3-Clause)
+
+####
+# This is the shared configuration of jobs for tioga
+.on_tioga:
+  tags:
+    - shell
+    - tioga
+  rules:
+    - if: '$CI_COMMIT_BRANCH =~ /_qnone/ || $ON_TIOGA == "OFF"' #run except if ...
+      when: never
+    - when: on_success
+
+####
+# Template
+.src_build_on_tioga:
+  stage: build
+  variables:
+    ALLOC_COMMAND: "srun -p pdebug -t 25 -N 1 "
+    EXTRA_OPTIONS: "--test-serial"
+  extends: [.src_build_script, .on_tioga, .src_workflow]
+  needs: []
+
+.full_build_on_tioga:
+  stage: build
+  variables:
+    ALLOC_COMMAND: "srun -p pbatch -t 60 -N 1 "
+  extends: [.full_build_script, .on_tioga, .full_workflow]
+  needs: []
+
+####
+# PR Build jobs
+tioga-clang_14_0_0_hip-src:
+  variables:
+    COMPILER: "clang@14.0.0_hip"
+    HOST_CONFIG: "tioga-toss_4_x86_64_ib_cray-${COMPILER}.cmake"
+  extends: .src_build_on_tioga
+  allow_failure: true
+
+####
+# Full Build jobs
+tioga-clang_14_0_0_hip-full:
+  variables:
+    COMPILER: "clang@14.0.0_hip"
+    SPEC: "%${COMPILER}~openmp+rocm+mfem+c2c"
+    EXTRASPEC: "amdgpu_target=gfx90a ^raja~openmp+rocm ^umpire~openmp+rocm"
+  extends: .full_build_on_tioga
+  allow_failure: true
diff --git a/.mailmap b/.mailmap
@@ -15,13 +15,16 @@ Benjamin Curtice Corbett <corbett5@llnl.gov>    Benjamin Corbett <corbett5@llnl.
 Benjamin Curtice Corbett <corbett5@llnl.gov>    Ben Corbett <32752943+corbett5@users.noreply.github.com>
 Brian Manh Hien Han <han12@llnl.gov>            Brian Han <han12@llnl.gov>          
 Brian Manh Hien Han <han12@llnl.gov>            Brian Manh Hien Han <han12@rzansel19.coral.llnl.gov>
+Brian T.N. Gunney <gunney1@llnl.gov>            Brian Gunney <45609916+gunney1@users.noreply.github.com>
 Chris White <white238@llnl.gov>                 Christopher A. White <white238@llnl.gov>
 Cyrus D. Harrison <harrison37@llnl.gov>         Cyrus Harrison <cyrush@llnl.gov>
 Cyrus D. Harrison <harrison37@llnl.gov>         Cyrus Harrison <harrison37@llnl.gov>
 Cyrus D. Harrison <harrison37@llnl.gov>         Cyrus <cyrush@llnl.gov>
+Daniel Taller <taller1@llnl.gov>                Danny Taller <66029857+dtaller@users.noreply.github.com>
 Esteban Pauli <pauli2@llnl.gov>                 Esteban Pauli <40901502+estebanpauli@users.noreply.github.com>
 Evan Taylor Desantola <desantola1@llnl.gov>     Evan Taylor DeSantola <desantola1@llnl.gov>
 George Zagaris <zagaris2@llnl.gov>              George Zagaris <george.zagaris@gmail.com>
+Jacob Spainhour <spainhour1@llnl.gov>           jcs15c <Jacob.Spainhour@colorado.edu>
 Joe Hennis <hennis1@llnl.gov>                   Hennis <hennis1@luz.llnl.gov>
 Joe Hennis <hennis1@llnl.gov>                   hennis1 <73615573+hennis1@users.noreply.github.com>
 Josh Essman <essman1@llnl.gov>                  Josh Essman <68349992+joshessman-llnl@users.noreply.github.com>
@@ -36,19 +39,26 @@ Lee A. Taylor <taylor16@llnl.gov>               Lee A. Taylor <taylor@cab688.lln
 Lee A. Taylor <taylor16@llnl.gov>               Lee Taylor <ltaylor@llnl.gov>
 Lee A. Taylor <taylor16@llnl.gov>               Lee Taylor <taylor16@llnl.gov>
 Lee A. Taylor <taylor16@llnl.gov>               Lee Taylor <31938638+ltaylor16@users.noreply.github.com>
-Matt Larsen <larsen30@llnl.gov>		            mclarsen <larsen30@llnl.gov>
+Matt Larsen <larsen30@llnl.gov>                 mclarsen <larsen30@llnl.gov>
+Max Yang <yang39@llnl.gov>                      kanye-quest <yang39@llnl.gov>
+Misha Zakharchanka <mishaz@llnl.gov>            Misha Zakharchanka <35752952+MishaZakharchanka@users.noreply.github.com>
+Misha Zakharchanka <mishaz@llnl.gov>            MishaZakharchanka <mishaz@rzgenie16.llnl.gov>
 Noah S. Elliott <elliott22@llnl.gov>            Noah Elliott <elliott22@llnl.gov>
 Punita P. Sinha <sinha2@llnl.gov>               Punita P. Sinha <sinha2@cab687.llnl.gov>
 Punita P. Sinha <sinha2@llnl.gov>               Punita P. Sinha <sinha2@cab669.llnl.gov>
 Punita P. Sinha <sinha2@llnl.gov>               Punita P. Sinha <sinha2@cab670.llnl.gov>
 Punita P. Sinha <sinha2@llnl.gov>               Punita Sinha <sinha2@llnl.gov>
-Raine Yeh <yeh14@llnl.gov>                      Yo-Sing Yeh <yeh14@llnl.gov>
+Raine Yeh <raine.yeh@gmail.com>                 Yo-Sing Yeh <yeh14@llnl.gov>
+Raine Yeh <raine.yeh@gmail.com>                 Raine Yeh <yeh14@llnl.gov>
+Raine Yeh <raine.yeh@gmail.com>                 Raine <raine.yeh@gmail.com>
 Randolph Settgast <settgast1@llnl.gov>          Randolph R. Settgast <rrsettgast@gmail.com>
 Randolph Settgast <settgast1@llnl.gov>          Randolph R. Settgast <settgast1@llnl.gov>
 Randolph Settgast <settgast1@llnl.gov>          Randy Settgast <settgast1@llnl.gov>
 Richard D. Hornung <hornung1@llnl.gov>          Rich Hornung <hornung1@llnl.gov>
 Robert Carson <rac428@cornell.edu>              Robert <rac428@cornell.edu>
 Robert Carson <rac428@cornell.edu>              rcarson3 <rac428@cornell.edu>
+Robert Cohn <robert.s.cohn@intel.com>           rscohn2 <rscohn2@gmail.com>
+Samuel P. Mish <mish2@llnl.gov>                 samuelpmishLLNL <61714427+samuelpmishLLNL@users.noreply.github.com>
 
 Axom Shared User <axom-dev@llnl.gov>            Asctoolkit Shared User <axom-dev@llnl.gov>
 Axom Shared User <axom-dev@llnl.gov>            Asctoolkit Shared User <atk@cab687.llnl.gov>

diff --git a/.uberenv_config.json b/.uberenv_config.json
@@ -3,12 +3,13 @@
 "package_version": "develop",
 "package_final_phase": "initconfig",
 "package_source_dir": "../..",
-"spack_url": "https://github.com/spack/spack",
-"spack_commit": "d19105f76165857ca5f25ddb7e63a45a31b2ee92",
+"spack_url": "https://github.com/spack/spack.git",
+"spack_commit": "30f239478285d721b5b296a7715c65c2b8972f37",
 "spack_configs_path": "scripts/spack/configs",
 "spack_packages_path": "scripts/spack/packages",
+"spack_concretizer": "clingo",
 "vcpkg_url": "https://github.com/microsoft/vcpkg",
-"vcpkg_commit": "5568f110b509a9fd90711978a7cb76bae75bb092",
+"vcpkg_commit": "cef0b3ec767df6e83806899fe9525f6cf8d7bc91",
 "vcpkg_triplet": "x64-windows",
 "vcpkg_ports_path": "scripts/vcpkg_ports"
 }
diff --git a/CITATION.cff b/CITATION.cff
@@ -15,6 +15,8 @@ authors:
   given-names: Noah
 - family-names: Essman
   given-names: Josh
+- family-names: Gunney
+  given-names: Brian
 - family-names: Han
   given-names: Brian
 - family-names: Harrison

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2017-2021, Lawrence Livermore National Security, LLC.
+Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without