added queue mechanism to parallelization of hyperparam resampling; new program argument 'num_jobs' to control granularity.

git-svn-id: https://ws10smt.googlecode.com/svn/trunk@232 ec762483-ff6d-05da-a07a-a48fb63a330f

1 files changed, 5 insertions, 7 deletions

diff --git a/gi/pyp-topics/src/pyp-topics.hh b/gi/pyp-topics/src/pyp-topics.hh
index 8097fe19..5e1fc6d6 100644
--- a/gi/pyp-topics/src/pyp-topics.hh
+++ b/gi/pyp-topics/src/pyp-topics.hh
@@ -21,12 +21,12 @@ public:
 
 public:
   PYPTopics(int num_topics, bool use_topic_pyp=false, unsigned long seed = 0,
-        int max_threads = 1) 
+        int max_threads = 1, int num_jobs = 1) 
     : m_num_topics(num_topics), m_word_pyps(1), 
     m_topic_pyp(0.5,1.0,seed), m_use_topic_pyp(use_topic_pyp),
     m_seed(seed),
     uni_dist(0,1), rng(seed == 0 ? (unsigned long)this : seed), 
-    rnd(rng, uni_dist), max_threads(max_threads) {}
+    rnd(rng, uni_dist), max_threads(max_threads), num_jobs(num_jobs) {}
 
   void sample_corpus(const Corpus& corpus, int samples,
                      int freq_cutoff_start=0, int freq_cutoff_end=0, 
@@ -81,15 +81,13 @@ private:
                 //call: rnd() generates uniform on [0,1)
 
   typedef boost::function<F()> JobReturnsF;
-  typedef SimpleWorker<JobReturnsF, F> SimpleResampleWorker;
-  typedef boost::ptr_vector<SimpleResampleWorker> WorkerPtrVect;
 
-  F hresample_docs(int num_threads, int thread_id);
+  F hresample_docs(int start, int end); //does i in [start, end)
 
-//  F hresample_topics();
+  F hresample_topics();
   
   int max_threads;
-
+  int num_jobs;
   TermBackoffPtr m_backoff;
 };