Merge pull request #6 from paranumal/paralmond

Paralmond Refactor Former-commit-id: ad07c20a69574a56525524cb3c4a0a36026334cf
paranumal · Sep 18, 2018 · fa3e693 · fa3e693
2 parents 02ff638 + 30773b5
commit fa3e693
Show file tree

Hide file tree

Showing 86 changed files with 8,392 additions and 7,478 deletions.
diff --git a/3rdParty/gslib/src/gs.c b/3rdParty/gslib/src/gs.c
@@ -1114,11 +1114,15 @@ static void auto_setup(struct gs_remote *r, struct gs_topology *top,
     struct gs_remote r_alt;
     double time[2][3];
 
+    // #define DRY_RUN(i,gsr,str) do { \
+    //   if(comm->id==0) printf("   " str ": "); \
+    //   dry_run_time(time[i],gsr,comm,buf); \
+    //   if(comm->id==0) \
+    //     printf("%g %g %g\n",time[i][0],time[i][1],time[i][2]); \
+    // } while(0)
+
     #define DRY_RUN(i,gsr,str) do { \
-      if(comm->id==0) printf("   " str ": "); \
       dry_run_time(time[i],gsr,comm,buf); \
-      if(comm->id==0) \
-        printf("%g %g %g\n",time[i][0],time[i][1],time[i][2]); \
     } while(0)
 
     #define DRY_RUN_CHECK(str,new_name) do { \
@@ -1143,7 +1147,7 @@ static void auto_setup(struct gs_remote *r, struct gs_topology *top,
     #undef DRY_RUN_CHECK
     #undef DRY_RUN
 
-    if(comm->id==0) printf("   used all_to_all method: %s\n",name);
+    // if(comm->id==0) printf("   used all_to_all method: %s\n",name);
   }
 }
 

diff --git a/include/ogs_t.h b/include/ogs_t.h