Merge branch 'master' of https://github.com/biometrics/openbr

Scott Klum
2 parents 66efa942 2d37a7bc
Showing 22 changed files with 155 additions and 151 deletions
app/br/br.cpp
openbr/core/core.cpp
openbr/openbr.cpp
openbr/openbr.h
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/algorithms.cpp
openbr/plugins/distance.cpp
openbr/plugins/draw.cpp
openbr/plugins/format.cpp
openbr/plugins/gallery.cpp
openbr/plugins/gui.cpp
openbr/plugins/meta.cpp
openbr/plugins/misc.cpp
openbr/plugins/neclatent1.cpp
openbr/plugins/normalize.cpp
openbr/plugins/openbr_internal.h
openbr/plugins/quantize.cpp
openbr/plugins/quantize2.cpp
openbr/plugins/stasm.cpp
@@ -68,12 +68,13 @@ public:
         if (argc == 0) printf("%s\nTry running 'br -help'\n", br_about());
         bool daemon = false;
+        const char *daemon_pipe = NULL;
         while (daemon || (argc > 0)) {
             const char *fun;
             int parc;
             const char **parv;
             if (argc == 0)
-                br_read_stdin(&argc, &argv);
+                br_read_pipe(daemon_pipe, &argc, &argv);
             fun = argv[0];
             if (fun[0] == '-') fun++;
@@ -158,8 +159,9 @@ public:
                 check(parc == 0, "No parameters expected for 'version'.");
                 printf("%s\n", br_version());
             } else if (!strcmp(fun, "daemon")) {
-                check(parc == 0, "No parameters expected for 'daemon'.");
+                check(parc == 1, "Incorrect parameter count for 'daemon'.");
                 daemon = true;
+                daemon_pipe = parv[0];
             } else if (!strcmp(fun, "exit")) {
                 check(parc == 0, "No parameters expected for 'exit'.");
                 daemon = false;
@@ -275,17 +275,14 @@ private:
         return QFileInfo(file).exists() ? file : QString();
     }
