Changeset 1339

Timestamp:

11/21/17 13:42:35 (7 years ago)

Author:

yushan

Message:

dev_omp OK

Location:

XIOS/dev/branch_openmp

Files:

• extern/remap/src/mapper.cpp (modified) (5 diffs)
• extern/src_ep_dev/ep_alltoall.cpp (modified) (1 diff)
• inputs/REMAP/iodef.xml (modified) (2 diffs)
• src/transformation/Functions/reduction.cpp (modified) (2 diffs)
• src/transformation/Functions/reduction.hpp (modified) (1 diff)
• src/transformation/axis_algorithm_extract_domain.cpp (modified) (2 diffs)
• src/transformation/axis_algorithm_extract_domain.hpp (modified) (2 diffs)
• src/transformation/axis_algorithm_reduce_domain.cpp (modified) (2 diffs)
• src/transformation/axis_algorithm_reduce_domain.hpp (modified) (2 diffs)
• src/transformation/scalar_algorithm_extract_axis.cpp (modified) (2 diffs)
• src/transformation/scalar_algorithm_extract_axis.hpp (modified) (2 diffs)
• src/transformation/scalar_algorithm_reduce_axis.cpp (modified) (3 diffs)
• src/transformation/scalar_algorithm_reduce_axis.hpp (modified) (2 diffs)
• src/transformation/scalar_algorithm_reduce_domain.cpp (modified) (2 diffs)
• src/transformation/scalar_algorithm_reduce_domain.hpp (modified) (2 diffs)

XIOS/dev/branch_openmp/extern/remap/src/mapper.cpp

@@ -243 +243 @@
   int *nbRecvElement = new int[mpiSize];
   MPI_Alltoall(nbSendElement, 1, MPI_INT, nbRecvElement, 1, MPI_INT, communicator);
+  
 
   /* communicate indices of source elements on other ranks whoes value and gradient we need (since intersection) */
@@ -315 +316 @@
       MPI_Issend(sendValue[rank],  nbRecvElement[rank], MPI_DOUBLE, rank, 0, communicator, &sendRequest[nbSendRequest]);
       nbSendRequest++;
