Update LC build scripts

LLNL · Nov 2, 2020 · fc209d0 · fc209d0
1 parent b5b5de9
commit fc209d0
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 23 deletions.
diff --git a/scripts/lc-builds/blueos_clang10.0.0.sh → scripts/lc-builds/blueos_clang10.0.1.sh b/scripts/lc-builds/blueos_clang10.0.0.sh → scripts/lc-builds/blueos_clang10.0.1.sh
@@ -7,7 +7,7 @@
 # SPDX-License-Identifier: (BSD-3-Clause)
 ###############################################################################
 
-BUILD_SUFFIX=lc_blueos-clang-10.0.0
+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
@@ -17,7 +17,7 @@ module load cmake/3.14.5
 
 cmake \
   -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_CXX_COMPILER=/usr/tce/packages/clang/clang-10.0.0/bin/clang++ \
+  -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} \

diff --git a/...lc-builds/blueos_clang10.0.0_omptarget.sh → ...lc-builds/blueos_clang10.0.1_omptarget.sh b/...lc-builds/blueos_clang10.0.0_omptarget.sh → ...lc-builds/blueos_clang10.0.1_omptarget.sh
@@ -7,7 +7,7 @@
 # SPDX-License-Identifier: (BSD-3-Clause)
 ###############################################################################
 
-BUILD_SUFFIX=lc_blueos-clang-10.0.0_omptarget
+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
@@ -19,7 +19,7 @@ module load cmake/3.14.5
 
 cmake \
   -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_CXX_COMPILER=/usr/tce/packages/clang/clang-10.0.0/bin/clang++ \
+  -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 \

diff --git a/...ts/lc-builds/blueos_nvcc10_clang10.0.0.sh → ...ts/lc-builds/blueos_nvcc10_clang10.0.1.sh b/...ts/lc-builds/blueos_nvcc10_clang10.0.0.sh → ...ts/lc-builds/blueos_nvcc10_clang10.0.1.sh
@@ -7,7 +7,7 @@
 # SPDX-License-Identifier: (BSD-3-Clause)
 ###############################################################################
 
-BUILD_SUFFIX=lc_blueos-nvcc10-clang10.0.0
+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
@@ -17,7 +17,7 @@ module load cmake/3.14.5
 
 cmake \
   -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_CXX_COMPILER=/usr/tce/packages/clang/clang-10.0.0/bin/clang++ \
+  -DCMAKE_CXX_COMPILER=/usr/tce/packages/clang/clang-10.0.1/bin/clang++ \
   -C ${RAJA_HOSTCONFIG} \
   -DENABLE_OPENMP=On \
   -DENABLE_CUDA=On \

diff --git a/scripts/lc-builds/blueos_nvcc11-beta_clang10.0.1.sh b/scripts/lc-builds/blueos_nvcc11-beta_clang10.0.1.sh
@@ -0,0 +1,35 @@
+#!/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)
+###############################################################################
+
+#
+## NOTE: After building code, you need to load the cuda 11 module to run
+##       your code or RAJA tests
+#
+
+BUILD_SUFFIX=lc_blueos-nvcc11-beta-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}
+
+module load cmake/3.14.5
+
+cmake \
+  -DCMAKE_BUILD_TYPE=Release \
+  -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-11.2.0-beta \
+  -DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-11.2.0-beta/bin/nvcc \
+  -DCUDA_ARCH=sm_70 \
+  -DCMAKE_CUDA_STANDARD="14" \
+  -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
+  "$@" \
+  ..
diff --git a/...pts/lc-builds/blueos_nvcc11_clang9.0.0.sh → ...ts/lc-builds/blueos_nvcc11_clang10.0.1.sh b/...pts/lc-builds/blueos_nvcc11_clang9.0.0.sh → ...ts/lc-builds/blueos_nvcc11_clang10.0.1.sh
@@ -12,7 +12,7 @@
 ##       your code
 #
 
-BUILD_SUFFIX=lc_blueos-nvcc11-clang9.0.0
+BUILD_SUFFIX=lc_blueos-nvcc11-clang10.0.1
 RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/nvcc_clang_X.cmake
 
 rm -rf build_${BUILD_SUFFIX} >/dev/null
@@ -22,12 +22,12 @@ module load cmake/3.14.5
 
 cmake \
   -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_CXX_COMPILER=/usr/tce/packages/clang/clang-9.0.0/bin/clang++ \
+  -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-11.0.2 \
-  -DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-11.0.2/bin/nvcc \
+  -DCUDA_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-11.1.0 \
+  -DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-11.1.0/bin/nvcc \
   -DCUDA_ARCH=sm_70 \
   -DCMAKE_CUDA_STANDARD="14" \
   -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \

diff --git a/scripts/lc-builds/blueos_nvcc11_gcc8.3.1.sh b/scripts/lc-builds/blueos_nvcc11_gcc8.3.1.sh
@@ -26,8 +26,8 @@ cmake \
   -C ${RAJA_HOSTCONFIG} \
   -DENABLE_OPENMP=On \
   -DENABLE_CUDA=On \
-  -DCUDA_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-11.0.182 \
-  -DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-11.0.182/bin/nvcc \
+  -DCUDA_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-11.1.0 \
+  -DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-11.1.0/bin/nvcc \
   -DCUDA_ARCH=sm_70 \
   -DCMAKE_CUDA_STANDARD="14" \
   -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \

diff --git a/.../lc-builds/blueos_nvcc11_xl-2020.08.24.sh → .../lc-builds/blueos_nvcc11_xl-2020.09.17.sh b/.../lc-builds/blueos_nvcc11_xl-2020.08.24.sh → .../lc-builds/blueos_nvcc11_xl-2020.09.17.sh
@@ -12,7 +12,7 @@
 ##       your code or RAJA tests
 #
 
-BUILD_SUFFIX=lc_blueos-nvcc11-xl_2020.08.24
+BUILD_SUFFIX=lc_blueos-nvcc11-xl_2020.09.17
 RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/nvcc_xl_X.cmake
 
 rm -rf build_${BUILD_SUFFIX} 2>/dev/null
@@ -22,12 +22,12 @@ module load cmake/3.14.5
 
 cmake \
   -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_CXX_COMPILER=/usr/tce/packages/xl/xl-2020.08.24/bin/xlc++_r \
+  -DCMAKE_CXX_COMPILER=/usr/tce/packages/xl/xl-2020.09.17/bin/xlc++_r \
   -C ${RAJA_HOSTCONFIG} \
   -DENABLE_OPENMP=On \
   -DENABLE_CUDA=On \
-  -DCUDA_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-11.0.2 \
-  -DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-11.0.2/bin/nvcc \
+  -DCUDA_TOOLKIT_ROOT_DIR=/usr/tce/packages/cuda/cuda-11.1.0 \
+  -DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-11.1.0/bin/nvcc \
   -DCUDA_ARCH=sm_70 \
   -DCMAKE_CUDA_STANDARD="14" \
   -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \

diff --git a/scripts/lc-builds/blueos_pgi19.9.sh → scripts/lc-builds/blueos_pgi19.10.sh b/scripts/lc-builds/blueos_pgi19.9.sh → scripts/lc-builds/blueos_pgi19.10.sh
@@ -8,7 +8,7 @@
 # SPDX-License-Identifier: (BSD-3-Clause)
 #################################################################################
 
-BUILD_SUFFIX=lc_blueos-pgi-19.9
+BUILD_SUFFIX=lc_blueos-pgi-19.10
 RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/blueos/pgi_X.cmake
 
 rm -rf build_${BUILD_SUFFIX} 2>/dev/null
@@ -18,8 +18,8 @@ module load cmake/3.14.5
 
 cmake \
   -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_CXX_COMPILER=/usr/tce/packages/pgi/pgi-19.9/bin/pgc++ \
-  -DCMAKE_C_COMPILER=/usr/tce/packages/pgi/pgi-19.9/bin/pgcc \
+  -DCMAKE_CXX_COMPILER=/usr/tce/packages/pgi/pgi-19.10/bin/pgc++ \
+  -DCMAKE_C_COMPILER=/usr/tce/packages/pgi/pgi-19.10/bin/pgcc \
   -C ${RAJA_HOSTCONFIG} \
   -DENABLE_OPENMP=On \
   -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \

diff --git a/scripts/lc-builds/toss3_clang10.0.0.sh → scripts/lc-builds/toss3_clang10.0.1.sh b/scripts/lc-builds/toss3_clang10.0.0.sh → scripts/lc-builds/toss3_clang10.0.1.sh
@@ -7,7 +7,7 @@
 # SPDX-License-Identifier: (BSD-3-Clause)
 ###############################################################################
 
-BUILD_SUFFIX=lc_toss3-clang-10.0.0
+BUILD_SUFFIX=lc_toss3-clang-10.0.1
 RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/toss3/clang_X.cmake
 
 rm -rf build_${BUILD_SUFFIX} 2>/dev/null
@@ -17,7 +17,7 @@ module load cmake/3.14.5
 
 cmake \
   -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_CXX_COMPILER=/usr/tce/packages/clang/clang-10.0.0/bin/clang++ \
+  -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} \

diff --git a/scripts/lc-builds/toss3_pgi19.7.sh → scripts/lc-builds/toss3_pgi20.1.sh b/scripts/lc-builds/toss3_pgi19.7.sh → scripts/lc-builds/toss3_pgi20.1.sh
@@ -8,7 +8,7 @@
 # SPDX-License-Identifier: (BSD-3-Clause)
 #################################################################################
 
-BUILD_SUFFIX=lc_toss3-pgi-19.7
+BUILD_SUFFIX=lc_toss3-pgi-20.1
 RAJA_HOSTCONFIG=../tpl/RAJA/host-configs/lc-builds/toss3/pgi_X.cmake
 
 rm -rf build_${BUILD_SUFFIX} 2>/dev/null
@@ -18,7 +18,8 @@ module load cmake/3.14.5
 
 cmake \
   -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_CXX_COMPILER=/usr/tce/packages/pgi/pgi-19.7/bin/pgc++ \
+  -DCMAKE_CXX_COMPILER=/usr/tce/packages/pgi/pgi-20.1/bin/pgc++ \
+  -DCMAKE_C_COMPILER=/usr/tce/packages/pgi/pgi-20.1/bin/pgcc \
   -C ${RAJA_HOSTCONFIG} \
   -DENABLE_OPENMP=On \
   -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \