Skip to content

Commit a6ef027

Browse files
rhornung67rhornung67
authored
Merge pull request #81 from LLNL/v0.7.0-RC
V0.7.0 rc
2 parents 21e476f + 1e14067 commit a6ef027

File tree

365 files changed

+588
-362
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

365 files changed

+588
-362
lines changed

‎CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
###############################################################################
2-
# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
2+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
33
# and RAJA Performance Suite project contributors.
44
# See the RAJAPerf/COPYRIGHT file for details.
55
#
@@ -70,8 +70,8 @@ if (ENABLE_OPENMP)
7070
endif ()
7171

7272
set(RAJA_PERFSUITE_VERSION_MAJOR 0)
73-
set(RAJA_PERFSUITE_VERSION_MINOR 5)
74-
set(RAJA_PERFSUITE_VERSION_PATCHLEVEL 2)
73+
set(RAJA_PERFSUITE_VERSION_MINOR 7)
74+
set(RAJA_PERFSUITE_VERSION_PATCHLEVEL 0)
7575

7676
set(RAJA_PERFSUITE_DEPENDS RAJA)
7777

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2016-2019, Lawrence Livermore National Security, LLC.
1+
Copyright (c) 2017-2020, Lawrence Livermore National Security, LLC.
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

‎README.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[comment]: # (#################################################################)
2-
[comment]: # (Copyright 2017-19, Lawrence Livermore National Security, LLC)
2+
[comment]: # (Copyright 2017-20, Lawrence Livermore National Security, LLC)
33
[comment]: # (and RAJA Performance Suite project contributors.)
44
[comment]: # (See the RAJA/COPYRIGHT file for details.)
55
[comment]: #
@@ -563,19 +563,22 @@ in earlier sections for adding a new kernel above.
563563
The RAJA Performance Suite is intended to be a work-in-progress, with new
564564
kernels and variants added over time. We encourage interested parties to
565565
contribute to it so that C++ compiler optimizations and support for programming
566-
models like RAJA continue to improve.
566+
models like RAJA continue to improve.
567567

