Peter M. Groen / openbr

Commit 497ea0d46a7e29c3d316dc1abe53dc3396bfcb73

Authored by Josh Klontz
1 parent 033b663d

Revert "finer grain concurrency for _projectPartial" 

This reverts commit 2f12e845d71d7189bfaa08a94f23b73f09685f91.
Inline Side-by-side
Showing 1 changed file with 3 additions and 4 deletions
openbr/plugins/meta.cpp
  View file @497ea0d
@@ -76,7 +76,7 @@ class PipeTransform : public CompositeTransform @@ -76,7 +76,7 @@ class PipeTransform : public CompositeTransform
76 { 76 {
77 Q_OBJECT 77 Q_OBJECT
78 78
79 - void _projectPartial(Template *srcdst, int startIndex, int stopIndex) 79 + void _projectPartial(TemplateList *srcdst, int startIndex, int stopIndex)
80 { 80 {
81 for (int i=startIndex; i<stopIndex; i++) 81 for (int i=startIndex; i<stopIndex; i++)
82 *srcdst >> *transforms[i]; 82 *srcdst >> *transforms[i];
@@ -124,9 +124,8 @@ class PipeTransform : public CompositeTransform @@ -124,9 +124,8 @@ class PipeTransform : public CompositeTransform
124 124
125 fprintf(stderr, " projecting..."); 125 fprintf(stderr, " projecting...");
126 QFutureSynchronizer<void> futures; 126 QFutureSynchronizer<void> futures;
127 - for (int j=0; j<dataLines.size(); j++)  
128 - for (int k=0; k<dataLines[j].size(); k++)  
129 - futures.addFuture(QtConcurrent::run(this, &PipeTransform::_projectPartial, &dataLines[j][k], i, nextTrainableTransform)); 127 + for (int j=0; j < dataLines.size(); j++)
  128 + futures.addFuture(QtConcurrent::run(this, &PipeTransform::_projectPartial, &dataLines[j], i, nextTrainableTransform));
130 futures.waitForFinished(); 129 futures.waitForFinished();
131 130
132 i = nextTrainableTransform; 131 i = nextTrainableTransform;