tweaks to meta transforms to skip training when possible

Josh Klontz
1 parent 1699213d
Showing 2 changed files with 9 additions and 5 deletions
openbr/openbr_plugin.h
openbr/plugins/meta.cpp
@@ -1213,11 +1213,10 @@ public:
     void init()
     {
         isTimeVarying = false;
+        trainable = false;
         foreach (const br::Transform *transform, transforms) {
-            if (transform->timeVarying()) {
-                isTimeVarying = true;
-                break;
-            }
+            isTimeVarying = isTimeVarying || transform->timeVarying();
+            trainable = trainable || transform->trainable;
         }
     }
@@ -73,7 +73,7 @@ static void _train(Transform *transform, const TemplateList *data)
  */
 class PipeTransform : public CompositeTransform
 {
-    Q_OBJECT
+    Q_OBJECT    
     void _projectPartial(Template *srcdst, int startIndex, int stopIndex)
     {
@@ -83,6 +83,8 @@ class PipeTransform : public CompositeTransform
     void train(const TemplateList &data)
     {
+        if (!trainable) return;
+
         TemplateList copy(data);
         int i = 0;
         while (i < transforms.size()) {
@@ -285,6 +287,7 @@ class ForkTransform : public CompositeTransform
     void train(const TemplateList &data)
     {
+        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));
@@ -415,6 +418,7 @@ public:
 private:
     void init()
     {
+        trainable = transform->trainable;
         if (!cache.isEmpty()) return;
         // Read from cache
@@ -476,6 +480,7 @@ private:
         if (transform != NULL) return;
         baseName = QRegExp("^[a-zA-Z0-9]+$").exactMatch(description) ? description : QtUtils::shortTextHash(description);
         if (!tryLoad()) transform = make(description);
+        else            trainable = false;
     }
     void train(const TemplateList &data)