Merge pull request #81 from LLNL/v0.7.0-RC

V0.7.0 rc

CMakeLists.txt

@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
 # and RAJA Performance Suite project contributors. 
 # See the RAJAPerf/COPYRIGHT file for details.
 #
@@ -70,8 +70,8 @@ if (ENABLE_OPENMP)
 endif ()
 
 set(RAJA_PERFSUITE_VERSION_MAJOR 0)
-set(RAJA_PERFSUITE_VERSION_MINOR 5)
-set(RAJA_PERFSUITE_VERSION_PATCHLEVEL 2)
+set(RAJA_PERFSUITE_VERSION_MINOR 7)
+set(RAJA_PERFSUITE_VERSION_PATCHLEVEL 0)
 
 set(RAJA_PERFSUITE_DEPENDS RAJA)
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2016-2019, Lawrence Livermore National Security, LLC.
+Copyright (c) 2017-2020, Lawrence Livermore National Security, LLC.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.md

@@ -1,5 +1,5 @@
 [comment]: # (#################################################################)
-[comment]: # (Copyright 2017-19, Lawrence Livermore National Security, LLC)
+[comment]: # (Copyright 2017-20, Lawrence Livermore National Security, LLC)
 [comment]: # (and RAJA Performance Suite project contributors.)
 [comment]: # (See the RAJA/COPYRIGHT file for details.)
 [comment]: #
@@ -563,19 +563,22 @@ in earlier sections for adding a new kernel above.
 The RAJA Performance Suite is intended to be a work-in-progress, with new
 kernels and variants added over time. We encourage interested parties to 
 contribute to it so that C++ compiler optimizations and support for programming
