Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ endif( SUPPORT_CXX )
option(SUPPORT_C11
"Enable support for C11 capabilities. Might not work with OpenMP support due to an OpenMP compilers restriction (default ON)." ON)
if(SUPPORT_C11)
set(SUPPORT_C11 OFF) # disable until we conirm the compiler supports it
set(SUPPORT_C11 OFF) # disable until we confirm the compiler supports it
foreach( item IN LISTS CMAKE_C_COMPILE_FEATURES )
if( item STREQUAL "c_std_11")
message(STATUS "Compiler support for C11 detected and enabled")
Expand Down Expand Up @@ -173,7 +173,7 @@ endif()
option(PARSEC_DIST_THREAD
"Use an extra thread to progress the data movements" ON)
option(PARSEC_DIST_PRIORITIES
"Favor the communications that unlock the most prioritary tasks" ON)
"Favor the communications that unlock the highest priority tasks" ON)
option(PARSEC_DIST_COLLECTIVES
"Use optimized asynchronous operations where collective communication pattern is detected" ON)
set (PARSEC_DIST_SHORT_LIMIT 1 CACHE STRING
Expand Down
4 changes: 4 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,8 @@ while [ "x$1" != x ]; do
--disable-doc) enable_doc=no; shift;;
--enable-testing) enable_testing=yes; shift;;
--disable-testing) enable_testing=no; shift;;
--enable-tools) enable_tools=yes; shift;;
--disable-tools) enable_tools=no; shift;;

#debug/profiling
--enable-debug=*) enable_debug="${1#*=}"; shift;;
Expand Down Expand Up @@ -452,6 +454,8 @@ CMAKE_DEFINES+=" ${prefix:+-DCMAKE_INSTALL_PREFIX=$prefix}"
[ x$enable_doc = xno ] && CMAKE_DEFINES+=" -DBUILD_DOCUMENTATION=OFF"
[ x$enable_testing = xyes ] && CMAKE_DEFINES+=" -DBUILD_TESTING=ON"
[ x$enable_testing = xno ] && CMAKE_DEFINES+=" -DBUILD_TESTING=OFF"
[ x$enable_tools = xyes ] && CMAKE_DEFINES+=" -DBUILD_TOOLS=ON"
[ x$enable_tools = xno ] && CMAKE_DEFINES+=" -DBUILD_TOOLS=OFF"

if [ -z "$enable_debug" ]; then CMAKE_DEFINES+=" -DCMAKE_BUILD_TYPE=RelWithDebInfo"
elif [[ "$enable_debug" =~ ^no$ ]]; then
Expand Down
12 changes: 8 additions & 4 deletions tools/profiling/python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,20 @@ endif( NOT CYTHON_EXECUTABLE )
execute_process(
COMMAND ${Python_EXECUTABLE} -c "import pandas"
RESULT_VARIABLE PARSEC_PYTHON_CAN_LOAD_PREREQUISITE_MODULES_IF_THIS_IS_ZERO
OUTPUT_QUIET
ERROR_QUIET
)
if ( NOT PARSEC_PYTHON_CAN_LOAD_PREREQUISITE_MODULES_IF_THIS_IS_ZERO STREQUAL 0 )
if ( NOT (PARSEC_PYTHON_CAN_LOAD_PREREQUISITE_MODULES_IF_THIS_IS_ZERO EQUAL 0) )
message(WARNING "Prerequisite Python modules (pandas) not found. Disabling the profiling tools")
set(PARSEC_PYTHON_TOOLS OFF CACHE BOOL "True iff Python tools are enabled in PaRSEC")
return()
endif ( NOT PARSEC_PYTHON_CAN_LOAD_PREREQUISITE_MODULES_IF_THIS_IS_ZERO STREQUAL 0 )
endif ( NOT (PARSEC_PYTHON_CAN_LOAD_PREREQUISITE_MODULES_IF_THIS_IS_ZERO EQUAL 0) )

set(SRC_PYTHON_SUPPORT ${CMAKE_CURRENT_SOURCE_DIR}/common_utils.py ${CMAKE_CURRENT_SOURCE_DIR}/parsec_trace_tables.py ${CMAKE_CURRENT_SOURCE_DIR}/ptt_utils.py ${CMAKE_CURRENT_SOURCE_DIR}/profile2h5.py ${CMAKE_CURRENT_SOURCE_DIR}/pbt2ptt.pyx ${CMAKE_CURRENT_SOURCE_DIR}/pbt2ptt.pxd)
if (NOT BUILD_TOOLS)
message(STATUS "All prerequisite available but python tools have been disabled (by command line option)")
return()
endif(NOT BUILD_TOOLS)

set(SRC_PYTHON_SUPPORT ${CMAKE_CURRENT_SOURCE_DIR}/common_utils.py ${CMAKE_CURRENT_SOURCE_DIR}/parsec_trace_tables.py ${CMAKE_CURRENT_SOURCE_DIR}/ptt_utils.py ${CMAKE_CURRENT_SOURCE_DIR}/profile2h5.py ${CMAKE_CURRENT_SOURCE_DIR}/pbt2ptt.pyx ${CMAKE_CURRENT_SOURCE_DIR}/pbt2ptt.pxd)
set(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/build/pbt2ptt.timestamp)

if(Python_VERSION_MAJOR EQUAL 2)
Expand Down