Changeset 1601 for XIOS/dev/dev_trunk_omp/src/transformation/Functions

Timestamp:

11/19/18 15:52:54 (6 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1597

Location:

XIOS/dev/dev_trunk_omp/src/transformation/Functions

Files:

• reduction.cpp (modified) (2 diffs)
• reduction.hpp (modified) (3 diffs)

XIOS/dev/dev_trunk_omp/src/transformation/Functions/reduction.cpp

@@ -9 +9 @@
 
 CReductionAlgorithm::CallBackMap* CReductionAlgorithm::reductionCreationCallBacks_ = 0;
-std::map<StdString,EReductionType> CReductionAlgorithm::ReductionOperations = std::map<StdString,EReductionType>();
+std::map<StdString,EReductionType> *CReductionAlgorithm::ReductionOperations_ptr = 0;
+
 bool CReductionAlgorithm::initReductionOperation(std::map<StdString,EReductionType>& m)
 {
@@ -29 +30 @@
 }
 
-bool CReductionAlgorithm::_dummyInit = CReductionAlgorithm::initReductionOperation(CReductionAlgorithm::ReductionOperations);
+bool CReductionAlgorithm::initReductionOperation()
+{
+  CReductionAlgorithm::ReductionOperations_ptr = new std::map<StdString,EReductionType>();
+  // So so stupid way to intialize operation but it works ...
+  (*CReductionAlgorithm::ReductionOperations_ptr)["sum"] = TRANS_REDUCE_SUM;
+  CSumReductionAlgorithm::registerTrans();
+
+  (*CReductionAlgorithm::ReductionOperations_ptr)["min"] = TRANS_REDUCE_MIN;
+  CMinReductionAlgorithm::registerTrans();
+
+  (*CReductionAlgorithm::ReductionOperations_ptr)["max"] = TRANS_REDUCE_MAX;
+  CMaxReductionAlgorithm::registerTrans();
+
+  (*CReductionAlgorithm::ReductionOperations_ptr)["extract"] = TRANS_REDUCE_EXTRACT;
+  CExtractReductionAlgorithm::registerTrans();
+
+  (*CReductionAlgorithm::ReductionOperations_ptr)["average"] = TRANS_REDUCE_AVERAGE;
+  CAverageReductionAlgorithm::registerTrans();
+}
+
 
 CReductionAlgorithm* CReductionAlgorithm::createOperation(EReductionType reduceType)

XIOS/dev/dev_trunk_omp/src/transformation/Functions/reduction.hpp

@@ -23 +23 @@
 {
 public:
-  static std::map<StdString,EReductionType> ReductionOperations;
-
+  static std::map<StdString,EReductionType> *ReductionOperations_ptr;
+  #pragma omp threadprivate(ReductionOperations_ptr)
 public:
   CReductionAlgorithm() {}
@@ -61 +61 @@
   typedef std::map<EReductionType, CreateOperationCallBack> CallBackMap;
   static CallBackMap* reductionCreationCallBacks_;
+  #pragma omp threadprivate(reductionCreationCallBacks_)
 
   static bool registerOperation(EReductionType reduceType, CreateOperationCallBack createFn);
@@ -67 +68 @@
 protected:
   static bool initReductionOperation(std::map<StdString,EReductionType>& m);
+  static bool initReductionOperation();
   static bool _dummyInit;
+  #pragma omp threadprivate(_dummyInit)
 };