Merge pull request #1222 from LLNL/v0.15.0-RC

V0.15.0 RC
LLNL · Mar 15, 2022 · 4351fe6 · 4351fe6
2 parents e44448c + 32c01aa
commit 4351fe6
Show file tree

Hide file tree

Showing 906 changed files with 38,451 additions and 4,739 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -38,6 +38,7 @@ variables:
   ALLOC_NAME: ${CI_PROJECT_NAME}_ci_${CI_PIPELINE_ID}
   BUILD_ROOT: ${CI_PROJECT_DIR}
   DEFAULT_TIME: 30
+  MP_BRANCH: "develop"
 
 # Normally, stages are blocking in Gitlab. However, using the keyword "needs" we
 # can express dependencies between job that break the ordering of stages, in
@@ -72,9 +73,9 @@ stages:
     reports:
       junit: junit.xml
 
-.build_toss_3_x86_64_ib_corona_script:
+.build_toss_4_x86_64_ib_corona_script:
   script:
-    - srun -p mi60 -t 30 -N 1 scripts/gitlab/build_and_test.sh
+    - srun -p pbatch -t 30 -N 1 scripts/gitlab/build_and_test.sh
 
 # Lassen and Butte use a different job scheduler (spectrum lsf) that does not
 # allow pre-allocation the same way slurm does.
@@ -85,21 +86,28 @@ stages:
     reports:
       junit: junit.xml
 
+.build_blueos_3_ppc64le_ib_ats_disabled_script:
+  script:
+    - lalloc 1 --atsdisable -W ${DEFAULT_TIME} scripts/gitlab/build_and_test.sh
+  artifacts:
+    reports:
+      junit: junit.xml
+
 .build_blueos_3_ppc64le_ib_p9_script:
   extends: .build_blueos_3_ppc64le_ib_script
 
 # If testing develop branch, trigger CHAI pipeline with this version of RAJA.
 # TODO: Once spack allows to clone a specific commit on demand, then point to the exact commit.
 #       This will prevent from sticking to a branch (here develop).
-#       To turn back on chai trigger, add '$CI_COMMIT_BRANCH == "develop" to rule.
-trigger-chai:
+#       MP_BRANCH is short for "Multi-Project Branch" and will usually be develop.
+trigger-rajaperf:
   stage: multi_project
   rules:
-    - if: '$MULTI_PROJECT == "ON"' #run only if ...
+    - if: '$CI_COMMIT_BRANCH == "${MP_BRANCH}" || $MULTI_PROJECT == "ON"' #run only if ...
   variables:
-    UPDATE_RAJA: develop
+    UPDATE_RAJA: ${MP_BRANCH}
   trigger:
-    project: radiuss/chai
+    project: radiuss/rajaperf
     branch: develop
     strategy: depend
 

diff --git a/.gitlab/corona-jobs.yml b/.gitlab/corona-jobs.yml
@@ -1,21 +1,16 @@
 #############################################################################
-# Copyright (c) 2016-21, Lawrence Livermore National Security, LLC
-# and RAJA project contributors. See the RAJA/COPYRIGHT file for details.
+# Copyright (c) 2016-22, Lawrence Livermore National Security, LLC
+# and RAJA project contributors. See the RAJA/LICENSE file for details.
 #
 # SPDX-License-Identifier: (BSD-3-Clause)
 #############################################################################
 
-hip_4_1_gcc_8_1_0 (build and test on corona):
+hip_4_5_2_clang_13_0_0 (build and test on corona):
   variables:
-    SPEC: "+hip~openmp %[email protected].0 cxxflags='-finline-functions -finline-limit=20000' cflags='-finline-functions -finline-limit=20000' ^hip@4.1.0"
+    SPEC: "+rocm~openmp amdgpu_target=gfx906 %[email protected].0 cxxflags=--offload-arch=gfx906 ^blt@develop ^hip@4.5.2"
   extends: .build_and_test_on_corona
 
-hip_4_2_gcc_8_1_0 (build and test on corona):
+hip_4_5_2_clang_13_0_0_desul_atomics (build and test on corona):
   variables:
