Changeset 520

Timestamp:

Jul 2, 2014 11:38:39 AM (5 years ago)

Author:

kulshres

Message:

Merge branch 'ampi' from 'aragonne'

The following commits were merged:

commit ba102836ff4533dc70f99c992b1fb2a6bf532c49
Author: Max Sagebaum <sagebaum@…>
Date: Mon Jun 30 15:44:54 2014 +0200

Fix of buffer length in ampi_pushSR

commit 918a9e2a60fb2c2d36617db95a96b16ca798e408
Author: Michel Schanen <schanen@…>
Date: Mon Jun 30 13:42:58 2014 +0200

Fix for the ampi tracing beyond chunk size

Using put_op_reserve instead of put_op for Gatherv and Scatterv. New function
push_CallCodeReserve with additional location number argument.

commit 00994d40a5d29bfcf40bebd22f3306bdaad86e92
Author: Jean Utke <utke@…>
Date: Fri Mar 28 15:57:29 2014 -0500

rearrange

commit a1c1d11ab0e2af58d43aaeb92f6e4982ce81d92f
Author: Jean Utke <utke@…>
Date: Fri Mar 28 15:29:47 2014 -0500

make it consistent and count in the loop rather than jumping of the duplicates like the end of tape ones and leaving it to guess to the user why the rev count doesn't got down to 1

commit bf1acc6155cd555bc35e8b9c6241097b4b833345
Author: Jean Utke <utke@…>
Date: Fri Mar 28 13:38:02 2014 -0500

fix up allgatherv output for chasing a misalignment observed in ISSM

Location:

trunk/ADOL-C/src

Files:

• ampisupport.cpp (modified) (3 diffs)
• tapedoc/tapedoc.c (modified) (7 diffs)

trunk/ADOL-C/src/ampisupport.cpp

@@ -51 +51 @@
   ourADTOOL_AMPI_FPCollection.popGSVinfo_fp=&ADTOOL_AMPI_popGSVinfo;
   ourADTOOL_AMPI_FPCollection.push_CallCode_fp=&ADTOOL_AMPI_push_CallCode;
+  ourADTOOL_AMPI_FPCollection.push_CallCodeReserve_fp=&ADTOOL_AMPI_push_CallCodeReserve;
   ourADTOOL_AMPI_FPCollection.pop_CallCode_fp=&ADTOOL_AMPI_pop_CallCode;
   ourADTOOL_AMPI_FPCollection.push_AMPI_Request_fp=&ADTOOL_AMPI_push_AMPI_Request;
@@ -245 +246 @@
         + sizeof(adouble)*(dtdata->last_active_block_lengths[dt_idx]-1);
     }
