Skip to content

Commit

Permalink
Merge pull request #18 from LLNL/task/rhornung67/submodule_update
Browse files Browse the repository at this point in the history
Update submodules and fix build scripts for release tarball...
  • Loading branch information
rhornung67 authored Jan 12, 2018
2 parents 03b8754 + 2fc6027 commit e824ad2
Show file tree
Hide file tree
Showing 42 changed files with 123 additions and 122 deletions.
6 changes: 3 additions & 3 deletions scripts/bgqos_clang4.0.0.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ rm -rf build_bgqos-clang-4.0.0 2>/dev/null
mkdir build_bgqos-clang-4.0.0 && cd build_bgqos-clang-4.0.0
. /usr/local/tools/dotkit/init.sh && use cmake-3.4.3

PERFSUITE_DIR=$(git rev-parse --show-toplevel)
TOP_DIR=../

cmake \
-DCMAKE_BUILD_TYPE=Release \
-C ${PERFSUITE_DIR}/host-configs/bgqos/clang_4_0_0.cmake \
-C ${TOP_DIR}/host-configs/bgqos/clang_4_0_0.cmake \
-DENABLE_OPENMP=On \
-DPERFSUITE_ENABLE_WARNINGS=Off \
-DENABLE_ALL_WARNINGS=Off \
-DCMAKE_INSTALL_PREFIX=../install_bgqos_clang-4.0.0 \
"$@" \
${PERFSUITE_DIR}
${TOP_DIR}
6 changes: 3 additions & 3 deletions scripts/bgqos_gcc4.7.2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ rm -rf build-bgqos_gcc-4.7.2 2>/dev/null
mkdir build-bgqos_gcc-4.7.2 && cd build-bgqos_gcc-4.7.2
. /usr/local/tools/dotkit/init.sh && use cmake-3.4.3

PERFSUITE_DIR=$(git rev-parse --show-toplevel)
TOP_DIR=../

cmake \
-DCMAKE_BUILD_TYPE=Release \
-C ${PERFSUITE_DIR}/host-configs/bgqos/gcc_4_7_2.cmake \
-C ${TOP_DIR}/host-configs/bgqos/gcc_4_7_2.cmake \
-DENABLE_OPENMP=On \
-DPERFSUITE_ENABLE_WARNINGS=Off \
-DENABLE_ALL_WARNINGS=Off \
-DCMAKE_INSTALL_PREFIX=../install-bgqos_gcc-4.7.2 \
"$@" \
${PERFSUITE_DIR}
${TOP_DIR}
6 changes: 3 additions & 3 deletions scripts/blueos_clang-coral-2017.06.29.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ mkdir build_blueos-clang-coral-2017.06.29 && cd build_blueos-clang-coral-2017.06

module load cmake/3.7.2

PERFSUITE_DIR=$(git rev-parse --show-toplevel)
TOP_DIR=../

cmake \
-DCMAKE_BUILD_TYPE=Release \
-C ${PERFSUITE_DIR}/host-configs/blueos/clang_coral_2017_06_29.cmake \
-C ${TOP_DIR}/host-configs/blueos/clang_coral_2017_06_29.cmake \
-DENABLE_OPENMP=On \
-DPERFSUITE_ENABLE_WARNINGS=Off \
-DENABLE_ALL_WARNINGS=Off \
-DCMAKE_INSTALL_PREFIX=../install_blueos-clang-coral-2017.06.29 \
"$@" \
${PERFSUITE_DIR}
${TOP_DIR}
6 changes: 3 additions & 3 deletions scripts/blueos_clang-coral-2017.08.31.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ mkdir build_blueos-clang-coral-2017.08.31 && cd build_blueos-clang-coral-2017.08

module load cmake/3.7.2

PERFSUITE_DIR=$(git rev-parse --show-toplevel)
TOP_DIR=../

cmake \
-DCMAKE_BUILD_TYPE=Release \
-C ${PERFSUITE_DIR}/host-configs/blueos/clang_coral_2017_08_31.cmake \
-C ${TOP_DIR}/host-configs/blueos/clang_coral_2017_08_31.cmake \
-DENABLE_OPENMP=On \
-DPERFSUITE_ENABLE_WARNINGS=Off \
-DENABLE_ALL_WARNINGS=Off \
-DCMAKE_INSTALL_PREFIX=../install_blueos-clang-coral-2017.08.31 \
"$@" \
${PERFSUITE_DIR}
${TOP_DIR}
6 changes: 3 additions & 3 deletions scripts/blueos_clang-coral-2017.09.18.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ mkdir build_blueos-clang-coral-2017.09.18 && cd build_blueos-clang-coral-2017.09

