pmi config

src/include/Makefile.mk

@@ -69,8 +69,6 @@ noinst_HEADERS +=                   \
     src/include/mpir_win.h          \
     src/include/mpir_pt2pt.h        \
     src/include/nopackage.h         \
-    src/include/pmi.h               \
-    src/include/pmi2.h              \
     src/include/rlog.h              \
     src/include/rlog_macros.h       \
     src/include/mpir_op_util.h

src/mpid/ch4/netmod/ofi/ofi_init.h

@@ -230,7 +230,7 @@ static inline int MPIDI_NM_mpi_init_hook(int rank,
                                          int spawned, int num_contexts, void **netmod_contexts)
 {
     int mpi_errno = MPI_SUCCESS, pmi_errno, i, fi_version;
-    int thr_err = 0, str_errno, maxlen;
+    int thr_err = 0, str_errno, maxlen, vallen;
     char *table = NULL, *provname = NULL;
     struct fi_info *hints, *prov, *prov_use;
     struct fi_cq_attr cq_attr;
@@ -740,7 +740,7 @@ static inline int MPIDI_NM_mpi_init_hook(int rank,
 
         val = valS;
         sprintf(keyS, "OFI-%d", rank);
-#ifdef USE_CRAYPMI_API
+#ifdef USE_PMI2_API
         MPIDI_OFI_PMI_CALL_POP(PMI2_KVS_Put(keyS, val), pmi);
         MPIDI_OFI_PMI_CALL_POP(PMI2_KVS_Fence(), pmi);
 #else
@@ -773,9 +773,10 @@ static inline int MPIDI_NM_mpi_init_hook(int rank,
             end += size % num_local;
         for (i = start; i < end; i++) {
             sprintf(keyS, "OFI-%d", i);
-#ifdef USE_CRAYPMI_API
+#ifdef USE_PMI2_API
             MPIDI_OFI_PMI_CALL_POP(PMI2_KVS_Get
-                                   (NULL, -1, keyS, valS, MPIDI_KVSAPPSTRLEN, &len), pmi);
+                                   (NULL, -1, keyS, valS, MPIDI_KVSAPPSTRLEN, &vallen), pmi);
+            MPIR_Assert(vallen > 0);
 #else
             MPIDI_OFI_PMI_CALL_POP(PMI_KVS_Get
                                    (MPIDI_Global.kvsname, keyS, valS, MPIDI_KVSAPPSTRLEN), pmi);
@@ -967,7 +968,7 @@ static inline int MPIDI_NM_mpi_finalize_hook(void)
         MPIR_Assert(slist_empty(&MPIDI_Global.cq_buff_list));
     }
 
-#ifdef USE_CRAYPMI_API
+#ifdef USE_PMI2_API
     PMI2_Finalize();
 #else
     PMI_Finalize();

src/mpid/ch4/src/ch4_init.h

@@ -119,7 +119,7 @@ MPL_STATIC_INLINE_PREFIX int MPID_Init(int *argc,
     MPIDI_CH4_DBG_MEMORY = MPL_dbg_class_alloc("CH4_MEMORY", "ch4_memory");
 #endif
     MPIDI_choose_netmod();
-#ifdef USE_CRAYPMI_API
+#ifdef USE_PMI2_API
     pmi_errno = PMI2_Init(&has_parent, &size, &rank, &appnum);
 
     if (pmi_errno != PMI_SUCCESS) {

src/pmi/cray/subconfigure.m4

@@ -0,0 +1,25 @@
+[#] start of __file__
+
+AC_DEFUN([PAC_SUBCFG_PREREQ_]PAC_SUBCFG_AUTO_SUFFIX,[
+])
+
+AC_DEFUN([PAC_SUBCFG_BODY_]PAC_SUBCFG_AUTO_SUFFIX,[
+
+AM_CONDITIONAL([BUILD_PMI_CRAY],[test "x$pmi_name" = "xcray"])
+AM_COND_IF([BUILD_PMI_CRAY],[
+
+# set CPPFLAGS and LDFLAGS
+PAC_PREPEND_FLAG([$CRAY_PMI_INCLUDE_OPTS], [CPPFLAGS])
+PAC_PREPEND_FLAG([$CRAY_PMI_POST_LINK_OPTS], [LDFLAGS])
+
+AC_CHECK_HEADER([pmi.h], [], [AC_MSG_ERROR([could not find pmi.h.  Configure aborted])])
+AC_CHECK_LIB([pmi], [PMI_Init], [], [AC_MSG_ERROR([could not find the cray libpmi.  Configure aborted])])
+
+AC_DEFINE(USE_PMI2_API, 1, [Define if Cray PMI API must be used])
+PAC_APPEND_FLAG([-lpmi], [WRAPPER_LIBS])
+
+])dnl end COND_IF
+
+])dnl end BODY macro
+
+[#] end of __file__

src/pmi/pmi2/simple/Makefile.mk

@@ -14,8 +14,10 @@ mpi_core_sources += \
 noinst_HEADERS +=                 \
     src/pmi/pmi2/simple/simple_pmiutil.h \
     src/pmi/pmi2/simple/simple2pmi.h     \
-    src/pmi/pmi2/simple/pmi2compat.h
+    src/pmi/pmi2/simple/pmi2compat.h     \
+    src/pmi/pmi2/include/pmi2.h
 
 AM_CPPFLAGS += -I$(top_srcdir)/src/pmi/pmi2/simple
+AM_CPPFLAGS += -I$(top_srcdir)/src/pmi/pmi2/include
 
 endif BUILD_PMI_PMI2_SIMPLE

src/pmi/simple/Makefile.mk

@@ -12,9 +12,11 @@ mpi_core_sources +=       \
     src/pmi/simple/simple_pmi.c
 
 noinst_HEADERS +=                   \
-    src/pmi/simple/simple_pmiutil.h
+    src/pmi/simple/simple_pmiutil.h \
+    src/pmi/include/pmi.h
 
 AM_CPPFLAGS += -I$(top_srcdir)/src/pmi/simple
+AM_CPPFLAGS += -I$(top_srcdir)/src/pmi/include
 
 endif BUILD_PMI_SIMPLE