Changeset 36577

Timestamp:

Mar 6, 2014, 4:42:10 PM (12 years ago)

Author:

eugene

Message:

only work with neighbors

Location:

branches/eam_branches/ipp-20140206/Ohana/src

Files:

• libdvo/include/dvo.h (modified) (2 diffs)
• libdvo/src/RegionHostTable.c (modified) (5 diffs)
• relastro/src/relastro_parallel_images.c (modified) (2 diffs)
• relastro/src/share_images_pos.c (modified) (1 diff)
• relastro/src/share_mean_pos.c (modified) (1 diff)
• relphot/src/relphot_parallel_images.c (modified) (2 diffs)
• relphot/src/share_image_mags.c (modified) (1 diff)
• relphot/src/share_mean_mags.c (modified) (1 diff)

branches/eam_branches/ipp-20140206/Ohana/src/libdvo/include/dvo.h

@@ -311 +311 @@
   off_t *imseq;
 
-  int *neighbors;
-  int Nneighbors;
+  int *neighbors;             // list of neighbor index values
+  int Nneighbors;             // number of neighbors
+  char isNeighbor;            // TRUE if I am a neighbor to the current region host
 } RegionHostInfo;
 
@@ -906 +907 @@
 int RegionHostTableWaitJobs (RegionHostTable *regionHosts, char *file, int lineno);
 int RegionHostTableWaitJobsGetIO (RegionHostTable *regionHosts, char *file, int lineno, int VERBOSE);
+int RegionHostFindNeighbors (RegionHostTable *table, int Nhost);
 
 # endif // DVO_H

branches/eam_branches/ipp-20140206/Ohana/src/libdvo/src/RegionHostTable.c

@@ -30 +30 @@
     hosts[i].neighbors = NULL;
     hosts[i].Nneighbors = 0;
+    hosts[i].isNeighbor = FALSE;
   }
   return;
@@ -170 +171 @@
   }
 
-  for (i = 0; i < table->Nhosts; i++) {
-    RegionHostFindNeighbors (table, i);
-  }
-
   free (filename);
   fclose (f);
@@ -180 +177 @@
 
 int RegionHostFindNeighbors (RegionHostTable *table, int Nhost) {
+
+  int i;
 
   // given a specific host (by table sequence), find all of its neighbors
@@ -192 +191 @@
 
     if (i == Nhost) continue;
-    RegionHostInfo *althost = &table->hosts[i];
+    RegionHostInfo *altHost = &table->hosts[i];
     
     int onBorder;
@@ -226 +225 @@
       myhost->Nneighbors ++;
       REALLOCATE (myhost->neighbors, int, myhost->Nneighbors + 1);
+      altHost->isNeighbor = TRUE;
   }
   return TRUE;

branches/eam_branches/ipp-20140206/Ohana/src/relastro/src/relastro_parallel_images.c

@@ -19 +19 @@
   // load the RegionTable (UserRegion should not be used at this level)
   RegionHostTable *regionHosts = RegionHostTableLoad (CATDIR, REGION_FILE);
+  int myHost = regionHosts->index[REGION_HOST_ID];
+  RegionHostFindNeighbors (regionHosts, myHost);
 
   // load the subset images belonging to this host
@@ -112 +114 @@
 
   // this is a checkpoint to make sure all hosts have finished the loop above
-  int myHost = regionHosts->index[REGION_HOST_ID];
   char *loopsyncfile = make_filename (CATDIR, regionHosts->hosts[myHost].hostname, REGION_HOST_ID, "loop.sync");
   update_sync_file (loopsyncfile, 0);

branches/eam_branches/ipp-20140206/Ohana/src/relastro/src/share_images_pos.c

@@ -53 +53 @@
   for (i = 0; i < regionHosts->Nhosts; i++) {
     if (regionHosts->hosts[i].hostID == REGION_HOST_ID) continue;
-    // XXX add neighbor check? : if (not_neighbor(host[i])) continue;
+    if ((REGION_HOST_ID > -1) && !regionHosts->hosts[i].isNeighbor) continue;
 
     char *syncfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "imagepos.sync");

branches/eam_branches/ipp-20140206/Ohana/src/relastro/src/share_mean_pos.c

@@ -66 +66 @@
 
   for (i = 0; i < regionHosts->Nhosts; i++) {
-    // if (not_neighbor(host[i])) continue;
     if (regionHosts->hosts[i].hostID == REGION_HOST_ID) continue;
+    if ((REGION_HOST_ID > -1) && !regionHosts->hosts[i].isNeighbor) continue;
 
     char *syncfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "meanpos.sync");

branches/eam_branches/ipp-20140206/Ohana/src/relphot/src/relphot_parallel_images.c

@@ -21 +21 @@
   // load the RegionTable (UserRegion should not be used at this level)
   RegionHostTable *regionHosts = RegionHostTableLoad (CATDIR, REGION_FILE);
+  int myHost = regionHosts->index[REGION_HOST_ID];
+  RegionHostFindNeighbors (regionHosts, myHost);
 
   // load the subset images belonging to this host
@@ -117 +119 @@
 
   // this is a checkpoint to make sure all hosts have finished the loop above
-  int myHost = regionHosts->index[REGION_HOST_ID];
   char *loopsyncfile = make_filename (CATDIR, regionHosts->hosts[myHost].hostname, REGION_HOST_ID, "loop.sync");
   update_sync_file (loopsyncfile, 0);

branches/eam_branches/ipp-20140206/Ohana/src/relphot/src/share_image_mags.c

@@ -53 +53 @@
   for (i = 0; i < regionHosts->Nhosts; i++) {
     if (regionHosts->hosts[i].hostID == REGION_HOST_ID) continue;
-    // XXX add neighbor check? : if (not_neighbor(host[i])) continue;
+    if ((REGION_HOST_ID > -1) && !regionHosts->hosts[i].isNeighbor) continue;
 
     char *syncfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "imagemags.sync");

branches/eam_branches/ipp-20140206/Ohana/src/relphot/src/share_mean_mags.c

@@ -77 +77 @@
     // if (not_neighbor(host[i])) continue;
     if (regionHosts->hosts[i].hostID == REGION_HOST_ID) continue;
+    if ((REGION_HOST_ID > -1) && !regionHosts->hosts[i].isNeighbor) continue;
 
     char *syncfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "meanmags.sync");