Commit 5e687ea5 authored by COULAUD Olivier's avatar COULAUD Olivier

BUG EZTRACE git statusgit statusgit status

parent c9a00713
...@@ -648,7 +648,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/") ...@@ -648,7 +648,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH "ON") set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH "ON")
pkg_search_module( EZTrace REQUIRED eztrace) pkg_search_module( EZTrace REQUIRED eztrace)
link_directories(${EZTrace_LIBRARY_DIRS}) link_directories(${EZTrace_LIBRARY_DIRS})
link_libraries( ${EZTrace_LIBRARIES} -leztrace-memory) link_libraries( ${EZTrace_LIBRARIES} -leztrace-mpi)
include_directories(${EZTrace_INCLUDE_DIRS}) include_directories(${EZTrace_INCLUDE_DIRS})
MESSAGE(STATUS "EZTRACE: ${EZTrace_INCLUDE_DIRS} ${EZTrace_LIBRARY_DIRS} ${EZTrace_LIBRARIES}") MESSAGE(STATUS "EZTRACE: ${EZTrace_INCLUDE_DIRS} ${EZTrace_LIBRARY_DIRS} ${EZTrace_LIBRARIES}")
CMAKE_DEPENDENT_OPTION(SCALFMM_TRACE_ALGO "Set to ON to trace the full algorithm (all operators)" ON "SCALFMM_USE_EZTRACE" OFF ) CMAKE_DEPENDENT_OPTION(SCALFMM_TRACE_ALGO "Set to ON to trace the full algorithm (all operators)" ON "SCALFMM_USE_EZTRACE" OFF )
......
...@@ -271,10 +271,6 @@ protected: ...@@ -271,10 +271,6 @@ protected:
if(operationsToProceed & FFmmP2M) bottomPass(); if(operationsToProceed & FFmmP2M) bottomPass();
Timers[P2MTimer].tac(); Timers[P2MTimer].tac();
#ifdef SCALFMM_TRACE_ALGO
eztrace_leave_event();
#endif
#ifdef SSCALFMM_TRACE_ALGO #ifdef SSCALFMM_TRACE_ALGO
eztrace_leave_event(); eztrace_leave_event();
eztrace_enter_event("M2M", EZTRACE_PINK); eztrace_enter_event("M2M", EZTRACE_PINK);
...@@ -285,7 +281,7 @@ protected: ...@@ -285,7 +281,7 @@ protected:
Timers[M2MTimer].tac(); Timers[M2MTimer].tac();
#ifdef SCALFMM_TRACE_ALGO #ifdef SCALFMM_TRACE_ALGO
eztrace_leave_event(); eztrace_leave_event();
eztrace_enter_event("M2L", EZTRACE_GREEN); eztrace_enter_event("M2L", EZTRACE_GREEN);
#endif #endif
......
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