From 487b37674f0d0db2a7c1e39ecf564c7850d43f92 Mon Sep 17 00:00:00 2001 From: john bowen Date: Fri, 17 Jan 2025 17:05:11 -0800 Subject: [PATCH] modify blueos scripts --- scripts/lc-builds/blueos_clang.sh | 3 +++ scripts/lc-builds/blueos_clang_omptarget.sh | 3 +++ scripts/lc-builds/blueos_clangcuda.sh | 4 ++++ scripts/lc-builds/blueos_gcc.sh | 3 +++ scripts/lc-builds/blueos_nvcc_clang.sh | 3 +++ scripts/lc-builds/blueos_nvcc_gcc.sh | 3 +++ scripts/lc-builds/blueos_pgi.sh | 3 +++ scripts/lc-builds/blueos_xl.sh | 3 +++ scripts/lc-builds/blueos_xl_omptarget.sh | 3 +++ 9 files changed, 28 insertions(+) diff --git a/scripts/lc-builds/blueos_clang.sh b/scripts/lc-builds/blueos_clang.sh index 269a53ea88..2cf7ec3e77 100755 --- a/scripts/lc-builds/blueos_clang.sh +++ b/scripts/lc-builds/blueos_clang.sh @@ -38,6 +38,9 @@ cmake \ -DBLT_CXX_STD=c++14 \ -C ../host-configs/lc-builds/blueos/clang_X.cmake \ -DENABLE_OPENMP=On \ + -DENABLE_CLANGFORMAT=On \ + -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ + -DCLANGFORMAT_EXECUTABLE=/usr/tce/packages/clang/clang-14.0.4/bin/clang-format \ -DENABLE_BENCHMARKS=On \ -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \ "$@" \ diff --git a/scripts/lc-builds/blueos_clang_omptarget.sh b/scripts/lc-builds/blueos_clang_omptarget.sh index 11cc03be2b..76aa888331 100755 --- a/scripts/lc-builds/blueos_clang_omptarget.sh +++ b/scripts/lc-builds/blueos_clang_omptarget.sh @@ -39,6 +39,9 @@ cmake \ -C ../host-configs/lc-builds/blueos/clang_X.cmake \ -DENABLE_OPENMP=On \ -DENABLE_CUDA=Off \ + -DENABLE_CLANGFORMAT=On \ + -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ + -DCLANGFORMAT_EXECUTABLE=/usr/tce/packages/clang/clang-14.0.4/bin/clang-format \ -DRAJA_ENABLE_TARGET_OPENMP=On \ -DBLT_OPENMP_COMPILE_FLAGS="-fopenmp;-fopenmp-targets=nvptx64-nvidia-cuda" \ -DBLT_OPENMP_LINK_FLAGS="-fopenmp;-fopenmp-targets=nvptx64-nvidia-cuda" \ diff --git a/scripts/lc-builds/blueos_clangcuda.sh b/scripts/lc-builds/blueos_clangcuda.sh index 98d2619546..6f2257404b 100755 --- a/scripts/lc-builds/blueos_clangcuda.sh +++ b/scripts/lc-builds/blueos_clangcuda.sh @@ -47,9 +47,13 @@ cmake \ -C ../host-configs/lc-builds/blueos/clangcuda_X.cmake \ -DENABLE_OPENMP=Off \ -DENABLE_CLANG_CUDA=On \ + -DENABLE_CLANGFORMAT=On \ + -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ + -DCLANGFORMAT_EXECUTABLE=/usr/tce/packages/clang/clang-14.0.4/bin/clang-format \ -DBLT_CLANG_CUDA_ARCH=${CUDA_ARCH} \ -DENABLE_CUDA=On \ -DCUDA_ARCH=${CUDA_ARCH} \ + -DCMAKE_CUDA_ARCHITECTURES=${CUDA_ARCH} \ -DENABLE_BENCHMARKS=On \ -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \ "$@" \ diff --git a/scripts/lc-builds/blueos_gcc.sh b/scripts/lc-builds/blueos_gcc.sh index da215921dc..16a2f46949 100755 --- a/scripts/lc-builds/blueos_gcc.sh +++ b/scripts/lc-builds/blueos_gcc.sh @@ -36,6 +36,9 @@ cmake \ -DBLT_CXX_STD=c++14 \ -C ../host-configs/lc-builds/blueos/gcc_X.cmake \ -DENABLE_OPENMP=On \ + -DENABLE_CLANGFORMAT=On \ + -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ + -DCLANGFORMAT_EXECUTABLE=/usr/tce/packages/clang/clang-14.0.4/bin/clang-format \ -DENABLE_BENCHMARKS=On \ -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \ "$@" \ diff --git a/scripts/lc-builds/blueos_nvcc_clang.sh b/scripts/lc-builds/blueos_nvcc_clang.sh index b9f191363b..75981a8ac8 100755 --- a/scripts/lc-builds/blueos_nvcc_clang.sh +++ b/scripts/lc-builds/blueos_nvcc_clang.sh @@ -49,6 +49,9 @@ cmake \ -DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-${COMP_NVCC_VER}/bin/nvcc \ -DCMAKE_CUDA_ARCHITECTURES=${COMP_ARCH} \ -DENABLE_BENCHMARKS=On \ + -DENABLE_CLANGFORMAT=On \ + -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ + -DCLANGFORMAT_EXECUTABLE=/usr/tce/packages/clang/clang-14.0.4/bin/clang-format \ -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \ "$@" \ .. diff --git a/scripts/lc-builds/blueos_nvcc_gcc.sh b/scripts/lc-builds/blueos_nvcc_gcc.sh index 0d0d6798ce..a4d8d6ba59 100755 --- a/scripts/lc-builds/blueos_nvcc_gcc.sh +++ b/scripts/lc-builds/blueos_nvcc_gcc.sh @@ -48,6 +48,9 @@ cmake \ -DCMAKE_CUDA_COMPILER=/usr/tce/packages/cuda/cuda-${COMP_NVCC_VER}/bin/nvcc \ -DCMAKE_CUDA_ARCHITECTURES=${COMP_ARCH} \ -DENABLE_BENCHMARKS=On \ + -DENABLE_CLANGFORMAT=On \ + -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ + -DCLANGFORMAT_EXECUTABLE=/usr/tce/packages/clang/clang-14.0.4/bin/clang-format \ -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \ "$@" \ .. diff --git a/scripts/lc-builds/blueos_pgi.sh b/scripts/lc-builds/blueos_pgi.sh index dc3e505272..de0fb871a7 100755 --- a/scripts/lc-builds/blueos_pgi.sh +++ b/scripts/lc-builds/blueos_pgi.sh @@ -38,6 +38,9 @@ cmake \ -C ../host-configs/lc-builds/blueos/pgi_X.cmake \ -DENABLE_OPENMP=On \ -DENABLE_BENCHMARKS=On \ + -DENABLE_CLANGFORMAT=On \ + -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ + -DCLANGFORMAT_EXECUTABLE=/usr/tce/packages/clang/clang-14.0.4/bin/clang-format \ -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \ "$@" \ .. diff --git a/scripts/lc-builds/blueos_xl.sh b/scripts/lc-builds/blueos_xl.sh index 25fcd57f89..fc40bd732d 100755 --- a/scripts/lc-builds/blueos_xl.sh +++ b/scripts/lc-builds/blueos_xl.sh @@ -37,6 +37,9 @@ cmake \ -C ../host-configs/lc-builds/blueos/xl_X.cmake \ -DENABLE_OPENMP=On \ -DENABLE_BENCHMARKS=On \ + -DENABLE_CLANGFORMAT=On \ + -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ + -DCLANGFORMAT_EXECUTABLE=/usr/tce/packages/clang/clang-14.0.4/bin/clang-format \ -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \ "$@" \ .. diff --git a/scripts/lc-builds/blueos_xl_omptarget.sh b/scripts/lc-builds/blueos_xl_omptarget.sh index b34648c3ba..7d813ed48e 100755 --- a/scripts/lc-builds/blueos_xl_omptarget.sh +++ b/scripts/lc-builds/blueos_xl_omptarget.sh @@ -40,6 +40,9 @@ cmake \ -DBLT_OPENMP_COMPILE_FLAGS="-qoffload;-qsmp=omp;-qalias=noansi" \ -DBLT_OPENMP_LINK_FLAGS="-qoffload;-qsmp=omp;-qalias=noansi" \ -DENABLE_BENCHMARKS=On \ + -DENABLE_CLANGFORMAT=On \ + -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ + -DCLANGFORMAT_EXECUTABLE=/usr/tce/packages/clang/clang-14.0.4/bin/clang-format \ -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \ "$@" \ ..