Merge pull request #223 from biometrics/enroll_update

Drop filelist return from enroll, don't accumulate metadata during enroll

Merge pull request #223 from biometrics/enroll_update
Drop filelist return from enroll, don't accumulate metadata during enroll
Josh Klontz
2 parents 385abcbd 302e5021
Showing 6 changed files with 72 additions and 37 deletions
openbr/core/core.cpp
openbr/gui/classifier.cpp
openbr/gui/gallerytoolbar.cpp
openbr/openbr_plugin.h
openbr/plugins/misc.cpp
openbr/plugins/stream.cpp
@@ -161,15 +161,13 @@ struct AlgorithmCore
         return name + file.baseName() + file.hash() + ".mem";
     }
-    FileList enroll(File input, File gallery = File())
+    void enroll(File input, File gallery = File())
     {
-        FileList files;
-
         qDebug("Enrolling %s%s", qPrintable(input.flat()),
                gallery.isNull() ? "" : qPrintable(" to " + gallery.flat()));
         if (gallery.name.isEmpty()) {
-            if (input.name.isEmpty()) return FileList();
+            if (input.name.isEmpty()) return;
             else                      gallery = getMemoryGallery(input);
         }
@@ -200,24 +198,18 @@ struct AlgorithmCore
         QScopedPointer<Transform> outputTform(Transform::make(outputDesc, NULL));
         stages.append(outputTform.data());
         stages.append(progressCounter.data());
-        QScopedPointer<Transform> discard(Transform::make("Discard",NULL));
-        stages.append(discard.data());
         QScopedPointer<Transform> pipeline(br::pipeTransforms(stages));
-        QScopedPointer<Transform> stream(br::wrapTransform(pipeline.data(), "Stream(readMode=StreamGallery)"));
+        QScopedPointer<Transform> stream(br::wrapTransform(pipeline.data(), "Stream(readMode=StreamGallery, endPoint=DiscardTemplates)"));
         TemplateList data, output;
         data.append(input);
         progressCounter->setPropertyRecursive("totalProgress", QString::number(total));
         stream->projectUpdate(data, output);
-        files.append(output.files());
-
         if (multiProcess)
             delete enroll;
-
-        return files;
     }
     void project(File input, File output)
@@ -492,8 +484,6 @@ struct AlgorithmCore
         // The ProgressCounter transform will simply provide a display about the number of rows completed.
         compareOutput.append(progressCounter.data());
-        QScopedPointer<Transform> discard(Transform::make("Discard",NULL));
-        compareOutput.append(discard.data());
         // With this, we have set up a transform which (optionally) enrolls templates, compares them
         // against a gallery, and outputs them.
@@ -501,7 +491,7 @@ struct AlgorithmCore
         // Now, we will give that base transform to a stream, which will incrementally read the row gallery
         // and pass the transforms it reads through the base algorithm.
-        QScopedPointer<Transform> streamWrapper(br::wrapTransform(pipeline, "Stream(readMode=StreamGallery)"));
+        QScopedPointer<Transform> streamWrapper(br::wrapTransform(pipeline, "Stream(readMode=StreamGallery, endPoint=DiscardTemplates)"));
         // We set up a template containing the rowGallery we want to compare. 
         TemplateList rowGalleryTemplate;
@@ -632,9 +622,9 @@ void br::Train(const File &amp;input, const File &amp;model)
     AlgorithmManager::getAlgorithm(model.get<QString>("algorithm"))->train(input, model);
 }
-FileList br::Enroll(const File &input, const File &gallery)
+void br::Enroll(const File &input, const File &gallery)
 {
-    return AlgorithmManager::getAlgorithm(gallery.get<QString>("algorithm"))->enroll(input, gallery);
+    AlgorithmManager::getAlgorithm(gallery.get<QString>("algorithm"))->enroll(input, gallery);
 }
 void br::Project(const File &input, const File &output)
