Skip to content

Commit 6319ae7

Browse files
corbett5corbett5
committed
Host config changes
1 parent 485b822 commit 6319ae7

19 files changed

+91
-437
lines changed

‎host-configs/LLNL/lassen-base.cmake‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Set up the tpls
2+
set(GEOSX_TPL_ROOT_DIR /usr/gapps/GEOSX/thirdPartyLibs CACHE PATH "")
3+
set(GEOSX_TPL_DIR ${GEOSX_TPL_ROOT_DIR}/2020-10-08/install-${CONFIG_NAME}-release CACHE PATH "")
4+
5+
set(RAJA_DIR ${GEOSX_TPL_DIR}/raja CACHE PATH "")
6+
7+
set(ENABLE_UMPIRE ON CACHE BOOL "")
8+
set(UMPIRE_DIR ${GEOSX_TPL_DIR}/chai CACHE PATH "")
9+
10+
set(ENABLE_CHAI ON CACHE BOOL "")
11+
set(CHAI_DIR ${GEOSX_TPL_DIR}/chai CACHE PATH "")
12+
13+
set(ENABLE_CALIPER ON CACHE BOOL "")
14+
set(CALIPER_DIR ${GEOSX_TPL_DIR}/caliper CACHE PATH "")
15+
16+
set(ENABLE_ADDR2LINE ON CACHE BOOL "")
17+
18+
# Cuda options
19+
set(ENABLE_CUDA ON CACHE BOOL "")
20+
set(CUDA_TOOLKIT_ROOT_DIR /usr/tce/packages/cuda/cuda-10.1.243 CACHE STRING "")
21+
set(CMAKE_CUDA_HOST_COMPILER ${CMAKE_CXX_COMPILER} CACHE STRING "")
22+
set(CMAKE_CUDA_COMPILER ${CUDA_TOOLKIT_ROOT_DIR}/bin/nvcc CACHE STRING "")
23+
set(CUDA_ARCH sm_70 CACHE STRING "")
24+
set(CMAKE_CUDA_STANDARD 14 CACHE STRING "")
25+
set(CMAKE_CUDA_FLAGS "-restrict -arch ${CUDA_ARCH} --expt-extended-lambda -Werror cross-execution-space-call,reorder,deprecated-declarations" CACHE STRING "")
26+
set(CMAKE_CUDA_FLAGS_RELEASE "-O3 -DNDEBUG -Xcompiler -DNDEBUG -Xcompiler -O3 -Xcompiler -mcpu=powerpc64le -Xcompiler -mtune=powerpc64le" CACHE STRING "")
27+
set(CMAKE_CUDA_FLAGS_RELWITHDEBINFO "-g -lineinfo ${CMAKE_CUDA_FLAGS_RELEASE}" CACHE STRING "")
28+
set(CMAKE_CUDA_FLAGS_DEBUG "-g -G -O0 -Xcompiler -O0" CACHE STRING "")
29+
30+
# Uncomment this line to make nvcc output register usage for each kernel.
31+
# set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --resource-usage" CACHE STRING "" FORCE)
32+
33+
# GTEST options
34+
set(ENABLE_GTEST_DEATH_TESTS OFF CACHE BOOL "")
35+
set(gtest_disable_pthreads ON CACHE BOOL "")
36+
37+
# Documentation
38+
set(ENABLE_UNCRUSTIFY OFF CACHE BOOL "")
39+
set(ENABLE_DOXYGEN OFF CACHE BOOL "")

‎host-configs/LLNL/[email protected]‎

Lines changed: 4 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,12 @@
11
set(CONFIG_NAME "lassen-clang@upstream" CACHE PATH "")
22