568568
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`
569569
branch. Then, create a pull request with the `develop` branch as the
570570
destination when it is ready to be reviewed. The `develop` branch contains the
571571
latest work in RAJA Performance Suite. Periodically, we will merge the
572572
develop branch into the `master` branch and tag a new release.
573573

574+
If you would like to contribute to the RAJA Performance Suitea, or have
575+
questions about doing so, please contact one of its developers. See below.
576+
574577
* * *
575578

576579
# Authors
577580

578-
The RAJA Performance Suite was originally developed by:
581+
The primary developer of the RAJA Performance Suite:
579582

580583
* Rich Hornung ([email protected])
581584

‎RELEASE

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
RAJA Performance Suite: ................................, version 0.5.2
44

5-
Copyright (c) 2017-19, Lawrence Livermore National Security, LLC.
5+
Copyright (c) 2017-20, Lawrence Livermore National Security, LLC.
66
Produced at the Lawrence Livermore National Laboratory.
77
All rights reserved. See details in the RAJAPerf/LICENSE file.
88

‎blt

Submodule blt updated 606 files

‎scripts/install_llvm.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
###############################################################################
2-
# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
2+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
33
# and RAJA Performance Suite project contributors.
44
# See the RAJAPerf/COPYRIGHT file for details.
55
#

‎scripts/lc-builds/bgqos_clang4.0.0.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
###############################################################################
4-
# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
55
# and RAJA Performance Suite project contributors.
66
# See the RAJAPerf/COPYRIGHT file for details.
77
#

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
###############################################################################
4-
# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
55
# and RAJA Performance Suite project contributors.
66
# See the RAJAPerf/COPYRIGHT file for details.
77
#

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
###############################################################################
4-
# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
55
# and RAJA Performance Suite project contributors.
66
# See the RAJAPerf/COPYRIGHT file for details.
77
#

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
###############################################################################
4-
# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
55
# and RAJA Performance Suite project contributors.
66
# See the RAJAPerf/COPYRIGHT file for details.
77
#

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
###############################################################################
4-
# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
55
# and RAJA Performance Suite project contributors.
66
# See the RAJAPerf/COPYRIGHT file for details.
77
#

‎scripts/lc-builds/blueos_clang6.0.0.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
###############################################################################
4-
# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
55
# and RAJA Performance Suite project contributors.
66
# See the RAJAPerf/COPYRIGHT file for details.
77
#

‎scripts/lc-builds/blueos_clang7.1.0.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
###############################################################################
4-
# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
55
# and RAJA Performance Suite project contributors.
66
# See the RAJAPerf/COPYRIGHT file for details.
77
#

‎scripts/lc-builds/blueos_clang8.0.1.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
###############################################################################
4-
# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
55
# and RAJA Performance Suite project contributors.
66
# See the RAJAPerf/COPYRIGHT file for details.
77
#

‎scripts/lc-builds/blueos_clang9.0.0.sh

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/usr/bin/env bash
2+
3+
###############################################################################
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
5+
# and RAJA Performance Suite project contributors.
6+
# See the RAJAPerf/COPYRIGHT file for details.
7+
#
8+
# SPDX-License-Identifier: (BSD-3-Clause)
9+
#################################################################################
10+
11+
BUILD_SUFFIX=lc_blueos-clang-9.0.0
12+
RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/clang_X.cmake
13+
14+
rm -rf build_${BUILD_SUFFIX} 2>/dev/null
15+
mkdir build_${BUILD_SUFFIX} && cd build_${BUILD_SUFFIX}
16+
17+
module load cmake/3.14.5
18+
19+
cmake \
20+
-DCMAKE_BUILD_TYPE=Release \
21+
-DCMAKE_CXX_COMPILER=/usr/tce/packages/clang/clang-9.0.0/bin/clang++ \
22+
-C ${RAJA_HOSTCONFIG} \
23+
-DENABLE_OPENMP=On \
24+
-DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
25+
"$@" \
26+
..

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
###############################################################################
4-
# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
55
# and RAJA Performance Suite project contributors.
66
# See the RAJAPerf/COPYRIGHT file for details.
77
#

‎scripts/lc-builds/blueos_gcc4.9.3.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
###############################################################################
4-
# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
55
# and RAJA Performance Suite project contributors.
66
# See the RAJAPerf/COPYRIGHT file for details.
77
#

‎scripts/lc-builds/blueos_gcc7.3.1.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
###############################################################################
4-
# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
55
# and RAJA Performance Suite project contributors.
66
# See the RAJAPerf/COPYRIGHT file for details.
77
#

‎scripts/lc-builds/blueos_gcc8.3.1.sh

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/usr/bin/env bash
2+
3+
###############################################################################
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
5+
# and RAJA Performance Suite project contributors.
6+
# See the RAJAPerf/COPYRIGHT file for details.
7+
#
8+
# SPDX-License-Identifier: (BSD-3-Clause)
9+
#################################################################################
10+
11+
BUILD_SUFFIX=lc_blueos-gcc-8.3.1
12+
RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/gcc_X.cmake
13+
14+
rm -rf build_${BUILD_SUFFIX} 2>/dev/null
15+
mkdir build_${BUILD_SUFFIX} && cd build_${BUILD_SUFFIX}
16+
17+
module load cmake/3.14.5
18+
19+
cmake \
20+
-DCMAKE_BUILD_TYPE=Release \
21+
-DCMAKE_CXX_COMPILER=/usr/tce/packages/gcc/gcc-8.3.1/bin/g++ \
22+
-C ${RAJA_HOSTCONFIG} \
23+
-DENABLE_OPENMP=On \
24+
-DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
25+
"$@" \
26+
..

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
###############################################################################
4-
# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
55
# and RAJA Performance Suite project contributors.
66
# See the RAJAPerf/COPYRIGHT file for details.
77
#

‎scripts/lc-builds/blueos_nvcc10_clang6.0.0.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
###############################################################################
4-
# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
55
# and RAJA Performance Suite project contributors.
66
# See the RAJAPerf/COPYRIGHT file for details.
77
#

‎scripts/lc-builds/blueos_nvcc10_clang7.1.0.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
###############################################################################
4-
# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
55
# and RAJA Performance Suite project contributors.
66
# See the RAJAPerf/COPYRIGHT file for details.
77
#

‎scripts/lc-builds/blueos_nvcc10_clang8.0.1.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
###############################################################################
4-
# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
55
# and RAJA Performance Suite project contributors.
66
# See the RAJAPerf/COPYRIGHT file for details.
77
#

‎scripts/lc-builds/blueos_nvcc10_clang9.0.0.sh

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/usr/bin/env bash
2+
3+
###############################################################################
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
5+
# and RAJA Performance Suite project contributors.
6+
# See the RAJAPerf/COPYRIGHT file for details.
7+
#
8+
# SPDX-License-Identifier: (BSD-3-Clause)
9+
#################################################################################
10+
11+
BUILD_SUFFIX=lc_blueos-nvcc10-clang9.0.0
12+
RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/nvcc_clang_X.cmake
13+
14+
rm -rf build_${BUILD_SUFFIX} >/dev/null
15+
mkdir build_${BUILD_SUFFIX} && cd build_${BUILD_SUFFIX}
16+
17+
module load cmake/3.14.5
18+
19+
cmake \
20+
-DCMAKE_BUILD_TYPE=Release \
21+
-DCMAKE_CXX_COMPILER=/usr/tce/packages/clang/clang-9.0.0/bin/clang++ \
22+
-C ${RAJA_HOSTCONFIG} \
23+
-DENABLE_OPENMP=On \
24+
-DENABLE_CUDA=On \
25+
-DCUDA_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-10.1.243 \
26+
-DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-10.1.243/bin/nvcc \
27+
-DCUDA_ARCH=sm_70 \
28+
-DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
29+
"$@" \
30+
..

‎scripts/lc-builds/blueos_nvcc10_gcc7.3.1.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
###############################################################################
4-
# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
55
# and RAJA Performance Suite project contributors.
66
# See the RAJAPerf/COPYRIGHT file for details.
77
#

‎scripts/lc-builds/blueos_nvcc10_gcc8.3.1.sh

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/usr/bin/env bash
2+
3+
###############################################################################
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
5+
# and RAJA Performance Suite project contributors.
6+
# See the RAJAPerf/COPYRIGHT file for details.
7+
#
8+
# SPDX-License-Identifier: (BSD-3-Clause)
9+
#################################################################################
10+
11+
BUILD_SUFFIX=lc_blueos-nvcc10-gcc8.3.1
12+
RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/nvcc_gcc_X.cmake
13+
14+
rm -rf build_${BUILD_SUFFIX} >/dev/null
15+
mkdir build_${BUILD_SUFFIX} && cd build_${BUILD_SUFFIX}
16+
17+
module load cmake/3.14.5
18+
19+
cmake \
20+
-DCMAKE_BUILD_TYPE=Release \
21+
-DCMAKE_CXX_COMPILER=/usr/tce/packages/gcc/gcc-8.3.1/bin/g++ \
22+
-C ${RAJA_HOSTCONFIG} \
23+
-DENABLE_OPENMP=On \
24+
-DENABLE_CUDA=On \
25+
-DCMAKE_CUDA_FLAGS="-Xcompiler -mno-float128" \
26+
-DCUDA_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-10.1.243 \
27+
-DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-10.1.243/bin/nvcc \
28+
-DCUDA_ARCH=sm_70 \
29+
-DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
30+
"$@" \
31+
..

‎scripts/lc-builds/blueos_nvcc10_xl-2019.04.19.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
###############################################################################
4-
# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
55
# and RAJA Performance Suite project contributors.
66
# See the RAJAPerf/COPYRIGHT file for details.
77
#

‎scripts/lc-builds/blueos_nvcc10_xl-2019.06.12.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
###############################################################################
4-
# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
55
# and RAJA Performance Suite project contributors.
66
# See the RAJAPerf/COPYRIGHT file for details.
77
#

‎scripts/lc-builds/blueos_nvcc10_xl-2019.08.20.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
###############################################################################
4-
# Copyright (c) 2017-19, Lawrence Livermore National Security, LLC
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
55
# and RAJA Performance Suite project contributors.
66
# See the RAJAPerf/COPYRIGHT file for details.
77
#

‎scripts/lc-builds/blueos_nvcc10_xl-2019.12.23.sh

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/usr/bin/env bash
2+
3+
###############################################################################
4+
# Copyright (c) 2017-20, Lawrence Livermore National Security, LLC
5+
# and RAJA Performance Suite project contributors.
6+
# See the RAJAPerf/COPYRIGHT file for details.
7+
#
8+
# SPDX-License-Identifier: (BSD-3-Clause)
9+
#################################################################################
10+
11+
BUILD_SUFFIX=lc_blueos-nvcc10-xl_2019.12.23
12+
RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/nvcc_xl_2019_X.cmake
13+
14+
rm -rf build_${BUILD_SUFFIX} >/dev/null
15+
mkdir build_${BUILD_SUFFIX} && cd build_${BUILD_SUFFIX}
16+
17+
module load cmake/3.14.5
18+
19+
cmake \
20+
-DCMAKE_BUILD_TYPE=Release \
21+
-DCMAKE_CXX_COMPILER=/usr/tce/packages/xl/xl-2019.12.23/bin/xlc++_r \
22+
-C ${RAJA_HOSTCONFIG} \
23+
-DENABLE_OPENMP=On \
24+
-DENABLE_CUDA=On \
25+
-DCUDA_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-10.1.243 \
26+
-DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-10.1.243/bin/nvcc \
27+
-DCUDA_ARCH=sm_70 \
28+
-DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
29+
"$@" \
30+
..

0 commit comments

Comments
 (0)