Merge pull request open-mpi#599 from hjelmn/v2.x_acc_ops

ompi/win: save value of accumulate_ops info key on window

Author: hppritcha

ompi/info/info.c

@@ -272,6 +272,22 @@ int ompi_info_set (ompi_info_t *info, const char *key, const char *value)
 }
 
 
+int ompi_info_set_value_enum (ompi_info_t *info, const char *key, int value,
+                              mca_base_var_enum_t *var_enum)
+{
+    char *string_value;
+    int ret;
+
+    ret = var_enum->string_from_value (var_enum, value, &string_value);
+    if (OPAL_SUCCESS != ret) {
+        return ret;
+    }
+
+    return ompi_info_set (info, key, string_value);
+}
+
+
+
 /*
  * Free an info handle and all of its keys and values.
  */

ompi/info/info.h

@@ -151,7 +151,7 @@ int ompi_info_finalize(void);
  */
 int ompi_info_dup (ompi_info_t *info, ompi_info_t **newinfo);
 
-/*
+/**
  * Set a new key,value pair on info.
  *
  * @param info pointer to ompi_info_t object
@@ -163,6 +163,21 @@ int ompi_info_dup (ompi_info_t *info, ompi_info_t **newinfo);
  */
 OMPI_DECLSPEC int ompi_info_set (ompi_info_t *info, const char *key, const char *value);
 
