Changeset b8b985e for python

Timestamp:

05/24/19 11:36:52 (6 years ago)

Author:

Tom Uram <turam@…>

Branches:

pympi

Parents:

1ef52ae

git-author:

Tom Uram <turam@…> (05/24/19 11:36:52)

git-committer:

Tom Uram <turam@…> (05/24/19 11:36:52)

Message:

Intermediate commit of work with Antonio

Location:

python/lib

Files:

• gio.cxx (modified) (1 diff)
• gio.h (modified) (2 diffs)

python/lib/gio.cxx

@@ -64 +64 @@
     int num_ranks = reader.readNRanks();
     uint64_t size = 0;
-    for(int i =0;i<num_ranks;++i)
-      size +=reader.readNumElems(i);
+    //for(int i =0;i<num_ranks;++i)
+    //  size +=reader.readNumElems(i);
+    int rank;
+    MPI_Comm_rank(C, &rank);
+    size = reader.readNumElems(rank);
     reader.close();
     return size;

python/lib/gio.h

@@ -49 +49 @@
 void read_gio(const MPI_Comm C, char* file_name, std::string var_name, T*& data, int field_count){
   gio::GenericIO reader(C, file_name);
+  int rank;
+  MPI_Comm_rank(C, &rank);
+  printf("rank = %d\n", rank);
 #else
 void read_gio(char* file_name, std::string var_name, T*& data, int field_count){
@@ -55 +58 @@
   reader.openAndReadHeader(gio::GenericIO::MismatchAllowed);
   int num_ranks = reader.readNRanks();
+  printf("num_ranks = %d\n", num_ranks);
   uint64_t max_size = 0;
-  uint64_t rank_size[num_ranks];
-  for(int i =0;i<num_ranks;++i){
-    rank_size[i] = reader.readNumElems(i);
-    if(max_size < rank_size[i])
-      max_size = rank_size[i];
-  }
+//  uint64_t rank_size[num_ranks];
+  uint64_t rank_size;
+//  for(int i =0;i<num_ranks;++i){
+//    rank_size[i] = reader.readNumElems(i);
+//    if(max_size < rank_size[i])
+//      max_size = rank_size[i];
+//  }
+  rank_size = reader.readNumElems(rank);
+  max_size = rank_size;
+  printf("rank_size: %ld\nmax_size: %ld\n", rank_size, max_size);
   T* rank_data = new T[max_size*field_count+reader.requestedExtraSpace()/sizeof(T)];
   int64_t offset =0;
   reader.addScalarizedVariable(var_name,rank_data,field_count,
                                gio::GenericIO::VarHasExtraSpace);
-  for(int i=0;i<num_ranks;++i){
-    reader.readData(i,false);
-    std::copy(rank_data,rank_data+rank_size[i]*field_count,data+offset);
-    offset +=rank_size[i]*field_count;
-  }
+//  for(int i=0;i<num_ranks;++i){
+//    reader.readData(i,false);
+//    std::copy(rank_data,rank_data+rank_size[i]*field_count,data+offset);
+//    offset +=rank_size[i]*field_count;
+//  }
+  reader.readData(rank,false);
+  std::copy(rank_data,rank_data+rank_size*field_count,data);
   delete [] rank_data;
   reader.close();