Changeset 8f0a211 for GenericIO.h

Timestamp:

04/12/16 19:18:46 (8 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master, pympi

Children:

14e73bb

Parents:

a4fee13

git-author:

Hal Finkel <hfinkel@…> (04/12/16 19:18:46)

git-committer:

Hal Finkel <hfinkel@…> (04/12/16 19:18:46)

Message:

Add redistribution support

File:

• GenericIO.h (modified) (7 diffs)

GenericIO.h

@@ -188 +188 @@
   GenericIO(const MPI_Comm &C, const std::string &FN, unsigned FIOT = -1)
     : NElems(0), FileIOType(FIOT == (unsigned) -1 ? DefaultFileIOType : FIOT),
-      Partition(DefaultPartition), Comm(C), FileName(FN), SplitComm(MPI_COMM_NULL) {
+      Partition(DefaultPartition), Comm(C), FileName(FN), Redistributing(false),
+      DisableCollErrChecking(false), SplitComm(MPI_COMM_NULL) {
     std::fill(PhysOrigin, PhysOrigin + 3, 0.0);
     std::fill(PhysScale,  PhysScale + 3, 0.0);
@@ -195 +196 @@
   GenericIO(const std::string &FN, unsigned FIOT = -1)
     : NElems(0), FileIOType(FIOT == (unsigned) -1 ? DefaultFileIOType : FIOT),
-      Partition(DefaultPartition), FileName(FN) {
+      Partition(DefaultPartition), FileName(FN), Redistributing(false),
+      DisableCollErrChecking(false) {
     std::fill(PhysOrigin, PhysOrigin + 3, 0.0);
     std::fill(PhysScale,  PhysScale + 3, 0.0);
@@ -264 +266 @@
 #endif
 
+  enum MismatchBehavior {
+    MismatchAllowed,
+    MismatchDisallowed,
+    MismatchRedistribute
+  };
+
   // Reading
-  void openAndReadHeader(bool MustMatch = true, int EffRank = -1,
-                         bool CheckPartMap = true);
+  void openAndReadHeader(MismatchBehavior MB = MismatchDisallowed,
+                         int EffRank = -1, bool CheckPartMap = true);
 
   int readNRanks();
@@ -280 +288 @@
 
   int getNumberOfVariables() { return this->Vars.size(); };
-
 
   void getVariableInfo(std::vector<VariableInfo> &VI);
@@ -330 +337 @@
 
   template <bool IsBigEndian>
-  void readHeaderLeader(void *GHPtr, bool MustMatch, int SplitNRanks,
-                        std::string &LocalFileName, uint64_t &HeaderSize,
-                        std::vector<char> &Header);
+  void readHeaderLeader(void *GHPtr, MismatchBehavior MB, int Rank, int NRanks,
+                        int SplitNRanks, std::string &LocalFileName,
+                        uint64_t &HeaderSize, std::vector<char> &Header);
 
   template <bool IsBigEndian>
@@ -358 +365 @@
   void readCoords(int Coords[3], int EffRank);
 
-  template <bool IsBigEndian>
-  void readData(int EffRank, bool PrintStats, bool CollStats);
+  void readData(int EffRank, size_t RowOffset, int Rank,
+                uint64_t &TotalReadSize, int NErrs[3]);
+
+  template <bool IsBigEndian>
+  void readData(int EffRank, size_t RowOffset,
+                int Rank, uint64_t &TotalReadSize, int NErrs[3]);
 
   template <bool IsBigEndian>
@@ -384 +395 @@
   static std::size_t CollectiveMPIIOThreshold;
 #endif
+
+  // When redistributing, the rank blocks which this process should read.
+  bool Redistributing, DisableCollErrChecking;
+  std::vector<int> SourceRanks;
 
   std::vector<int> RankMap;