scnc
/
qmcpack
mirror of https://github.com/QMCPACK/qmcpack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jeongnim Kim 2013-12-02 18:09:25 +00:00
parent c1c555cb5d
commit f7c337d648
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -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()

2
config/PsiIntelMPI.cmake
View File

@ -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}")