-models like RAJA continue to improve.
+models like RAJA continue to improve. 
 
 The Suite developers follow the [GitFlow](http://nvie.com/posts/a-successful-git-branching-model/) development model. Folks wishing to contribute to the Suite, should include their work in a feature branch created from the RAJA `develop` 
 branch. Then, create a pull request with the `develop` branch as the 
 destination when it is ready to be reviewed. The `develop` branch contains the 
 latest work in RAJA Performance Suite. Periodically, we will merge the
 develop branch into the `master` branch and tag a new release.
 
+If you would like to contribute to the RAJA Performance Suitea, or have 
+questions about doing so, please contact one of its developers. See below.
+
 * * *
 
 # Authors
 
-The RAJA Performance Suite was originally developed by:
+The primary developer of the RAJA Performance Suite:
 
   * Rich Hornung ([email protected])
 

RELEASE

@@ -2,7 +2,7 @@
 
 RAJA Performance Suite: ................................, version 0.5.2
 
-Copyright (c) 2017-19, Lawrence Livermore National Security, LLC. 
+Copyright (c) 2017-20, Lawrence Livermore National Security, LLC. 
 Produced at the Lawrence Livermore National Laboratory.
 All rights reserved. See details in the RAJAPerf/LICENSE file.
 

scripts/install_llvm.sh

@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
 # and RAJA Performance Suite project contributors. 
 # See the RAJAPerf/COPYRIGHT file for details.
 #

scripts/lc-builds/bgqos_clang4.0.0.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ###############################################################################
-# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
 # and RAJA Performance Suite project contributors.
 # See the RAJAPerf/COPYRIGHT file for details.
 #

scripts/lc-builds/blueos_clang-coral-2018.08.08.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ###############################################################################
-# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
 # and RAJA Performance Suite project contributors.
 # See the RAJAPerf/COPYRIGHT file for details.
 #

scripts/lc-builds/blueos_clang-coral-2018.08.08_omptarget.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ###############################################################################
-# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
 # and RAJA Performance Suite project contributors.
 # See the RAJAPerf/COPYRIGHT file for details.
 #

scripts/lc-builds/blueos_clang-upstream-2019.08.15.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ###############################################################################
-# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
 # and RAJA Performance Suite project contributors.
 # See the RAJAPerf/COPYRIGHT file for details.
 #

scripts/lc-builds/blueos_clang-upstream-2019.08.15_omptarget.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ###############################################################################
-# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
 # and RAJA Performance Suite project contributors.
 # See the RAJAPerf/COPYRIGHT file for details.
 #

scripts/lc-builds/blueos_clang6.0.0.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ###############################################################################
-# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
 # and RAJA Performance Suite project contributors.
 # See the RAJAPerf/COPYRIGHT file for details.
 #

scripts/lc-builds/blueos_clang7.1.0.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ###############################################################################
-# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
 # and RAJA Performance Suite project contributors.
 # See the RAJAPerf/COPYRIGHT file for details.
 #

scripts/lc-builds/blueos_clang8.0.1.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ###############################################################################
-# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
 # and RAJA Performance Suite project contributors.
 # See the RAJAPerf/COPYRIGHT file for details.
 #

scripts/lc-builds/blueos_clang9.0.0.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+###############################################################################
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
+# and RAJA Performance Suite project contributors.
+# See the RAJAPerf/COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (BSD-3-Clause)
+#################################################################################
+
+BUILD_SUFFIX=lc_blueos-clang-9.0.0
+RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/clang_X.cmake
+
+rm -rf build_${BUILD_SUFFIX} 2>/dev/null
+mkdir build_${BUILD_SUFFIX} && cd build_${BUILD_SUFFIX}
+
+module load cmake/3.14.5
+
+cmake \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_CXX_COMPILER=/usr/tce/packages/clang/clang-9.0.0/bin/clang++ \
+  -C ${RAJA_HOSTCONFIG} \
+  -DENABLE_OPENMP=On \
+  -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
+  "$@" \
+  .. 

scripts/lc-builds/blueos_clangcuda-upstream-2018.12.03_nvcc9.2.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ###############################################################################
-# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
 # and RAJA Performance Suite project contributors.
 # See the RAJAPerf/COPYRIGHT file for details.
 #

scripts/lc-builds/blueos_gcc4.9.3.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ###############################################################################
-# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
 # and RAJA Performance Suite project contributors.
 # See the RAJAPerf/COPYRIGHT file for details.
 #

scripts/lc-builds/blueos_gcc7.3.1.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ###############################################################################
-# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
 # and RAJA Performance Suite project contributors.
 # See the RAJAPerf/COPYRIGHT file for details.
 #

scripts/lc-builds/blueos_gcc8.3.1.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+###############################################################################
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
+# and RAJA Performance Suite project contributors.
+# See the RAJAPerf/COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (BSD-3-Clause)
+#################################################################################
+
+BUILD_SUFFIX=lc_blueos-gcc-8.3.1
+RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/gcc_X.cmake
+
+rm -rf build_${BUILD_SUFFIX} 2>/dev/null
+mkdir build_${BUILD_SUFFIX} && cd build_${BUILD_SUFFIX}
+
+module load cmake/3.14.5
+
+cmake \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_CXX_COMPILER=/usr/tce/packages/gcc/gcc-8.3.1/bin/g++ \
+  -C ${RAJA_HOSTCONFIG} \
+  -DENABLE_OPENMP=On \
+  -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
+  "$@" \
+  ..

scripts/lc-builds/blueos_nvcc10_clang-upstream-2019.08.15.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ###############################################################################
-# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
 # and RAJA Performance Suite project contributors.
 # See the RAJAPerf/COPYRIGHT file for details.
 #

scripts/lc-builds/blueos_nvcc10_clang6.0.0.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ###############################################################################
-# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
 # and RAJA Performance Suite project contributors.
 # See the RAJAPerf/COPYRIGHT file for details.
 #

scripts/lc-builds/blueos_nvcc10_clang7.1.0.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ###############################################################################
-# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
 # and RAJA Performance Suite project contributors.
 # See the RAJAPerf/COPYRIGHT file for details.
 #

scripts/lc-builds/blueos_nvcc10_clang8.0.1.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ###############################################################################
-# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
 # and RAJA Performance Suite project contributors.
 # See the RAJAPerf/COPYRIGHT file for details.
 #

scripts/lc-builds/blueos_nvcc10_clang9.0.0.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+###############################################################################
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
+# and RAJA Performance Suite project contributors.
+# See the RAJAPerf/COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (BSD-3-Clause)
+#################################################################################
+
+BUILD_SUFFIX=lc_blueos-nvcc10-clang9.0.0
+RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/nvcc_clang_X.cmake
+
+rm -rf build_${BUILD_SUFFIX} >/dev/null
+mkdir build_${BUILD_SUFFIX} && cd build_${BUILD_SUFFIX}
+
+module load cmake/3.14.5
+
+cmake \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_CXX_COMPILER=/usr/tce/packages/clang/clang-9.0.0/bin/clang++ \
+  -C ${RAJA_HOSTCONFIG} \
+  -DENABLE_OPENMP=On \
+  -DENABLE_CUDA=On \
+  -DCUDA_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-10.1.243 \
+  -DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-10.1.243/bin/nvcc \
+  -DCUDA_ARCH=sm_70 \
+  -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
+  "$@" \
+  ..

scripts/lc-builds/blueos_nvcc10_gcc7.3.1.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ###############################################################################
-# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
 # and RAJA Performance Suite project contributors.
 # See the RAJAPerf/COPYRIGHT file for details.
 #

scripts/lc-builds/blueos_nvcc10_gcc8.3.1.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+###############################################################################
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
+# and RAJA Performance Suite project contributors.
+# See the RAJAPerf/COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (BSD-3-Clause)
+#################################################################################
+
+BUILD_SUFFIX=lc_blueos-nvcc10-gcc8.3.1
+RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/nvcc_gcc_X.cmake
+
+rm -rf build_${BUILD_SUFFIX} >/dev/null
+mkdir build_${BUILD_SUFFIX} && cd build_${BUILD_SUFFIX}
+
+module load cmake/3.14.5
+
+cmake \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_CXX_COMPILER=/usr/tce/packages/gcc/gcc-8.3.1/bin/g++ \
+  -C ${RAJA_HOSTCONFIG} \
+  -DENABLE_OPENMP=On \
+  -DENABLE_CUDA=On \
+  -DCMAKE_CUDA_FLAGS="-Xcompiler -mno-float128" \
+  -DCUDA_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-10.1.243 \
+  -DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-10.1.243/bin/nvcc \
+  -DCUDA_ARCH=sm_70 \
+  -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
+  "$@" \
+  ..

scripts/lc-builds/blueos_nvcc10_xl-2019.04.19.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ###############################################################################
-# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
 # and RAJA Performance Suite project contributors.
 # See the RAJAPerf/COPYRIGHT file for details.
 #

scripts/lc-builds/blueos_nvcc10_xl-2019.06.12.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ###############################################################################
-# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
 # and RAJA Performance Suite project contributors.
 # See the RAJAPerf/COPYRIGHT file for details.
 #

scripts/lc-builds/blueos_nvcc10_xl-2019.08.20.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ###############################################################################
-# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
 # and RAJA Performance Suite project contributors.
 # See the RAJAPerf/COPYRIGHT file for details.
 #

scripts/lc-builds/blueos_nvcc10_xl-2019.12.23.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+###############################################################################
+# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
+# and RAJA Performance Suite project contributors.
+# See the RAJAPerf/COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (BSD-3-Clause)
+#################################################################################
+
+BUILD_SUFFIX=lc_blueos-nvcc10-xl_2019.12.23
+RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/nvcc_xl_2019_X.cmake
+
+rm -rf build_${BUILD_SUFFIX} >/dev/null
+mkdir build_${BUILD_SUFFIX} && cd build_${BUILD_SUFFIX}
+
+module load cmake/3.14.5
+
+cmake \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_CXX_COMPILER=/usr/tce/packages/xl/xl-2019.12.23/bin/xlc++_r \
+  -C ${RAJA_HOSTCONFIG} \
+  -DENABLE_OPENMP=On \
+  -DENABLE_CUDA=On \
+  -DCUDA_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-10.1.243 \
+  -DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-10.1.243/bin/nvcc \
+  -DCUDA_ARCH=sm_70 \
+  -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
+  "$@" \
+  ..