-    SPEC: "+hip~openmp %[email protected] cxxflags='-finline-functions -finline-limit=20000' cflags='-finline-functions -finline-limit=20000' ^[email protected]"
-  extends: .build_and_test_on_corona
-
-hip_4_1_clang_9_0_0 (build and test on corona):
-  variables:
-    SPEC: "+hip~openmp %[email protected] cxxflags=--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.1.0 ^[email protected]"
+    SPEC: "+rocm~openmp +desul amdgpu_target=gfx906 %[email protected] cxxflags=--offload-arch=gfx906 ^blt@develop ^[email protected]"
   extends: .build_and_test_on_corona
diff --git a/.gitlab/corona-templates.yml b/.gitlab/corona-templates.yml
@@ -1,6 +1,6 @@
 #############################################################################
-# Copyright (c) 2016-21, Lawrence Livermore National Security, LLC
-# and RAJA project contributors. See the RAJA/COPYRIGHT file for details.
+# Copyright (c) 2016-22, Lawrence Livermore National Security, LLC
+# and RAJA project contributors. See the RAJA/LICENSE file for details.
 #
 # SPDX-License-Identifier: (BSD-3-Clause)
 #############################################################################
@@ -25,7 +25,7 @@
 # Generic corona build job, extending build script
 .build_and_test_on_corona:
   stage: c_build_and_test
-  extends: [.build_toss_3_x86_64_ib_corona_script, .on_corona]
+  extends: [.build_toss_4_x86_64_ib_corona_script, .on_corona]
   needs: []
 
 .build_and_test_on_corona_advanced:

diff --git a/.gitlab/lassen-jobs.yml b/.gitlab/lassen-jobs.yml
@@ -1,6 +1,6 @@
 ##############################################################################
-# Copyright (c) 2016-21, Lawrence Livermore National Security, LLC
-# and RAJA project contributors. See the RAJA/COPYRIGHT file for details.
+# Copyright (c) 2016-22, Lawrence Livermore National Security, LLC
+# and RAJA project contributors. See the RAJA/LICENSE file for details.
 #
 # SPDX-License-Identifier: (BSD-3-Clause)
 ##############################################################################
@@ -11,28 +11,28 @@
 
 ibm_clang_9:
   variables:
-    SPEC: "%[email protected].0ibm"
+    SPEC: "%clang@ibm.9.0.0"
   extends: .build_and_test_on_lassen
 
 ibm_clang_9_gcc_8:
   variables:
-    SPEC: "%[email protected].0ibm cxxflags=--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 cflags=--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1"
+    SPEC: "%clang@ibm.9.0.0 cxxflags=--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 cflags=--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1"
   extends: .build_and_test_on_lassen
 
 gcc_8_3_1:
   variables:
     SPEC: "%[email protected] cxxflags='-finline-functions -finline-limit=20000' cflags='-finline-functions -finline-limit=20000'"
   extends: .build_and_test_on_lassen
 
-xl_16_1_1_7:
+xl_16_1_1_11:
   variables:
-    SPEC: "%[email protected].7 cxxflags='-qthreaded -std=c++14 -O3 -qxlcompatmacros -qlanglvl=extended0x -qalias=noansi -qhot -qpic -qsmp=omp -qsuppress=1500-029 -qsuppress=1500-036'"
+    SPEC: "%[email protected].11 cxxflags='-qthreaded -std=c++14 -O3 -qxlcompatmacros -qlanglvl=extended0x -qalias=noansi -qhot -qpic -qsmp=omp -qsuppress=1500-029 -qsuppress=1500-036'"
     DEFAULT_TIME: 50
   extends: .build_and_test_on_lassen
 
-xl_16_1_1_7_gcc_8_3_1:
+xl_16_1_1_11_gcc_8_3_1:
   variables:
