Update deps for updated parser and collectives

  * Depends libsesstype 1.4.3 and libscribble 1.3.4
  * Update collective operation generator to detect group (non-all)
    collectives
  * Adds incomplete support for inline groups

Author: nickng

debian/changelog

@@ -1,3 +1,12 @@
+pabble-mpi (1.1.1) unstable; urgency=low
+
+  * Depends libsesstype 1.4.3 and libscribble 1.3.4
+  * Update collective operation generator to detect group (non-all)
+    collectives
+  * Adds incomplete support for inline groups
+
+ -- Nicholas Ng <[email protected]>  Thu, 5 Dec 2013 21:14:30 +0000
+
 pabble-mpi (1.1.0) unstable; urgency=low
 
   * Add non-deterministic receive support

debian/control

@@ -9,7 +9,7 @@ Vcs-Git: git://github.com/sessionc/pabble-mpi.git
 
 Package: pabble-mpi
 Architecture: amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, libsesstype (>=1.4.1), libscribble (>=1.3.3~scribble0.3+pabble)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libsesstype (>=1.4.3), libscribble (>=1.3.4~scribble0.3+pabble)
 Description: Scribble to MPI conversion tool
  Binary tool to convert Scribble/Pabble (endpoint) communication protocols to MPI/C code.
  This is part of Session C programming framework. See http://www.doc.ic.ac.uk/~cn06/sessionc for details.

include/scribble/mpi_print.h

@@ -25,6 +25,8 @@ void mpi_print(FILE *stream, st_tree *local_tree);
 void mpi_fprintf(FILE *stream, const char *format, ...);
 
 // Helpers
+//
+int is_role_in_group(char *role_name, st_tree *tree);
 
 void mpi_fprint_const_or_var(FILE *stream, st_tree *tree, st_expr *expr);
 void mpi_fprint_msg_cond(FILE *stream, st_tree *tree, const msg_cond_t *msg_cond, int indent);

src/pabble-mpi-tool.c

@@ -6,6 +6,7 @@
 #include <unistd.h>
 
 #include <sesstype/st_node.h>
+#include <sesstype/st_node_print.h>
 #include <sesstype/st_normalise.h>
 
 #include <scribble/parser.h>

src/print.c

@@ -6,6 +6,9 @@
 #include <unistd.h>
 
 #include <sesstype/st_node.h>
+#ifdef __DEBUG__
+#include <sesstype/st_node_print.h>
+#endif
 #include <scribble/print.h>
 
 #include "scribble/mpi_print.h"
@@ -44,8 +47,6 @@ void mpi_find_labels(st_node *node)
 }
 
 
