[opengm] 307/386: fixed that shit

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/master
in repository opengm.

commit b28b49788272c48c3fd1fd095691c483f09af1d2
Author: DerThorsten <thorsten.beier at iwr.uni-heidelberg.de>
Date:   Thu Dec 10 23:29:20 2015 -0300

     fixed that shit
---
 include/opengm/learning/structured_perceptron.hxx | 25 ++---------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/include/opengm/learning/structured_perceptron.hxx b/include/opengm/learning/structured_perceptron.hxx
index ee058bb..df4ecdb 100644
--- a/include/opengm/learning/structured_perceptron.hxx
+++ b/include/opengm/learning/structured_perceptron.hxx
@@ -7,9 +7,7 @@
 #include <opengm/graphicalmodel/weights.hxx>
 #include <opengm/utilities/random.hxx>
 #include <opengm/learning/gradient-accumulator.hxx>
-#ifndef CI
-#include <omp.h>
-#endif
+
 
 namespace opengm {
     namespace learning {
@@ -152,16 +150,9 @@ namespace opengm {
                 featureAcc_.resetWeights();
 
 
-                #ifndef CI
-                omp_lock_t modelLockUnlock;
-                omp_init_lock(&modelLockUnlock);
 
-                omp_lock_t featureAccLock;
-                omp_init_lock(&featureAccLock);
-                #endif
 
-
-                #pragma omp parallel for
+                //#pragma omp parallel for
                 for(size_t gmi=0; gmi<nModels; ++gmi)
                 {
                     
@@ -183,20 +174,8 @@ namespace opengm {
                     featureAcc.accumulateModelFeatures(gm, dataset_.getGT(gmi).begin(), arg.begin());
 
 
-                    // acc features
-                    #ifndef CI
-                    omp_set_lock(&featureAccLock);
-                    featureAcc_.accumulateFromOther(featureAcc);
-                    omp_unset_lock(&featureAccLock);
-
-                    // unlock the model
-                    omp_set_lock(&modelLockUnlock);
-                    dataset_.unlockModel(gmi);     
-                    omp_unset_lock(&modelLockUnlock);
-                    #else
                     featureAcc_.accumulateFromOther(featureAcc);
                     dataset_.unlockModel(gmi);    
-                    #endif
 
 
                 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opengm.git