Changeset 36503

Timestamp:

Feb 11, 2014, 6:15:41 AM (12 years ago)

Author:

eugene

Message:

working on relphot -parallel-regions

Location:

branches/eam_branches/ipp-20140206/Ohana/src

Files:

• libdvo/include/dvo.h (modified) (1 diff)
• libdvo/src/RegionHostTable.c (added)
• relphot/doc/parallel.txt (modified) (1 diff)
• relphot/src/args.c (modified) (1 diff)
• relphot/src/assign_images.c (added)
• relphot/src/relphot.c (modified) (1 diff)
• relphot/src/relphot_images.c (modified) (1 diff)
• relphot/src/relphot_parallel_images.c (added)
• relphot/src/relphot_parallel_region.c (added)
• relphot/src/setMrelCatalog.c (modified) (1 diff)
• relphot/src/share_mean_mags.c (added)

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

@@ -284 +284 @@
   short *index;
 } HostTable;
+
+// A RegionHost processes data for some region in parallel with other regions
+typedef struct {
+  double Rmin;
+  double Rmax;
+  double Dmin;
+  double Dmax;
+  int hostID;                 // remove machine ID in SkyTable
+  int stdio[3];               // fd's for communication with the remote host
+  int pid;                    // remote process ID
+  char *hostname;
+  ImageSubset *image;
+  int line_numbers;
+} RegionHostInfo;
+
+typedef struct {
+  int Nhosts;
+  RegionHostInfo *hosts;
+  short *index;
+} RegionHostTable;
 
 // special-case function:

branches/eam_branches/ipp-20140206/Ohana/src/relphot/doc/parallel.txt

@@ +1 @@
+
+2014.02.06
+
+** a single region-level host owns images for which the center lands
+   in its region.
+
+** it owns detections which come from images which it owns
+   
+** it owns objects which land in its region
+
+Extending parallel relphot processing to split the sky (and images)
+into regions, each of which runs in parallel at the same time:
+
+Top Level (relphot -parallel-images):
+ * define regions of the sky -> hosts
+ * load images, assign to hosts
+ * launch region-level jobs on remote hosts
+
+ Region Level (relphot -parallel-images-region)
+  * load my image subset table
+  * request objects and detections for my skyregion
+  * match images & objects, etc
+
+  * update my image parameters
+  * update my detections
+  * write out detections 
+  * load detections from my border hosts
+  * match to my objects
+  * update my objects
+  * write out objects
+  * load objects from my border hosts
+  * update images
+    (iterate N times)
+  * write out image parameters
+
+Top Level
+  * read image parameters, update
+  * update objects
 
 2012.02.13

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

@@ -354 +354 @@
   }
 
+  ParallelImages = FALSE;
+  if ((N = get_argument (argc, argv, "-parallel-images"))) {
+    remove_argument (N, &argc, argv);
+    ParallelImages = TRUE;
+  }
+
   if (UpdateAverages && (argc == 1)) return TRUE;
   if (argc != 2) relphot_usage ();

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

@@ -22 +22 @@
   }
 
+  /* the object analysis is a separate process iterating over catalogs */
+  if (ParallelImages) {
+    relphot_parallel_images ();
+    exit (0);
+  }
+
+  /* the object analysis is a separate process iterating over catalogs */
+  if (ParallelRegion) {
+    relphot_parallel_region ();
+    exit (0);
+  }
+
   relphot_images ();
 

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

@@ -244 +244 @@
   if (!UPDATE) exit (0);
   
-  /* load catalog data from region files, update Mrel include all data */
+  /* Load catalog data from region files, update Mrel include all data.  In a parallel
+     context, this function writes the image parameters as a subset table for the remote
+     clients */
   reload_catalogs (skylist, flatcorr, 0, NULL);
   MARKTIME("-- updated all catalogs: %f sec\n", dtime);

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

@@ -259 +259 @@
       list[N]  = Msys - Mcal - Mmos - Mgrid;
 
+      // NOTE: 
+      // Msys is measure[i].M + zp corrections
+      // Mcal is image[j].Mcal
+      // Mmos and Mgrid are offsets for mosaic and grid
+
       // up-weight the ubercal values (or convergence can take a long time...)
       if (measureT[k].dbFlags & ID_MEAS_PHOTOM_UBERCAL) {