comparison src/Silvet.cpp @ 106:ac750e222ad3 bqvec-openmp

Merge OpenMP and bqvec stuff into bqvec-openmp branch

 {
     Grid filtered = preProcess(cqout);
 
     FeatureSet fs;
 
+    if (filtered.empty()) return fs;
+
     for (int i = 0; i < (int)filtered.size(); ++i) {
         Feature f;
         for (int j = 0; j < processingHeight; ++j) {
             f.values.push_back(float(filtered[i][j]));
         }

 
     int width = filtered.size();
 
     int iterations = 12;
 
-    for (int i = 0; i < width; ++i) {
-
-        double sum = 0.0;
-        for (int j = 0; j < processingHeight; ++j) {
-            sum += filtered[i][j];
-        }
-
-        if (sum < 1e-5) continue;
-
-        EM em;
-        for (int j = 0; j < iterations; ++j) {
-            em.iterate(filtered[i].data());
-        }
-
-        const double *pd = em.getPitchDistribution();
-        vector<double> pitches(pd, pd + processingNotes);
+    int stride = 8;
+
+    for (int i = 0; i < width; i += stride) {
+
+        int chunk = stride;
+        if (i + chunk > width) {
+            chunk = width - i;
+        }
+
+        vector<vector<double> > pitchSubMatrix
+            (chunk, vector<double>(processingNotes));
+
+#pragma omp parallel for
+        for (int k = 0; k < chunk; ++k) {
+
+            double sum = 0.0;
+            for (int j = 0; j < processingHeight; ++j) {
+                sum += filtered[i + k][j];
+            }
+
+            if (sum < 1e-5) continue;
+
+            EM em;
+            for (int j = 0; j < iterations; ++j) {
+                em.iterate(filtered[i + k].data());
+            }
+
+            const double *pitches = em.getPitchDistribution();
         
-        for (int j = 0; j < processingNotes; ++j) {
-            pitches[j] *= sum;
-        }
-
-        Feature f;
-        for (int j = 0; j < processingNotes; ++j) {
-            f.values.push_back(float(pitches[j]));
-        }
-        fs[m_pitchOutputNo].push_back(f);
-
-        FeatureList noteFeatures = postProcess(pitches);
-
-        for (FeatureList::const_iterator fi = noteFeatures.begin();
-             fi != noteFeatures.end(); ++fi) {
-            fs[m_notesOutputNo].push_back(*fi);
+            for (int j = 0; j < processingNotes; ++j) {
+                pitchSubMatrix[k][j] = pitches[j] * sum;
+            }
+        }
+        
+        for (int k = 0; k < chunk; ++k) {
+
+            const vector<double> &pitches = pitchSubMatrix[k];
+
+            Feature f;
+            for (int j = 0; j < processingNotes; ++j) {
+                f.values.push_back(float(pitches[j]));
+            }
+            fs[m_pitchOutputNo].push_back(f);
+
+            FeatureList noteFeatures = postProcess(pitches);
+
+            for (FeatureList::const_iterator fi = noteFeatures.begin();
+                 fi != noteFeatures.end(); ++fi) {
+                fs[m_notesOutputNo].push_back(*fi);
+            }
         }
     }
 
     return fs;
 }