-    SPEC: "%[email protected].7 cxxflags='--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 -qthreaded -std=c++14 -O3 -qxlcompatmacros -qlanglvl=extended0x -qalias=noansi -qhot -qpic -qsmp=omp -qsuppress=1500-029 -qsuppress=1500-036' cflags=--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1"
+    SPEC: "%[email protected].11 cxxflags='--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 -qthreaded -std=c++14 -O3 -qxlcompatmacros -qlanglvl=extended0x -qalias=noansi -qhot -qpic -qsmp=omp -qsuppress=1500-029 -qsuppress=1500-036' cflags=--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1"
     DEFAULT_TIME: 50
   extends: .build_and_test_on_lassen
 
@@ -42,19 +42,24 @@ xl_16_1_1_7_gcc_8_3_1:
 
 ibm_clang_9_cuda:
   variables:
-    SPEC: "+cuda cuda_arch=70 %[email protected].0ibm ^[email protected]"
+    SPEC: "+cuda cuda_arch=70 %clang@ibm.9.0.0 ^[email protected]"
   extends: .build_and_test_on_lassen
 
-ibm_clang_9_gcc_8_cuda:
+ibm_clang_10_cuda:
   variables:
-    SPEC: "+cuda %[email protected] cuda_arch=70 cxxflags=--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 cflags=--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 ^[email protected]"
+    SPEC: "+cuda cuda_arch=70 %[email protected].1 ^[email protected]"
   extends: .build_and_test_on_lassen
 
 gcc_8_3_1_cuda:
   variables:
     SPEC: "+cuda %[email protected] cuda_arch=70 ^[email protected]"
   extends: .build_and_test_on_lassen
 
+gcc_8_3_1_cuda_ats_disabled:
+  variables:
+    SPEC: "+cuda %[email protected] cuda_arch=70 ^[email protected]"
+  extends: .build_and_test_on_lassen_ats_disabled
+
 xl_16_1_1_7_cuda:
   variables:
     SPEC: "+cuda %[email protected] cuda_arch=70 ^[email protected] ^[email protected]"
@@ -83,3 +88,8 @@ clang_9_0_0_memleak (build and test on lassen):
     SPEC: "%[email protected] cxxflags=-fsanitize=address"
     ASAN_OPTIONS: "detect_leaks=1"
   extends: .build_and_test_on_lassen
+
+gcc_8_3_1_cuda_desul_atomics:
+  variables:
+    SPEC: "+cuda +desul %[email protected] cuda_arch=70 ^[email protected]"
+  extends: .build_and_test_on_lassen
diff --git a/.gitlab/lassen-templates.yml b/.gitlab/lassen-templates.yml
@@ -1,6 +1,6 @@
 ##############################################################################
-# Copyright (c) 2016-21, Lawrence Livermore National Security, LLC
-# and RAJA project contributors. See the RAJA/COPYRIGHT file for details.
+# Copyright (c) 2016-22, Lawrence Livermore National Security, LLC
+# and RAJA project contributors. See the RAJA/LICENSE file for details.
 #
 # SPDX-License-Identifier: (BSD-3-Clause)
 ##############################################################################
@@ -22,6 +22,11 @@
   extends: [.build_blueos_3_ppc64le_ib_p9_script, .on_lassen]
   needs: []
 
+.build_and_test_on_lassen_ats_disabled:
+  stage: l_build_and_test
+  extends: [.build_blueos_3_ppc64le_ib_ats_disabled_script, .on_lassen]
+  needs: []
+
 # Note: .build_and_test_on_lassen_advanced inherits from
 # .build_and_test_on_lassen and .advanced_pileline.
 # In particular, the rules section will be merged. Careful when changing rules.

diff --git a/.gitlab/ruby-jobs.yml b/.gitlab/ruby-jobs.yml
@@ -1,6 +1,6 @@
 ##############################################################################
-# Copyright (c) 2016-21, Lawrence Livermore National Security, LLC
-# and RAJA project contributors. See the RAJA/COPYRIGHT file for details.
+# Copyright (c) 2016-22, Lawrence Livermore National Security, LLC
+# and RAJA project contributors. See the RAJA/LICENSE file for details.
 #
 # SPDX-License-Identifier: (BSD-3-Clause)
 ##############################################################################
@@ -21,11 +21,11 @@ gcc_8_1_0:
     DEFAULT_TIME: 60
   extends: .build_and_test_on_ruby
 
