Merge pull request #191 from LLNL/release/2.4.0

Release 2.4.0

Author: davidbeckingsale

.gitlab-ci.yml

@@ -65,7 +65,7 @@ stages:
 # allow pre-allocation the same way slurm does.
 .build_blueos_3_ppc64le_ib_script:
   script:
-    - lalloc 1 -W 10 scripts/gitlab/build_and_test.sh
+    - lalloc 1 -W 20 scripts/gitlab/build_and_test.sh
 
 .build_blueos_3_ppc64le_ib_p9_script:
   extends: .build_blueos_3_ppc64le_ib_script

.gitlab/lassen-jobs.yml

@@ -5,62 +5,76 @@
 # SPDX-License-Identifier: (MIT)
 ##############################################################################
 
-####
-# All lassen build jobs
+# CPU ONLY
+ibm_clang_9:
+  variables:
+    SPEC: "%[email protected]"
+  extends: .build_and_test_on_lassen
 
-clang_default (build and test on lassen):
+ibm_clang_9_gcc_8:
   variables:
-    SPEC: "%clang@default"
+    SPEC: "%clang@9.0.0ibm 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_default (build and test on lassen):
+gcc_8_3_1:
   variables:
-    SPEC: "%gcc@default"
+    SPEC: "%gcc@8.3.1 ^[email protected]"
   extends: .build_and_test_on_lassen
 
-xl_default (build and test on lassen):
+xl_16_1_1_7:
   variables:
-    SPEC: "%xl@default"
+    SPEC: "%xl@16.1.1.7"
   extends: .build_and_test_on_lassen
 
-pgi_default (build and test on lassen):
+xl_16_1_1_7_gcc_8_3_1:
   variables:
-    SPEC: "%pgi@default"
+    SPEC: "%[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_lassen
-  allow_failure: true
 
-gcc_8_3_1 (build and test on lassen):
+# CUDA
+
+ibm_clang_9_cuda:
   variables:
-    SPEC: "%[email protected]"
+    SPEC: "+cuda %[email protected] ^[email protected]"
   extends: .build_and_test_on_lassen
 
-clang_3_9_1 (build and test on lassen):
+ibm_clang_9_gcc_8_cuda:
   variables:
-    SPEC: "%[email protected]"
-  extends: .build_and_test_on_lassen_advanced
+    SPEC: "+cuda %[email protected] cxxflags=--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 cflags=--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 ^[email protected]"
+  allow_failure: true
+  extends: .build_and_test_on_lassen
 
-clang_4_0_0 (build and test on lassen):
+gcc_8_3_1_cuda:
   variables:
-    SPEC: "%[email protected]"
-  extends: .build_and_test_on_lassen_advanced
+    SPEC: "+cuda %[email protected] ^[email protected]"
+  extends: .build_and_test_on_lassen
 
-clang_9_0_0 (build and test on lassen):
+xl_16_1_1_7_cuda:
   variables:
-    SPEC: "%[email protected]"
+    SPEC: "+cuda %[email protected] ^[email protected] ^[email protected]"
   extends: .build_and_test_on_lassen
 
-nvcc_gcc_4_9_3 (build and test on lassen):
+xl_16_1_1_7_gcc_8_3_1_cuda_11:
   variables:
-    SPEC: "%[email protected]+cuda"
+    SPEC: "+cuda %[email protected] cxxflags=--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 cflags=--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 ^[email protected] ^[email protected]"
+  allow_failure: true
   extends: .build_and_test_on_lassen
 
-nvcc_gcc_4_9_3_raja (build and test on lassen):
+# EXTRAS
+
+clang_9_0_0_libcpp (build and test on lassen):
   variables:
-    SPEC: "%[email protected]+cuda+raja"
+    SPEC: "%[email protected]+libcpp"
   extends: .build_and_test_on_lassen
-  allow_failure: true
 
-nvcc_xl-beta-2019.06.20 (build and test on lassen):
+clang_9_0_0_memleak (build and test on lassen):
   variables:
-    SPEC: "%[email protected]+cuda"
+    SPEC: "%[email protected] cxxflags=-fsanitize=address"
+    ASAN_OPTIONS: "detect_leaks=1"
   extends: .build_and_test_on_lassen
+
+clang_9_0_0_datarace (build and test on lassen):
+  variables:
+    SPEC: "%[email protected] cxxflags=-fsanitize=thread"
+  allow_failure: true
+  extends: .build_and_test_on_lassen

