Changeset 423 for trunk

Timestamp:

09/02/10 19:26:07 (14 years ago)

Author:

lnalod

Message:

Update of the backward procedure for generating the atomi directives. The precedent backward generation was wrong.

Location:

trunk

Files:

• examples/nardi/shallow/shalw.d (modified) (1 diff)
• yao/src/Translator.cpp (modified) (1 diff)

trunk/examples/nardi/shallow/shalw.d

@@ -8 +8 @@
 
 //option o_gradtest
-//option o_parallel
+option o_parallel
 option o_m1qn3
 

trunk/yao/src/Translator.cpp

@@ -3052 +3052 @@
         anImplementation << "\t Ytbeta[" << con->getIn()-1 << "]=YG" << con->getOut() << "_" << con->getOutModule() << "(";
       else{                   // ibad=='A': case gradients Alpha: backward.
-        if(firstAxis==1 && con->getReli() && con->getI() ||
+
+        /* Old first wrong version for adding atomic pragma on the backward
+           if(firstAxis==1 && con->getReli() && con->getI() ||
            firstAxis==2 && con->getRelj() && con->getJ() ||
            firstAxis==3 && con->getRelk() && con->getK() ){
-          if(parallel){
-            anImplementation << "\t #pragma omp atomic\n";
-            totalAtomicOperations++;
-          }
-        }
+           if(parallel){
+           anImplementation << "\t #pragma omp atomic\n";
+           totalAtomicOperations++;
+           }
+           }
+           */
+
+        if(parallel){
+          bool flagCon=true;
+          for(Table<Connection>::iterator conDest=theConnectionTable.begin(); conDest != theConnectionTable.end() && flagCon; conDest++){
+            if(conDest->getOutModule() == con->getOutModule() &&
+                conDest->getRelt() == con->getRelt() &&
+                conDest->ist() == con->ist() &&
+                conDest->isT() == con->isT() &&
+                conDest->getT() == con->getT() &&
+                conDest->getOut() == con->getOut()
+              ){
+
+              if(firstAxis==1 && con->getReli() && con->getI()!=conDest->getI() ||
+                  firstAxis==2 && con->getRelj() && con->getJ()!=conDest->getJ() ||
+                  firstAxis==3 && con->getRelk() && con->getK()!=conDest->getK() ){
+                anImplementation << "\t #pragma omp atomic\n";
+                totalAtomicOperations++;
+                flagCon=false;
+
+                // To see/debug
+                /*cout << "ctin: " << con->getOutModule() << " ====> " << con->getInModule() << "    "
+                  << "trovata ctin: " << conDest->getOutModule() << " ====> " << conDest->getInModule()
+                  << " " << con->getOut() << " " << conDest->getOut() << "-- " << con->getI() << " " << conDest->getI()
+                  << "-- " << con->getReli() << " " << conDest->getReli() << "-- " << con->ist() << " " << conDest->ist()
+                  << "-- " << con->getT() << " " << conDest->getT() << "-- " << con->getRelt() << " " << conDest->getRelt() << endl;
+                  */
+              }
+            }
+          }
+
+        }
+      
         anImplementation << "\t YG" << con->getOut() << "_" << con->getOutModule() << "(";
       }