-icpc_17_0_2:
-  variables:
-    SPEC: "%[email protected]"
-    DEFAULT_TIME: 40
-  extends: .build_and_test_on_ruby
+#icpc_17_0_2:
+#  variables:
+#    SPEC: "%[email protected]"
+#    DEFAULT_TIME: 40
+#  extends: .build_and_test_on_ruby
 
 icpc_18_0_2:
   variables:
@@ -41,8 +41,13 @@ icpc_19_1_0:
 
 # EXTRAS
 
-gcc_4_9_3:
+#gcc_4_9_3:
+#  variables:
+#    SPEC: "%[email protected]"
+#    DEFAULT_TIME: 60
+#  extends: .build_and_test_on_ruby
+
+clang_10_desul_atomics:
   variables:
-    SPEC: "%[email protected]"
-    DEFAULT_TIME: 60
+    SPEC: "+openmp +desul %[email protected] cxxflags=--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 cflags=--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1"
   extends: .build_and_test_on_ruby
diff --git a/.gitlab/ruby-templates.yml b/.gitlab/ruby-templates.yml
@@ -1,6 +1,6 @@
 ##############################################################################
-# Copyright (c) 2016-21, Lawrence Livermore National Security, LLC
-# and RAJA project contributors. See the RAJA/COPYRIGHT file for details.
+# Copyright (c) 2016-22, Lawrence Livermore National Security, LLC
+# and RAJA project contributors. See the RAJA/LICENSE file for details.
 #
 # SPDX-License-Identifier: (BSD-3-Clause)
 ##############################################################################

diff --git a/.gitmodules b/.gitmodules
@@ -13,3 +13,9 @@
 [submodule "scripts/radiuss-spack-configs"]
 	path = scripts/radiuss-spack-configs
 	url = https://github.com/LLNL/radiuss-spack-configs
+[submodule "scripts/uberenv"]
+	path = scripts/uberenv
+	url = https://github.com/LLNL/uberenv.git
+[submodule "tpl/desul"]
+	path = tpl/desul
+	url = https://github.com/desul/desul.git
diff --git a/.travis.yml b/.travis.yml
@@ -10,59 +10,54 @@ env:
   - DO_TEST=yes
 matrix:
   include:
-  - compiler: gcc49
-    env:
-    - COMPILER=g++
-    - IMG=gcc49
-    - CMAKE_EXTRA_FLAGS="-DENABLE_WARNINGS=On -DENABLE_TBB=On -DRAJA_DEPRECATED_TESTS=On"
   - compiler: gcc6
     env:
     - COMPILER=g++
     - IMG=gcc6
-    - CMAKE_EXTRA_FLAGS="-DENABLE_WARNINGS=On -DENABLE_TBB=On -DRAJA_ENABLE_RUNTIME_PLUGINS=On"
+    - CMAKE_EXTRA_FLAGS="-DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_TBB=On -DRAJA_ENABLE_RUNTIME_PLUGINS=On"
   - compiler: gcc7
     env:
     - COMPILER=g++
     - IMG=gcc7
-    - CMAKE_EXTRA_FLAGS="-DENABLE_WARNINGS=On -DENABLE_TBB=On"
+    - CMAKE_EXTRA_FLAGS="-DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_TBB=On"
   - compiler: gcc8
     env:
     - COMPILER=g++
     - IMG=gcc8
-    - CMAKE_EXTRA_FLAGS="-DENABLE_WARNINGS=On -DENABLE_TBB=On -DRAJA_ENABLE_BOUNDS_CHECK=ON"
+    - CMAKE_EXTRA_FLAGS="-DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_TBB=On -DRAJA_ENABLE_BOUNDS_CHECK=ON"
   - compiler: clang9
     env:
     - COMPILER=clang++-9
     - IMG=clang9
-    - CMAKE_EXTRA_FLAGS="-DCMAKE_CXX_FLAGS=-fmodules -DENABLE_TBB=On"
+    - CMAKE_EXTRA_FLAGS="-DCMAKE_CXX_FLAGS=-fmodules -DRAJA_ENABLE_TBB=On"
   - compiler: intel18
     env:
     - COMPILER=/opt/intel/bin/icpc
     - IMG=icc18