-    else { activeVarCount = count; bitCountToFirstActive = 0; bitCountToLastActive = count-1; }
+    else { activeVarCount = count; bitCountToFirstActive = 0; bitCountToLastActive = (count-1)*sizeof(adouble); }
     if (count>0) {
       assert(buf);
@@ -479 +480 @@
         put_op(ampi_allgather);
         break;
+      default:
+        assert(0);
+        break;
+    }
+  }
+}
+
+void ADTOOL_AMPI_push_CallCodeReserve(enum AMPI_CallCode_E thisCall, unsigned int numlocations) {
+  if (ADOLC_CURRENT_TAPE_INFOS.traceFlag) {
+    switch(thisCall) {
       case AMPI_GATHERV:
-        put_op(ampi_gatherv);
+        put_op_reserve(ampi_gatherv, numlocations);
         break;
       case AMPI_SCATTERV:
-        put_op(ampi_scatterv);
+        put_op_reserve(ampi_scatterv, numlocations);
         break;
       case AMPI_ALLGATHERV:
-         put_op(ampi_allgatherv);
+         put_op_reserve(ampi_allgatherv, numlocations);
          break;
       default:

trunk/ADOL-C/src/tapedoc/tapedoc.c

@@ -106 +106 @@
                 double *val,int ncst, double* cst) {
     int i;
-
-    ++op_cnt;
-    --rev_op_cnt;
 
     checkPageBreak();
@@ -180 +177 @@
     int i;
 
-    ++op_cnt;
-    --rev_op_cnt;
-
     checkPageBreak();
 
@@ -207 +201 @@
 /*--------------------------------------------------------------------------*/
 void filewrite_end( int opcode ) {
-    ++op_cnt;
-    --rev_op_cnt;
 #ifdef ADOLC_TAPE_DOC_VALUES
   fprintf(fp," %i & %i & %i & end of tape & & & & & & & & & &  \\\\ \\hline \n",op_cnt,rev_op_cnt, opcode);
@@ -282 +274 @@
     /* globals */
     op_cnt=0;
-    rev_op_cnt=ADOLC_CURRENT_TAPE_INFOS.stats[NUM_OPERATIONS];
+    rev_op_cnt=ADOLC_CURRENT_TAPE_INFOS.stats[NUM_OPERATIONS]+1;
 
     dp_T0 = myalloc1(ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES]);
 
     operation=get_op_f();
+    ++op_cnt;
+    --rev_op_cnt;
     while (operation !=end_of_tape) {
+      ++op_cnt;
+      --rev_op_cnt;
         switch (operation) {
 
@@ -298 +294 @@
                 get_op_block_f();
                 operation=get_op_f();
+                ++op_cnt;
+                --rev_op_cnt;
                 /* Skip next operation, it's another end_of_op */
                 break;
@@ -1410 +1408 @@
 
             case ampi_allgatherv:
-                TAPE_AMPI_read_int(loc_a+1); /* commSizeForRootOrNull */
-                for (l=0;l<*(loc_a+1);++l) {
-                  TAPE_AMPI_read_int(loc_a+2); /* rcnts */
-                  TAPE_AMPI_read_int(loc_a+2); /* displs */
-                }
-                if (*(loc_a+1)>0) {
-                  loc_a[2] = get_locint_f(); /* rbuf loc */
-                  TAPE_AMPI_read_MPI_Datatype(&anMPI_Datatype); /* rtype */
-                }
-                TAPE_AMPI_read_int(loc_a+3); /* count */
-                TAPE_AMPI_read_MPI_Datatype(&anMPI_Datatype); /* type */
-                TAPE_AMPI_read_MPI_Comm(&anMPI_Comm);
-                TAPE_AMPI_read_int(loc_a+1); /* commSizeForRootOrNull */
-                filewrite_ampi(operation, "ampi allgatherv",4, loc_a);
-                break;
+              size=0;
+              TAPE_AMPI_read_int(loc_a+size++); /* commSizeForRootOrNull */
+              for (l=0;l<*(loc_a);++l) {
+                TAPE_AMPI_read_int(loc_a+size); /* rcnts */
+                TAPE_AMPI_read_int(loc_a+size+1); /* displs */
+              }
+              if (*(loc_a)>0) {
+                size+=2;
+                loc_a[size++] = get_locint_f(); /* rbuf loc */
+                TAPE_AMPI_read_MPI_Datatype(&anMPI_Datatype); /* rtype */
+              }
+              loc_a[size++] = get_locint_f(); /* buf loc */
+              TAPE_AMPI_read_int(loc_a+size++); /* count */
+              TAPE_AMPI_read_MPI_Datatype(&anMPI_Datatype); /* type */
+              TAPE_AMPI_read_int(loc_a+size++); /* root */
+              TAPE_AMPI_read_MPI_Comm(&anMPI_Comm);
+              TAPE_AMPI_read_int(loc_a); /* commSizeForRootOrNull */
+              filewrite_ampi(operation, "ampi allgatherv",size, loc_a);
+              break;
 #endif
                 /*--------------------------------------------------------------------------*/
@@ -1437 +1439 @@
         /* Read the next operation */
         operation=get_op_f();
+        ++op_cnt;
+        --rev_op_cnt;
     }  /* endwhile */