Changeset 33305

Timestamp:

Feb 18, 2012, 12:40:00 PM (14 years ago)

Author:

eugene

Message:

new dvo_client for parallel operations

Location:

branches/eam_branches/ipp-20111122/Ohana/src/opihi

Files:

• Makefile (modified) (3 diffs)
• doc/dvo.parallel.txt (added)
• dvo/Makefile (modified) (3 diffs)
• dvo/dvo_client.c (added)
• dvo/mextract.c (modified) (3 diffs)

branches/eam_branches/ipp-20111122/Ohana/src/opihi/Makefile

@@ -9 +9 @@
 dimm:            lib.data lib.shell cmd.basic cmd.data cmd.astro
 dvo:             lib.data lib.shell cmd.basic cmd.data cmd.astro
+dvo_client:      lib.data lib.shell cmd.basic cmd.data cmd.astro
 pantasks:        lib.data lib.shell cmd.basic cmd.data cmd.astro
 pantasks_server: lib.data lib.shell cmd.basic cmd.data cmd.astro
@@ -24 +25 @@
 all:
         for i in $(PROGRAM) $(SPECIAL); do $(MAKE) $$i || exit; done
-        $(MAKE) pantasks_client
-        $(MAKE) pantasks_server
+        # $(MAKE) dvo_client
+        # $(MAKE) pantasks_client
+        # $(MAKE) pantasks_server
 
 libs:
@@ -63 +65 @@
         if [ -d pantasks ]; then (cd pantasks && $(MAKE) $@); fi
 
+dvo_client:
+        if [ -d dvo ]; then (cd dvo && $(MAKE) $@); fi
+
+dvo_client.install: dvo_client
+        if [ -d dvo ]; then (cd dvo && $(MAKE) $@); fi
+
 $(PROGRAM) $(LIBS) $(EXTRAS):
         if [ -d "$@" ]; then (cd $@ && $(MAKE)); fi

branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/Makefile

@@ -25 +25 @@
 $(SRC)/region_list.$(ARCH).o            \
 $(SRC)/find_matches.$(ARCH).o           \
-$(SRC)/photometry.$(ARCH).o             \
-$(SRC)/dvo.$(ARCH).o
+$(SRC)/photometry.$(ARCH).o             
 
 cmds = \
@@ -88 +87 @@
 dvo: $(BIN)/dvo.$(ARCH)
 $(SRC)/dvo.$(ARCH).o : $(libs)
-$(BIN)/dvo.$(ARCH)   : $(funcs) $(cmds)
+$(BIN)/dvo.$(ARCH)   : $(funcs) $(cmds) $(SRC)/dvo.$(ARCH).o
+
+dvo_client: $(BIN)/dvo_client.$(ARCH)
+$(SRC)/dvo_client.$(ARCH).o : $(libs)
+$(BIN)/dvo_client.$(ARCH)   : $(funcs) $(cmds) $(SRC)/dvo_client.$(ARCH).o
+
+dvo.install: $(DESTBIN)/dvo
+dvo_client.install: $(DESTBIN)/dvo_client
 
 install: $(DESTBIN)/dvo help modules
@@ -98 +104 @@
 modules: dvo.modules
 
-.PHONY: dvo
+.PHONY: dvo dvo_client
 
 # deprecated functions: verify & delete

branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/mextract.c

@@ -32 +32 @@
     remove_argument (N, &argc, argv);
     VERBOSE = TRUE;
+  }
+
+  // XXX not yet thought through (where are these set?)
+  if (PARALLEL && !HOST_ID) {
+    HostTableLaunchJobs (CATDIR, argc, argv);
+    HostTableWaitJobs (table, __FILE__, __LINE__);
+
+    // load fields from file
+    ReadVectorTables
+    return TRUE;
   }
 
@@ -121 +131 @@
 
   for (i = 0; (i < skylist[0].Nregions) && !interrupt; i++) {
+
+    // XXX parallel case, wrong client
+    if (HOST_ID && (HOST_ID != skylist[0].regions[i]->hostID)) continue;
+
     /* lock, load, unlock catalog */
     catalog.filename = skylist[0].filename[i];
@@ -189 +203 @@
   for (n = 0; n < Nreturn; n++) {
     ResetVector (vec[n], fields[n].type, MAX(0,Npts));
+  }
+
+  if (HOST_ID) {
+    // write table
+    WriteVectorTable (vec);
+    return TRUE;
   }