Merge branch 'slurm-2.6'

contribs/README

@@ -87,6 +87,10 @@ of the SLURM contribs distribution follows:
      API to SLURM using php.  Not a complete API, but offers quite a few
      interfaces to existing SLURM proper APIs.
 
+  pmi2               [ PMI2 client library ]
+     User applications can link with this library to use Slurm's mpi/pmi2
+     plugin.
+
   ptrace.patch       [ Linux Kernel patch required to for TotalView use ]
      0. This has been fixed on most recent Linux kernels. Older versions of
      Linux may need this patch support TotalView.

contribs/pmi2/pmi2_util.c

@@ -18,7 +18,6 @@
 #include <string.h>
 #include <errno.h>
 
-/* #include "orte/mca/errmgr/errmgr.h" */
 #include "pmi2_util.h"
 
 #define MAXVALLEN 1024
@@ -119,7 +118,6 @@ int PMI2U_writeline(int fd, char *buf) {
 
         if (n < 0) {
             PMI2U_printf("write_line error; fd=%d buf=:%s:", fd, buf);
-            ORTE_PMI_ERROR(-1, "system msg for write_line failure");
             return (-1);
         }
         if (n < size)

contribs/pmi2/pmi2_util.h

@@ -7,17 +7,9 @@
 #ifndef PMI2UTIL_H_INCLUDED
 #define PMI2UTIL_H_INCLUDED
 
-/* #include "orte/mca/errmgr/errmgr.h" */
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef DEBUG
-#define opal_output(level, x...) do{printf(x);}while(0)
-#else
-#define opal_output(level, x...)
-#endif
-#define ORTE_PMI_ERROR(err, msg) do{printf(msg); exit(err);}while(0)
-
 /* maximum sizes for arrays */
 #define PMI2_MAXLINE 1024
 #define PMI2_IDSIZE    32
@@ -36,12 +28,16 @@
 #endif
 
 #if (1)
-    #define PMI2U_printf(x...) do { \
-        char logstr[1024]; \
-        snprintf(logstr, 1024, x); \
-        opal_output(0, "[%s (%d): %s] %s\n", \
-            __FILE__, __LINE__, __FUNCTION__, logstr); \
-} while (0)
+    #define PMI2U_printf(x...) do {				\
+	char logstr[1024];					\
+	if (NULL == x) {					\
+		snprintf(logstr, 1024, "N/A");			\
+	} else {						\
+		snprintf(logstr, 1024, x);			\
+	}							\
+	fprintf(stderr, "[%s (%d): %s] %s\n",			\
+		__FILE__, __LINE__, __FUNCTION__, logstr);	\
+    } while (0)
 #else
     #define PMI2U_printf(x...)
 #endif

doc/html/team.shtml

@@ -47,7 +47,7 @@ Lead Slurm developers are:
 <li>Thomas Cadeau (Bull)</li>
 <li>Hongjia Cao (National University of Defense Technology, China)</li>
 <li>Jimmy Cao (Greenplum/EMC)</li>
-<li>Ralph Castain (Los Alamos National Laboratory, Greenplum/EMC)</li>
+<li>Ralph Castain (Intel, Greenplum/EMC, Los Alamos National Laboratory)</li>
 <li>Fran&ccedil;ois Chevallier (CEA)</li>
 <li>Daniel Christians (HP)</li>
 <li>Gilles Civario (Bull)</li>
@@ -172,6 +172,6 @@ Lead Slurm developers are:
 <!-- INDIVIDUALS, PLEASE KEEP IN ALPHABETICAL ORDER -->
 </ul>
 
-<p style="text-align:center;">Last modified 1 October 2013</p>
+<p style="text-align:center;">Last modified 9 October 2013</p>
 
 <!--#include virtual="footer.txt"-->