Changeset ac6d04 for src/comm/mpi/datatype.hpp

Timestamp:

Apr 10, 2012, 1:55:49 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

a40eea

Parents:

d24c2f

Message:

Merge recent changes of the vmg library into ScaFaCos.

Includes a fix for the communication problems on Jugene.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1666 5161e1c8-67bf-11de-9fd5-51895aff932f

File:

• src/comm/mpi/datatype.hpp (modified) (6 diffs)

src/comm/mpi/datatype.hpp

@@ -1 +1 @@
 #ifndef DATATYPE_HPP_
 #define DATATYPE_HPP_
+
+#include <vector>
 
 #include "base/index.hpp"
@@ -29 +31 @@
     _rank(rank),
     _tag_send(tag_send),
-    _tag_recv(tag_receive)
+    _tag_recv(tag_receive),
+    _buffer(subsizes.Product())
   {
-    if (_sizes.Product() > 0 && _subsizes.Product() > 0) {
-      MPI_Type_create_subarray(3, _sizes.vec(), _subsizes.vec(), _starts.vec(), MPI_ORDER_C, MPI_DOUBLE, &_type);
-      MPI_Type_commit(&_type);
-    }else {
-      _type = MPI_DATATYPE_NULL;
-    }
+    InitDatatype();
   }
 
@@ -46 +44 @@
     _rank(rank),
     _tag_send(tag_send),
-    _tag_recv(tag_receive)
+    _tag_recv(tag_receive),
+    _buffer(_subsizes.Product())
   {
-    if (_sizes.Product() > 0 && _subsizes.Product() > 0) {
-      MPI_Type_create_subarray(3, _sizes.vec(), _subsizes.vec(), _starts.vec(), MPI_ORDER_C, MPI_DOUBLE, &_type);
-      MPI_Type_commit(&_type);
-    }else {
-      _type = MPI_DATATYPE_NULL;
-    }
+    InitDatatype();
   }
 
@@ -62 +56 @@
     _rank(other._rank),
     _tag_send(other._tag_send),
-    _tag_recv(other._tag_recv)
+    _tag_recv(other._tag_recv),
+    _buffer(_subsizes.Product())
   {
-    if (_sizes.Product() > 0 && _subsizes.Product() > 0) {
-      MPI_Type_create_subarray(3, _sizes.vec(), _subsizes.vec(), _starts.vec(), MPI_ORDER_C, MPI_DOUBLE, &_type);
-      MPI_Type_commit(&_type);
-    }else {
-      _type = MPI_DATATYPE_NULL;
-    }
-  }
-
-  void Set(const GridIteratorSet& bounds, const Grid& grid, const int& rank,
-           const int& tag_send, const int& tag_receive)
-  {
-    _sizes = grid.Local().SizeTotal();
-    _subsizes = bounds.Begin().GetEnd() - bounds.Begin().GetBegin();
-    _starts = bounds.Begin().GetBegin();
-    _rank = rank;
-    _tag_send = tag_send;
-    _tag_recv = tag_receive;
-
-    if (_sizes.Product() > 0 && _subsizes.Product() > 0) {
-      MPI_Type_create_subarray(3, _sizes.vec(), _subsizes.vec(), _starts.vec(), MPI_ORDER_C, MPI_DOUBLE, &_type);
-      MPI_Type_commit(&_type);
-    }else {
-      _type = MPI_DATATYPE_NULL;
-    }
-  }
-
-  void Set(const Index& sizes, const Index& subsizes, const Index& starts, const int& rank,
-           const int& tag_send, const int& tag_receive)
-  {
-    _sizes = sizes;
-    _subsizes = subsizes;
-    _starts = starts;
-    _rank = rank;
-    _tag_send = tag_send;
-    _tag_recv = tag_receive;
-
-    if (_sizes.Product() > 0 && _subsizes.Product() > 0) {
-      MPI_Type_create_subarray(3, _sizes.vec(), _subsizes.vec(), _starts.vec(), MPI_ORDER_C, MPI_DOUBLE, &_type);
-      MPI_Type_commit(&_type);
-    }else {
-      _type = MPI_DATATYPE_NULL;
-    }
+    InitDatatype();
   }
 
@@ -114 +68 @@
   }
 
-  Index& Sizes() {return _sizes;}
-  Index& Subsizes() {return _subsizes;}
-  Index& Starts() {return _starts;}
+  void Set(const GridIteratorSet& bounds, const Grid& grid, const int& rank,
+           const int& tag_send, const int& tag_receive);
+
+  void Set(const Index& sizes, const Index& subsizes, const Index& starts, const int& rank,
+           const int& tag_send, const int& tag_receive);
+
+  const Index& Sizes() const {return _sizes;}
+  const Index& Subsizes() const {return _subsizes;}
+  const Index& Starts() const {return _starts;}
+
   const int& Rank() const {return _rank;}
   const int& TagSend() const {return _tag_send;}
   const int& TagReceive() const {return _tag_recv;}
-  MPI_Datatype Type() const {return _type;}
+
+  const MPI_Datatype& Type() const {return _type;}
+
+  const std::vector<vmg_float>& Buffer() const {return _buffer;}
+
+  void Send(Grid& grid, const int& tag, const MPI_Comm& comm) const;
+  void Isend(Grid& grid, const int& tag, const MPI_Comm& comm, MPI_Request& request) const;
+  void Recv(Grid& grid, const int& tag, const MPI_Comm& comm) const;
+  void Irecv(Grid& grid, const int& tag, const MPI_Comm& comm, MPI_Request& request) const;
+
+  void SendBuffered(const Grid& grid, const int& tag, const MPI_Comm& comm);
+  void IsendBuffered(const Grid& grid, const int& tag, const MPI_Comm& comm, MPI_Request& request);
+  void RecvBuffered(const int& tag, const MPI_Comm& comm);
+  void IrecvBuffered(const int& tag, const MPI_Comm& comm, MPI_Request& request);
+
+  void GridReplace(Grid& grid) const;
+  void GridSum(Grid& grid) const;
 
   bool Feasible() const
@@ -127 +104 @@
   }
 
-  int Size() const
-  {
-    return _subsizes.Product();
-  }
+private:
+  void InitDatatype();
 
-private:
   Index _sizes, _subsizes, _starts;
   int _rank, _tag_send, _tag_recv;
   MPI_Datatype _type;
+  std::vector<vmg_float> _buffer;
 };