@@ -37,7 +37,13 @@ void Classifier::setClassification(const QString &amp;key, const QString &amp;value)
 void Classifier::_classify(File file)
 {
     QString key, value;
-    foreach (const File &f, Enroll(file.flat(), File("[algorithm=" + algorithm + "]"))) {
+    QSharedPointer<Transform> transform = Transform::fromAlgorithm(algorithm);
+
+    TemplateList input, output;
+    input.append(file);
+    transform->projectUpdate(input, output);
+
+    foreach (const File &f, output.files() ) {
         if      (algorithm == "GenderClassification") key = "Gender";
         else if (algorithm == "AgeRegression")        key = "Age";
         else                                          key = algorithm;
@@ -83,9 +83,10 @@ void br::GalleryToolBar::_enroll(const br::File &amp;input)
 {
     galleryLock.lock();
     this->input = input;
-    if (input.suffix() == "gal") gallery = input.name + ".mem";
-    else                         gallery = QString("%1/galleries/%2.gal[cache]").arg(br::Globals->scratchPath(), qPrintable(input.baseName()+input.hash()));
-    files = br::Enroll(input.flat(), gallery.flat());
+    gallery = input.name + ".mem";
+    br::Enroll(input.flat(), gallery.flat());
+    files = FileList::fromGallery(gallery);
+
     galleryLock.unlock();
 }
@@ -1393,7 +1393,7 @@ BR_EXPORT void Train(const File &amp;input, const File &amp;model);
  * \brief High-level function for creating galleries.
  * \see br_enroll
  */
-BR_EXPORT FileList Enroll(const File &input, const File &gallery = File());
+BR_EXPORT void Enroll(const File &input, const File &gallery = File());
 /*!
  * \brief High-level function for enrolling templates.
@@ -278,6 +278,23 @@ class DiscardTransform : public UntrainableMetaTransform
 BR_REGISTER(Transform, DiscardTransform)
+class DiscardTemplatesTransform : public UntrainableMetaTransform
+{
+    Q_OBJECT
+
+    void project(const Template &src, Template &dst) const
+    {
+        (void) src; (void) dst;
+        qFatal("Incorrect project called on DiscardTemplatesTransform");
+    }
+    void project(const TemplateList &src, TemplateList &dst) const
+    {
+        (void) src;
+        dst.clear();
+    }
+};
+BR_REGISTER(Transform, DiscardTemplatesTransform)
+
 /*!
  * \ingroup transforms
  * \brief Removes all but the first matrix from the template.
@@ -1085,6 +1085,32 @@ public:
 };
+class CollectOutputTransform : public TimeVaryingTransform
+{
+    Q_OBJECT
+public:
+    CollectOutputTransform() : TimeVaryingTransform(false, false) {}
+
+    TemplateList data;
+
+    void projectUpdate(const TemplateList &src, TemplateList &dst)
+    {
+        (void) dst;
+        data.append(src);
+    }
+
+    void finalize(TemplateList & output)
+    {
+        output = data;
+        data.clear();
+    }
+    void train(const TemplateList &data)
+    {
+        (void) data;
+    }
+};
+BR_REGISTER(Transform, CollectOutputTransform)
+
 // This stage reads new frames from the data source.
 class ReadStage : public SingleThreadStage
 {
@@ -1204,11 +1230,12 @@ class DirectStreamTransform : public CompositeTransform
 {
     Q_OBJECT
 public:
-
     Q_PROPERTY(int activeFrames READ get_activeFrames WRITE set_activeFrames RESET reset_activeFrames)
     Q_PROPERTY(br::Idiocy::StreamModes readMode READ get_readMode WRITE set_readMode RESET reset_readMode)
+    Q_PROPERTY(br::Transform* endPoint READ get_endPoint WRITE set_endPoint RESET reset_endPoint STORED true)
     BR_PROPERTY(int, activeFrames, 100)
     BR_PROPERTY(br::Idiocy::StreamModes, readMode, br::Idiocy::Auto)
+    BR_PROPERTY(br::Transform*, endPoint, make("CollectOutput"))
     friend class StreamTransfrom;
@@ -1349,22 +1376,19 @@ public:
             }
             final_output.append(output_set);
         }
+        endPoint->projectUpdate(final_output);
         // Clear dst, since we set it to src so that the datasource could open it
         dst.clear();
         // dst is set to all output received by the final stage, along
         // with anything output via the calls to finalize.
-        foreach (const TemplateList &list, collector->sets)
-            dst.append(list);
-
-        collector->sets.clear();
-
-        dst.append(final_output);
+        TemplateList output;
+        endPoint->finalize(output);
+        dst.append(output);
         foreach (ProcessingStage *stage, processingStages)
             stage->reset();
-
     }
@@ -1387,7 +1411,7 @@ public:
         QMutexLocker poolLock(&poolsAccess);
         QHash<QObject *, QThreadPool *>::Iterator it;
         if (!pools.contains(this->parent())) {
-            it = pools.insert(this->parent(), new QThreadPool(this->parent()));
+            it = pools.insert(this->parent(), new QThreadPool());
             it.value()->setMaxThreadCount(Globals->parallelism);
         }
         else it = pools.find(this->parent());
@@ -1440,7 +1464,7 @@ public:
         // We also have the last stage, which just puts the output of the
         // previous stages on a template list.
         collectionStage = new SingleThreadStage(prev_stage_variance);
-        collectionStage->transform = this->collector.data();
+        collectionStage->transform = this->endPoint;
         processingStages.append(collectionStage);
@@ -1456,11 +1480,6 @@ public:
         collectionStage->nextStage = readStage;
     }
-    DirectStreamTransform()
-    {
-        this->collector = QSharedPointer<CollectSets>(new CollectSets());
-    }
-
     ~DirectStreamTransform()
     {
         // Delete all the stages
@@ -1476,7 +1495,6 @@ protected:
     ReadStage *readStage;
     SingleThreadStage *collectionStage;
-    QSharedPointer<CollectSets> collector;
     QList<ProcessingStage *> processingStages;
@@ -1525,11 +1543,13 @@ public:
     {
     }
+    Q_PROPERTY(br::Transform* endPoint READ get_endPoint WRITE set_endPoint RESET reset_endPoint STORED true)
     Q_PROPERTY(int activeFrames READ get_activeFrames WRITE set_activeFrames RESET reset_activeFrames)
     Q_PROPERTY(br::Idiocy::StreamModes readMode READ get_readMode WRITE set_readMode RESET reset_readMode)
     BR_PROPERTY(int, activeFrames, 100)
     BR_PROPERTY(br::Idiocy::StreamModes, readMode, br::Idiocy::Auto)
+    BR_PROPERTY(br::Transform*, endPoint, make("CollectOutput"))
     bool timeVarying() const { return true; }
@@ -1571,6 +1591,7 @@ public:
         basis->transforms.clear();
         basis->activeFrames = this->activeFrames;
         basis->readMode = this->readMode;
+        basis->endPoint = this->endPoint;
         // We need at least a CompositeTransform * to acess transform's children.
         CompositeTransform *downcast = dynamic_cast<CompositeTransform *> (transform);