module load cmake/3.7.2

PERFSUITE_DIR=$(git rev-parse --show-toplevel)
TOP_DIR=../

cmake \
-DCMAKE_BUILD_TYPE=Release \
-C ${PERFSUITE_DIR}/host-configs/blueos/clang_coral_2017_09_18.cmake \
-C ${TOP_DIR}/host-configs/blueos/clang_coral_2017_09_18.cmake \
-DENABLE_OPENMP=On \
-DPERFSUITE_ENABLE_WARNINGS=Off \
-DENABLE_ALL_WARNINGS=Off \
-DCMAKE_INSTALL_PREFIX=../install_blueos-clang-coral-2017.09.18 \
"$@" \
${PERFSUITE_DIR}
${TOP_DIR}
6 changes: 3 additions & 3 deletions scripts/blueos_clang-coral-2017.10.13_omptarget-nvcc8.0.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ mkdir build_blueos_clang-coral-2017.10.13_omptarget-nvcc8.0 && cd build_blueos_c

module load cmake/3.9.2

PERFSUITE_DIR=$(git rev-parse --show-toplevel)
TOP_DIR=../

cmake \
-DCMAKE_BUILD_TYPE=Release \
-C ${PERFSUITE_DIR}/host-configs/blueos/clang_coral_2017_10_13.cmake \
-C ${TOP_DIR}/host-configs/blueos/clang_coral_2017_10_13.cmake \
-DENABLE_OPENMP=On \
-DENABLE_CUDA=Off \
-DENABLE_TARGET_OPENMP=On \
Expand All @@ -33,4 +33,4 @@ cmake \
-DENABLE_ALL_WARNINGS=Off \
-DCMAKE_INSTALL_PREFIX=../install_blueos_clang-coral-2017.10.13_omptarget-nvcc8.0 \
"$@" \
${PERFSUITE_DIR}
${TOP_DIR}
6 changes: 3 additions & 3 deletions scripts/blueos_clang-coral-2017.10.13_omptarget-nvcc9.0.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ mkdir build_blueos_clang-coral-2017.10.13_omptarget-nvcc9.0 && cd build_blueos_c

module load cmake/3.9.2

PERFSUITE_DIR=$(git rev-parse --show-toplevel)
TOP_DIR=../

cmake \
-DCMAKE_BUILD_TYPE=Release \
-C ${PERFSUITE_DIR}/host-configs/blueos/clang_coral_2017_10_13.cmake \
-C ${TOP_DIR}/host-configs/blueos/clang_coral_2017_10_13.cmake \
-DENABLE_OPENMP=On \
-DENABLE_CUDA=Off \
-DENABLE_TARGET_OPENMP=On \
Expand All @@ -33,4 +33,4 @@ cmake \
-DENABLE_ALL_WARNINGS=Off \
-DCMAKE_INSTALL_PREFIX=../install_blueos_clang-coral-2017.10.13_omptarget-nvcc9.0 \
"$@" \
${PERFSUITE_DIR}
${TOP_DIR}
6 changes: 3 additions & 3 deletions scripts/blueos_clang3.9.1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ mkdir build_blueos-clang-3.9.1 && cd build_blueos-clang-3.9.1

module load cmake/3.7.2

PERFSUITE_DIR=$(git rev-parse --show-toplevel)
TOP_DIR=../

cmake \
-DCMAKE_BUILD_TYPE=Release \
-C ${PERFSUITE_DIR}/host-configs/blueos/clang_3_9_1.cmake \
-C ${TOP_DIR}/host-configs/blueos/clang_3_9_1.cmake \
-DENABLE_OPENMP=On \
-DPERFSUITE_ENABLE_WARNINGS=Off \
-DENABLE_ALL_WARNINGS=Off \
-DCMAKE_INSTALL_PREFIX=../install_blueos-clang-3.9.1 \
"$@" \
${PERFSUITE_DIR}
${TOP_DIR}
6 changes: 3 additions & 3 deletions scripts/blueos_clang4.0.0.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ mkdir build_blueos-clang-4.0.0 && cd build_blueos-clang-4.0.0

module load cmake/3.7.2

PERFSUITE_DIR=$(git rev-parse --show-toplevel)
TOP_DIR=../

