hdiff output

r30385/CMakeLists.txt 2016-05-04 11:30:10.890937782 +0100 r30384/CMakeLists.txt 2016-05-04 11:30:11.094940483 +0100
278:   set_target_properties(A12OPTIM PROPERTIES COMPILE_DEFINITIONS "${COMPILE_DEFINITIONS};DUMMY_CUDA") 278:   set_target_properties(A12OPTIM PROPERTIES COMPILE_DEFINITIONS "${COMPILE_DEFINITIONS};DUMMY_CUDA") 
279:   target_link_libraries(A12OPTIM optimlib279:   target_link_libraries(A12OPTIM optimlib
280:                                  amber12_base280:                                  amber12_base
281:                                  ${MYLAPACK_LIBS}281:                                  ${MYLAPACK_LIBS}
282:                                  ${BOWMAN_LIBS} )282:                                  ${BOWMAN_LIBS} )
283: endif(WITH_AMBER12 AND NOT WITH_CUDA)283: endif(WITH_AMBER12 AND NOT WITH_CUDA)
284: 284: 
285: # CUDAOPTIM285: # CUDAOPTIM
286: option(WITH_CUDA "Enable CUDAOPTIM compilation" OFF)286: option(WITH_CUDA "Enable CUDAOPTIM compilation" OFF)
287: if(WITH_CUDA)287: if(WITH_CUDA)
 288:   # AMBER12 will also compile with gfortran/gcc, but OPTIM does a lot of CPU work so Intel compilers give much better performance
 289:   if(NOT ${COMPILER_SWITCH} STREQUAL "ifort")
 290:     message( FATAL_ERROR "Please compile with Intel compilers for optimal performance. " )
 291:   endif (NOT ${COMPILER_SWITCH} STREQUAL "ifort")
288:   SET(EXTRA_SOURCES ${ALL_EXTRA_SOURCES} modcudabfgsts.f90 modcudalbfgs.f90)292:   SET(EXTRA_SOURCES ${ALL_EXTRA_SOURCES} modcudabfgsts.f90 modcudalbfgs.f90)
289:   list(REMOVE_ITEM EXTRA_SOURCES ${DUMMY_CUDA})293:   list(REMOVE_ITEM EXTRA_SOURCES ${DUMMY_CUDA})
290:   add_subdirectory(${SVN_ROOT}/CUDA CUDAinterface)294:   add_subdirectory(${SVN_ROOT}/CUDA CUDAinterface)
291:   add_executable(CUDAOPTIM getparams.f ${EXTRA_SOURCES})295:   add_executable(CUDAOPTIM getparams.f ${EXTRA_SOURCES})
292:   set_module_dir(CUDAOPTIM)296:   set_module_dir(CUDAOPTIM)
293:   set_module_depends(CUDAOPTIM optimlib amber12_base)297:   set_module_depends(CUDAOPTIM optimlib amber12_base)
294:   set_target_properties(CUDAOPTIM PROPERTIES LINKER_LANGUAGE "Fortran")298:   set_target_properties(CUDAOPTIM PROPERTIES LINKER_LANGUAGE "Fortran")
295:   set_target_properties(CUDAOPTIM PROPERTIES COMPILE_DEFINITIONS "${COMPILE_DEFINITIONS};CUDA")299:   set_target_properties(CUDAOPTIM PROPERTIES COMPILE_DEFINITIONS "${COMPILE_DEFINITIONS};CUDA")
296:   target_link_libraries(CUDAOPTIM optimlib CUDAinterface amber12_base ${MYLAPACK_LIBS} ${BOWMAN_LIBS})300:   target_link_libraries(CUDAOPTIM optimlib CUDAinterface amber12_base ${MYLAPACK_LIBS} ${BOWMAN_LIBS})
297: endif(WITH_CUDA)301: endif(WITH_CUDA)


legend
Lines Added 
Lines changed
 Lines Removed

hdiff - version: 2.1.0