Commit 9ddb5631 authored by Florent Pruvost's avatar Florent Pruvost

add comments for me about further modifications concerning the use of find...

add comments for me about further modifications concerning the use of find starpu with some components (cuda, opencl)
parent 65780aea
......@@ -365,10 +365,10 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
string(FIND ${CMAKE_CXX_COMPILER} "icl++" NAME)
if( ${NAME} GREATER 0)
if( ${INTEL_VERSION} EQUAL 15. OR ${INTEL_VERSION} GREATER 15.0.0)
message( STATUS " Intel compiler is icl++ ( version >= 15.0.0)")
set(INTEL_ICL_COMPILER "ON")
message( STATUS " Intel compiler is icl++ ( version >= 15.0.0)")
set(INTEL_ICL_COMPILER "ON")
else()
message(FATAL_ERROR " Intel compiler should be icl++ ( version >= 15.0.0)")
message(FATAL_ERROR " Intel compiler should be icl++ ( version >= 15.0.0)")
endif()
else()
message(FATAL_ERROR " Intel compiler should be icl++ ( version >= 15.0.0)")
......@@ -439,6 +439,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
endif()
endforeach()
# TODO: is this very useful? CUDA is already a component of find starpu
if (CUDA_LIBRARIES)
set(SCALFMM_LIBRARIES "${SCALFMM_LIBRARIES}; ${CUDA_LIBRARIES}")
endif()
......@@ -449,6 +450,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
message(STATUS " STARPU_INCLUDES = ${STARPU_INCLUDE_DIRS}")
endif()
# TODO: replace this by a component of find starpu
OPTION( ScalFMM_USE_OPENCL "Set to ON to use OPENCL with StarPU" OFF )
MESSAGE( STATUS "ScalFMM_USE_OPENCL = ${ScalFMM_USE_OPENCL}" )
if(ScalFMM_USE_OPENCL)
......@@ -484,7 +486,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
if( NOT ${COMPILE_RESULT_VAR})
set(__SSEPE_INTEL_COMPILER ON)
endif()
# set(ScalFMM_USE_AVX OFF)
#set(ScalFMM_USE_AVX OFF)
else(${COMPILE_SSE})
message(FATAL_ERROR "SSE NOT SUPPORTED ; Set ScalFMM_USE_SSE to OFF \n Output from test is : ${COMPILE_SSE_OUTPUT}")
endif(${COMPILE_SSE})
......@@ -507,7 +509,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
OUTPUT_VARIABLE COMPILE_AVX_OUTPUT)
if(${COMPILE_AVX})
set(ScalFMM_CXX_FLAGS "${ScalFMM_CXX_FLAGS} ${AVX_FLAGS}")
# set( ScalFMM_USE_SSE OFF FORCE) # ne marche pas
#set( ScalFMM_USE_SSE OFF FORCE) # ne marche pas
try_compile(COMPILE_RESULT_AVSPE ${CMAKE_CURRENT_BINARY_DIR}
${ScalFMM_CMAKE_MODULE_PATH}/checkAVXpe.cpp
COMPILE_DEFINITIONS "${CMAKE_CXX_FLAGS} ${AVX_FLAGS}")
......@@ -538,7 +540,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmic")
else()
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xhost")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xhost")
endif()
list(APPEND FUSE_LIST "MIC")
##################################################################
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment