refactored future waiting

Josh Klontz
1 parent 521999f4
Showing 8 changed files with 37 additions and 43 deletions
app/examples/face_recognition_evaluation.cpp
sdk/core/qtutils.h
sdk/openbr_plugin.cpp
sdk/openbr_plugin.h
sdk/plugins/distance.cpp
sdk/plugins/meta.cpp
sdk/plugins/normalize.cpp
sdk/plugins/validate.cpp
@@ -41,21 +41,21 @@ int main(int argc, char *argv[])
     br_set_property("algorithm", "FaceRecognition");
     // Equivalent to 'Globals->path = "../data/MEDS/img/";' in C++ API
-    br_set_property("path", "../data/MEDS/img/");
+    //br_set_property("path", "../data/MEDS/img/");
     // Enroll galleries, don't re-enroll if they already exist (cache)
-    br_enroll("../data/MEDS/sigset/MEDS_frontal_target.xml", "target.gal[cache]");
-    br_enroll("../data/MEDS/sigset/MEDS_frontal_query.xml", "query.gal[cache]");
+    //br_enroll("../data/MEDS/sigset/MEDS_frontal_target.xml", "target.gal[cache]");
+    //br_enroll("../data/MEDS/sigset/MEDS_frontal_query.xml", "query.gal[cache]");
     // Compare galleries and store result in a binary similarity matrix
     br_compare("target.gal", "query.gal", "FaceRecognition_MEDS.mtx");
     // Make a ground truth "mask" matrix from the sigsets.
-    br_make_mask("../data/MEDS/sigset/MEDS_frontal_target.xml", "../data/MEDS/sigset/MEDS_frontal_query.xml", "MEDS.mask");
+    //br_make_mask("../data/MEDS/sigset/MEDS_frontal_target.xml", "../data/MEDS/sigset/MEDS_frontal_query.xml", "MEDS.mask");
     // Evaluate the performance of OpenBR's FaceRecognition and a COTS face recognition system.
-    br_eval("FaceRecognition_MEDS.mtx", "MEDS.mask", "Algorithm_Dataset/FaceRecognition_MEDS.csv");
-    br_eval("../data/MEDS/simmat/COTS_MEDS.mtx", "MEDS.mask", "Algorithm_Dataset/COTS_MEDS.csv");
+    //br_eval("FaceRecognition_MEDS.mtx", "MEDS.mask", "Algorithm_Dataset/FaceRecognition_MEDS.csv");
+    //br_eval("../data/MEDS/simmat/COTS_MEDS.mtx", "MEDS.mask", "Algorithm_Dataset/COTS_MEDS.csv");
     // The '_' character has special significance and is used to populate plot legends.
     // Requires R installation, see documentation of br_plot for details.
@@ -63,6 +63,9 @@ int main(int argc, char *argv[])
     files[0] = "Algorithm_Dataset/FaceRecognition_MEDS.csv";
     files[1] = "Algorithm_Dataset/COTS_MEDS.csv";
     br_plot(2, files, "MEDS", true);
+    br_plot(2, files, "MEDS", true);
+    br_plot(2, files, "MEDS", true);
+    br_plot(2, files, "MEDS", true);
     br_finalize();
     return 0;
@@ -21,6 +21,7 @@
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
+#include <QFuture>
 #include <QMap>
 #include <QString>
 #include <QStringList>
@@ -62,6 +63,14 @@ namespace QtUtils
     bool runRScript(const QString &file);
     bool runDot(const QString &file);
     void showFile(const QString &file);
+
+    /**** Thread Utilities ****/
+    template <typename T>
+    static inline void waitForFinished(const QList< QFuture<T> > &futures)
+    {
+        foreach (QFuture<T> future, futures)
+            future.waitForFinished();
+    }
 }
 #endif // __QTUTILS_H
@@ -781,14 +781,6 @@ int br::Context::timeRemaining() const
     return std::max(0, int((1 - p) / p * startTime.elapsed())) / 1000;
 }
-void br::Context::trackFutures(QList< QFuture<void> > &futures)
-{
-    foreach (QFuture<void> future, futures) {
-        QCoreApplication::processEvents();
-        future.waitForFinished();
-    }
-}
-
 bool br::Context::checkSDKPath(const QString &sdkPath)
 {
     return QFileInfo(sdkPath + "/share/openbr/openbr.bib").exists();
@@ -1171,13 +1163,11 @@ private:
             templatesList[i] = Downsample(templatesList[i], transforms[i]);
         QList< QFuture<void> > futures;
-        const bool threaded = Globals->parallelism && (templatesList.size() > 1);
         for (int i=0; i<templatesList.size(); i++) {
-            if (threaded) futures.append(QtConcurrent::run(_train, transforms[i], &templatesList[i]));
-            else                                           _train (transforms[i], &templatesList[i]);
+            if (Globals->parallelism) futures.append(QtConcurrent::run(_train, transforms[i], &templatesList[i]));
+            else                                                       _train (transforms[i], &templatesList[i]);
         }
-
-        if (threaded) Globals->trackFutures(futures);
+        QtUtils::waitForFinished(futures);
     }
     void project(const Template &src, Template &dst) const
