diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1950ec0e449ee92d84db749282b91b391f6abee..e0463fe7f47079abf43b8eeede47684c989ba608 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,13 +168,6 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/cmake_modules/")
"configure to do so.")
endif()
- if(CHAMELEON_USE_FXT AND NOT CHAMELEON_SCHED_STARPU)
- message(WARNING "You have activated FXT but CHAMELEON_SCHED_STARPU is OFF.\n"
- "You should use StarPU Runtime system if you want to benefit from FxT.\n"
- "Use -DCHAMELEON_SCHED_QUARK=OFF -DCHAMELEON_SCHED_STARPU=ON at cmake \n"
- "configure to do so.")
- endif()
-
# Additional options
# ------------------
@@ -204,13 +197,12 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/cmake_modules/")
message("-- ${BoldGreen}CHAMELEON_USE_MAGMA is set to OFF, turn it ON to use MAGMA (only with StarPU)${ColourReset}")
endif()
- # Enable FXT if StarPU (only if StarPU runtime is enabled)
- cmake_dependent_option(CHAMELEON_USE_FXT
- "Enable FXT with STARPU" OFF
- "CHAMELEON_SCHED_STARPU" OFF)
- if (NOT CHAMELEON_USE_FXT)
- message("-- ${BoldGreen}CHAMELEON_USE_FXT is set to OFF, turn it ON to use FxT (only with StarPU)${ColourReset}")
+ # Enable FXT if StarPU
+ option(CHAMELEON_ENABLE_TRACING "Enable tracing support" OFF)
+ if (NOT CHAMELEON_ENABLE_TRACING)
+ message("-- ${BoldGreen}CHAMELEON_ENABLE_TRACING is set to OFF, turn it ON to use FxT (with StarPU)${ColourReset}")
endif()
+ #option(CHAMELEON_USE_EZTRACE "Enable EZTRACE to build modules" OFF)
# Options to enable/disable testings and timings
# ----------------------------------------------
@@ -553,7 +545,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/cmake_modules/")
list(APPEND STARPU_COMPONENT_LIST "CUDA")
endif()
endif()
- if(CHAMELEON_USE_FXT)
+ if(CHAMELEON_ENABLE_TRACING)
list(APPEND STARPU_COMPONENT_LIST "FXT")
endif()
@@ -583,7 +575,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/cmake_modules/")
if ( STARPU_DATA_WONT_USE_FOUND )
add_definitions(-DCHAMELEON_USE_STARPU_DATA_WONT_USE)
endif()
- if(CHAMELEON_USE_FXT)
+ if(CHAMELEON_ENABLE_TRACING)
# check if fxt profiling is accessible in starpu and activate it in chameleon
set(CMAKE_REQUIRED_LIBRARIES "${STARPU_SHM_LIBRARIES}")
unset(STARPU_FXT_START_PROFILING_FOUND CACHE)
@@ -635,7 +627,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/cmake_modules/")
Print_Find_Library_Status(hwloc libhwloc)
endif ()
endif()
- if(CHAMELEON_USE_FXT AND (NOT FXT_FOUND OR NOT FXT_LIBRARIES))
+ if(CHAMELEON_ENABLE_TRACING AND (NOT FXT_FOUND OR NOT FXT_LIBRARIES))
if (NOT FXT_fxt.h_DIRS)
Print_Find_Header_Status(fxt fxt.h)
endif ()
@@ -666,7 +658,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/cmake_modules/")
if(NOT HWLOC_FOUND OR NOT HWLOC_LIBRARIES)
message(FATAL_ERROR "hwloc library is required but has not been found")
endif()
- if(CHAMELEON_USE_FXT AND (NOT FXT_FOUND OR NOT FXT_LIBRARIES))
+ if(CHAMELEON_ENABLE_TRACING AND (NOT FXT_FOUND OR NOT FXT_LIBRARIES))
message(FATAL_ERROR "FxT library is required but has not been found")
endif()
if( (NOT STARPU_SHM_FOUND) OR (NOT STARPU_SHM_LIBRARIES) OR
diff --git a/INSTALL.txt b/INSTALL.txt
index bc62f10be1571050f040bcbbec4bae9bea5cb43e..c119fe9c8526cf70dbc72de0d2963bd253b04ebc 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -94,7 +94,7 @@ example: cmake /home/toto/chameleon/ -DCMAKE_BUILD_TYPE=Debug \
-DCHAMELEON_USE_MPI=ON \
-DBLA_VENDOR=Intel10_64lp \
-DSTARPU_DIR=/home/toto/install/starpu-1.1/build/include/starpu/1.1/ \
- -DCHAMELEON_USE_FXT=ON
+ -DCHAMELEON_ENABLE_TRACING=ON
You can get the full list of options with -L[A][H] options of cmake command
example: cmake -LH /home/toto/chameleon/
@@ -126,7 +126,7 @@ CHAMELEON specific:
CHAMELEON_USE_MPI=ON|OFF (default OFF)
CHAMELEON_USE_CUDA=ON|OFF (default OFF)
CHAMELEON_USE_MAGMA=ON|OFF (default OFF)
-CHAMELEON_USE_FXT=ON|OFF (default OFF)
+CHAMELEON_ENABLE_TRACING=ON|OFF (default OFF)
CHAMELEON_SCHED_STARPU=ON|OFF (default ON)
CHAMELEON_SCHED_QUARK=ON|OFF (default OFF)
CHAMELEON_SIMULATION=ON|OFF (default OFF)
@@ -150,7 +150,7 @@ StarPU in the directory pointed by the STARPU_FXT_PREFIX environment variable.
example: export STARPU_FXT_PREFIX=/home/toto/fxt_files/
When executing a ./timing/... CHAMELEON program, if it has been enabled
-(StarPU compiled with FxT and -DCHAMELEON_USE_FXT=ON), you can give the option --trace
+(StarPU compiled with FxT and -DCHAMELEON_ENABLE_TRACING=ON), you can give the option --trace
to tell the program to generate trace log files.
Finally, to generate the trace file which can be opened with Vite program
diff --git a/cmake_modules/PrintOpts.cmake b/cmake_modules/PrintOpts.cmake
index 4a096ec338b80d772b822854e7753dcae8684647..aabdeb24ddd8aaacfb5fbf500713f94dcf575583 100644
--- a/cmake_modules/PrintOpts.cmake
+++ b/cmake_modules/PrintOpts.cmake
@@ -49,12 +49,12 @@ set(dep_message "${dep_message}"
" Runtime specific\n"
" QUARK ...............: ${CHAMELEON_SCHED_QUARK}\n"
" StarPU ..............: ${CHAMELEON_SCHED_STARPU}\n"
-" FxT .................: ${CHAMELEON_USE_FXT}\n"
"\n"
" Kernels specific\n"
" BLAS ................: ${BLA_VENDOR}\n"
" MAGMA ...............: ${CHAMELEON_USE_MAGMA}\n"
"\n"
+" Trace ...............: ${CHAMELEON_ENABLE_TRACING}\n"
" Simulation mode .....: ${CHAMELEON_SIMULATION}\n"
"\n"
" Binaries to build\n"