3-
# Set up the tpls
4-
set(GEOSX_TPL_ROOT_DIR /usr/gapps/GEOSX/thirdPartyLibs CACHE PATH "")
5-
set(GEOSX_TPL_DIR ${GEOSX_TPL_ROOT_DIR}/2020-09-18/install-${CONFIG_NAME}-release CACHE PATH "")
6-
7-
set(ENABLE_UMPIRE ON CACHE BOOL "")
8-
set(ENABLE_CHAI ON CACHE BOOL "")
9-
set(USE_ADDR2LINE ON CACHE BOOL "")
10-
11-
# C options
12-
set(CMAKE_C_COMPILER /usr/tce/packages/clang/clang-upstream-2019.03.26/bin/clang CACHE PATH "")
13-
set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG -mcpu=powerpc64le -mtune=powerpc64le" CACHE STRING "")
14-
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g ${CMAKE_C_FLAGS_RELEASE}" CACHE STRING "")
15-
set(CMAKE_C_FLAGS_DEBUG "-O0 -g" CACHE STRING "")
3+
set(COMPILER_DIR /usr/tce/packages/clang/clang-upstream-2019.03.26 )
4+
set(CMAKE_C_COMPILER ${COMPILER_DIR}/bin/clang CACHE PATH "")
5+
set(CMAKE_CXX_COMPILER ${COMPILER_DIR}/bin/clang++ CACHE PATH "")
166

177
# C++ options
18-
set(CMAKE_CXX_COMPILER /usr/tce/packages/clang/clang-upstream-2019.03.26/bin/clang++ CACHE PATH "")
198
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -mcpu=powerpc64le -mtune=powerpc64le" CACHE STRING "")
209
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g ${CMAKE_CXX_FLAGS_RELEASE}" CACHE STRING "")
2110
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING "")
22-
set(CMAKE_CXX_STANDARD 14 CACHE STRING "")
23-
24-
# Fortran options
25-
set(CMAKE_Fortran_COMPILER /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf_r CACHE PATH "")
26-
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -qarch=pwr9 -qtune=pwr9" CACHE STRING "")
27-
set(FORTRAN_MANGLE_NO_UNDERSCORE ON CACHE BOOL "")
28-
29-
# OpenMP options
30-
set(ENABLE_OPENMP ON CACHE BOOL "" FORCE)
31-
set(OpenMP_Fortran_FLAGS "-qsmp=omp" CACHE STRING "")
32-
set(OpenMP_Fortran_LIB_NAMES "" CACHE STRING "")
33-
34-
# MPI options
35-
set(ENABLE_MPI ON CACHE BOOL "")
36-
set(MPI_ROOT /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-upstream-2019.03.26 CACHE PATH "")
37-
set(MPI_C_COMPILER ${MPI_ROOT}/bin/mpicc CACHE PATH "")
38-
set(MPI_CXX_COMPILER ${MPI_ROOT}/bin/mpicxx CACHE PATH "")
39-
set(MPI_Fortran_COMPILER /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-beta-2019.06.20/bin/mpifort CACHE PATH "")
40-
set(MPIEXEC lrun CACHE STRING "")
41-
set(MPIEXEC_NUMPROC_FLAG -n CACHE STRING "")
42-
set(ENABLE_WRAP_ALL_TESTS_WITH_MPIEXEC ON CACHE BOOL "")
43-
44-
# Cuda options
45-
set(ENABLE_CUDA ON CACHE BOOL "")
46-
set(CUDA_TOOLKIT_ROOT_DIR /usr/tce/packages/cuda/cuda-10.1.243 CACHE STRING "")
47-
set(CMAKE_CUDA_HOST_COMPILER ${MPI_CXX_COMPILER} CACHE STRING "")
48-
set(CMAKE_CUDA_COMPILER ${CUDA_TOOLKIT_ROOT_DIR}/bin/nvcc CACHE STRING "")
49-
set(CUDA_ARCH sm_70 CACHE STRING "")
50-
set(CMAKE_CUDA_STANDARD 14 CACHE STRING "")
51-
set(CMAKE_CUDA_FLAGS "-restrict -arch ${CUDA_ARCH} --expt-extended-lambda -Werror cross-execution-space-call,reorder,deprecated-declarations" CACHE STRING "")
52-
set(CMAKE_CUDA_FLAGS_RELEASE "-O3 -DNDEBUG -Xcompiler -DNDEBUG -Xcompiler -O3 -Xcompiler -mcpu=powerpc64le -Xcompiler -mtune=powerpc64le" CACHE STRING "")
53-
set(CMAKE_CUDA_FLAGS_RELWITHDEBINFO "-g -lineinfo ${CMAKE_CUDA_FLAGS_RELEASE}" CACHE STRING "")
54-
set(CMAKE_CUDA_FLAGS_DEBUG "-g -G -O0 -Xcompiler -O0" CACHE STRING "")
55-
56-
# Uncomment this line to make nvcc output register usage for each kernel.
57-
#set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --resource-usage" CACHE STRING "" FORCE)
5811

