Changeset 1482 for XIOS/dev/branch_openmp/extern/src_ep_dev

Timestamp:

04/13/18 16:25:46 (6 years ago)

Author:

yushan

Message:

Branch EP merged with Dev_cmip6 @r1481

Location:

XIOS/dev/branch_openmp/extern/src_ep_dev

Files:

• ep_declaration.cpp (modified) (4 diffs)
• ep_declaration.hpp (modified) (2 diffs)
• ep_reduce.cpp (modified) (3 diffs)

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

@@ -25 +25 @@
 ::MPI_Datatype MPI_UNSIGNED_CHAR_STD = MPI_UNSIGNED_CHAR;
 ::MPI_Datatype MPI_UINT64_T_STD = MPI_UINT64_T;
+::MPI_Datatype MPI_LONG_LONG_INT_STD = MPI_LONG_LONG_INT;
 
 #undef MPI_INT
@@ -34 +35 @@
 #undef MPI_UNSIGNED_CHAR
 #undef MPI_UINT64_T
+#undef MPI_LONG_LONG_INT
 
 
@@ -57 +59 @@
 extern ::MPI_Datatype MPI_UNSIGNED_CHAR_STD;
 extern ::MPI_Datatype MPI_UINT64_T_STD;
+extern ::MPI_Datatype MPI_LONG_LONG_INT_STD;
 
 
@@ -79 +82 @@
 ep_lib::MPI_Datatype MPI_UNSIGNED_CHAR = &MPI_UNSIGNED_CHAR_STD;
 ep_lib::MPI_Datatype MPI_UINT64_T = &MPI_UINT64_T_STD;
+ep_lib::MPI_Datatype MPI_LONG_LONG_INT = &MPI_LONG_LONG_INT_STD;
 
 

XIOS/dev/branch_openmp/extern/src_ep_dev/ep_declaration.hpp

@@ -10 +10 @@
 #undef MPI_UNSIGNED_CHAR
 #undef MPI_UINT64_T
+#undef MPI_LONG_LONG_INT
 
 #undef MPI_SUM
@@ -31 +32 @@
 extern ep_lib::MPI_Datatype MPI_UNSIGNED_CHAR;
 extern ep_lib::MPI_Datatype MPI_UINT64_T;
+extern ep_lib::MPI_Datatype MPI_LONG_LONG_INT;
 
 extern ep_lib::MPI_Op MPI_SUM;

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

@@ -130 +130 @@
             reduce_max<uint64_t>(static_cast<uint64_t*>(comm.my_buffer->void_buffer[i]), static_cast<uint64_t*>(recvbuf), count);
         }
+        
+        else if(datatype == MPI_LONG_LONG_INT)
+        {
+          assert(datasize == sizeof(long long));
+          for(int i=1; i<num_ep; i++)
+            reduce_max<long long>(static_cast<long long*>(comm.my_buffer->void_buffer[i]), static_cast<long long*>(recvbuf), count);
+        }
 
         else printf("datatype Error\n");
@@ -185 +192 @@
             reduce_min<uint64_t>(static_cast<uint64_t*>(comm.my_buffer->void_buffer[i]), static_cast<uint64_t*>(recvbuf), count);
         }
+        
+        else if(datatype == MPI_LONG_LONG_INT)
+        {
+          assert(datasize == sizeof(long long));
+          for(int i=1; i<num_ep; i++)
+            reduce_min<long long>(static_cast<long long*>(comm.my_buffer->void_buffer[i]), static_cast<long long*>(recvbuf), count);
+        }
 
         else printf("datatype Error\n");
@@ -240 +254 @@
           for(int i=1; i<num_ep; i++)
             reduce_sum<uint64_t>(static_cast<uint64_t*>(comm.my_buffer->void_buffer[i]), static_cast<uint64_t*>(recvbuf), count);
+        }
+        
+        else if(datatype ==MPI_LONG_LONG_INT)
+        {
+          assert(datasize == sizeof(long long));
+          for(int i=1; i<num_ep; i++)
+            reduce_sum<long long>(static_cast<long long*>(comm.my_buffer->void_buffer[i]), static_cast<long long*>(recvbuf), count);
         }