cmake \
-DCMAKE_BUILD_TYPE=Release \
-C ${PERFSUITE_DIR}/host-configs/blueos/clang_4_0_0.cmake \
-C ${TOP_DIR}/host-configs/blueos/clang_4_0_0.cmake \
-DENABLE_OPENMP=On \
-DPERFSUITE_ENABLE_WARNINGS=Off \
-DENABLE_ALL_WARNINGS=Off \
-DCMAKE_INSTALL_PREFIX=../install_blueos-clang-4.0.0 \
"$@" \
${PERFSUITE_DIR}
${TOP_DIR}
6 changes: 3 additions & 3 deletions scripts/blueos_gcc4.9.3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ mkdir build_blueos-gcc-4.9.3 && cd build_blueos-gcc-4.9.3

module load cmake/3.7.2

PERFSUITE_DIR=$(git rev-parse --show-toplevel)
TOP_DIR=../

cmake \
-DCMAKE_BUILD_TYPE=Release \
-C ${PERFSUITE_DIR}/host-configs/blueos/gcc_4_9_3.cmake \
-C ${TOP_DIR}/host-configs/blueos/gcc_4_9_3.cmake \
-DENABLE_OPENMP=On \
-DPERFSUITE_ENABLE_WARNINGS=Off \
-DENABLE_ALL_WARNINGS=Off \
-DCMAKE_INSTALL_PREFIX=../install_blueos-gcc-4.9.3 \
"$@" \
${PERFSUITE_DIR}
${TOP_DIR}
6 changes: 3 additions & 3 deletions scripts/blueos_nvcc8.0_clang-coral-2017.06.29.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ mkdir build_blueos_nvcc8.0_clang-coral-2017.06.29 && cd build_blueos_nvcc8.0_cla

module load cmake/3.7.2

PERFSUITE_DIR=$(git rev-parse --show-toplevel)
TOP_DIR=../

cmake \
-DCMAKE_BUILD_TYPE=Release \
-C ${PERFSUITE_DIR}/host-configs/blueos/nvcc_clang_coral_2017_06_29.cmake \
-C ${TOP_DIR}/host-configs/blueos/nvcc_clang_coral_2017_06_29.cmake \
-DENABLE_OPENMP=On \
-DENABLE_CUDA=On \
-DCUDA_TOOLKIT_ROOT_DIR=/usr/tcetmp/packages/cuda-8.0 \
-DPERFSUITE_ENABLE_WARNINGS=Off \
-DENABLE_ALL_WARNINGS=Off \
-DCMAKE_INSTALL_PREFIX=../install_blueos_nvcc8.0_clang-coral-2017.06.29 \
"$@" \
${PERFSUITE_DIR}
${TOP_DIR}
6 changes: 3 additions & 3 deletions scripts/blueos_nvcc8.0_clang-coral-2017.08.31.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ mkdir build_blueos_nvcc8.0_clang-coral-2017.08.31 && cd build_blueos_nvcc8.0_cla

module load cmake/3.7.2

PERFSUITE_DIR=$(git rev-parse --show-toplevel)
TOP_DIR=../

cmake \
-DCMAKE_BUILD_TYPE=Release \
-C ${PERFSUITE_DIR}/host-configs/blueos/nvcc_clang_coral_2017_08_31.cmake \
-C ${TOP_DIR}/host-configs/blueos/nvcc_clang_coral_2017_08_31.cmake \
-DENABLE_OPENMP=On \
-DENABLE_CUDA=On \
-DCUDA_TOOLKIT_ROOT_DIR=/usr/tcetmp/packages/cuda-8.0 \
-DPERFSUITE_ENABLE_WARNINGS=Off \
-DENABLE_ALL_WARNINGS=Off \
-DCMAKE_INSTALL_PREFIX=../install_blueos_nvcc8.0_clang-coral-2017.08.31 \
"$@" \
${PERFSUITE_DIR}
${TOP_DIR}
6 changes: 3 additions & 3 deletions scripts/blueos_nvcc8.0_clang-coral-2017.09.18.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ mkdir build_blueos_nvcc8.0_clang-coral-2017.09.18 && cd build_blueos_nvcc8.0_cla

module load cmake/3.7.2

PERFSUITE_DIR=$(git rev-parse --show-toplevel)
TOP_DIR=../

cmake \
-DCMAKE_BUILD_TYPE=Release \
-C ${PERFSUITE_DIR}/host-configs/blueos/nvcc_clang_coral_2017_09_18.cmake \
-C ${TOP_DIR}/host-configs/blueos/nvcc_clang_coral_2017_09_18.cmake \
-DENABLE_OPENMP=On \
-DENABLE_CUDA=On \
-DCUDA_TOOLKIT_ROOT_DIR=/usr/tcetmp/packages/cuda-8.0 \
-DPERFSUITE_ENABLE_WARNINGS=Off \
-DENABLE_ALL_WARNINGS=Off \
-DCMAKE_INSTALL_PREFIX=../install_blueos_nvcc8.0_clang-coral-2017.09.18 \
"$@" \
${PERFSUITE_DIR}
${TOP_DIR}
6 changes: 3 additions & 3 deletions scripts/blueos_nvcc8.0_gcc4.9.3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ mkdir build_blueos_nvcc8.0_gcc4.9.3 && cd build_blueos_nvcc8.0_gcc4.9.3

module load cmake/3.7.2

PERFSUITE_DIR=$(git rev-parse --show-toplevel)
TOP_DIR=../

cmake \
-DCMAKE_BUILD_TYPE=Release \
-C ${PERFSUITE_DIR}/host-configs/blueos/nvcc_gcc_4_9_3.cmake \
-C ${TOP_DIR}/host-configs/blueos/nvcc_gcc_4_9_3.cmake \
-DENABLE_OPENMP=On \
-DENABLE_CUDA=On \
-DCUDA_TOOLKIT_ROOT_DIR=/usr/tcetmp/packages/cuda-8.0 \
-DPERFSUITE_ENABLE_WARNINGS=Off \
-DENABLE_ALL_WARNINGS=Off \
-DCMAKE_INSTALL_PREFIX=../install_blueos_nvcc8.0_gcc4.9.3 \
"$@" \
${PERFSUITE_DIR}
${TOP_DIR}
6 changes: 3 additions & 3 deletions scripts/blueos_nvcc9.0_clang-coral-2017.08.31.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ mkdir build_blueos_nvcc9.0_clang-coral-2017.08.31 && cd build_blueos_nvcc9.0_cla

module load cmake/3.7.2

PERFSUITE_DIR=$(git rev-parse --show-toplevel)
TOP_DIR=../

cmake \
-DCMAKE_BUILD_TYPE=Release \
-C ${PERFSUITE_DIR}/host-configs/blueos/nvcc_clang_coral_2017_08_31.cmake \
-C ${TOP_DIR}/host-configs/blueos/nvcc_clang_coral_2017_08_31.cmake \
-DENABLE_OPENMP=On \
-DENABLE_CUDA=On \
-DCUDA_TOOLKIT_ROOT_DIR=/usr/tcetmp/packages/cuda-9.0.176 \
-DPERFSUITE_ENABLE_WARNINGS=Off \
-DENABLE_ALL_WARNINGS=Off \
-DCMAKE_INSTALL_PREFIX=../install_blueos_nvcc9.0_clang-coral-2017.08.31 \
"$@" \
${PERFSUITE_DIR}
${TOP_DIR}
6 changes: 3 additions & 3 deletions scripts/blueos_nvcc9.0_clang-coral-2017.09.18.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ mkdir build_blueos_nvcc9.0_clang-coral-2017.09.18 && cd build_blueos_nvcc9.0_cla

module load cmake/3.7.2

PERFSUITE_DIR=$(git rev-parse --show-toplevel)
TOP_DIR=../

cmake \
-DCMAKE_BUILD_TYPE=Release \
-C ${PERFSUITE_DIR}/host-configs/blueos/nvcc_clang_coral_2017_09_18.cmake \
-C ${TOP_DIR}/host-configs/blueos/nvcc_clang_coral_2017_09_18.cmake \
-DENABLE_OPENMP=On \
-DENABLE_CUDA=On \
-DCUDA_TOOLKIT_ROOT_DIR=/usr/tcetmp/packages/cuda-9.0.176 \
-DPERFSUITE_ENABLE_WARNINGS=Off \
-DENABLE_ALL_WARNINGS=Off \
-DCMAKE_INSTALL_PREFIX=../install_blueos_nvcc9.0_clang-coral-2017.09.18 \
"$@" \
${PERFSUITE_DIR}
${TOP_DIR}
6 changes: 3 additions & 3 deletions scripts/blueos_nvcc9.0_clang-coral-2017.10.13.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ mkdir build_blueos_nvcc9.0_clang-coral-2017.10.13 && cd build_blueos_nvcc9.0_cla

module load cmake/3.7.2

PERFSUITE_DIR=$(git rev-parse --show-toplevel)
TOP_DIR=../

