diff src/Silvet.cpp @ 352:a3fc6e1f2d4e

Restore threads stuff -- the host needs to be compiled with threading

--- a/src/Silvet.cpp	Fri Aug 14 12:24:12 2015 +0100
+++ b/src/Silvet.cpp	Thu Sep 03 12:06:31 2015 +0100
@@ -727,11 +727,10 @@
         localBestShifts = vector<vector<int> >(width);
     }
 
-#ifndef MAX_EM_THREADS
-#define MAX_EM_THREADS 8
-#endif
-
     int emThreadCount = MAX_EM_THREADS;
+    if (emThreadCount > int(std::thread::hardware_concurrency())) {
+        emThreadCount = std::thread::hardware_concurrency();
+    }
     if (m_mode == LiveMode && pack.templates.size() == 1) {
         // The EM step is probably not slow enough to merit it
         emThreadCount = 1;
@@ -743,15 +742,12 @@
             typedef future<pair<vector<double>, vector<int>>> EMFuture;
             vector<EMFuture> results;
             for (int j = 0; j < emThreadCount && i + j < width; ++j) {
-                cerr << "creating future " << j << " (i = " << i << ", width = " << width << ")" << endl;
+                const vector<double> &column = filtered.at(i + j);
                 results.push_back
                     (async(std::launch::async,
-                           [&](int index) {
-                               return applyEM(pack, filtered.at(index));
-                           }, i + j));
+                           [&]() { return applyEM(pack, column); }));
             }
             for (int j = 0; j < emThreadCount && i + j < width; ++j) {
-                cerr << "reaping future " << j << " (i = " << i << ", width = " << width << ")" << endl;
                 auto out = results[j].get();
                 localPitches[i+j] = out.first;
                 if (wantShifts) localBestShifts[i+j] = out.second;