59-
# GTEST options
60-
set(ENABLE_GTEST_DEATH_TESTS OFF CACHE BOOL "")
61-
set(gtest_disable_pthreads ON CACHE BOOL "")
12+
include(${CMAKE_CURRENT_LIST_DIR}/lassen-base.cmake)

‎host-configs/LLNL/[email protected]‎

Lines changed: 7 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,12 @@
11
set(CONFIG_NAME "[email protected]" CACHE PATH "")
22

3-
# Set up the tpls
4-
# These were probably built with clang (no guarantee that they would work)
5-
set(GEOSX_TPL_ROOT_DIR /usr/gapps/GEOSX/thirdPartyLibs CACHE PATH "")
6-
set(GEOSX_TPL_DIR ${GEOSX_TPL_ROOT_DIR}/2020-09-18/install-${CONFIG_NAME}-release CACHE PATH "")
3+
set(COMPILER_DIR /usr/tce/packages/gcc/gcc-8.3.1)
4+
set(CMAKE_C_COMPILER ${COMPILER_DIR}/bin/gcc CACHE PATH "")
5+
set(CMAKE_CXX_COMPILER ${COMPILER_DIR}/bin/g++ CACHE PATH "")
76

8-
set(ENABLE_UMPIRE ON CACHE BOOL "")
9-
set(ENABLE_CHAI ON CACHE BOOL "")
10-
set(USE_ADDR2LINE ON CACHE BOOL "")
11-
12-
set(CMAKE_C_COMPILER /usr/tce/packages/gcc/gcc-8.3.1/bin/gcc CACHE PATH "")
13-
set(CMAKE_CXX_COMPILER /usr/tce/packages/gcc/gcc-8.3.1/bin/g++ CACHE PATH "")
14-
set(CMAKE_Fortran_COMPILER /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran CACHE PATH "")
15-
16-
set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG -mcpu=power9 -mtune=power9" CACHE STRING "")
7+
# C++ options
178
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -mcpu=power9 -mtune=power9" CACHE STRING "")
18-
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -mcpu=power9 -mtune=power9" CACHE STRING "")
19-
set(FORTRAN_MANGLE_NO_UNDERSCORE OFF CACHE BOOL "")
20-
21-
# OpenMP options
22-
set(ENABLE_OPENMP ON CACHE BOOL "" FORCE)
23-
24-
# MPI options
25-
set(ENABLE_MPI ON CACHE BOOL "")
26-
27-
set(MPI_ROOT /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1 CACHE PATH "")
28-
29-
set(MPI_C_COMPILER ${MPI_ROOT}/bin/mpicc CACHE PATH "")
30-
set(MPI_CXX_COMPILER ${MPI_ROOT}/bin/mpicxx CACHE PATH "")
31-
set(MPI_Fortran_COMPILER ${MPI_ROOT}/bin/mpifort CACHE PATH "")
32-
set(MPIEXEC lrun CACHE STRING "")
33-
set(MPIEXEC_NUMPROC_FLAG -n CACHE STRING "")
34-
set(ENABLE_WRAP_ALL_TESTS_WITH_MPIEXEC ON CACHE BOOL "")
35-
36-
# Cuda options
37-
set(ENABLE_CUDA ON CACHE BOOL "")
38-
set(CUDA_TOOLKIT_ROOT_DIR /usr/tce/packages/cuda/cuda-10.1.243 CACHE STRING "")
39-
set(CMAKE_CUDA_HOST_COMPILER ${MPI_CXX_COMPILER} CACHE STRING "")
40-
set(CMAKE_CUDA_COMPILER ${CUDA_TOOLKIT_ROOT_DIR}/bin/nvcc CACHE STRING "")
41-
set(CUDA_ARCH sm_70 CACHE STRING "")
42-
set(CMAKE_CUDA_STANDARD 14 CACHE STRING "")
43-
set(CMAKE_CUDA_FLAGS "-restrict -arch ${CUDA_ARCH} -Xcompiler -mno-float128 --expt-extended-lambda -Werror cross-execution-space-call,reorder,deprecated-declarations" CACHE STRING "")
44-
set(CMAKE_CUDA_FLAGS_RELEASE "-O3 -DNDEBUG -Xcompiler -DNDEBUG -Xcompiler -O3 -Xcompiler -mcpu=powerpc64le -Xcompiler -mtune=powerpc64le" CACHE STRING "")
45-
set(CMAKE_CUDA_FLAGS_RELWITHDEBINFO "-g -lineinfo ${CMAKE_CUDA_FLAGS_RELEASE}" CACHE STRING "")
46-
set(CMAKE_CUDA_FLAGS_DEBUG "-g -G -O0 -Xcompiler -O0" CACHE STRING "")
47-
48-
# Uncomment this line to make nvcc output register usage for each kernel.
49-
# set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --resource-usage" CACHE STRING "" FORCE)
9+
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g ${CMAKE_CXX_FLAGS_RELEASE}" CACHE STRING "")
10+
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING "")
5011

