From b91a45ae54dc77f6fee1f6a4a9771918e5b2044c Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Sun, 16 Nov 2014 15:52:03 +0000
Subject: [PATCH] save number of MPI process and print it with main
informations in timings
---
example/basic_zposv/basic_posv.h | 4 ++--
timing/timing.c | 11 ++++++++++-
timing/timing.h | 2 +-
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/example/basic_zposv/basic_posv.h b/example/basic_zposv/basic_posv.h
index 165235798..030f42d9e 100644
--- a/example/basic_zposv/basic_posv.h
+++ b/example/basic_zposv/basic_posv.h
@@ -117,7 +117,7 @@ enum iparam_examples {
IPARAM_INVERSE,
IPARAM_NCUDAS,
- IPARAM_NDOM,
+ IPARAM_NMPI,
IPARAM_P, /* Parameter for 2D cyclic distribution */
IPARAM_Q, /* Parameter for 2D cyclic distribution */
/* Added for StarPU version */
@@ -182,7 +182,7 @@ static void init_iparam(int iparam[IPARAM_SIZEOF]){
iparam[IPARAM_INVERSE ] = 0;
iparam[IPARAM_NCUDAS ] = 0;
- iparam[IPARAM_NDOM ] = 1;
+ iparam[IPARAM_NMPI ] = 1;
iparam[IPARAM_P ] = 1;
iparam[IPARAM_Q ] = 1;
iparam[IPARAM_PROFILE ] = 0;
diff --git a/timing/timing.c b/timing/timing.c
index 894114632..92c15fe88 100644
--- a/timing/timing.c
+++ b/timing/timing.c
@@ -400,6 +400,10 @@ print_header(char *prog_name, int * iparam) {
"# CHAMELEON %d.%d.%d, %s\n"
"# Nb threads: %d\n"
"# Nb GPUs: %d\n"
+#if defined(CHAMELEON_USE_MPI)
+ "# Nb mpi: %d\n"
+ "# PxQ: %dx%d\n"
+#endif
"# NB: %d\n"
"# IB: %d\n"
"# eps: %e\n"
@@ -410,6 +414,10 @@ print_header(char *prog_name, int * iparam) {
prog_name,
iparam[IPARAM_THRDNBR],
iparam[IPARAM_NCUDAS],
+#if defined(CHAMELEON_USE_MPI)
+ iparam[IPARAM_NMPI],
+ iparam[IPARAM_P], iparam[IPARAM_Q],
+#endif
iparam[IPARAM_NB],
iparam[IPARAM_IB],
eps );
@@ -472,7 +480,7 @@ main(int argc, char *argv[]) {
iparam[IPARAM_INVERSE ] = 0;
iparam[IPARAM_NCUDAS ] = 0;
- iparam[IPARAM_NDOM ] = 1;
+ iparam[IPARAM_NMPI ] = 1;
iparam[IPARAM_P ] = 1;
iparam[IPARAM_Q ] = 1;
iparam[IPARAM_PROFILE ] = 0;
@@ -615,6 +623,7 @@ main(int argc, char *argv[]) {
#if defined(CHAMELEON_USE_MPI)
MPI_Comm_size( MPI_COMM_WORLD, &nbnode );
+ iparam[IPARAM_NMPI] = nbnode;
/* Check P */
if ( (iparam[IPARAM_P] > 1) &&
(nbnode % iparam[IPARAM_P] != 0) ) {
diff --git a/timing/timing.h b/timing/timing.h
index 011030048..bf8f2403b 100644
--- a/timing/timing.h
+++ b/timing/timing.h
@@ -43,7 +43,7 @@ enum iparam_timing {
IPARAM_INVERSE,
IPARAM_NCUDAS,
- IPARAM_NDOM,
+ IPARAM_NMPI,
IPARAM_P, /* Parameter for 2D cyclic distribution */
IPARAM_Q, /* Parameter for 2D cyclic distribution */
/* Added for StarPU version */
--
GitLab