Changeset 35406

Timestamp:

Apr 16, 2013, 1:10:03 PM (13 years ago)

Author:

eugene

Message:

enable parallel delstar

Location:

branches/eam_branches/ipp-20130307/Ohana/src/delstar

Files:

• Makefile (modified) (2 diffs)
• include/delstar.h (modified) (2 diffs)
• src/ImageIDsOps.c (added)
• src/args.c (modified) (1 diff)
• src/delete_duplicate_images.c (modified) (3 diffs)
• src/delstar_client.c (modified) (1 diff)

branches/eam_branches/ipp-20130307/Ohana/src/delstar/Makefile

@@ -38 +38 @@
 $(SRC)/find_matches.$(ARCH).o     \
 $(SRC)/parse_time.$(ARCH).o       \
+$(SRC)/ImageIDsOps.$(ARCH).o       \
 $(SRC)/check_permissions.$(ARCH).o \
 $(SRC)/Shutdown.$(ARCH).o          
@@ -49 +50 @@
 $(SRC)/delete_photcodes.$(ARCH).o \
 $(SRC)/delete_photcodes_single.$(ARCH).o \
+$(SRC)/ImageIDsOps.$(ARCH).o       \
 $(SRC)/Shutdown.$(ARCH).o          
 

branches/eam_branches/ipp-20130307/Ohana/src/delstar/include/delstar.h

@@ -117 +117 @@
 int delete_duplicate_images (int hostID, char *hostpath, FITS_DB *db);
 int delete_duplicate_image_measures (int hostID, char *hostpath, IndexArray *imageID);
-int delete_duplicate_image_measures_parallel (SkyList *sky);
+int delete_duplicate_image_measures_parallel (SkyList *sky, IndexArray *imageID);
 int delete_duplicate_image_measures_catalog (Catalog *catalog, IndexArray *imageID);
 
@@ -123 +123 @@
 IndexArray *make_index_array (Image *image, off_t Nimage, int mode);
 
+IndexArray *ImageIDLoad(char *filename);
+int ImageIDSave(char *filename, IndexArray *imageID);

branches/eam_branches/ipp-20130307/Ohana/src/delstar/src/args.c

@@ -328 +328 @@
     remove_argument (N, &argc, argv);
   }
+  if ((N = get_argument (argc, argv, "-dup-images"))) {
+    if (MODE != MODE_NONE) usage();
+    MODE = MODE_DUP_IMAGES;
+    remove_argument (N, &argc, argv);
+  }
 
   if (MODE == MODE_NONE) delstar_client_usage ();

branches/eam_branches/ipp-20130307/Ohana/src/delstar/src/delete_duplicate_images.c

@@ -84 +84 @@
   // launch the remote jobs
   if (PARALLEL && !hostID) {
-    int status = delete_duplicate_image_measures_parallel (skylist);
+    int status = delete_duplicate_image_measures_parallel (skylist, imageID);
     return status;
   }
@@ -132 +132 @@
   // write out the subset table of image information
   char imageFile[512];
-  snprintf (imageFile, 512, "%s/Images.subset.dat", CATDIR);
-
-  if (!ImageSubsetSave (imageFile, image, Nimage)) {
-    fprintf (stderr, "failed to write image subset\n");
+  snprintf (imageFile, 512, "%s/ImageIDs.tmp.fits", CATDIR);
+
+  if (!ImageIDSave (imageFile, imageID)) {
+    fprintf (stderr, "failed to write image ID table\n");
     exit (1);
   }
-
 
   // launch the delstar_client jobs to the parallel hosts
@@ -167 +166 @@
 
     fprintf (stderr, "command: %s\n", command);
-
-    fprintf (stderr, "parallel version is not ready (need to save / load the imageID array\n");
 
     if (PARALLEL_MANUAL) continue;

branches/eam_branches/ipp-20130307/Ohana/src/delstar/src/delstar_client.c

@@ -6 +6 @@
 int main (int argc, char **argv) {
 
+  char imageFile[512];
+
   SetSignals ();
   ConfigInit (&argc, argv);
   args_client (argc, argv);
 
-  // load the current sky table (layout of all SkyRegions) 
-  SkyTable *sky = SkyTableLoadOptimal (CATDIR, NULL, NULL, TRUE, -1, VERBOSE);
-  if (!sky) {
-      fprintf (stderr, "ERROR running loading sky table from %s\n", CATDIR);
-      exit (2);
-  }
-  SkyTableSetFilenames (sky, CATDIR, "cpt");
-
-  SkyList *skylist = SkyListByPatch (sky, -1, &UserPatch);
-  if (!skylist) {
-      fprintf (stderr, "ERROR setting up skylist for %s\n", CATDIR);
-      exit (2);
-  }
-
   switch (MODE) {
+    case MODE_DUP_IMAGES:
+      // read the subset table of image information
+      snprintf (imageFile, 512, "%s/ImageIDs.tmp.fits", CATDIR);
+      
+      IndexArray *imageID = ImageIDLoad (imageFile);
+      if (!imageID) {
+        fprintf (stderr, "failed to read image ID table\n");
+        exit (1);
+      }
+      if (!delete_duplicate_image_measures (HOST_ID, HOSTDIR, imageID)) exit (1);
+      exit (0);
+      break;
     case MODE_IMAGEFILE:
       break;