Skip to content

Commit

Permalink
Merge pull request #88 from LLNL/v0.8.0-rc
Browse files Browse the repository at this point in the history
V0.8.0 rc
  • Loading branch information
rhornung67 authored Nov 2, 2020
2 parents a6ef027 + fc209d0 commit 94c65b2
Show file tree
Hide file tree
Showing 113 changed files with 1,748 additions and 1,815 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ set(ENABLE_TESTS Off CACHE BOOL "Enable BLT and RAJA tests")
set(ENABLE_EXAMPLES Off CACHE BOOL "Enable RAJA examples")
set(ENABLE_EXERCISES Off CACHE BOOL "Enable RAJA exercises")

include(blt/SetupBLT.cmake)

set(CMAKE_CXX_STANDARD 11)
set(BLT_CXX_STANDARD 11)

include(blt/SetupBLT.cmake)

#
# Define RAJA settings...
#
Expand Down Expand Up @@ -70,7 +70,7 @@ if (ENABLE_OPENMP)
endif ()

set(RAJA_PERFSUITE_VERSION_MAJOR 0)
set(RAJA_PERFSUITE_VERSION_MINOR 7)
set(RAJA_PERFSUITE_VERSION_MINOR 8)
set(RAJA_PERFSUITE_VERSION_PATCHLEVEL 0)

set(RAJA_PERFSUITE_DEPENDS RAJA)
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ The Suite developers follow the [GitFlow](http://nvie.com/posts/a-successful-git
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.
develop branch into the `main` 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.
Expand Down Expand Up @@ -626,13 +626,13 @@ as Git submodules. These packages are covered by various permissive licenses.
A summary listing follows. See the license included with each package for
full details.

PackageName: BLT
PackageHomePage: https://github.com/LLNL/blt/
PackageName: BLT
PackageHomePage: https://github.com/LLNL/blt/
PackageLicenseDeclared: BSD-3-Clause

PackageName: RAJA
PackageHomePage: http://github.com/LLNL/RAJA/
PackageLicenseDeclared: BSD-3-Clause
PackageName: RAJA
PackageHomePage: http://github.com/LLNL/RAJA/
PackageLicenseDeclared: BSD-3-Clause

* * *

Expand Down
2 changes: 1 addition & 1 deletion blt
Submodule blt updated 47 files
+16 −10 .mailmap
+0 −225 .travis.yml
+6 −13 CONTRIBUTING.md
+31 −19 README.md
+74 −2 RELEASE-NOTES.md
+1 −1 SetupBLT.cmake
+0 −156 appveyor.yml
+105 −0 azure-pipelines.yml
+107 −47 cmake/BLTMacros.cmake
+13 −6 cmake/BLTOptions.cmake
+30 −25 cmake/BLTPrivateMacros.cmake
+410 −144 cmake/SetupCodeChecks.cmake
+24 −3 cmake/SetupCompilerOptions.cmake
+420 −0 cmake/run-clang-format.py
+350 −0 cmake/run-clang-tidy.py
+134 −54 cmake/thirdparty/FindHIP.cmake
+19 −5 cmake/thirdparty/FindHIP/run_hipcc.cmake
+29 −6 cmake/thirdparty/SetupCUDA.cmake
+1 −1 cmake/thirdparty/SetupHIP.cmake
+28 −3 cmake/thirdparty/SetupMPI.cmake
+10 −4 cmake/thirdparty/SetupThirdParty.cmake
+207 −53 docs/api/code_check.rst
+136 −68 docs/api/target.rst
+36 −0 docs/api/utility.rst
+10 −0 docs/tutorial/blank_project/CMakeLists.txt
+6 −5 docs/tutorial/calc_pi/CMakeLists.txt
+1 −1 docs/tutorial/calc_pi/example_2.cpp
+0 −51 host-configs/llnl/bgqos_0/[email protected]_xlf.cmake
+68 −0 host-configs/llnl/blueos_3_ppc64le_ib_p9/clang@upstream_nvcc_c++17.cmake
+66 −0 host-configs/llnl/blueos_3_ppc64le_ib_p9/clang@upstream_nvcc_c++17_no_separable.cmake
+25 −0 host-configs/llnl/blueos_3_ppc64le_ib_p9/[email protected]_nvcc.cmake
+3 −1 host-configs/llnl/toss_3_x86_64_ib/[email protected]
+26 −6 tests/internal/CMakeLists.txt
+3 −0 tests/internal/return_true.in
+1 −0 tests/internal/return_true_win32.in
+6 −0 tests/internal/src/static_analysis/CMakeLists.txt
+25 −0 tests/internal/src/static_analysis/subtle_error_source.cpp
+1 −1 tests/smoke/blt_hip_smoke.cpp
+8 −8 thirdparty_builtin/CMakeLists.txt
+0 −3 thirdparty_builtin/benchmark-1.5.0/CMakeLists.txt
+2 −2 thirdparty_builtin/googletest-master-2020-01-07/googlemock/CMakeLists.txt
+2 −2 thirdparty_builtin/googletest-master-2020-01-07/googletest/CMakeLists.txt
+2 −2 thirdparty_builtin/googletest-master-2020-01-07/googletest/cmake/internal_utils.cmake
+14 −0 thirdparty_builtin/patches/gbenchmark-2020-03-11-remove-werror.patch
+20 −0 thirdparty_builtin/patches/gtest-2020-03-11-remove-werror.patch
+54 −0 thirdparty_builtin/patches/gtest-2020-08-25-turn-off-exported-includes.patch
+34 −0 thirdparty_builtin/patches/gtest-2020-10-07-interface-includes.patch
32 changes: 32 additions & 0 deletions scripts/lc-builds/blueos_clang-ibm-2019.10.03_omptarget.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#!/usr/bin/env bash

###############################################################################
# Copyright (c) 2016-20, Lawrence Livermore National Security, LLC
# and RAJA project contributors. See the RAJA/COPYRIGHT file for details.
#
# SPDX-License-Identifier: (BSD-3-Clause)
###############################################################################

BUILD_SUFFIX=lc_blueos-clang-ibm-2019.10.03_omptarget
RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/clang_X.cmake

rm -rf build_${BUILD_SUFFIX} >/dev/null
mkdir build_${BUILD_SUFFIX} && cd build_${BUILD_SUFFIX}

module load cmake/3.14.5

## NOTE: RAJA tests are turned off due to compilation issues.

cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_COMPILER=/usr/tce/packages/clang/clang-ibm-2019.10.03/bin/clang++ \
-C ${RAJA_HOSTCONFIG} \
-DENABLE_OPENMP=On \
-DENABLE_CUDA=Off \
-DENABLE_TARGET_OPENMP=On \
-DOpenMP_CXX_FLAGS="-fopenmp;-fopenmp-targets=nvptx64-nvidia-cuda" \
-DENABLE_ALL_WARNINGS=Off \
-DENABLE_EXAMPLES=On \
-DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
"$@" \
..
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
#!/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.
# Copyright (c) 2016-20, Lawrence Livermore National Security, LLC
# and RAJA project contributors. See the RAJA/COPYRIGHT file for details.
#
# SPDX-License-Identifier: (BSD-3-Clause)
#################################################################################
###############################################################################

BUILD_SUFFIX=lc_blueos-xl_2019.12.23
RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/xl_2019_X.cmake
BUILD_SUFFIX=lc_blueos-clang-10.0.1
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}
Expand All @@ -18,9 +17,9 @@ 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 \
-DCMAKE_CXX_COMPILER=/usr/tce/packages/clang/clang-10.0.1/bin/clang++ \
-C ${RAJA_HOSTCONFIG} \
-DENABLE_OPENMP=On \
-DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
"$@" \
..
..
34 changes: 34 additions & 0 deletions scripts/lc-builds/blueos_clang10.0.1_omptarget.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/usr/bin/env bash