51-
# GTEST options
52-
set(ENABLE_GTEST_DEATH_TESTS OFF CACHE BOOL "")
53-
set(gtest_disable_pthreads ON CACHE BOOL "")
12+
include(${CMAKE_CURRENT_LIST_DIR}/lassen-base.cmake)

‎host-configs/LLNL/[email protected]‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎host-configs/LLNL/quartz-base.cmake‎

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,26 @@
1-
###############################################################################
2-
#
3-
# Base configuration for LC builds
4-
# Calling configuration file must define the following CMAKE variables:
5-
#
6-
# CONFIG_NAME
7-
# CMAKE_C_COMPILER
8-
# CMAKE_CXX_COMPILER
9-
# CMAKE_Fortran_COMPILER
10-
# MPI_HOME
11-
#
12-
#
13-
###############################################################################
14-
151
set(ENABLE_FORTRAN OFF CACHE BOOL "")
16-
set(ENABLE_MPI ON CACHE BOOL "")
17-
18-
set(MPI_C_COMPILER ${MPI_HOME}/bin/mpicc CACHE PATH "")
19-
set(MPI_CXX_COMPILER ${MPI_HOME}/bin/mpicxx CACHE PATH "")
20-
set(MPI_Fortran_COMPILER ${MPI_HOME}/bin/mpifort CACHE PATH "")
21-
22-
set(MPIEXEC /usr/bin/srun CACHE PATH "")
23-
set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "")
242

253
set(GEOSX_TPL_ROOT_DIR /usr/gapps/GEOSX/thirdPartyLibs CACHE PATH "")
26-
set(GEOSX_TPL_DIR ${GEOSX_TPL_ROOT_DIR}/2020-09-18/install-${CONFIG_NAME}-release CACHE PATH "")
4+
set(GEOSX_TPL_DIR ${GEOSX_TPL_ROOT_DIR}/2020-10-08/install-${CONFIG_NAME}-release CACHE PATH "")
5+
6+
set(RAJA_DIR ${GEOSX_TPL_DIR}/raja CACHE PATH "")
277