-    - CMAKE_EXTRA_FLAGS="-DENABLE_FORCEINLINE_RECURSIVE=Off -DENABLE_TBB=On -DBLT_CXX_STD=c++14"
+    - CMAKE_EXTRA_FLAGS="-DRAJA_ENABLE_FORCEINLINE_RECURSIVE=Off -DRAJA_ENABLE_TBB=On -DBLT_CXX_STD=c++14"
   - compiler: nvcc10.2
     env:
     - COMPILER=g++
     - IMG=nvcc10.2
-    - CMAKE_EXTRA_FLAGS="-DENABLE_CUDA=On -DENABLE_TBB=On"
+    - CMAKE_EXTRA_FLAGS="-DENABLE_CUDA=On -DRAJA_ENABLE_TBB=On"
     - DO_TEST=no
-  - compiler: gcc-4.9-debug
+  - compiler: gcc-8-debug
     env:
     - COMPILER=g++
-    - IMG=gcc49
+    - IMG=gcc8
     - CMAKE_EXTRA_FLAGS="-DCMAKE_BUILD_TYPE=Debug -DENABLE_WARNINGS=On -DENABLE_WARNINGS_AS_ERRORS=On -DENABLE_COVERAGE=On -DENABLE_TBB=On"
   - compiler: clang-9-debug
     env:
     - COMPILER=clang++-9
     - IMG=clang9
-    - CMAKE_EXTRA_FLAGS="-DCMAKE_BUILD_TYPE=Debug -DENABLE_TBB=On -DCMAKE_CXX_FLAGS=-fsanitize=address"
+    - CMAKE_EXTRA_FLAGS="-DCMAKE_BUILD_TYPE=Debug -DRAJA_ENABLE_TBB=On -DCMAKE_CXX_FLAGS=-fsanitize=address"
     - ASAN_OPTIONS=detect_leaks=0
     - "LSAN_OPTIONS=verbosity=1:log_threads=1"
   - compiler: nvcc-debug
     env:
     - COMPILER=g++
     - IMG=nvcc10.2
-    - CMAKE_EXTRA_FLAGS="-DCMAKE_BUILD_TYPE=Debug -DENABLE_CUDA=On -DENABLE_WARNINGS=On -DENABLE_WARNINGS_AS_ERRORS=On -DENABLE_TBB=On"
+    - CMAKE_EXTRA_FLAGS="-DCMAKE_BUILD_TYPE=Debug -DENABLE_CUDA=On -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DRAJA_ENABLE_TBB=On"
     - DO_TEST=no
 # Disable Clang Cuda until we update some things
 #  - compiler: clang9-cuda9.1
@@ -76,7 +71,7 @@ matrix:
       - COMPILER=g++
       - IMG=hip
       - HCC_AMDGPU_TARGET=gfx900
-      - CMAKE_EXTRA_FLAGS="-DENABLE_HIP=On -DENABLE_OPENMP=Off -DENABLE_CUDA=Off -DENABLE_WARNINGS_AS_ERRORS=Off -DHIP_HIPCC_FLAGS=-fPIC"
+      - CMAKE_EXTRA_FLAGS="-DENABLE_HIP=On -DENABLE_OPENMP=Off -DENABLE_CUDA=Off -DRAJA_ENABLE_WARNINGS_AS_ERRORS=Off -DHIP_HIPCC_FLAGS=-fPIC"
       - DO_TEST=no
 
 

diff --git a/.uberenv_config.json b/.uberenv_config.json
@@ -0,0 +1,12 @@
+{
+"package_name" : "raja",
+"package_version" : "develop",
+"package_final_phase" : "hostconfig",
+"package_source_dir" : "../..",
+"spack_url": "https://github.com/spack/spack",
+"spack_branch": "develop",
+"spack_commit": "be1c4bc563722d0774436cc905fd938c88c61a72",
+"spack_activate" : {},
+"spack_configs_path": "scripts/radiuss-spack-configs",
+"spack_packages_path": "scripts/spack_packages"
+}