Changeset 14e73bb

Timestamp:

04/12/16 19:22:09 (9 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master, pympi

Children:

754e14c

Parents:

8f0a211

git-author:

Hal Finkel <hfinkel@…> (04/12/16 19:22:09)

git-committer:

Hal Finkel <hfinkel@…> (04/12/16 19:22:09)

Message:

Misc. improvements to splitting and error handling

Files:

• GenericIO.cxx (modified) (7 diffs)
• GenericIO.h (modified) (1 diff)

GenericIO.cxx

@@ -51 +51 @@
 #include <fstream>
 #include <stdexcept>
+#include <iterator>
 #include <algorithm>
 #include <cassert>
@@ -66 +67 @@
 
 #ifdef __bgq__
-#include <spi/include/kernel/location.h>
-#include <spi/include/kernel/process.h>
-#include <firmware/include/personality.h>
+#include <mpix.h>
 #endif
 
@@ -206 +205 @@
         continue;
 
-      throw runtime_error("Unable to read " + D + " from file: " + FileName);
+      throw runtime_error("Unable to read " + D + " from file: " + FileName +
+                          ": " + strerror(errno));
     }
 
@@ -224 +224 @@
         continue;
 
-      throw runtime_error("Unable to write " + D + " to file: " + FileName);
+      throw runtime_error("Unable to write " + D + " to file: " + FileName +
+                          ": " + strerror(errno));
     }
 
@@ -1151 +1152 @@
 
   return (int) RH->GlobalRank;
+}
+
+void GenericIO::getSourceRanks(vector<int> &SR) {
+  SR.clear();
+
+  if (Redistributing) {
+    std::copy(SourceRanks.begin(), SourceRanks.end(), std::back_inserter(SR));
+    return;
+  }
+
+  int Rank;
+#ifndef GENERICIO_NO_MPI
+  MPI_Comm_rank(Comm, &Rank);
+#else
+  Rank = 0;
+#endif
+
+  SR.push_back(Rank);
 }
 
@@ -1505 +1524 @@
         dofs.write((const char *) Data, ReadSize);
         dofs.close();
+
+        uint64_t RawCRC = crc64_omp(Data, ReadSize - CRCSize);
+        unsigned char *UData = (unsigned char *) Data;
+        crc64_invert(RawCRC, &UData[ReadSize - CRCSize]);
+        uint64_t NewCRC = crc64_omp(Data, ReadSize);
+        std::cerr << "Recalulated CRC: " << NewCRC << ((NewCRC == -1) ? "ok" : "bad") << "\n";
         break;
       }
@@ -1615 +1640 @@
 void GenericIO::setNaturalDefaultPartition() {
 #ifdef __bgq__
-  Personality_t pers;
-  Kernel_GetPersonality(&pers, sizeof(pers));
-
-  // Nodes in an ION Partition
-  int SPLIT_A = 2;
-  int SPLIT_B = 2;
-  int SPLIT_C = 4;
-  int SPLIT_D = 4;
-  int SPLIT_E = 2;
-
-  int Anodes, Bnodes, Cnodes, Dnodes, Enodes;
-  int Acoord, Bcoord, Ccoord, Dcoord, Ecoord;
-  int A_color, B_color, C_color, D_color, E_color;
-  int A_blocks, B_blocks, C_blocks, D_blocks, E_blocks;
-  uint32_t id_on_node;
-  int ranks_per_node, color;
-
-  Anodes = pers.Network_Config.Anodes;
-  Acoord = pers.Network_Config.Acoord;
-
-  Bnodes = pers.Network_Config.Bnodes;
-  Bcoord = pers.Network_Config.Bcoord;
-
-  Cnodes = pers.Network_Config.Cnodes;
-  Ccoord = pers.Network_Config.Ccoord;
-
-  Dnodes = pers.Network_Config.Dnodes;
-  Dcoord = pers.Network_Config.Dcoord;
-
-  Enodes = pers.Network_Config.Enodes;
-  Ecoord = pers.Network_Config.Ecoord;
-
-  A_color  = Acoord /  SPLIT_A;
-  B_color  = Bcoord /  SPLIT_B;
-  C_color  = Ccoord /  SPLIT_C;
-  D_color  = Dcoord /  SPLIT_D;
-  E_color  = Ecoord /  SPLIT_E;
-
-  // Number of blocks
-  A_blocks = Anodes / SPLIT_A;
-  B_blocks = Bnodes / SPLIT_B;
-  C_blocks = Cnodes / SPLIT_C;
-  D_blocks = Dnodes / SPLIT_D;
-  E_blocks = Enodes / SPLIT_E;
-
-  color = (A_color * (B_blocks * C_blocks * D_blocks * E_blocks))
-    + (B_color * (C_blocks * D_blocks * E_blocks))
-    + (C_color * ( D_blocks * E_blocks))
-    + (D_color * ( E_blocks))
-    + E_color;
-
-  DefaultPartition = color;
+  DefaultPartition = MPIX_IO_link_id();
 #else
 #ifndef GENERICIO_NO_MPI

GenericIO.h

@@ -297 +297 @@
   void readData(int EffRank = -1, bool PrintStats = true, bool CollStats = true);
 
+  void getSourceRanks(std::vector<int> &SR);
+
   void close() {
     FH.close();