Merge pull request #178 from intel/develop

Re-enable build without mpi (make mpi=0 ...).
intel · Nov 7, 2018 · e6476ed · e6476ed
2 parents 4beabb5 + 56a7bca
commit e6476ed
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/common/common_utils.cpp b/src/common/common_utils.cpp
@@ -46,7 +46,7 @@ namespace yask {
     // for numbers above 9 (at least up to 99).
 
     // Format: "major.minor.patch".
-    const string version = "2.15.08";
+    const string version = "2.15.09";
 
     string yask_get_version_string() {
         return version;

diff --git a/src/kernel/lib/setup.cpp b/src/kernel/lib/setup.cpp
@@ -1629,8 +1629,9 @@ namespace yask {
             " stencil-name:          " << get_name() << endl <<
             " element-size:          " << makeByteStr(get_element_bytes()) << endl <<
             " rank-domain:           " << rank_bb.bb_begin.makeDimValStr() <<
-            " ... " << rank_bb.bb_end.subElements(1).makeDimValStr() << endl <<
+            " ... " << rank_bb.bb_end.subElements(1).makeDimValStr() << endl;
 #ifdef USE_MPI
+        os <<
             " num-ranks:             " << _opts->_num_ranks.makeDimValStr(" * ") << endl <<
             " rank-indices:          " << _opts->_rank_indices.makeDimValStr() << endl <<
             " rank-domain-offsets:   " << rank_domain_offsets.makeDimValOffsetStr() << endl;

diff --git a/src/kernel/lib/yask.hpp b/src/kernel/lib/yask.hpp
@@ -41,10 +41,13 @@ IN THE SOFTWARE.
 #define MPI_Barrier(comm) ((void)0)
 #define MPI_Finalize()    ((void)0)
 typedef int MPI_Comm;
+typedef int MPI_Win;
+typedef int MPI_Group;
 typedef int MPI_Request;
 #define MPI_PROC_NULL     (-1)
 #define MPI_COMM_NULL     ((MPI_Comm)0x04000000)
 #define MPI_REQUEST_NULL  ((MPI_Request)0x2c000000)
+#define MPI_GROUP_NULL    ((MPI_Group)0x08000000)
 #ifdef MPI_VERSION
 #undef MPI_VERSION
 #endif