From 3d126bd78a401e5ae3f5e650eb7c4665b73e726c Mon Sep 17 00:00:00 2001 From: Jeongnim Kim Date: Wed, 29 Sep 2004 21:18:41 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://subversion.assembla.com/svn/qmcdev/trunk@67 e5b18d87-469d-4833-9cc0-8cdfa06e9491 --- CMake/FindBlitz++.cmake | 1 + CMake/FindGSL.cmake | 2 ++ CMake/FindHDF5.cmake | 2 ++ CMake/FindLapack.cmake | 1 + CMake/FindSprng.cmake | 45 +++++++++++++++++++++++++++++++++++++++++ CMake/Intel8.cmake | 10 ++++----- CMake/addSPRNG.cmake | 23 ++++++++++++++++----- CMakeLists.txt | 8 +++++--- 8 files changed, 79 insertions(+), 13 deletions(-) create mode 100644 CMake/FindSprng.cmake diff --git a/CMake/FindBlitz++.cmake b/CMake/FindBlitz++.cmake index 448b57c87..82e554e78 100644 --- a/CMake/FindBlitz++.cmake +++ b/CMake/FindBlitz++.cmake @@ -19,6 +19,7 @@ ELSE(Blitzpp_INCLUDE_DIRS) /usr/include /opt/include /usr/local/include + /u/ncsa/jnkim/shared/include ) ENDIF(Blitzpp_INCLUDE_DIRS) diff --git a/CMake/FindGSL.cmake b/CMake/FindGSL.cmake index 4c6ab52cb..5f63a8cf8 100644 --- a/CMake/FindGSL.cmake +++ b/CMake/FindGSL.cmake @@ -23,6 +23,7 @@ ELSE(Gsl_INCLUDE_DIRS) /usr/local/lib /opt/lib /sw/lib + /usr/apps/math/gsl/gsl-1.4/intel/lib ) SET(TRIAL_INCLUDE_PATHS @@ -30,6 +31,7 @@ ELSE(Gsl_INCLUDE_DIRS) /opt/include /usr/local/include /sw/include + /usr/apps/math/gsl/gsl-1.4/intel/include ) FIND_LIBRARY(GSL_LIBRARY gsl ${TRIAL_LIBRARY_PATHS}) diff --git a/CMake/FindHDF5.cmake b/CMake/FindHDF5.cmake index 9ad131d07..ce247d173 100644 --- a/CMake/FindHDF5.cmake +++ b/CMake/FindHDF5.cmake @@ -18,6 +18,7 @@ IF(Hdf5_INCLUDE_DIRS) ELSE(Hdf5_INCLUDE_DIRS) SET(TRIAL_LIBRARY_PATHS + /usr/apps/hdf5/lib /usr/apps/lib /usr/lib /usr/local/lib @@ -26,6 +27,7 @@ ELSE(Hdf5_INCLUDE_DIRS) ) SET(TRIAL_INCLUDE_PATHS + /usr/apps/hdf5/include /usr/apps/include /usr/include /opt/include diff --git a/CMake/FindLapack.cmake b/CMake/FindLapack.cmake index f31b92d47..302d8da21 100755 --- a/CMake/FindLapack.cmake +++ b/CMake/FindLapack.cmake @@ -25,6 +25,7 @@ IF(INTEL_COMPILER) ENDIF($ENV{MKL} MATCHES "mkl") SET(MKL_PATHS ${MKL_PATHS} + $ENV{MKL_HOME} /usr/local/intel/mkl60/mkl60/lib/64 /usr/local/intel/mkl/lib/32 /opt/intel/mkl/lib/32 diff --git a/CMake/FindSprng.cmake b/CMake/FindSprng.cmake new file mode 100644 index 000000000..4680cc614 --- /dev/null +++ b/CMake/FindSprng.cmake @@ -0,0 +1,45 @@ +# +# this module look for SPRNG (http://hdf.ncsa.uiuc.edu) support +# it will define the following values +# +# SPRNG_INCLUDE_PATH = where sprng.h can be found +# SPRNG_LIBRARY = the library to link against (sprng etc) +# + +SET(TRIAL_LIBRARY_PATHS + /usr/local/lib + /sw/lib +) +SET(TRIAL_INCLUDE_PATHS + /usr/local/include + /sw/include +) + +IF($ENV{SPRNG_HOME} MATCHES "sprng") + SET(TRIAL_LIBRARY_PATHS + $ENV{SPRNG_HOME}/lib ${TRIAL_LIBRARY_PATHS} ) + SET(TRIAL_INCLUDE_PATHS + $ENV{SPRNG_HOME}/include ${TRIAL_INCLUDE_PATHS} ) +ENDIF($ENV{SPRNG_HOME} MATCHES "sprng") + +FIND_LIBRARY(SPRNG_LIBRARY + sprng + ${TRIAL_LIBRARY_PATHS} +) + +FIND_PATH(SPRNG_INCLUDE_DIR + sprng.h + ${TRIAL_INCLUDE_PATHS} +) + +IF(SPRNG_INCLUDE_DIR AND SPRNG_LIBRARY) + SET(FOUND_SPRNG 1 CACHE BOOL "Found sprng library") +ELSE(SPRNG_INCLUDE_DIR AND SPRNG_LIBRARY) + SET(FOUND_SPRNG 0 CACHE BOOL "Not fount sprng library") +ENDIF(SPRNG_INCLUDE_DIR AND SPRNG_LIBRARY) + +MARK_AS_ADVANCED( + SPRNG_INCLUDE_DIR + SPRNG_LIBRARY + FOUND_SPRNG +) diff --git a/CMake/Intel8.cmake b/CMake/Intel8.cmake index e902e9ff9..3800f4fd0 100755 --- a/CMake/Intel8.cmake +++ b/CMake/Intel8.cmake @@ -4,8 +4,10 @@ ADD_DEFINITIONS(-DADD_) #enable Interprocedural (IP) Optimizations #-ipo_obj force generation of real object files (requires -ipo) -SET(CMAKE_CXX_FLAGS "-restrict -unroll -fno-alias -O3 -Ob=1 -ansi -ipo -ipo_obj") -SET(CMAKE_CC_FLAGS "-restrict -unroll -fno-alias -O3 -Ob=1 -ansi -ipo -ipo_obj") +#SET(CMAKE_CXX_FLAGS "-restrict -unroll -fno-alias -O3 -Ob=1 -ansi -ipo -ipo_obj") +#SET(CMAKE_CC_FLAGS "-restrict -unroll -fno-alias -O3 -Ob=1 -ansi -ipo -ipo_obj") +SET(CMAKE_CXX_FLAGS "-restrict -unroll -fno-alias -O3 -Ob=1 -ansi") +SET(CMAKE_CC_FLAGS "-restrict -unroll -fno-alias -O3 -Ob=1 -ansi") #IF(BITS MATCHES 64) # SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} " -ftz") @@ -28,9 +30,7 @@ ELSE(IA32 MATCHES ia64) ENDIF(IA32 MATCHES ia64) #ifc -> ifort -SET(FORTRAN_LIBS " -lifcore") +SET(FORTRAN_LIBS " -lifcore -lguide") SET(F77 ifort) SET(F77OPTFLAGS -fpp2 -O3) SET(F77FLAGS ${F77OPTFLAGS}) - - diff --git a/CMake/addSPRNG.cmake b/CMake/addSPRNG.cmake index d743878a7..b61e1958e 100644 --- a/CMake/addSPRNG.cmake +++ b/CMake/addSPRNG.cmake @@ -6,17 +6,30 @@ # HDF5_LIBRARY = the library to link against (hdf5 etc) # -FIND_LIBRARY(SPRNG_LIBRARY - sprng +SET(TRIAL_LIBRARY_PATHS /usr/local/lib /sw/lib ) +SET(TRIAL_INCLUDE_PATHS + /usr/local/include + /sw/include +) + +IF($ENV{SPRNG_HOME} MATCHES "sprng") + SET(TRIAL_LIBRARY_PATHS + $ENV{SPRNG_HOME}/lib ${TRIAL_LIBRARY_PATHS} ) + SET(TRIAL_INCLUDE_PATHS + $ENV{SPRNG_HOME}/include ${TRIAL_INCLUDE_PATHS} ) +ENDIF($ENV{SPRNG_HOME} MATCHES "sprng") + +FIND_LIBRARY(SPRNG_LIBRARY + sprng + ${TRIAL_LIBRARY_PATHS} +) FIND_PATH(SPRNG_INCLUDE_PATH sprng.h - /usr/local/include - /usr/include - /sw/lib + ${TRIAL_INCLUDE_PATHS} ) IF(SPRNG_LIBRARY) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b89cc08f..edc15c81c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,9 +97,11 @@ IF(QMC_MPI) INCLUDE(${PROJECT_SOURCE_DIR}/CMake/addMPI.cmake) ENDIF(QMC_MPI) -IF(QMC_SPRNG) - INCLUDE(${PROJECT_SOURCE_DIR}/CMake/addSPRNG.cmake) -ENDIF(QMC_SPRNG) +IF(FOUND_SPRNG) + SET(HAVE_LIBSPRNG 1) + INCLUDE_DIRECTORIES(${SPRNG_INCLUDE_DIR}) + LINK_LIBRARIES(${SPRNG_LIBRARY} -lgmp) +ENDIF(FOUND_SPRNG) INCLUDE_DIRECTORIES( ${qmcPlusPlus_SOURCE_DIR}/src