From c65cc9823cca814b508069a645c8289ae42cf0cf Mon Sep 17 00:00:00 2001
From: Philippe Virouleau <philippe.44@gmail.com>
Date: Fri, 21 Sep 2018 11:31:31 +0200
Subject: [PATCH] add more params into xp output
---
CMakeLists.txt | 7 ++++---
timing/timing.c | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12ecacaae..59932b16b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -939,7 +939,7 @@ if( CHAMELEON_SCHED_OPENMP )
list(APPEND OPENMP_COMPONENT_LIST "CUDA")
endif()
- find_package(${OPENMP_COMPONENT_LIST})
+ find_package(OpenMP COMPONENTS ${OPENMP_COMPONENT_LIST})
# Add definition and include_dir if found
# TODO
@@ -950,8 +950,8 @@ if( CHAMELEON_SCHED_OPENMP )
#include_directories(${STARPU_INCLUDE_DIRS_DEP})
#set(CMAKE_REQUIRED_INCLUDES "${STARPU_INCLUDE_DIRS_DEP}")
#endif()
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fopenmp")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_CXX_FLAGS}")
#if(STARPU_LDFLAGS_OTHER_DEP)
#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${STARPU_LDFLAGS_OTHER_DEP}")
#set(CMAKE_REQUIRED_LDFLAGS "${STARPU_LDFLAGS_OTHER_DEP}")
@@ -995,6 +995,7 @@ if( CHAMELEON_SCHED_OPENMP )
#message("-- ${Blue}CHAMELEON_USE_MIGRATE is turned OFF because starpu_mpi_data_migrate not found${ColourReset}")
#endif()
else ( OPENMP_FOUND )
+ message(FATAL_ERROR "Something went wrong when finding OpenMP")
#if(MORSE_VERBOSE_FIND_PACKAGE)
#if(NOT HWLOC_FOUND OR NOT HWLOC_LIBRARIES)
#if (NOT HWLOC_hwloc.h_DIRS)
diff --git a/timing/timing.c b/timing/timing.c
index 274c486a0..ff268c719 100644
--- a/timing/timing.c
+++ b/timing/timing.c
@@ -147,7 +147,7 @@ Test(int64_t n, int *iparam) {
}
if ( CHAMELEON_My_Mpi_Rank() == 0)
- printf( "%7d %7d %7d ", iparam[IPARAM_M], iparam[IPARAM_N], iparam[IPARAM_K] );
+ printf( "%10d %7d %7d %7d %7d ", iparam[IPARAM_THRDNBR], iparam[IPARAM_M], iparam[IPARAM_N], iparam[IPARAM_NB], iparam[IPARAM_K] );
fflush( stdout );
// FIXME: use posix_memalign, or hwloc allocation with first touch, to avoid
@@ -430,7 +430,7 @@ print_header(char *prog_name, int * iparam) {
iparam[IPARAM_IB],
eps );
- printf( "# M N K/NRHS seconds Gflop/s Deviation%s%s\n",
+ printf( "# Threads M N BS K/NRHS seconds Gflop/s Deviation%s%s\n",
bound_header, iparam[IPARAM_INVERSE] ? inverse_header : check_header);
return;
}
--
GitLab