+/**
+ * Set a new key,value pair from a variable enumerator.
+ *
+ * @param info pointer to ompi_info_t object
+ * @param key pointer to the new key object
+ * @param value integer value of the info key (must be valid in var_enum)
+ * @param var_enum variable enumerator
+ *
+ * @retval MPI_SUCCESS upon success
+ * @retval MPI_ERR_NO_MEM if out of memory
+ * @retval OPAL_ERR_VALUE_OUT_OF_BOUNDS if the value is not valid in the enumerator
+ */
+OMPI_DECLSPEC int ompi_info_set_value_enum (ompi_info_t *info, const char *key, int value,
+                                            mca_base_var_enum_t *var_enum);
+
 /**
  * ompi_info_free - Free an 'MPI_Info' object.
  *

ompi/mpi/c/win_get_info.c

@@ -58,6 +58,7 @@ int MPI_Win_get_info(MPI_Win win, MPI_Info *info_used)
         _win_info_set (*info_used, "no_locks", win->w_flags & OMPI_WIN_NO_LOCKS);
         _win_info_set (*info_used, "same_size", win->w_flags & OMPI_WIN_SAME_SIZE);
         _win_info_set (*info_used, "same_disp_unit", win->w_flags & OMPI_WIN_SAME_DISP);
+        ompi_info_set_value_enum (*info_used, "accumulate_ops", win->w_acc_ops, ompi_win_accumulate_ops);
     }
 
     OMPI_ERRHANDLER_RETURN(ret, win, ret, FUNC_NAME);

ompi/win/win.c

@@ -44,6 +44,13 @@ opal_pointer_array_t ompi_mpi_windows = {{0}};
 
 ompi_predefined_win_t ompi_mpi_win_null = {{{0}}};
 ompi_predefined_win_t *ompi_mpi_win_null_addr = &ompi_mpi_win_null;
+mca_base_var_enum_t *ompi_win_accumulate_ops = NULL;
+
+static mca_base_var_enum_value_t accumulate_ops_values[] = {
+    {.value = OMPI_WIN_ACCUMULATE_OPS_SAME_OP_NO_OP, .string = "same_op_no_op",},
+    {.value = OMPI_WIN_ACCUMULATE_OPS_SAME_OP, .string = "same_op",},
+    {.value = -1, .string = NULL},
+};
 
 static void ompi_win_construct(ompi_win_t *win);
 static void ompi_win_destruct(ompi_win_t *win);
@@ -54,6 +61,10 @@ OBJ_CLASS_INSTANCE(ompi_win_t, opal_object_t,
 int
 ompi_win_init(void)
 {
+    int ret;
+
+    assert (sizeof (ompi_predefined_win_t) >= sizeof (ompi_win_t));
+
     /* setup window Fortran array */
     OBJ_CONSTRUCT(&ompi_mpi_windows, opal_pointer_array_t);
     if( OPAL_SUCCESS != opal_pointer_array_init(&ompi_mpi_windows, 0,
@@ -69,6 +80,11 @@ ompi_win_init(void)
     ompi_win_set_name(&ompi_mpi_win_null.win, "MPI_WIN_NULL");
     opal_pointer_array_set_item(&ompi_mpi_windows, 0, &ompi_mpi_win_null.win);
 
+    ret = mca_base_var_enum_create ("accumulate_ops", accumulate_ops_values, &ompi_win_accumulate_ops);
+    if (OPAL_SUCCESS != ret) {
+        return ret;
+    }
+
     return OMPI_SUCCESS;
 }
 
@@ -78,27 +94,42 @@ ompi_win_finalize(void)
 {
     OBJ_DESTRUCT(&ompi_mpi_win_null.win);
     OBJ_DESTRUCT(&ompi_mpi_windows);
+    OBJ_RELEASE(ompi_win_accumulate_ops);
 
     return OMPI_SUCCESS;
 }
 
-static ompi_win_t *
-alloc_window(struct ompi_communicator_t *comm)
+static int alloc_window(struct ompi_communicator_t *comm, ompi_info_t *info, ompi_win_t **win_out)
 {
     ompi_win_t *win;
     ompi_group_t *group;
+    int acc_ops, flag, ret;
 
     /* create the object */
     win = OBJ_NEW(ompi_win_t);
-    if (NULL == win) return NULL;
+    if (NULL == win) {
+        return OMPI_ERR_OUT_OF_RESOURCE;
+    }
+
+    ret = ompi_info_get_value_enum (info, "accumulate_ops", &acc_ops,
+                                    OMPI_WIN_ACCUMULATE_OPS_SAME_OP_NO_OP,
+                                    ompi_win_accumulate_ops, &flag);
+    if (OMPI_SUCCESS != ret) {
+        OBJ_RELEASE(win);
+        return ret;
+    }
+
+    win->w_acc_ops = acc_ops;
 
     /* setup data that is independent of osc component */
     group = comm->c_local_group;
     OBJ_RETAIN(group);
     ompi_group_increment_proc_count(group);
     win->w_group = group;
 
-    return win;
+    *win_out = win;
+
+    return OMPI_SUCCESS;
 }
 
 static int
@@ -148,8 +179,10 @@ ompi_win_create(void *base, size_t size,
     int model;
     int ret;
 
-    win = alloc_window(comm);
-    if (NULL == win) return OMPI_ERR_OUT_OF_RESOURCE;
+    ret = alloc_window (comm, info, &win);
+    if (OMPI_SUCCESS != ret) {
+        return ret;
+    }
 
     ret = ompi_osc_base_select(win, &base, size, disp_unit, comm, info, MPI_WIN_FLAVOR_CREATE, &model);
     if (OMPI_SUCCESS != ret) {
@@ -178,8 +211,10 @@ ompi_win_allocate(size_t size, int disp_unit, ompi_info_t *info,
     int ret;
     void *base;
 
-    win = alloc_window(comm);
-    if (NULL == win) return OMPI_ERR_OUT_OF_RESOURCE;
+    ret = alloc_window (comm, info, &win);
+    if (OMPI_SUCCESS != ret) {
+        return ret;
+    }
 
     ret = ompi_osc_base_select(win, &base, size, disp_unit, comm, info, MPI_WIN_FLAVOR_ALLOCATE, &model);
     if (OMPI_SUCCESS != ret) {
@@ -209,8 +244,10 @@ ompi_win_allocate_shared(size_t size, int disp_unit, ompi_info_t *info,
     int ret;
     void *base;
 
-    win = alloc_window(comm);
-    if (NULL == win) return OMPI_ERR_OUT_OF_RESOURCE;
+    ret = alloc_window (comm, info, &win);
+    if (OMPI_SUCCESS != ret) {
+        return ret;
+    }
 
     ret = ompi_osc_base_select(win, &base, size, disp_unit, comm, info, MPI_WIN_FLAVOR_SHARED, &model);
     if (OMPI_SUCCESS != ret) {
@@ -238,8 +275,10 @@ ompi_win_create_dynamic(ompi_info_t *info, ompi_communicator_t *comm, ompi_win_t
     int model;
     int ret;
 
-    win = alloc_window(comm);
-    if (NULL == win) return OMPI_ERR_OUT_OF_RESOURCE;
+    ret = alloc_window (comm, info, &win);
+    if (OMPI_SUCCESS != ret) {
+        return ret;
+    }
 
     ret = ompi_osc_base_select(win, MPI_BOTTOM, 0, 1, comm, info, MPI_WIN_FLAVOR_DYNAMIC, &model);
     if (OMPI_SUCCESS != ret) {

ompi/win/win.h

@@ -44,6 +44,14 @@ BEGIN_C_DECLS
 #define OMPI_WIN_SAME_DISP    0x00000008
 #define OMPI_WIN_SAME_SIZE    0x00000010
 
+enum ompi_win_accumulate_ops_t {
+    OMPI_WIN_ACCUMULATE_OPS_SAME_OP_NO_OP,
+    OMPI_WIN_ACCUMULATE_OPS_SAME_OP,
+};
+typedef enum ompi_win_accumulate_ops_t ompi_win_accumulate_ops_t;
+
+OMPI_DECLSPEC extern mca_base_var_enum_t *ompi_win_accumulate_ops;
+
 OMPI_DECLSPEC extern opal_pointer_array_t ompi_mpi_windows;
 
 struct ompi_win_t {
@@ -59,6 +67,9 @@ struct ompi_win_t {
     /* Information about the state of the window.  */
     uint16_t w_flags;
 
+    /** Accumulate ops */
+    ompi_win_accumulate_ops_t w_acc_ops;
+
     /* Attributes */
     opal_hash_table_t *w_keyhash;