@@ -1317,11 +1307,10 @@ void Transform::backProject(const TemplateList &amp;dst, TemplateList &amp;src) const
     for (int i=0; i<dst.size(); i++) src.append(Template());
     QList< QFuture<void> > futures;
-    if (Globals->parallelism) futures.reserve(dst.size());
     for (int i=0; i<dst.size(); i++)
         if (Globals->parallelism) futures.append(QtConcurrent::run(_backProject, this, &dst[i], &src[i]));
-        else                                                      _backProject (this, &dst[i], &src[i]);
-    if (Globals->parallelism) Globals->trackFutures(futures);
+        else                                                       _backProject (this, &dst[i], &src[i]);
+    QtUtils::waitForFinished(futures);
 }
 /* Distance - public methods */
@@ -1358,7 +1347,7 @@ void Distance::compare(const TemplateList &amp;target, const TemplateList &amp;query, Ou
         if (Globals->parallelism) futures.append(QtConcurrent::run(this, &Distance::compareBlock, targets, queries, output, targetOffset, queryOffset));
         else                                                                        compareBlock (targets, queries, output, targetOffset, queryOffset);
     }
-    if (Globals->parallelism) Globals->trackFutures(futures);
+    QtUtils::waitForFinished(futures);
 }
 QList<float> Distance::compare(const TemplateList &targets, const Template &query) const
@@ -622,12 +622,6 @@ public:
     int timeRemaining() const;
     /*!
-     * \brief Continues to print the progress of the futures until they are completed.
-     * \param futures The list of futures to track.
-     */
-    void trackFutures(QList< QFuture<void> > &futures);
-
-    /*!
      * \brief Returns \c true if \em sdkPath is valid, \c false otherwise.
      * \param sdkPath The path to <tt>share/openbr/openbr.bib</tt>
      */
@@ -19,6 +19,7 @@
 #include <openbr_plugin.h>
 #include "core/distance_sse.h"
+#include "core/qtutils.h"
 using namespace cv;
@@ -158,7 +159,7 @@ class PipeDistance : public Distance
         foreach (br::Distance *distance, distances)
             if (Globals->parallelism) futures.append(QtConcurrent::run(distance, &Distance::train, data));
             else                      distance->train(data);
-        Globals->trackFutures(futures);
+        QtUtils::waitForFinished(futures);
     }
     float compare(const Template &a, const Template &b) const
@@ -285,12 +285,11 @@ class ForkTransform : public CompositeTransform
     void train(const TemplateList &data)
     {
         QList< QFuture<void> > futures;
-        const bool threaded = Globals->parallelism && (transforms.size() > 1);
         for (int i=0; i<transforms.size(); i++) {
-            if (threaded) futures.append(QtConcurrent::run(_train, transforms[i], &data));
-            else                                           _train (transforms[i], &data);
+            if (Globals->parallelism) futures.append(QtConcurrent::run(_train, transforms[i], &data));
+            else                                                       _train (transforms[i], &data);
         }
-        if (threaded) Globals->trackFutures(futures);
+        QtUtils::waitForFinished(futures);
     }
     void backProject(const Template &dst, Template &src) const {Transform::backProject(dst, src);}
@@ -644,9 +643,7 @@ public:
             else
                 _projectList(transform, &input_buffer[i], &output_buffer[i]);
         }
-
-        if (Globals->parallelism)
-            Globals->trackFutures(futures);
+        QtUtils::waitForFinished(futures);
         for (int i=0; i<src.size(); i++) dst.append(output_buffer[i]);
     }
@@ -22,6 +22,7 @@
 #include "core/common.h"
 #include "core/opencvutils.h"
+#include "core/qtutils.h"
 using namespace cv;
@@ -119,9 +120,8 @@ private:
             bv.push_back(Mat(1, dims, CV_64FC1));
         }
-        QList< QFuture<void> > futures; futures.reserve(dims);
+        QList< QFuture<void> > futures;
         const bool parallel = (data.size() > 1000) && Globals->parallelism;
-
         for (size_t c = 0; c < mv.size(); c++) {
             for (int i=0; i<dims; i++)
                 if (parallel) futures.append(QtConcurrent::run(_train, method, mv[c], &av[c], &bv[c], i));
@@ -129,8 +129,7 @@ private:
             av[c] = av[c].reshape(1, data.first().m().rows);
             bv[c] = bv[c].reshape(1, data.first().m().rows);
         }
-
-        if (parallel) Globals->trackFutures(futures);
+        QtUtils::waitForFinished(futures);
         merge(av, a);
         merge(bv, b);
 #include <QtConcurrentRun>
 #include <openbr_plugin.h>
+#include "core/qtutils.h"
+
 namespace br
 {
@@ -41,9 +43,9 @@ class CrossValidateTransform : public MetaTransform
                 if (partitions[j] == i)
                     partitionedData.removeAt(j);
             if (Globals->parallelism) futures.append(QtConcurrent::run(transforms[i], &Transform::train, partitionedData));
-            else                      transforms[i]->train(partitionedData);
+            else                                                       transforms[i]->train(partitionedData);
         }
-        Globals->trackFutures(futures);
+        QtUtils::waitForFinished(futures);
     }
     void project(const Template &src, Template &dst) const