-    void init(QString description)
+    void init(const File &description)
     {
         // Check if a trained binary already exists for this algorithm
         const QString file = getFileName(description);
-        if (!file.isEmpty()) description = file;
+        if (!file.isEmpty()) return init(file);
-        File asdf(description);
-        QString distribute_status = asdf.get<QString>("distribute","true");
-
-        if (QFileInfo(description).exists()) {
-            qDebug("Loading %s", qPrintable(QFileInfo(description).fileName()));
+        if (description.exists()) {
+            qDebug("Loading %s", qPrintable(description.fileName()));
             load(description);
             return;
         }
@@ -294,13 +291,11 @@ private:
         if (Globals->abbreviations.contains(description))
             return init(Globals->abbreviations[description]);
-        QStringList words = QtUtils::parse(description, ':');
-        if (words.size() > 2) qFatal("Invalid algorithm format.");
+        QStringList words = QtUtils::parse(description.flat(), ':');
+        if ((words.size() < 1) || (words.size() > 2)) qFatal("Invalid algorithm format.");
-        if (distribute_status == "true") {
-            words[0].prepend("DistributeTemplate(");
-            words[0].append(")");
-        }
+        if (description.getBool("distribute", true))
+            words[0] = "DistributeTemplate(" + words[0] + ")";
         transform = QSharedPointer<Transform>(Transform::make(words[0], NULL));
         if (words.size() > 1) distance = QSharedPointer<Distance>(Distance::make(words[1], NULL));
@@ -182,17 +182,23 @@ float br_progress()
     return Globals->progress();
 }
-void br_read_stdin(int *argc, char ***argv)
+void br_read_pipe(const char *pipe, int *argc, char ***argv)
 {
     static QList<QByteArray> byteArrayList;
     static QVector<char*> rawCharArrayList;
+    QFile file(pipe);
+    file.open(QFile::ReadOnly);
+    QTextStream stream(&file);
+
     QStringList args;
     while (args.isEmpty()) {
-        args = QtUtils::parse(QTextStream(stdin).readLine(), ' ');
-        QThread::yieldCurrentThread();
+        args = QtUtils::parse(stream.readAll(), ' ');
+        if (args.isEmpty()) QThread::sleep(100);
     }
+    file.close();
+
     byteArrayList.clear(); rawCharArrayList.clear();
     foreach (const QString &string, args) {
         byteArrayList.append(string.toLocal8Bit());
@@ -297,16 +297,15 @@ BR_EXPORT bool br_plot_metadata(int num_files, const char *files[], const char *
 BR_EXPORT float br_progress();
 /*!
- * \brief Read and parse stdin.
+ * \brief Read and parse arguments from a named pipe.
  *
- * Used by the \ref cli to implement \c -daemon.
+ * Used by the \ref cli to implement \c -daemon, generally not useful otherwise.
  * Guaranteed to return at least one argument.
- * Generally not useful otherwise.
  * \param[out] argc argument count
  * \param[out] argv argument list
  * \note \ref managed_return_value
  */
-BR_EXPORT void br_read_stdin(int *argc, char ***argv);
+BR_EXPORT void br_read_pipe(const char *pipe, int *argc, char ***argv);
 /*!
  * \brief Converts a simmat to a new output format.
@@ -801,8 +801,8 @@ void br::Context::setProperty(const QString &amp;key, const QString &amp;value)
     qDebug("Set %s%s", qPrintable(key), value.isEmpty() ? "" : qPrintable(" to " + value));
     if (key == "parallelism") {
-        const int maxThreads = std::max(1, QThread::idealThreadCount());
-        QThreadPool::globalInstance()->setMaxThreadCount(parallelism ? std::min(maxThreads, abs(parallelism)) : maxThreads);
+        if (parallelism <= 0) parallelism = 1;
+        QThreadPool::globalInstance()->setMaxThreadCount(parallelism);
     } else if (key == "log") {
         logFile.close();
         if (log.isEmpty()) return;
@@ -829,8 +829,17 @@ bool br::Context::checkSDKPath(const QString &amp;sdkPath)
 // We create our own when the user hasn't
 static QCoreApplication *application = NULL;
-void br::Context::initialize(int &argc, char *argv[], QString sdkPath)
+void br::Context::initialize(int &argc, char *argv[], QString sdkPath, bool use_gui)
 {
+    for (int i=0; i < argc; i ++)
+    {
+        if (strcmp("-useGui", argv[i]) == 0) {
+            const char * val = i+1 < argc ? argv[i+1] : "";
+            if (strcmp(val, "false") ==0 || strcmp(val, "0") == 0)
+                use_gui = false;
+            break;
+        }
+    }
     // We take in argc as a reference due to:
     //   https://bugreports.qt-project.org/browse/QTBUG-5637
     // QApplication should be initialized before anything else.
@@ -861,6 +870,7 @@ void br::Context::initialize(int &amp;argc, char *argv[], QString sdkPath)
     Globals = new Context();
     Globals->init(File());
+    Globals->useGui = use_gui;
     qInstallMessageHandler(messageHandler);
@@ -885,8 +895,7 @@ void br::Context::initialize(int &amp;argc, char *argv[], QString sdkPath)
     }
     Globals->sdkPath = sdkPath;
-    // Empirical evidence suggests an extra thread helps achieve full CPU utilization
-    QThreadPool::globalInstance()->releaseThread();
+    QThreadPool::globalInstance()->setMaxThreadCount(Globals->parallelism);
     // Trigger registered initializers
     QList< QSharedPointer<Initializer> > initializers = Factory<Initializer>::makeAll();
@@ -896,9 +905,6 @@ void br::Context::initialize(int &amp;argc, char *argv[], QString sdkPath)
 void br::Context::finalize()
 {
-    // Undo the 'releaseThread()' in 'initialize()'
-    QThreadPool::globalInstance()->reserveThread();
-
     // Trigger registered finalizers
     QList< QSharedPointer<Initializer> > initializers = Factory<Initializer>::makeAll();
     foreach (const QSharedPointer<Initializer> &initializer, initializers)
@@ -1192,10 +1198,8 @@ private:
             templatesList[i] = Downsample(templatesList[i], transforms[i]);
         QFutureSynchronizer<void> futures;
-        for (int i=0; i<templatesList.size(); i++) {
-            if (Globals->parallelism) futures.addFuture(QtConcurrent::run(_train, transforms[i], &templatesList[i]));
-            else                                                          _train (transforms[i], &templatesList[i]);
-        }
+        for (int i=0; i<templatesList.size(); i++)
+            futures.addFuture(QtConcurrent::run(_train, transforms[i], &templatesList[i]));
         futures.waitForFinished();
     }
@@ -1308,21 +1312,12 @@ void Transform::project(const TemplateList &amp;src, TemplateList &amp;dst) const
 {
     dst.reserve(src.size());
-    // There are certain conditions where we should process the templates in serial,
-    // but generally we'd prefer to process them in parallel.
-    if ((src.size() < 2) || (Globals->parallelism == 0)) {
-        foreach (const Template &t, src) {
-            dst.append(Template());
-            _project(this, &t, &dst.last());
-        }
-    } else {
-        for (int i=0; i<src.size(); i++)
-            dst.append(Template());
-        QFutureSynchronizer<void> futures;
-        for (int i=0; i<dst.size(); i++)
-            futures.addFuture(QtConcurrent::run(_project, this, &src[i], &dst[i]));
-        futures.waitForFinished();
-    }
+    for (int i=0; i<src.size(); i++)
+        dst.append(Template());
+    QFutureSynchronizer<void> futures;
+    for (int i=0; i<dst.size(); i++)
+        futures.addFuture(QtConcurrent::run(_project, this, &src[i], &dst[i]));
+    futures.waitForFinished();
 }
 static void _backProject(const Transform *transform, const Template *dst, Template *src)
@@ -1343,8 +1338,7 @@ void Transform::backProject(const TemplateList &amp;dst, TemplateList &amp;src) const
     QFutureSynchronizer<void> futures;
     for (int i=0; i<dst.size(); i++)
-        if (Globals->parallelism) futures.addFuture(QtConcurrent::run(_backProject, this, &dst[i], &src[i]));
-        else                                                          _backProject (this, &dst[i], &src[i]);
+        futures.addFuture(QtConcurrent::run(_backProject, this, &dst[i], &src[i]));
     futures.waitForFinished();
 }
@@ -189,6 +189,7 @@ struct BR_EXPORT File
     inline QString baseName() const { const QString baseName = QFileInfo(name).baseName();
                                       return baseName.isEmpty() ? QDir(name).dirName() : baseName; } /*!< \brief Returns the file's base name. */
     inline QString suffix() const { return QFileInfo(name).suffix(); } /*!< \brief Returns the file's extension. */
+    inline QString path() const { return QFileInfo(name).path(); } /*! \brief Returns the file's path excluding its name. */
     QString resolved() const; /*!< \brief Returns name prepended with Globals->path if name does not exist. */
     bool contains(const QString &key) const; /*!< \brief Returns \c true if the key has an associated value, \c false otherwise. */
@@ -547,7 +548,13 @@ public:
      * \brief The number of threads to use.
      */
     Q_PROPERTY(int parallelism READ get_parallelism WRITE set_parallelism RESET reset_parallelism)
-    BR_PROPERTY(int, parallelism, std::max(1, QThread::idealThreadCount()))
+    BR_PROPERTY(int, parallelism, std::max(1, QThread::idealThreadCount()+1))
+
+    /*!
+     * \brief Whether or not to use GUI functions
+     */
+    Q_PROPERTY(bool useGui READ get_useGui WRITE set_useGui RESET reset_useGui)
+    BR_PROPERTY(bool, useGui, true)
     /*!
      * \brief The maximum number of templates to process in parallel.
@@ -701,7 +708,7 @@ public:
      * \note <a href="http://qt-project.org/">Qt</a> users should instead call this <i>after</i> initializing QApplication.
      * \see finalize
      */
-    static void initialize(int &argc, char *argv[], QString sdkPath = "");
+    static void initialize(int &argc, char *argv[], QString sdkPath = "", bool use_gui = true);
     /*!
      * \brief Call \em once at the end of the application to deallocate global variables.
@@ -38,11 +38,11 @@ class AlgorithmsInitializer : public Initializer
         Globals->abbreviations.insert("MedianFace", "Open!Cascade(FrontalFace)+ASEFEyes+Affine(256,256,0.37,0.45)+Center(Median)");
         Globals->abbreviations.insert("BlurredFaceDetection", "Open+LimitSize(1024)+SkinMask/(Cvt(Gray)+GradientMask)+And+Morph(Erode,16)+LargestConvexArea");
         Globals->abbreviations.insert("DrawFaceDetection", "Open+Cascade(FrontalFace)!ASEFEyes+Draw");
-        Globals->abbreviations.insert("ShowFaceDetection", "DrawFaceDetection!Show");
+        Globals->abbreviations.insert("ShowFaceDetection", "DrawFaceDetection!Show[distribute=false]");
         Globals->abbreviations.insert("OpenBR", "FaceRecognition");
         Globals->abbreviations.insert("GenderEstimation", "GenderClassification");
         Globals->abbreviations.insert("AgeEstimation", "AgeRegression");
-        Globals->abbreviations.insert("FaceRecognition2", "{PP5Register+Affine(128,128,0.25,0.35)+Cvt(Gray)}+(Gradient+Bin(0,360,9,true))/(Blur(1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)+LBP(1,2,true)+Bin(0,10,10,true))+Merge+Integral+RecursiveIntegralSampler(4,2,8,Center(Hellinger)+LDA(.98)+Normalize(L1)+Cat+PCA(768)+Normalize(L1)+Quantize:UCharL1");
+        Globals->abbreviations.insert("FaceRecognition2", "{PP5Register+Affine(128,128,0.25,0.35)+Cvt(Gray)}+(Gradient+Bin(0,360,9,true))/(Blur(1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)+LBP(1,2,true)+Bin(0,10,10,true))+Merge+Integral+RecursiveIntegralSampler(4,2,8,LDA(.98)+Normalize(L1))+Cat+PCA(768)+Normalize(L1)+Quantize:UCharL1");
         // Generic Image Processing
         Globals->abbreviations.insert("SIFT", "Open+KeyPointDetector(SIFT)+KeyPointDescriptor(SIFT):KeyPointMatcher(BruteForce)");
@@ -158,8 +158,7 @@ class PipeDistance : public Distance
     {
         QFutureSynchronizer<void> futures;
         foreach (br::Distance *distance, distances)
-            if (Globals->parallelism) futures.addFuture(QtConcurrent::run(distance, &Distance::train, data));
-            else                                                          distance->train(data);
+            futures.addFuture(QtConcurrent::run(distance, &Distance::train, data));
         futures.waitForFinished();
     }
@@ -98,6 +98,8 @@ class DrawGridTransform : public UntrainableTransform
 BR_REGISTER(Transform, DrawGridTransform)
+// TODO: re-implement EditTransform using Qt
+#if 0
 /*!
  * \ingroup transforms
  * \brief Remove landmarks.
@@ -162,6 +164,7 @@ Template EditTransform::currentTemplate;
 QMutex EditTransform::currentTemplateLock;
 BR_REGISTER(Transform, EditTransform)
+#endif
 } // namespace br
@@ -15,6 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include <QDate>
+#include <QSize>
 #ifndef BR_EMBEDDED
 #include <QtXml>
 #endif // BR_EMBEDDED
@@ -547,14 +548,43 @@ BR_REGISTER(Format, nullFormat)
 class rawFormat : public Format
 {
     Q_OBJECT
+    static QHash<QString, QHash<QString,QSize> > imageSizes; // QHash<Path, QHash<File,Size> >
     Template read() const
     {
+        QString path = file.path();
+        if (!imageSizes.contains(path)) {
+            static QMutex mutex;
+            QMutexLocker locker(&mutex);
+
+            if (!imageSizes.contains(path)) {
+                const QString imageSize = path+"/ImageSize.txt";
+                QStringList lines;
+                if (QFileInfo(imageSize).exists()) {
+                    lines = QtUtils::readLines(imageSize);
+                    lines.removeFirst(); // Remove header
+                }
+
+                QHash<QString,QSize> sizes;
+                QRegExp whiteSpace("\\s+");
+                foreach (const QString &line, lines) {
+                    QStringList words = line.split(whiteSpace);
+                    if (words.size() != 3) continue;
+                    sizes.insert(words[0], QSize(words[2].toInt(), words[1].toInt()));
+                }
+
+                imageSizes.insert(path, sizes);
+            }
+        }
+
         QByteArray data;
         QtUtils::readFile(file, data);
-        if (data.size() != 768*800)
-            qFatal("Expected 768*800 bytes.");
-        return Template(file, Mat(768, 800, CV_8UC1, data.data()).clone());
+
+        QSize size = imageSizes[path][file.baseName()];
+        if (!size.isValid()) size = QSize(800,768);
+        if (data.size() != size.width() * size.height())
+            qFatal("Expected %d*%d bytes, got %d.", size.height(), size.width(), data.size());
+        return Template(file, Mat(size.height(), size.width(), CV_8UC1, data.data()).clone());
     }
     void write(const Template &t) const
@@ -563,6 +593,8 @@ class rawFormat : public Format
     }
 };
+QHash<QString, QHash<QString,QSize> > rawFormat::imageSizes;
+
 BR_REGISTER(Format, rawFormat)
 /*!
@@ -107,8 +107,7 @@ class EmptyGallery : public Gallery
         QList< QFuture<TemplateList> > futures;
         foreach (const QString &folder, NaturalStringSort(dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))) {
             const QDir subdir = dir.absoluteFilePath(folder);
-            if (Globals->parallelism) futures.append(QtConcurrent::run(&EmptyGallery::getTemplates, subdir));
-            else                      templates.append(getTemplates(subdir));
+            futures.append(QtConcurrent::run(&EmptyGallery::getTemplates, subdir));
         }
         foreach (const QFuture<TemplateList> &future, futures)
             templates.append(future.result());
@@ -94,6 +94,8 @@ public slots:
     void createWindow()
     {
         delete window;
+        QApplication::instance()->removeEventFilter(this);
+
         window = new QLabel();
         window->setVisible(true);
@@ -109,21 +111,25 @@ public slots:
  * \ingroup transforms
  * \brief Displays templates in a GUI pop-up window using QT.
  * \author Charles Otto \cite caotto
- * Unlike ShowTransform, this can be used with parallelism enabled, although it
- * is considered TimeVarying.
+ * Can be used with parallelism enabled, although it is considered TimeVarying.
  */
-class Show2Transform : public TimeVaryingTransform
+class ShowTransform : public TimeVaryingTransform
 {
     Q_OBJECT
 public:
     Q_PROPERTY(bool waitInput READ get_waitInput WRITE set_waitInput RESET reset_waitInput STORED false)
-    BR_PROPERTY(bool, waitInput, false)
+    BR_PROPERTY(bool, waitInput, true)
     Q_PROPERTY(QStringList keys READ get_keys WRITE set_keys RESET reset_keys STORED false)
     BR_PROPERTY(QStringList, keys, QStringList("FrameNumber"))
-    Show2Transform() : TimeVaryingTransform(false, false)
+    ShowTransform() : TimeVaryingTransform(false, false)
     {
+        gui = NULL;
+        displayBuffer = NULL;
+        if (!Globals->useGui)
+            return;
+        displayBuffer = new QPixmap();
         // Create our GUI proxy
         gui = new GUIProxy();
         // Move it to the main thread, this means signals we send to it will
@@ -134,16 +140,17 @@ public:
         connect(this, SIGNAL(updateImage(QPixmap)), gui,SLOT(showImage(QPixmap)));
     }
-    ~Show2Transform()
+    ~ShowTransform()
     {
         delete gui;
+        delete displayBuffer;
     }
     void train(const TemplateList &data) { (void) data; }
     void project(const TemplateList &src, TemplateList &dst) const
     {
-        Transform * non_const = (Show2Transform *) this;
+        Transform * non_const = (ShowTransform *) this;
         non_const->projectUpdate(src,dst);
     }
@@ -151,7 +158,7 @@ public:
     {
         dst = src;
-        if (src.empty())
+        if (src.empty() || !Globals->useGui)
             return;
         foreach (const Template & t, src) {
@@ -168,12 +175,12 @@ public:
             foreach(const cv::Mat & m, t) {
                 qImageBuffer = toQImage(m);
-                displayBuffer.convertFromImage(qImageBuffer);
+                displayBuffer->convertFromImage(qImageBuffer);
                 // Emit an explicit  copy of our pixmap so that the pixmap used
                 // by the main thread isn't damaged when we update displayBuffer
                 // later.
-                emit updateImage(displayBuffer.copy(displayBuffer.rect()));
+                emit updateImage(displayBuffer->copy(displayBuffer->rect()));
                 // Blocking wait for a key-press
                 if (this->waitInput)
@@ -191,6 +198,9 @@ public:
     void init()
     {
+        if (!Globals->useGui)
+            return;
+
         emit needWindow();
         connect(this, SIGNAL(changeTitle(QString)), gui->window, SLOT(setWindowTitle(QString)));
         connect(this, SIGNAL(hideWindow()), gui->window, SLOT(hide()));
@@ -199,7 +209,7 @@ public:
 protected:
     GUIProxy * gui;
     QImage qImageBuffer;
-    QPixmap displayBuffer;
+    QPixmap * displayBuffer;
 signals:
     void needWindow();
@@ -208,7 +218,7 @@ signals:
     void hideWindow();
 };
-BR_REGISTER(Transform, Show2Transform)
+BR_REGISTER(Transform, ShowTransform)
 class FPSSynch : public TimeVaryingTransform
 {
@@ -109,8 +109,7 @@ class PipeTransform : public CompositeTransform
             fprintf(stderr, " projecting...");
             QFutureSynchronizer<void> futures;
             for (int j=0; j<copy.size(); j++)
-                if (Globals->parallelism) futures.addFuture(QtConcurrent::run(this, &PipeTransform::_projectPartial, &copy[j], i, nextTrainableTransform));
-                else                                                                                _projectPartial( &copy[j], i, nextTrainableTransform);
+                futures.addFuture(QtConcurrent::run(this, &PipeTransform::_projectPartial, &copy[j], i, nextTrainableTransform));
             futures.waitForFinished();
             i = nextTrainableTransform;
         }
@@ -288,10 +287,8 @@ class ForkTransform : public CompositeTransform
     {
         if (!trainable) return;
         QFutureSynchronizer<void> futures;
-        for (int i=0; i<transforms.size(); i++) {
-            if (Globals->parallelism) futures.addFuture(QtConcurrent::run(_train, transforms[i], &data));
-            else                                                          _train (transforms[i], &data);
-        }
+        for (int i=0; i<transforms.size(); i++)
+            futures.addFuture(QtConcurrent::run(_train, transforms[i], &data));
         futures.waitForFinished();
     }
@@ -51,46 +51,6 @@ BR_REGISTER(Transform, OpenTransform)
 /*!
  * \ingroup transforms
- * \brief Displays templates in a GUI pop-up window.
- * \author Josh Klontz \cite jklontz
- */
-class ShowTransform : public UntrainableMetaTransform
-{
-    Q_OBJECT
-    Q_PROPERTY(bool waitKey READ get_waitKey WRITE set_waitKey RESET reset_waitKey STORED false)
-    BR_PROPERTY(bool, waitKey, true)
-
-    static int counter;
-    int uid;
-
-    void init()
-    {
-        uid = counter++;
-        Globals->setProperty("parallelism", "0"); // Can only work in single threaded mode
-    }
-
-    void project(const Template &src, Template &dst) const
-    {
-        dst = src;
-
-        if (Globals->parallelism) {
-            qWarning("Show::project() only works in single threaded mode.");
-            return;
-        }
-
-        for (int i=0; i<src.size(); i++)
-            OpenCVUtils::showImage(src[i], "Show" + (counter*src.size() > 1 ? "-" + QString::number(uid*src.size()+i) : QString()), false);
-
-        if (waitKey && !src.isEmpty()) cv::waitKey(-1);
-    }
-};
-
-int ShowTransform::counter = 0;
-
-BR_REGISTER(Transform, ShowTransform)
-
-/*!
- * \ingroup transforms
  * \brief Prints the template's file to stdout or stderr.
  * \author Josh Klontz \cite jklontz
  */
@@ -368,6 +328,8 @@ class AnonymizeTransform : public UntrainableMetaTransform
 BR_REGISTER(Transform, AnonymizeTransform)
+// TODO: Use a global Mutex to prevent concurrent reads from stdin
+#if 0
 /*!
  * \ingroup transforms
  * \brief Name a point
@@ -415,6 +377,7 @@ class ElicitMetadataTransform : public UntrainableMetaTransform
 };
 BR_REGISTER(Transform, ElicitMetadataTransform)
+#endif
 /*!
  * \ingroup transforms
@@ -18,9 +18,12 @@ class NECLatent1Initialier : public Initializer
     void initialize() const
     {
-        Globals->abbreviations.insert("NECTenprint1", "Open+Cvt(Gray)+NECLatent1Enroll:NECLatent1Compare");
-        Globals->abbreviations.insert("NECLatent1", "Open+Cvt(Gray)+NECLatent1Enroll(true):NECLatent1Compare");
-        Globals->abbreviations.insert("NECLatentLFFS1", "Open+NECLatent1Enroll(true,ELFT_M):NECLatent1Compare(ELFT_M)");
+        Globals->abbreviations.insert("NECTenprintLFML", "Open+Cvt(Gray)+NECLatent1Enroll(false,LFML):NECLatent1Compare(LFML)");
+        Globals->abbreviations.insert("NECTenprintELFT", "Open+Cvt(Gray)+NECLatent1Enroll(false,ELFT):NECLatent1Compare(ELFT)");
+        Globals->abbreviations.insert("NECTenprintELFTM", "Open+Cvt(Gray)+NECLatent1Enroll(false,ELFT_M):NECLatent1Compare(ELFT_M)");
+        Globals->abbreviations.insert("NECLatentLFML", "Open+Cvt(Gray)+NECLatent1Enroll(true,LFML):NECLatent1Compare(LFML)");
+        Globals->abbreviations.insert("NECLatentELFT", "Open+Cvt(Gray)+NECLatent1Enroll(true,ELFT):NECLatent1Compare(ELFT)");
+        Globals->abbreviations.insert("NECLatentELFTM", "Open+NECLatent1Enroll(true,ELFT_M):NECLatent1Compare(ELFT_M)");
     }
 };
@@ -50,23 +53,25 @@ private:
     void project(const Template &src, Template &dst) const
     {
+        static QMutex mutex;
+        QMutexLocker locker(&mutex); // It seems that most of the API is not reentrant
+
         if (src.m().type() != CV_8UC1) qFatal("Requires 8UC1 data!");
         uchar *data = src.m().data;
         const int rows = src.m().rows;
         const int columns = src.m().cols;
         uchar buff[MAX_TEMPLATE_SIZE];
         uchar* pBuff = NULL;
-        int size = 0;
-        int error;
+        int size, error;
         if (latent) {
             if      (algorithm == LFML) error = NEC_LFML_ExtractLatent(data, rows, columns, 500, buff, &size);
-            else if (algorithm == ELFT) error = NEC_ELFT_ExtractLatent(data, rows, columns, 500, 4, buff, &size);
-            else                        error = NEC_ELFT_M_ExtractLatent(data, columns, 1, &pBuff, &size);
+            else if (algorithm == ELFT) error = NEC_ELFT_ExtractLatent(data, rows, columns, 500, 32, buff, &size);
+            else                        error = NEC_ELFT_M_ExtractLatent(data, columns, 5, &pBuff, &size);
         } else {
             if      (algorithm == LFML) error = NEC_LFML_ExtractTenprint(data, rows, columns, 500, buff, &size);
-            else if (algorithm == ELFT) error = NEC_ELFT_ExtractTenprint(data, rows, columns, 500, 2, buff, &size);
-            else                        qFatal("ELFT_M Tenprint not implemented.");
+            else if (algorithm == ELFT) error = NEC_ELFT_ExtractTenprint(data, rows, columns, 500, 8, buff, &size);
+            else                        error = NEC_ELFT_M_ExtractTenprint(data, rows, columns, 500, 5, &pBuff, &size);
         }
         if (!error) {
@@ -109,10 +114,12 @@ private:
         uchar *aData = a.m().data;
         uchar *bData = b.m().data;
         if (!a.m().data || !b.m().data) return -std::numeric_limits<float>::max();
-        int score;
-        if      (algorithm == LFML) NEC_LFML_Verify(bData, b.m().total(), aData, a.m().total(), &score);
-        else if (algorithm == ELFT) NEC_ELFT_Verify(bData, aData, &score, 1);
-        else                        NEC_ELFT_M_Verify(bData, aData, &score, 1);
+        int score, error;
+        if      (algorithm == LFML) error = NEC_LFML_Verify(bData, b.m().total(), aData, a.m().total(), &score);
+        else if (algorithm == ELFT) error = NEC_ELFT_Verify(bData, aData, &score, 1);
+        else                        error = NEC_ELFT_M_Verify(bData, aData, &score, 1);
+        if (error)
+            qWarning("NECLatent1CompareDistance error %d", error);
         return score;
     }
 };
@@ -137,11 +137,9 @@ private:
         }
         QFutureSynchronizer<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.addFuture(QtConcurrent::run(_train, method, mv[c].col(i), labels, &av[c].at<double>(0, i), &bv[c].at<double>(0, i)));
-                else                                              _train (method, mv[c].col(i), labels, &av[c].at<double>(0, i), &bv[c].at<double>(0, i));
+                futures.addFuture(QtConcurrent::run(_train, method, mv[c].col(i), labels, &av[c].at<double>(0, i), &bv[c].at<double>(0, i)));
             av[c] = av[c].reshape(1, data.first().m().rows);
             bv[c] = bv[c].reshape(1, data.first().m().rows);
         }
@@ -221,7 +221,7 @@ public:
             Transform * maybe_copy = t->smartCopy();
             if (maybe_copy->parent() == NULL)
                 maybe_copy->setParent(output);
-            output->transforms.append(t->smartCopy());
+            output->transforms.append(maybe_copy);
         }
         output->file = this->file;
@@ -82,8 +82,7 @@ class HistEqQuantizationTransform : public Transform
         QFutureSynchronizer<void> futures;
         for (int i=0; i<data.cols; i++)
-            if (Globals->parallelism) futures.addFuture(QtConcurrent::run(&HistEqQuantizationTransform::computeThresholds, data.col(i), &thresholds.data()[i*256]));
-            else                                                                                        computeThresholds( data.col(i), &thresholds.data()[i*256]);
+            futures.addFuture(QtConcurrent::run(&HistEqQuantizationTransform::computeThresholds, data.col(i), &thresholds.data()[i*256]));
         futures.waitForFinished();
     }
@@ -156,8 +155,7 @@ class BayesianQuantizationDistance : public Distance
         QFutureSynchronizer<void> futures;
         for (int i=0; i<data.cols; i++)
-            if (Globals->parallelism) futures.addFuture(QtConcurrent::run(&BayesianQuantizationDistance::computeLogLikelihood, data.col(i), templateLabels, &loglikelihoods.data()[i*256]));
-            else                                                                                         computeLogLikelihood( data.col(i), templateLabels, &loglikelihoods.data()[i*256]);
+            futures.addFuture(QtConcurrent::run(&BayesianQuantizationDistance::computeLogLikelihood, data.col(i), templateLabels, &loglikelihoods.data()[i*256]));
         futures.waitForFinished();
     }
@@ -83,8 +83,7 @@ class BayesianQuantizationTransform : public Transform
         QFutureSynchronizer<void> futures;
         for (int i=0; i<data.cols; i++)
-            if (Globals->parallelism) futures.addFuture(QtConcurrent::run(&BayesianQuantizationTransform::computeThresholds, data.col(i), labels, &thresholds.data()[i*256]));
-            else                                                                                          computeThresholds( data.col(i), labels, &thresholds.data()[i*256]);
+            futures.addFuture(QtConcurrent::run(&BayesianQuantizationTransform::computeThresholds, data.col(i), labels, &thresholds.data()[i*256]));
         futures.waitForFinished();
     }
@@ -33,7 +33,8 @@ BR_REGISTER(Initializer, StasmInitializer)
  * \brief Wraps STASM key point detector
  * \author Scott Klum \cite sklum
  */
-
+// TODO: Use a global mutex to prevent concurrent calls to AsmSearchDll
+#if 0
 class StasmTransform : public UntrainableTransform
 {
     Q_OBJECT
@@ -67,6 +68,7 @@ class StasmTransform : public UntrainableTransform
 };
 BR_REGISTER(Transform, StasmTransform)
+#endif
 } // namespace br
@@ -771,11 +771,6 @@ public:
         (void) src; (void) dst;
         qFatal("nope");
     }
-    void project(const TemplateList & src, TemplateList & dst) const
-    {
-        (void) src; (void) dst;
-        qFatal("nope");
-    }
     void projectUpdate(const Template &src, Template &dst)
     {
@@ -46,8 +46,7 @@ class CrossValidateTransform : public MetaTransform
                 if (partitions[j] == i)
                     partitionedData.removeAt(j);
             // Train on the remaining templates
-            if (Globals->parallelism) futures.addFuture(QtConcurrent::run(transforms[i], &Transform::train, partitionedData));
-            else                                                          transforms[i]->train(partitionedData);
+            futures.addFuture(QtConcurrent::run(transforms[i], &Transform::train, partitionedData));
         }
         futures.waitForFinished();
     }