288
set(ENABLE_UMPIRE ON CACHE BOOL "")
9+
set(UMPIRE_DIR ${GEOSX_TPL_DIR}/chai CACHE PATH "")
10+
2911
set(ENABLE_CHAI ON CACHE BOOL "")
12+
set(CHAI_DIR ${GEOSX_TPL_DIR}/chai CACHE PATH "")
13+
14+
set(ENABLE_CALIPER ON CACHE BOOL "")
15+
set(CALIPER_DIR ${GEOSX_TPL_DIR}/caliper CACHE PATH "")
3016

3117
set(SPHINX_EXECUTABLE /collab/usr/gapps/python/build/spack-toss3.2/opt/spack/linux-rhel7-x86_64/gcc-4.9.3/python-2.7.14-7rci3jkmuht2uiwp433afigveuf4ocnu/bin/sphinx-build CACHE PATH "")
3218
set(DOXYGEN_EXECUTABLE ${GEOSX_TPL_ROOT_DIR}/doxygen/bin/doxygen CACHE PATH "")
3319

3420
set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "")
3521

36-
set(ENABLE_CALIPER ON CACHE BOOL "")
37-
set(ENABLE_PAPI ON CACHE BOOL "")
38-
set(PAPI_PREFIX /usr/tce/packages/papi/papi-5.4.3 CACHE PATH "")
39-
40-
set(USE_ADDR2LINE ON CACHE BOOL "")
22+
set(ENABLE_ADDR2LINE ON CACHE BOOL "")
4123

42-
set(ENABLE_OPENMP ON CACHE BOOL "")
4324
set(CUDA_ENABLED OFF CACHE BOOL "")
4425

4526
set(ENABLE_TOTALVIEW_OUTPUT OFF CACHE BOOL "Enables Totalview custom view" FORCE)

‎host-configs/LLNL/[email protected]‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
set(CONFIG_NAME "[email protected]" CACHE PATH "")
22

3-
set(COMPILER_DIR /usr/tce/packages/clang/clang-10.0.0/ )
4-
set(CMAKE_C_COMPILER ${COMPILER_DIR}/bin/clang CACHE PATH "")
5-
set(CMAKE_CXX_COMPILER ${COMPILER_DIR}/bin/clang++ CACHE PATH "")
6-
set(CMAKE_Fortran_COMPILER /usr/tce/packages/gcc/gcc-4.9.3/bin/gfortran CACHE PATH "")
3+
set(COMPILER_DIR /usr/tce/packages/clang/clang-10.0.0)
74

5+
# C
6+
set(CMAKE_C_COMPILER ${COMPILER_DIR}/bin/clang CACHE PATH "")
87
set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
9-
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
10-
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
118

12-
set(MPI_HOME /usr/tce/packages/mvapich2/mvapich2-2.3-clang-10.0.0 CACHE PATH "")
9+
# C++
10+
set(CMAKE_CXX_COMPILER ${COMPILER_DIR}/bin/clang++ CACHE PATH "")
11+
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
1312

14-
include(${CMAKE_CURRENT_LIST_DIR}/../../host-configs/LLNL/quartz-base.cmake)
13+
include(${CMAKE_CURRENT_LIST_DIR}/quartz-base.cmake)

‎host-configs/LLNL/[email protected]‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
set(CONFIG_NAME "[email protected]" CACHE PATH "")
22

3-
set(COMPILER_DIR /usr/tce/packages/clang/clang-9.0.0/ )
4-
set(CMAKE_C_COMPILER ${COMPILER_DIR}/bin/clang CACHE PATH "")
5-
set(CMAKE_CXX_COMPILER ${COMPILER_DIR}/bin/clang++ CACHE PATH "")
6-
set(CMAKE_Fortran_COMPILER /usr/tce/packages/gcc/gcc-4.9.3/bin/gfortran CACHE PATH "")
3+
set(COMPILER_DIR /usr/tce/packages/clang/clang-9.0.0)
74

