[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.1-106-g1cc48e3

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  1cc48e34f182c08ada0ce554fce35c545d336817 (commit)
      from  142b944024cbac4f6fc2cfc989b5404c52f7d1cc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/1cc48e34f182c08ada0ce554fce35c545d336817

commit 1cc48e34f182c08ada0ce554fce35c545d336817
Author: Sameh Sharkawi <sssharka at us.ibm.com>
Date:   Tue Jul 15 16:40:17 2014 -0400

    pamid: Fix for pami_tune parameter parsing
    
    (ibm) D197049
    
    Signed-off-by: Michael Blocksome <blocksom at us.ibm.com>

diff --git a/src/mpid/pamid/src/mpidi_util.c b/src/mpid/pamid/src/mpidi_util.c
index 45a36d0..8217ade 100644
--- a/src/mpid/pamid/src/mpidi_util.c
+++ b/src/mpid/pamid/src/mpidi_util.c
@@ -1288,14 +1288,14 @@ int num_tasks;
 static int MPIDI_collsel_print_usage()
 {
   if(!task_id)
-    fputs("Usage: pami_tune [options]\n\
+    fputs("Usage: pami_tune (MPICH) [options]\n\
 Options:\n\
   -c            Comma separated list of collectives to benchmark\n\
                 Valid options are: \n\
-                   allgather, allgatherv, allgatherv_int, allreduce, alltoall,\n\
-                   alltoallv, alltoallv_int, ambroadcast, amgather, amreduce,\n\
-                   amscatter, barrier, broadcast, gather, gatherv, gatherv_int,\n\
-                   reduce, reduce_scatter, scan, scatter, scatterv, scatterv_int\n\
+                   allgather, allgatherv_int, allreduce, alltoall,\n\
+                   alltoallv_int, ambroadcast, amgather, amreduce,\n\
+                   amscatter, barrier, broadcast, gather, gatherv_int,\n\
+                   reduce, reduce_scatter, scan, scatter, scatterv_int\n\
                    (Default: all collectives)\n\n\
   -m            Comma separated list of message sizes to benchmark\n\
                 (Default: 1 to 2^k, where k <= 20)\n\n\
@@ -1394,6 +1394,7 @@ static int MPIDI_collsel_process_collectives(char *coll_arg, advisor_params_t *p
   coll = strtok(collectives,",");
   while (coll != NULL)
   {
+    int invalid_collective = 0;
     for(i=0; i<PAMI_XFER_COUNT; i++)
     {
       if(strcmp(coll, xfer_array_str[i]) == 0)
@@ -1402,24 +1403,28 @@ static int MPIDI_collsel_process_collectives(char *coll_arg, advisor_params_t *p
         {
           if(infolevel >= 1) 
             fprintf(stderr,"WARNING: MPICH (pami_tune) doesn't support tuning for ALLGATHERV. ALLGATHERV tuning will be skipped.\nTune for ALLGATHERV_INT instead\n");
+          invalid_collective = 1;
           break;
         }
         else if(i == 7)
         {
           if(infolevel >= 1)
             fprintf(stderr,"WARNING: MPICH (pami_tune) doesn't support tuning for SCATTERV. SCATTERV tuning will be skipped.\nTune for SCATTERV_INT instead\n");
+          invalid_collective = 1;
           break;
         }
         else if(i == 10)
         {
           if(infolevel >= 1)
             fprintf(stderr,"WARNING: MPICH (pami_tune) doesn't support tuning for GATHERV. GATHERV tuning will be skipped.\nTune for GATHERV_INT instead\n");
+          invalid_collective = 1;
           break;
         }
         else if(i == 14)
         {
           if(infolevel >= 1)
             fprintf(stderr,"WARNING: MPICH (pami_tune) doesn't support tuning for ALLTOALLV. ALLTOALLV tuning will be skipped.\nTune for ALLTOALLV_INT instead\n");
+          invalid_collective = 1;
           break;
         }
         else
@@ -1430,19 +1435,23 @@ static int MPIDI_collsel_process_collectives(char *coll_arg, advisor_params_t *p
       }
     }
     /* arg did not match any collective */
-    if(i == PAMI_XFER_COUNT)
+    if(i == PAMI_XFER_COUNT || invalid_collective)
     {
-      MPIU_Free(params->collectives);
-      params->collectives = NULL;
       if(!task_id)
       {
         fprintf(stderr, "Invalid collective: %s\n", coll);
       }
-      ret = 1;
       break;
     }
     coll = strtok(NULL,",");
   }
+  if(params->num_collectives == 0)
+  {
+    MPIU_Free(params->collectives);
+    params->collectives = NULL;
+    ret = 1;
+  }
+
   MPIU_Free(collectives);
   return ret;
 }

-----------------------------------------------------------------------

Summary of changes:
 src/mpid/pamid/src/mpidi_util.c |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
MPICH primary repository