###############################################################################
# Copyright (c) 2016-20, Lawrence Livermore National Security, LLC
# and RAJA project contributors. See the RAJA/COPYRIGHT file for details.
#
# SPDX-License-Identifier: (BSD-3-Clause)
###############################################################################

BUILD_SUFFIX=lc_blueos-clang-10.0.1_omptarget
RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/clang_X.cmake

rm -rf build_${BUILD_SUFFIX} >/dev/null
mkdir build_${BUILD_SUFFIX} && cd build_${BUILD_SUFFIX}

module load cmake/3.14.5

## NOTE: RAJA tests are turned off due to compilation issues.

cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_COMPILER=/usr/tce/packages/clang/clang-10.0.1-gcc-8.3.1/bin/clang++ \
-C ${RAJA_HOSTCONFIG} \
-DENABLE_OPENMP=On \
-DENABLE_CUDA=Off \
-DENABLE_TARGET_OPENMP=On \
-DOpenMP_CXX_FLAGS="-fopenmp;-fopenmp-targets=nvptx64-nvidia-cuda" \
-DENABLE_ALL_WARNINGS=Off \
-DENABLE_TESTS=Off \
-DENABLE_EXAMPLES=Off \
-DENABLE_EXERCISES=Off \
-DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
"$@" \
..
4 changes: 2 additions & 2 deletions scripts/lc-builds/blueos_nvcc10_clang-upstream-2019.08.15.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ cmake \
-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_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-10.2.89 \
-DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-10.2.89/bin/nvcc \
-DCUDA_ARCH=sm_70 \
-DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
"$@" \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
#!/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.
# Copyright (c) 2016-20, Lawrence Livermore National Security, LLC
# and RAJA project contributors. See the RAJA/COPYRIGHT file for details.
#
# SPDX-License-Identifier: (BSD-3-Clause)
#################################################################################
###############################################################################

BUILD_SUFFIX=lc_blueos-nvcc10-xl_2019.04.19
RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/nvcc_xl_2019_X.cmake
BUILD_SUFFIX=lc_blueos-nvcc10-clang10.0.1
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}
Expand All @@ -18,12 +17,12 @@ module load cmake/3.14.5

cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_COMPILER=/usr/tce/packages/xl/xl-2019.04.19/bin/xlc++_r \
-DCMAKE_CXX_COMPILER=/usr/tce/packages/clang/clang-10.0.1/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_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-10.2.89 \
-DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-10.2.89/bin/nvcc \
-DCUDA_ARCH=sm_70 \
-DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
"$@" \
Expand Down
4 changes: 2 additions & 2 deletions scripts/lc-builds/blueos_nvcc10_clang6.0.0.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ cmake \
-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_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-10.2.89 \
-DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-10.2.89/bin/nvcc \
-DCUDA_ARCH=sm_70 \
-DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
"$@" \
Expand Down
4 changes: 2 additions & 2 deletions scripts/lc-builds/blueos_nvcc10_clang7.1.0.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ cmake \
-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_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-10.2.89 \
-DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-10.2.89/bin/nvcc \
-DCUDA_ARCH=sm_70 \
-DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
"$@" \
Expand Down
4 changes: 2 additions & 2 deletions scripts/lc-builds/blueos_nvcc10_clang8.0.1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ cmake \
-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_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-10.2.89 \
-DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-10.2.89/bin/nvcc \
-DCUDA_ARCH=sm_70 \
-DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
"$@" \
Expand Down
4 changes: 2 additions & 2 deletions scripts/lc-builds/blueos_nvcc10_clang9.0.0.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ cmake \
-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_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-10.2.89 \
-DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-10.2.89/bin/nvcc \
-DCUDA_ARCH=sm_70 \
-DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
"$@" \
Expand Down
4 changes: 2 additions & 2 deletions scripts/lc-builds/blueos_nvcc10_gcc7.3.1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ cmake \
-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_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-10.2.89 \
-DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-10.2.89/bin/nvcc \
-DCUDA_ARCH=sm_70 \
-DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
"$@" \
Expand Down
4 changes: 2 additions & 2 deletions scripts/lc-builds/blueos_nvcc10_gcc8.3.1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ cmake \
-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_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-10.2.89 \
-DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-10.2.89/bin/nvcc \
-DCUDA_ARCH=sm_70 \
-DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
"$@" \
Expand Down
30 changes: 0 additions & 30 deletions scripts/lc-builds/blueos_nvcc10_xl-2019.06.12.sh

This file was deleted.

6 changes: 3 additions & 3 deletions scripts/lc-builds/blueos_nvcc10_xl-2019.08.20.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#################################################################################

BUILD_SUFFIX=lc_blueos-nvcc10-xl_2019.08.20
RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/nvcc_xl_2019_X.cmake
RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/nvcc_xl_X.cmake

rm -rf build_${BUILD_SUFFIX} >/dev/null
mkdir build_${BUILD_SUFFIX} && cd build_${BUILD_SUFFIX}
Expand All @@ -22,8 +22,8 @@ cmake \
-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_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-10.2.89 \
-DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-10.2.89/bin/nvcc \
-DCUDA_ARCH=sm_70 \
-DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
"$@" \
Expand Down
6 changes: 3 additions & 3 deletions scripts/lc-builds/blueos_nvcc10_xl-2019.12.23.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#################################################################################

BUILD_SUFFIX=lc_blueos-nvcc10-xl_2019.12.23
RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/nvcc_xl_2019_X.cmake
RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/nvcc_xl_X.cmake

rm -rf build_${BUILD_SUFFIX} >/dev/null
mkdir build_${BUILD_SUFFIX} && cd build_${BUILD_SUFFIX}
Expand All @@ -22,8 +22,8 @@ cmake \
-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_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-10.2.89 \
-DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-10.2.89/bin/nvcc \
-DCUDA_ARCH=sm_70 \
-DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
"$@" \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
#!/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.
# Copyright (c) 2016-20, Lawrence Livermore National Security, LLC
# and RAJA project contributors. See the RAJA/COPYRIGHT file for details.
#
# SPDX-License-Identifier: (BSD-3-Clause)
#################################################################################
###############################################################################

BUILD_SUFFIX=lc_blueos-nvcc9-xl_2019.04.19
RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/nvcc_xl_2019_X.cmake
BUILD_SUFFIX=lc_blueos-nvcc10-xl_2020.06.25
RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/nvcc_xl_X.cmake

rm -rf build_${BUILD_SUFFIX} 2>/dev/null
mkdir build_${BUILD_SUFFIX} && cd build_${BUILD_SUFFIX}
Expand All @@ -18,12 +17,12 @@ module load cmake/3.14.5

cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_COMPILER=/usr/tce/packages/xl/xl-2019.04.19/bin/xlc++_r \
-DCMAKE_CXX_COMPILER=/usr/tce/packages/xl/xl-2020.06.25/bin/xlc++_r \
-C ${RAJA_HOSTCONFIG} \
-DENABLE_OPENMP=On \
-DENABLE_CUDA=On \
-DCUDA_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-9.2.148 \
-DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-9.2.148/bin/nvcc \
-DCUDA_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-10.2.89 \
-DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-10.2.89/bin/nvcc \
-DCUDA_ARCH=sm_70 \
-DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
"$@" \
Expand Down
Loading

0 comments on commit 94c65b2

Please sign in to comment.