.gitlab/quartz-jobs.yml

@@ -4,93 +4,34 @@
 #
 # SPDX-License-Identifier: (MIT)
 ##############################################################################
-
-####
-# Quartz build jobs
-clang_3_9_1 (build and test on quartz):
-  variables:
-    SPEC: "%[email protected]"
-  extends: .build_and_test_on_quartz_advanced
-
-clang_4_0_0 (build and test on quartz):
-  variables:
-    SPEC: "%[email protected]"
-  extends: .build_and_test_on_quartz_advanced
-
-clang_6_0_0 (build and test on quartz):
-  variables:
-    SPEC: "%[email protected]"
-  extends: .build_and_test_on_quartz_advanced
-
-clang_9_0_0 (build and test on quartz):
+clang_10:
   variables:
-    SPEC: "%clang@9.0.0"
+    SPEC: " %clang@10.0.1"
   extends: .build_and_test_on_quartz
 
-
-gcc_4_9_3 (build and test on quartz):
-  variables:
-    SPEC: "%[email protected]"
-  extends: .build_and_test_on_quartz_advanced
-
-gcc_6_1_0 (build and test on quartz):
+clang_9:
   variables:
-    SPEC: "%[email protected]"
-  extends: .build_and_test_on_quartz_advanced
-
-gcc_7_1_0 (build and test on quartz):
-  variables:
-    SPEC: "%[email protected]"
-  extends: .build_and_test_on_quartz_advanced
-
-gcc_7_3_0 (build and test on quartz):
-  variables:
-    SPEC: "%[email protected]"
-  extends: .build_and_test_on_quartz_advanced
+    SPEC: " %[email protected]"
+  extends: .build_and_test_on_quartz
 
-gcc_8_1_0 (build and test on quartz):
+gcc_8_1_0:
   variables:
     SPEC: "%[email protected]"
   extends: .build_and_test_on_quartz
 
+# icpc_18_0_2:
+#   variables:
+#     SPEC: " tests=none %[email protected]"
+#   extends: .build_and_test_on_quartz
 
-icpc_16_0_4 (build and test on quartz):
-  variables:
-    SPEC: "%[email protected]"
-  extends: .build_and_test_on_quartz_advanced
-  allow_failure: true
-
-icpc_17_0_2 (build and test on quartz):
+icpc_19_1_0:
   variables:
-    SPEC: "%[email protected]"
-  extends: .build_and_test_on_quartz_advanced
-
-icpc_18_0_0 (build and test on quartz):
-  variables:
-    SPEC: "%[email protected]"
-  extends: .build_and_test_on_quartz_advanced
-  allow_failure: true
-
-icpc_19_0_4 (build and test on quartz):
-  variables:
-    SPEC: "%[email protected]"
+    SPEC: "%[email protected]"
   extends: .build_and_test_on_quartz
 
+# EXTRAS
 
-pgi_17_10 (build and test on quartz):
-  variables:
-    SPEC: "%[email protected]"
-  extends: .build_and_test_on_quartz_advanced
-  allow_failure: true
-
-pgi_18_5 (build and test on quartz):
-  variables:
-    SPEC: "%[email protected]"
-  extends: .build_and_test_on_quartz_advanced
-  allow_failure: true
-
-pgi_19_4 (build and test on quartz):
+gcc_4_9_3:
   variables:
-    SPEC: "%[email protected]"
+    SPEC: "%[email protected]"
   extends: .build_and_test_on_quartz
-  allow_failure: true

.gitlab/quartz-templates.yml

@@ -29,8 +29,7 @@ allocate_resources (on quartz):
   extends: .on_quartz
   stage: q_allocate_resources
   script:
-    - salloc -N 1 -c 36 -p pdebug -t 10 --no-shell --job-name=${ALLOC_NAME}
-  needs: []
+    - salloc -N 1 -c 36 -p pdebug -t 20 --no-shell --job-name=${ALLOC_NAME}
 
 ####
 # In post-build phase, deallocate resources
@@ -47,8 +46,8 @@ release_resources (on quartz):
 ####
 # Generic quartz build job, extending build script
 .build_and_test_on_quartz:
-  stage: q_build_and_test
   extends: [.build_toss_3_x86_64_ib_script, .on_quartz]
+  stage: q_build_and_test
 
 .build_and_test_on_quartz_advanced:
   extends: [.build_and_test_on_quartz, .advanced_pipeline]