-
-
 void mpi_fprint_choice(FILE *pre_stream, FILE *stream, FILE *post_stream, st_tree *tree, st_node *node, int indent)
 {
   assert(node != NULL && node->type == ST_NODE_CHOICE);
@@ -125,6 +126,10 @@ void mpi_fprint_choice(FILE *pre_stream, FILE *stream, FILE *post_stream, st_tre
 void mpi_fprint_node(FILE *pre_stream, FILE *stream, FILE *post_stream, st_tree *tree, st_node *node, int indent)
 {
   assert(node != NULL);
+#ifdef __DEBUG__
+  st_node_fprint(stderr, node, 0);
+  fprintf(stderr, "\n");
+#endif
 
   switch (node->type) {
     case ST_NODE_ROOT:      mpi_fprint_root(pre_stream, stream, post_stream, tree, node, indent);      break;

src/print_collective.c

@@ -4,6 +4,7 @@
 #include <string.h>
 
 #include <sesstype/st_node.h>
+#include <sesstype/st_node_print.h>
 #include <scribble/print.h>
 
 #include "scribble/mpi_print.h"
@@ -14,6 +15,13 @@ extern unsigned int mpi_primitive_count;
 
 void mpi_fprint_allgather(FILE *pre_stream, FILE *stream, FILE *post_stream, st_tree *tree, st_node *node, int indent)
 {
+#ifdef __DEBUG__
+  fprintf(stderr, "INFO/%s:%d %s entry\nINFO/", __FILE__, __LINE__, __FUNCTION__);
+  st_node_fprint(stderr, node, indent);
+#endif
+
+  assert(node != NULL);
+
   // Variable declarations
   mpi_fprintf(pre_stream, "  int count%u = 1 /* CHANGE ME */;\n", mpi_primitive_count);
 
@@ -53,8 +61,12 @@ void mpi_fprint_allgather(FILE *pre_stream, FILE *stream, FILE *post_stream, st_
 
 void mpi_fprint_allreduce(FILE *pre_stream, FILE *stream, FILE *post_stream, st_tree *tree, st_node *node, int indent)
 {
-  assert(node != NULL && node->type == ST_NODE_ALLREDUCE);
+#ifdef __DEBUG__
+  fprintf(stderr, "INFO/%s:%d %s entry\nINFO/", __FILE__, __LINE__, __FUNCTION__);
+  st_node_fprint(stderr, node, indent);
+#endif
 
+  assert(node != NULL && node->type == ST_NODE_ALLREDUCE);
 
   // Variable declarations
   mpi_fprintf(pre_stream, "  int count%u = 1 /* CHANGE ME */;\n", mpi_primitive_count);
@@ -85,8 +97,12 @@ void mpi_fprint_allreduce(FILE *pre_stream, FILE *stream, FILE *post_stream, st_
 
 void mpi_fprint_scatter(FILE *pre_stream, FILE *stream, FILE *post_stream, st_tree *tree, st_node *node, int indent)
 {
-  assert(node != NULL && node->type == ST_NODE_RECV);
+#ifdef __DEBUG__
+  fprintf(stderr, "INFO/%s:%d %s entry\nINFO/", __FILE__, __LINE__, __FUNCTION__);
+  st_node_fprint(stderr, node, indent);
+#endif
 
+  assert(node != NULL && node->type == ST_NODE_RECV);
 
   // Variable declarations
   mpi_fprintf(pre_stream, "  int count%u = 1 /* CHANGE ME */;\n", mpi_primitive_count);
@@ -114,7 +130,15 @@ void mpi_fprint_scatter(FILE *pre_stream, FILE *stream, FILE *post_stream, st_tr
     if (param!=0) mpi_fprintf(stream, ",");
     mpi_fprint_const_or_var(stream, tree, node->interaction->from->param[param]);
   }
-  mpi_fprintf(stream, "), MPI_COMM_WORLD);\n");
+  if (is_role_in_group(node->interaction->msg_cond->name, tree)) {
+    mpi_fprintf(stream, "), %s_comm);\n", node->interaction->msg_cond->name);
+  } else if (strcmp(node->interaction->msg_cond->name, ST_ROLE_ALL) == 0) {
+    mpi_fprintf(stream, "), MPI_COMM_WORLD);\n");
+  } else {
+    fprintf(stderr, "ERROR/%s:%d %s Cannot determine communicator (inline group?), defaulting to MPI_COMM_WORLD\n", __FILE__, __LINE__, __FUNCTION__);
+    // TODO Inline group not given name
+    mpi_fprintf(stream, "), MPI_COMM_WORLD);\n");
+  }
   mpi_fprintf(stream, "#pragma pabble compute%u (buf%u, count%u)\n", mpi_primitive_count, mpi_primitive_count, mpi_primitive_count);
 
   mpi_fprintf(post_stream, "  free(sbuf%u);\n", mpi_primitive_count);
@@ -125,8 +149,12 @@ void mpi_fprint_scatter(FILE *pre_stream, FILE *stream, FILE *post_stream, st_tr
 
 void mpi_fprint_gather(FILE *pre_stream, FILE *stream, FILE *post_stream, st_tree *tree, st_node *node, int indent)
 {
-  assert(node != NULL && node->type == ST_NODE_SEND);
+#ifdef __DEBUG__
+  fprintf(stderr, "INFO/%s:%d %s entry\nINFO/", __FILE__, __LINE__, __FUNCTION__);
+  st_node_fprint(stderr, node, indent);
+#endif
 
+  assert(node != NULL && node->type == ST_NODE_SEND);
 
   // Variable declarations
   mpi_fprintf(pre_stream, "  int count%u = 1 /* CHANGE ME */;\n", mpi_primitive_count);
@@ -162,7 +190,15 @@ void mpi_fprint_gather(FILE *pre_stream, FILE *stream, FILE *post_stream, st_tre
     if (param!=0) mpi_fprintf(stream, ",");
     mpi_fprint_const_or_var(stream, tree, node->interaction->to[0]->param[param]);
   }
-  mpi_fprintf(stream, "), MPI_COMM_WORLD);\n");
+  if (is_role_in_group(node->interaction->msg_cond->name, tree)) {
+    mpi_fprintf(stream, "), %s_comm);\n", node->interaction->msg_cond->name);
+  } else if (strcmp(node->interaction->msg_cond->name, ST_ROLE_ALL) == 0) {
+    mpi_fprintf(stream, "), MPI_COMM_WORLD);\n");
+  } else {
+    fprintf(stderr, "ERROR/%s:%d %s Cannot determine communicator (inline group?), defaulting to MPI_COMM_WORLD\n", __FILE__, __LINE__, __FUNCTION__);
+    // TODO Inline group not given name
+    mpi_fprintf(stream, "), MPI_COMM_WORLD);\n");
+  }
   mpi_fprintf(stream, "#pragma pabble compute%u (buf%u, count%u)\n", mpi_primitive_count, mpi_primitive_count, mpi_primitive_count);
 
   mpi_fprintf(post_stream, "  free(sbuf%u);\n", mpi_primitive_count);