cmake \
-DCMAKE_BUILD_TYPE=Release \
-C ${PERFSUITE_DIR}/host-configs/blueos/nvcc_clang_coral_2017_10_13.cmake \
-C ${TOP_DIR}/host-configs/blueos/nvcc_clang_coral_2017_10_13.cmake \
-DENABLE_OPENMP=On \
-DENABLE_CUDA=On \
-DCUDA_TOOLKIT_ROOT_DIR=/usr/tcetmp/packages/cuda-9.0.176 \
-DPERFSUITE_ENABLE_WARNINGS=Off \
-DENABLE_ALL_WARNINGS=Off \
-DCMAKE_INSTALL_PREFIX=../install_blueos_nvcc9.0_clang-coral-2017.10.13 \
"$@" \
${PERFSUITE_DIR}
${TOP_DIR}
6 changes: 3 additions & 3 deletions scripts/blueos_nvcc9.0_clang-coral-2017.11.03.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ mkdir build_blueos_nvcc9.0_clang-coral-2017.11.03 && cd build_blueos_nvcc9.0_cla

module load cmake/3.7.2

PERFSUITE_DIR=$(git rev-parse --show-toplevel)
TOP_DIR=../

cmake \
-DCMAKE_BUILD_TYPE=Release \
-C ${PERFSUITE_DIR}/host-configs/blueos/nvcc_clang_coral_2017_11_03.cmake \
-C ${TOP_DIR}/host-configs/blueos/nvcc_clang_coral_2017_11_03.cmake \
-DENABLE_OPENMP=On \
-DENABLE_CUDA=On \
-DCUDA_TOOLKIT_ROOT_DIR=/usr/tcetmp/packages/cuda-9.0.176 \
-DPERFSUITE_ENABLE_WARNINGS=Off \
-DENABLE_ALL_WARNINGS=Off \
-DCMAKE_INSTALL_PREFIX=../install_blueos_nvcc9.0_clang-coral-2017.11.03 \
"$@" \
${PERFSUITE_DIR}
${TOP_DIR}
6 changes: 3 additions & 3 deletions scripts/blueos_nvcc9.0_gcc4.9.3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ mkdir build_blueos_nvcc9.0_gcc4.9.3 && cd build_blueos_nvcc9.0_gcc4.9.3

module load cmake/3.7.2

PERFSUITE_DIR=$(git rev-parse --show-toplevel)
TOP_DIR=../

cmake \
-DCMAKE_BUILD_TYPE=Release \
-C ${PERFSUITE_DIR}/host-configs/blueos/nvcc_gcc_4_9_3.cmake \
-C ${TOP_DIR}/host-configs/blueos/nvcc_gcc_4_9_3.cmake \
-DENABLE_OPENMP=On \
-DENABLE_CUDA=On \
-DCUDA_TOOLKIT_ROOT_DIR=/usr/tcetmp/packages/cuda-9.0.176 \
-DPERFSUITE_ENABLE_WARNINGS=Off \
-DENABLE_ALL_WARNINGS=Off \
-DCMAKE_INSTALL_PREFIX=../install_blueos_nvcc9.0_gcc4.9.3 \
"$@" \
${PERFSUITE_DIR}
${TOP_DIR}
6 changes: 3 additions & 3 deletions scripts/blueos_nvcc9.0_xl-beta-2017.09.13.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ mkdir build_blueos_nvcc9.0_xl-beta-2017.09.13 && cd build_blueos_nvcc9.0_xl-beta

module load cmake/3.7.2

PERFSUITE_DIR=$(git rev-parse --show-toplevel)
TOP_DIR=../

cmake \
-DCMAKE_BUILD_TYPE=Release \
-C ${PERFSUITE_DIR}/host-configs/blueos/nvcc_xl-beta-2017.09.13.cmake \
-C ${TOP_DIR}/host-configs/blueos/nvcc_xl-beta-2017.09.13.cmake \
-DENABLE_OPENMP=On \
-DENABLE_CUDA=On \
-DCUDA_TOOLKIT_ROOT_DIR=/usr/tcetmp/packages/cuda-9.0.176 \
-DPERFSUITE_ENABLE_WARNINGS=Off \
-DENABLE_ALL_WARNINGS=Off \
-DCMAKE_INSTALL_PREFIX=../install_blueos_nvcc9.0_xl-beta-2017.09.13 \
"$@" \
${PERFSUITE_DIR}
${TOP_DIR}
Loading

0 comments on commit e824ad2

Please sign in to comment.