-      MPI_Issend(sendArea[rank],  nbRecvElement[rank], MPI_DOUBLE, rank, 0, communicator, &sendRequest[nbSendRequest]);
+      MPI_Issend(sendArea[rank],  nbRecvElement[rank], MPI_DOUBLE, rank, 1, communicator, &sendRequest[nbSendRequest]);
       nbSendRequest++;
       if (order == 2)
       {
-        MPI_Issend(sendGrad[rank], 3*nbRecvElement[rank]*(NMAX+1), MPI_DOUBLE, rank, 0, communicator, &sendRequest[nbSendRequest]);
+        MPI_Issend(sendGrad[rank], 3*nbRecvElement[rank]*(NMAX+1), MPI_DOUBLE, rank, 2, communicator, &sendRequest[nbSendRequest]);
         nbSendRequest++;
-        MPI_Issend(sendNeighIds[rank], 4*nbRecvElement[rank]*(NMAX+1), MPI_INT, rank, 0, communicator, &sendRequest[nbSendRequest]);
+        MPI_Issend(sendNeighIds[rank], 4*nbRecvElement[rank]*(NMAX+1), MPI_INT, rank, 3, communicator, &sendRequest[nbSendRequest]);
 //ym  --> attention taille GloId
         nbSendRequest++;
@@ -327 +328 @@
       else
       {
-        MPI_Issend(sendNeighIds[rank], 4*nbRecvElement[rank], MPI_INT, rank, 0, communicator, &sendRequest[nbSendRequest]);
+        MPI_Issend(sendNeighIds[rank], 4*nbRecvElement[rank], MPI_INT, rank, 4, communicator, &sendRequest[nbSendRequest]);
 //ym  --> attention taille GloId
         nbSendRequest++;
@@ -336 +337 @@
       MPI_Irecv(recvValue[rank],  nbSendElement[rank], MPI_DOUBLE, rank, 0, communicator, &recvRequest[nbRecvRequest]);
       nbRecvRequest++;
-      MPI_Irecv(recvArea[rank],  nbSendElement[rank], MPI_DOUBLE, rank, 0, communicator, &recvRequest[nbRecvRequest]);
+      MPI_Irecv(recvArea[rank],  nbSendElement[rank], MPI_DOUBLE, rank, 1, communicator, &recvRequest[nbRecvRequest]);
       nbRecvRequest++;
       if (order == 2)
       {
-        MPI_Irecv(recvGrad[rank], 3*nbSendElement[rank]*(NMAX+1), MPI_DOUBLE, rank, 0, communicator, &recvRequest[nbRecvRequest]);
+        MPI_Irecv(recvGrad[rank], 3*nbSendElement[rank]*(NMAX+1), MPI_DOUBLE, rank, 2, communicator, &recvRequest[nbRecvRequest]);
         nbRecvRequest++;
-        MPI_Irecv(recvNeighIds[rank], 4*nbSendElement[rank]*(NMAX+1), MPI_INT, rank, 0, communicator, &recvRequest[nbRecvRequest]);
+        MPI_Irecv(recvNeighIds[rank], 4*nbSendElement[rank]*(NMAX+1), MPI_INT, rank, 3, communicator, &recvRequest[nbRecvRequest]);
 //ym  --> attention taille GloId
         nbRecvRequest++;
@@ -348 +349 @@
       else
       {
-        MPI_Irecv(recvNeighIds[rank], 4*nbSendElement[rank], MPI_INT, rank, 0, communicator, &recvRequest[nbRecvRequest]);
+        MPI_Irecv(recvNeighIds[rank], 4*nbSendElement[rank], MPI_INT, rank, 4, communicator, &recvRequest[nbRecvRequest]);
 //ym  --> attention taille GloId
         nbRecvRequest++;

XIOS/dev/branch_openmp/extern/src_ep_dev/ep_alltoall.cpp

@@ -59 +59 @@
       delete[] tmp_sendbuf;
     }
+    
+    MPI_Barrier(comm);
 
     return 0;

XIOS/dev/branch_openmp/inputs/REMAP/iodef.xml

@@ -58 +58 @@
           <field field_ref="dst_field_2D_regular_pole" name="field_dst_regular_2" enabled=".TRUE."/>
           <field field_ref="dst_field_2D_clone" name="field_dst_regular_3" detect_missing_value=".false." default_value="100000" enabled=".FALSE."/>
-          <field field_ref="dst_field_2D_extract" name="field_dst_regular_4" enabled=".FALSE."/>
+          <field field_ref="dst_field_2D_extract" name="field_dst_regular_4" enabled=".TRUE."/>
         </file> 
        <file id="output_3D" name="output_3D" enabled=".TRUE.">
@@ -68 +68 @@
        <file id="output_4D" name="output_4D" enabled=".TRUE.">
           <field field_ref="src_field_4D" name="field_4D" />
-          <field field_ref="dst_field_4D_extract" name="field_4D_extract" enabled=".FALSE."/>
+          <field field_ref="dst_field_4D_extract" name="field_4D_extract" enabled=".TRUE."/>
         </file>
      </file_group>

XIOS/dev/branch_openmp/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;
 
@@ -52 +51 @@
 
 //bool CReductionAlgorithm::_dummyInit = CReductionAlgorithm::initReductionOperation(CReductionAlgorithm::ReductionOperations);
-bool CReductionAlgorithm::_dummyInit = CReductionAlgorithm::initReductionOperation();
+//bool CReductionAlgorithm::_dummyInit = CReductionAlgorithm::initReductionOperation();
 
 CReductionAlgorithm* CReductionAlgorithm::createOperation(EReductionType reduceType)

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

@@ -16 +16 @@
 namespace xios {
 
-/*!
+/*!  
   \class CReductionAlgorithm
   Interface for all reduction alogrithms.

XIOS/dev/branch_openmp/src/transformation/axis_algorithm_extract_domain.cpp

@@ -13 +13 @@
 #include "grid.hpp"
 #include "grid_transformation_factory_impl.hpp"
-#include "reduction.hpp"
 
 namespace xios {
@@ -62 +61 @@
 
   pos_ = algo->position;
-  //reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations[op]);
+  if(CReductionAlgorithm::ReductionOperations_ptr == 0) 
+  {
+    CReductionAlgorithm::initReductionOperation();
+  }
   reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations_ptr->at(op));
 }

XIOS/dev/branch_openmp/src/transformation/axis_algorithm_extract_domain.hpp

@@ -13 +13 @@
 #include "transformation.hpp"
 
+#include "reduction.hpp"
 namespace xios {
 
@@ -25 +26 @@
   Extract a domain to an axis
 */
-class CAxisAlgorithmExtractDomain : public CAxisAlgorithmTransformation
+class CAxisAlgorithmExtractDomain : public CAxisAlgorithmTransformation, public CReductionAlgorithm
 {
 public:

XIOS/dev/branch_openmp/src/transformation/axis_algorithm_reduce_domain.cpp

@@ -13 +13 @@
 #include "grid.hpp"
 #include "grid_transformation_factory_impl.hpp"
-#include "reduction.hpp"
 
 namespace xios {
@@ -70 +69 @@
 
   dir_ = (CReduceDomainToAxis::direction_attr::iDir == algo->direction)  ? iDir : jDir;
-  //reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations[op]);
+  if(CReductionAlgorithm::ReductionOperations_ptr == 0) 
+  {
+    CReductionAlgorithm::initReductionOperation();
+  }
   reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations_ptr->at(op));
 }

XIOS/dev/branch_openmp/src/transformation/axis_algorithm_reduce_domain.hpp

@@ -12 +12 @@
 #include "axis_algorithm_transformation.hpp"
 #include "transformation.hpp"
+#include "reduction.hpp"
 
 namespace xios {
@@ -24 +25 @@
   Reduce a domain to an axis
 */
-class CAxisAlgorithmReduceDomain : public CAxisAlgorithmTransformation
+class CAxisAlgorithmReduceDomain : public CAxisAlgorithmTransformation, public CReductionAlgorithm
 {
 public:

XIOS/dev/branch_openmp/src/transformation/scalar_algorithm_extract_axis.cpp

@@ -14 +14 @@
 #include "grid_transformation_factory_impl.hpp"
 
-#include "reduction.hpp"
 
 namespace xios {
@@ -49 +48 @@
   StdString op = "extract";
   pos_ = algo->position;
-  //reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations[op]);
+  if(CReductionAlgorithm::ReductionOperations_ptr == 0) 
+  {
+    CReductionAlgorithm::initReductionOperation();
+  }
   reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations_ptr->at(op));
 }

XIOS/dev/branch_openmp/src/transformation/scalar_algorithm_extract_axis.hpp

@@ -12 +12 @@
 #include "scalar_algorithm_transformation.hpp"
 #include "transformation.hpp"
+#include "reduction.hpp"
 
 namespace xios {
@@ -24 +25 @@
   Extract a scalar from an axis
 */
-class CScalarAlgorithmExtractAxis : public CScalarAlgorithmTransformation
+class CScalarAlgorithmExtractAxis : public CScalarAlgorithmTransformation, public CReductionAlgorithm
 {
 public:

XIOS/dev/branch_openmp/src/transformation/scalar_algorithm_reduce_axis.cpp

@@ -13 +13 @@
 #include "grid.hpp"
 #include "grid_transformation_factory_impl.hpp"
-#include "reduction.hpp"
 
 namespace xios {
@@ -73 +72 @@
   }
   
+  if(CReductionAlgorithm::ReductionOperations_ptr == 0) 
+  {
+    CReductionAlgorithm::initReductionOperation();
+  }
+  
   //if (CReductionAlgorithm::ReductionOperations.end() == CReductionAlgorithm::ReductionOperations.find(op))
-  if (CReductionAlgorithm::ReductionOperations_ptr->end() == CReductionAlgorithm::ReductionOperations_ptr->find(op))
+  if ((*CReductionAlgorithm::ReductionOperations_ptr).end() == (*CReductionAlgorithm::ReductionOperations_ptr).find(op))
     ERROR("CScalarAlgorithmReduceAxis::CScalarAlgorithmReduceAxis(CAxis* axisDestination, CAxis* axisSource, CReduceAxisToScalar* algo)",
        << "Operation '" << op << "' not found. Please make sure to use a supported one"
@@ -81 +85 @@
 
   //reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations[op]);
-  reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations_ptr->at(op));
+  reduction_ = CReductionAlgorithm::createOperation((*CReductionAlgorithm::ReductionOperations_ptr)[op]);
 }
 

XIOS/dev/branch_openmp/src/transformation/scalar_algorithm_reduce_axis.hpp

@@ -12 +12 @@
 #include "scalar_algorithm_transformation.hpp"
 #include "transformation.hpp"
+#include "reduction.hpp"
 
 namespace xios {
@@ -24 +25 @@
   Reducing an axis to a scalar
 */
-class CScalarAlgorithmReduceAxis : public CScalarAlgorithmTransformation
+class CScalarAlgorithmReduceAxis : public CScalarAlgorithmTransformation, public CReductionAlgorithm
 {
 public:

XIOS/dev/branch_openmp/src/transformation/scalar_algorithm_reduce_domain.cpp

@@ -14 +14 @@
 #include "grid_transformation_factory_impl.hpp"
 
-#include "reduction.hpp"
 
 namespace xios {
@@ -69 +68 @@
   }
   
-  // if(CReductionAlgorithm::ReductionOperations_ptr == 0) 
-  //   CReductionAlgorithm::initReductionOperation();
+  if(CReductionAlgorithm::ReductionOperations_ptr == 0) 
+  {
+    CReductionAlgorithm::initReductionOperation();
+  }
 
   //if (CReductionAlgorithm::ReductionOperations.end() == CReductionAlgorithm::ReductionOperations.find(op))

XIOS/dev/branch_openmp/src/transformation/scalar_algorithm_reduce_domain.hpp

@@ -12 +12 @@
 #include "scalar_algorithm_transformation.hpp"
 #include "transformation.hpp"
+#include "reduction.hpp"
 
 namespace xios {
@@ -24 +25 @@
   Reducing an DOMAIN to a scalar
 */
-class CScalarAlgorithmReduceDomain : public CScalarAlgorithmTransformation
+class CScalarAlgorithmReduceDomain : public CScalarAlgorithmTransformation, public CReductionAlgorithm
 {
 public: