From f7c337d6482f642e05658ee8d6dc0750f32a13ad Mon Sep 17 00:00:00 2001 From: Jeongnim Kim Date: Mon, 2 Dec 2013 18:09:25 +0000 Subject: [PATCH] Make real structure factor, disable timer etc as the default options. git-svn-id: https://subversion.assembla.com/svn/qmcdev/trunk@6093 e5b18d87-469d-4833-9cc0-8cdfa06e9491 --- CMakeLists.txt | 7 ++++++- config/PsiIntelMPI.cmake | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 547e9702d..2e724ed62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -542,7 +542,12 @@ MESSAGE(STATUS "Ready to build qmcpack") # -DMPICH_SKIP_MPICXX : disable C++ binding of MPICH #################################################################### -ADD_DEFINITIONS(-DHAVE_CONFIG_H -DH5_USE_16_API) +ADD_DEFINITIONS(-DHAVE_CONFIG_H -DH5_USE_16_API -DDISABLE_TIMER=1 -DUSE_REAL_STRUCT_FACTOR -DINLINE_ALL=inline) + +IF(CMAKE_COMPILER_IS_GNUCXX) + ADD_DEFINITIONS(-DADD_) +ENDIF(CMAKE_COMPILER_IS_GNUCXX) + if(HAVE_MPI) ADD_DEFINITIONS(-DMPICH_SKIP_MPICXX) endif() diff --git a/config/PsiIntelMPI.cmake b/config/PsiIntelMPI.cmake index 4dce1ddd7..d787d0d59 100644 --- a/config/PsiIntelMPI.cmake +++ b/config/PsiIntelMPI.cmake @@ -6,7 +6,7 @@ #-------------------------------------------------------------------------- set(CMAKE_CXX_COMPILER mpiicpc) set(CMAKE_C_COMPILER icc) -set(GNU_OPTS "-DADD_ -DINLINE_ALL=inline -DDISABLE_TIMER -DUSE_REAL_STRUCT_FACTOR") +#set(GNU_OPTS "-DADD_ -DINLINE_ALL=inline -DDISABLE_TIMER -DUSE_REAL_STRUCT_FACTOR") #set(INTEL_OPTS "-g -restrict -unroll -O3 -ip -xSSE4.2 -openmp -Wno-deprecated") set(INTEL_OPTS "-g -restrict -unroll -O3 -ip -xAVX -openmp -Wno-deprecated") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${INTEL_OPTS} ${GNU_OPTS}")