.gitmodules

@@ -7,3 +7,9 @@
 [submodule "src/tpl/raja"]
 	path = src/tpl/raja
 	url = https://github.com/LLNL/RAJA.git
+[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

.uberenv_config.json

@@ -0,0 +1,11 @@
+{
+"package_name" : "chai",
+"package_version" : "develop",
+"package_final_phase" : "hostconfig",
+"package_source_dir" : "../..",
+"spack_url": "https://github.com/davidbeckingsale/spack",
+"spack_branch": "feature/allow-untested-cuda-versions",
+"spack_commit": "46b22d0f6227f6b12bab712bda5b916a53cfc67d",
+"spack_activate" : {},
+"spack_configs_path": "scripts/radiuss-spack-configs",
+"spack_packages_path": "scripts/spack_packages"}

CMakeLists.txt

@@ -6,8 +6,9 @@
 ##############################################################################
 cmake_policy(SET CMP0057 NEW)
 cmake_policy(SET CMP0048 NEW)
+cmake_policy(SET CMP0025 NEW)
 
-project(Chai LANGUAGES CXX VERSION 2.3.0)
+project(Chai LANGUAGES CXX VERSION 2.4.0)
 
 set(ENABLE_CUDA Off CACHE BOOL "Enable CUDA")
 set(ENABLE_HIP Off CACHE BOOL "Enable HIP")
@@ -22,6 +23,7 @@ option(ENABLE_UM "Use CUDA unified (managed) memory" Off)
 option(ENABLE_PINNED "Use pinned host memory" Off)
 option(ENABLE_RAJA_PLUGIN "Build plugin to set RAJA execution spaces" Off)
 option(CHAI_ENABLE_GPU_ERROR_CHECKING "Enable GPU error checking" On)
+option(CHAI_ENABLE_MANAGED_PTR "Enable managed_ptr" On)
 option(CHAI_DEBUG "Enable Debug Logging.")
 set(ENABLE_RAJA_NESTED_TEST ON CACHE BOOL "Enable raja-chai-nested-tests, which fails to build on Debug CUDA builds.")
 
@@ -41,6 +43,11 @@ endif()
 set(ENABLE_COPY_HEADERS Off CACHE BOOL "")
 set(BLT_CXX_STD c++11 CACHE STRING "")
 
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "PGI")
+  message(STATUS "Setting CMAKE_CXX_EXTENSIONS to ON for PGI Compiler")
+  set( CMAKE_CXX_EXTENSIONS ON )
+endif()
+
 if (ENABLE_CUDA)
   cmake_minimum_required(VERSION 3.9)
 else ()

README.md

@@ -1,4 +1,4 @@
-# CHAI v2.3
+# CHAI v2.4
 
 [![Azure Build Status](https://dev.azure.com/davidbeckingsale/CHAI/_apis/build/status/LLNL.CHAI?branchName=develop)](https://dev.azure.com/davidbeckingsale/CHAI/_build/latest?definitionId=2&branchName=develop)
 [![Build Status](https://travis-ci.org/LLNL/CHAI.svg?branch=develop)](https://travis-ci.org/LLNL/CHAI)

benchmarks/CMakeLists.txt

@@ -13,6 +13,7 @@ if (ENABLE_CUDA)
     ${chai_benchmark_depends}
     cuda)
 endif ()
+
 if (ENABLE_HIP)
   set (chai_benchmark_depends
     ${chai_benchmark_depends}
@@ -37,12 +38,13 @@ blt_add_benchmark(
   NAME managedarray_benchmarks
   COMMAND managedarray_benchmarks)
 
-blt_add_executable(
-  NAME managed_ptr_benchmarks
-  SOURCES chai_managed_ptr_benchmarks.cpp
-  DEPENDS_ON ${chai_benchmark_depends})
-
-blt_add_benchmark(
-  NAME managed_ptr_benchmarks
-  COMMAND managed_ptr_benchmarks)
+if (CHAI_ENABLE_MANAGED_PTR)
+  blt_add_executable(
+    NAME managed_ptr_benchmarks
+    SOURCES chai_managed_ptr_benchmarks.cpp
+    DEPENDS_ON ${chai_benchmark_depends})
 
+  blt_add_benchmark(
+    NAME managed_ptr_benchmarks
+    COMMAND managed_ptr_benchmarks)
+endif ()