5+
# C
6+
set(CMAKE_C_COMPILER ${COMPILER_DIR}/bin/clang CACHE PATH "")
87
set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
9-
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
10-
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
118

12-
set(MPI_HOME /usr/tce/packages/mvapich2/mvapich2-2.3-clang-9.0.0 CACHE PATH "")
9+
# C++
10+
set(CMAKE_CXX_COMPILER ${COMPILER_DIR}/bin/clang++ CACHE PATH "")
11+
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
1312

14-
include(${CMAKE_CURRENT_LIST_DIR}/../../host-configs/LLNL/quartz-base.cmake)
13+
include(${CMAKE_CURRENT_LIST_DIR}/quartz-base.cmake)

‎host-configs/LLNL/[email protected]‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
set(CONFIG_NAME "[email protected]" CACHE PATH "")
22

3-
set(COMPILER_DIR /usr/tce/packages/gcc/gcc-8.1.0/ )
4-
set(CMAKE_C_COMPILER ${COMPILER_DIR}/bin/gcc CACHE PATH "")
5-
set(CMAKE_CXX_COMPILER ${COMPILER_DIR}/bin/g++ CACHE PATH "")
6-
set(CMAKE_Fortran_COMPILER ${COMPILER_DIR}/bin/gfortran CACHE PATH "")
3+
set(COMPILER_DIR /usr/tce/packages/gcc/gcc-8.1.0)
74

5+
# C
6+
set(CMAKE_C_COMPILER ${COMPILER_DIR}/bin/gcc CACHE PATH "")
87
set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
9-
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
10-
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
118

12-
set(MPI_HOME /usr/tce/packages/mvapich2/mvapich2-2.3-gcc-8.1.0 CACHE PATH "")
9+
# C++
10+
set(CMAKE_CXX_COMPILER ${COMPILER_DIR}/bin/g++ CACHE PATH "")
11+
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
1312

14-
include(${CMAKE_CURRENT_LIST_DIR}/../../host-configs/LLNL/quartz-base.cmake)
13+
include(${CMAKE_CURRENT_LIST_DIR}/quartz-base.cmake)

‎host-configs/LLNL/[email protected]‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
set(CONFIG_NAME "[email protected]" CACHE PATH "")
22

3-
set(COMPILER_DIR /usr/tce/packages/intel/intel-19.0.4/compilers_and_libraries_2019.4.227/linux )
4-
set(CMAKE_C_COMPILER ${COMPILER_DIR}/bin/intel64/icc CACHE PATH "")
5-
set(CMAKE_CXX_COMPILER ${COMPILER_DIR}/bin/intel64/icpc CACHE PATH "")
6-
set(CMAKE_Fortran_COMPILER ${COMPILER_DIR}/bin/intel64/ifort CACHE PATH "")
3+
set(COMPILER_DIR /usr/tce/packages/intel/intel-19.0.4/compilers_and_libraries_2019.4.227/linux)
74

8-
set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
9-
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
10-
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
5+
# C
6+
set(CMAKE_C_COMPILER ${COMPILER_DIR}/bin/intel64/icc CACHE PATH "")
7+
set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -march=native -mtune=native -qoverride-limits" CACHE STRING "")
8+
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g ${CMAKE_C_FLAGS_RELEASE}" CACHE STRING "")
119

12-
set(MPI_HOME /usr/tce/packages/mvapich2/mvapich2-2.3-intel-19.0.4 CACHE PATH "")
10+
# C++
11+
set(CMAKE_CXX_COMPILER ${COMPILER_DIR}/bin/intel64/icpc CACHE PATH "")
12+
set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -march=native -mtune=native -qoverride-limits" CACHE STRING "")
13+
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g ${CMAKE_CXX_FLAGS_RELEASE}" CACHE STRING "")
1314

14-
include(${CMAKE_CURRENT_LIST_DIR}/../../host-configs/LLNL/quartz-base.cmake)
15+
include(${CMAKE_CURRENT_LIST_DIR}/quartz-base.cmake)

0 commit comments

Comments
 (0)