Merge pull request #7 from hppritcha/topic/remove_mpi_flags

drop use of MPI_Flag

Author: hppritcha

ompi/communicator/comm.c

@@ -1281,6 +1281,11 @@ int ompi_comm_create_from_group (ompi_group_t *group, const char *tag, opal_info
     snprintf(newcomp->c_name, MPI_MAX_OBJECT_NAME, "MPI COMM %s FROM GROUP",
 	     ompi_comm_print_cid (newcomp));
 
+    newcomp->super.s_info = OBJ_NEW(opal_info_t);
+    if (NULL == newcomp->super.s_info) {
+        return OMPI_ERR_OUT_OF_RESOURCE;
+    }
+
     /* NTH: HACK IN SLEEPY STUFF */
     {
         opal_info_entry_t *info_entry;

ompi/include/mpi.h.in

@@ -399,8 +399,6 @@ typedef int (MPI_Grequest_query_function)(void *, MPI_Status *);
 typedef int (MPI_Grequest_free_function)(void *);
 typedef int (MPI_Grequest_cancel_function)(void *, int);
 
-typedef unsigned long MPI_Flags;
-
 /*
  * Deprecated typedefs.  Usage is discouraged, as these may be deleted
  * in future versions of the MPI Standard.
@@ -1712,7 +1710,7 @@ OMPI_DECLSPEC  int MPI_Session_get_num_psets (MPI_Session session, int *npset_na
 OMPI_DECLSPEC  int MPI_Session_get_nth_pset (MPI_Session session, int n, int len, char *pset_name);
 OMPI_DECLSPEC  int MPI_Session_get_pset_info (MPI_Session session, const char *pset_name, MPI_Info *info_used);
 OMPI_DECLSPEC  int MPI_Session_get_psetlen (MPI_Session session, int n, int *pset_name_len);
-OMPI_DECLSPEC  int MPI_Session_init (MPI_Flags *flags, MPI_Info info, MPI_Errhandler errhandler,
+OMPI_DECLSPEC  int MPI_Session_init (MPI_Info info, MPI_Errhandler errhandler,
                                      MPI_Session *session);
 OMPI_DECLSPEC  MPI_Session MPI_Session_f2c (MPI_Fint session);
 OMPI_DECLSPEC  int MPI_Session_set_attr (MPI_Session session, int session_keyval, void *attribute_val);
@@ -2425,7 +2423,7 @@ OMPI_DECLSPEC  int PMPI_Session_get_num_psets (MPI_Session session, int *npset_n
 OMPI_DECLSPEC  int PMPI_Session_get_nth_pset (MPI_Session session, int n, int len, char *pset_name);
 OMPI_DECLSPEC  int PMPI_Session_get_pset_info (MPI_Session session, const char *pset_name, MPI_Info *info_used);
 OMPI_DECLSPEC  int PMPI_Session_get_psetlen (MPI_Session session, int n, int *pset_name_len);
-OMPI_DECLSPEC  int PMPI_Session_init (MPI_Flags *flags, MPI_Info info, MPI_Errhandler errhandler,
+OMPI_DECLSPEC  int PMPI_Session_init (MPI_Info info, MPI_Errhandler errhandler,
                                      MPI_Session *session);
 OMPI_DECLSPEC  MPI_Session PMPI_Session_f2c (MPI_Fint session);
 OMPI_DECLSPEC  int PMPI_Session_set_attr (MPI_Session session, int session_keyval, void *attribute_val);

ompi/instance/instance.c

@@ -589,7 +589,7 @@ static int ompi_mpi_instance_init_common (void)
     return OMPI_SUCCESS;
 }
 
-int ompi_mpi_instance_init (MPI_Flags *flags, opal_info_t *info, ompi_errhandler_t *errhandler, ompi_instance_t **instance)
+int ompi_mpi_instance_init (int ts_level,  opal_info_t *info, ompi_errhandler_t *errhandler, ompi_instance_t **instance)
 {
     ompi_instance_t *new_instance;
     int ret;
@@ -598,7 +598,7 @@ int ompi_mpi_instance_init (MPI_Flags *flags, opal_info_t *info, ompi_errhandler
 
     /* If thread support was enabled, then setup OPAL to allow for them by deault. This must be done
      * early to prevent a race condition that can occur with orte_init(). */
-    if (*flags & MPI_FLAG_THREAD_CONCURRENT) {
+    if (ts_level == MPI_THREAD_MULTIPLE) {
         opal_set_using_threads(true);
     }
 

ompi/instance/instance.h

@@ -118,11 +118,11 @@ void ompi_mpi_instance_release (void);
 /**
  * @brief Create a new MPI instance
  *
- * @param[inout] flags     instance flags (see mpi.h)
+ * @param[in]    ts_level  thread support level (see mpi.h)
  * @param[in]    info      info object
  * @param[in]    errhander errhandler to set on the instance
  */
-OMPI_DECLSPEC int ompi_mpi_instance_init (MPI_Flags *flags, opal_info_t *info, ompi_errhandler_t *errhandler, ompi_instance_t **instance);
+OMPI_DECLSPEC int ompi_mpi_instance_init (int ts_level, opal_info_t *info, ompi_errhandler_t *errhandler, ompi_instance_t **instance);
 
 /**
  * @brief Destroy an MPI instance and set it to MPI_SESSION_NULL

ompi/mpi/c/session_init.c

@@ -25,12 +25,15 @@
 static const char FUNC_NAME[] = "MPI_Session_init";
 
 
-int MPI_Session_init (MPI_Flags *flags, MPI_Info info, MPI_Errhandler errhandler, MPI_Session *session)
+int MPI_Session_init (MPI_Info info, MPI_Errhandler errhandler, MPI_Session *session)
 {
-    int rc;
+    int rc, flag;
+    int ts_level = MPI_THREAD_SINGLE;  /* for now we default to thread single for OMPI sessions */
+    char info_value[MPI_MAX_INFO_VAL + 1];
+    const char ts_level_multi[] = "MPI_THREAD_MULTIPLE";
 
     if ( MPI_PARAM_CHECK ) {
-        if (NULL == errhandler || NULL == flags || NULL == session) {
+        if (NULL == errhandler || NULL == session) {
             return MPI_ERR_ARG;
         }
 
@@ -39,7 +42,16 @@ int MPI_Session_init (MPI_Flags *flags, MPI_Info info, MPI_Errhandler errhandler
         }
     }
 
-    rc = ompi_mpi_instance_init (flags, &info->super, errhandler, session);
+    if (MPI_INFO_NULL != info) {
+        (void) ompi_info_get (info, "thread_support_level", MPI_MAX_INFO_VAL, info_value, &flag);
+        if (flag) {
+            if(strncmp(info_value, ts_level_multi, strlen(ts_level_multi)) == 0) {
+                ts_level = MPI_THREAD_MULTIPLE;
+            }
+        }
+    }
+
+    rc = ompi_mpi_instance_init (ts_level, &info->super, errhandler, session);
     /* if an error occured raise it on the null session */
     OMPI_ERRHANDLER_RETURN (rc, MPI_SESSION_NULL, rc, FUNC_NAME);
 }

ompi/runtime/ompi_mpi_init.c

@@ -339,28 +339,9 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided,
         }
     }
 
-    /* Figure out the final MPI thread levels.  If we were not
-       compiled for support for MPI threads, then don't allow
-       MPI_THREAD_MULTIPLE.  Set this stuff up here early in the
-       process so that other components can make decisions based on
-       this value. */
-
     ompi_mpi_thread_level(requested, provided);
 
-    MPI_Flags flags;
-    switch (*provided) {
-    case MPI_THREAD_SINGLE:
-    case MPI_THREAD_FUNNELED:
-    case MPI_THREAD_SERIALIZED:
-        flags = MPI_FLAG_THREAD_NONCONCURRENT_SINGLE;
-        break;
-    case MPI_THREAD_MULTIPLE:
-        flags = MPI_FLAG_THREAD_CONCURRENT;
-        break;
-    }
-
-
-    ret = ompi_mpi_instance_init (&flags, &ompi_mpi_info_null.info.super, MPI_ERRORS_ARE_FATAL, &ompi_mpi_instance_default);
+    ret = ompi_mpi_instance_init (*provided, &ompi_mpi_info_null.info.super, MPI_ERRORS_ARE_FATAL, &ompi_mpi_instance_default);
     if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {
         error = "ompi_mpi_init: ompi_mpi_instance_init failed";
         goto error;