Complete changes specified in MPI-3 Ticket #125. Still holding on proposed change to MPI_Init as it remains under discussion (and is just plain uuuugly). No action taken on changing string arrays as that part of #125 was not included in the final pdf text.

This commit was SVN r26939.
2012-08-02 16:31:02 +00:00 · 2012-08-02 16:31:02 +00:00 · 8b595ddf84
--- a/ompi/include/mpi.h.in
+++ b/ompi/include/mpi.h.in
@ -13,6 +13,7 @@
 * Copyright (c) 2008-2009 Sun Microsystems, Inc.  All rights reserved.
 * Copyright (c) 2009-2012 Oak Rigde National Laboratory.  All rights reserved.
 * Copyright (c) 2011      Sandia National Laboratories. All rights reserved.
+ * Copyright (c) 2012      Los Alamos Nat Security, LLC. All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -1103,11 +1104,11 @@ OMPI_DECLSPEC  int MPI_Bsend_init(void *buf, int count, MPI_Datatype datatype,
 OMPI_DECLSPEC  int MPI_Buffer_attach(void *buffer, int size);
 OMPI_DECLSPEC  int MPI_Buffer_detach(void *buffer, int *size);
 OMPI_DECLSPEC  int MPI_Cancel(MPI_Request *request);
-OMPI_DECLSPEC  int MPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int *coords);
+OMPI_DECLSPEC  int MPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int coords[]);
 OMPI_DECLSPEC  int MPI_Cart_create(MPI_Comm old_comm, int ndims, int *dims,
                                   int *periods, int reorder, MPI_Comm *comm_cart);
-OMPI_DECLSPEC  int MPI_Cart_get(MPI_Comm comm, int maxdims, int *dims,
-                                int *periods, int *coords);
+OMPI_DECLSPEC  int MPI_Cart_get(MPI_Comm comm, int maxdims, int dims[],
+                                int periods[], int coords[]);
 OMPI_DECLSPEC  int MPI_Cart_map(MPI_Comm comm, int ndims, int *dims,
                                int *periods, int *newrank);
 OMPI_DECLSPEC  int MPI_Cart_rank(MPI_Comm comm, int *coords, int *rank);
@ -1294,12 +1295,12 @@ OMPI_DECLSPEC  int MPI_Get_version(int *version, int *subversion);
 OMPI_DECLSPEC  int MPI_Graph_create(MPI_Comm comm_old, int nnodes, int *index,
                                    int *edges, int reorder, MPI_Comm *comm_graph);
 OMPI_DECLSPEC  int MPI_Graph_get(MPI_Comm comm, int maxindex, int maxedges,
-                                 int *index, int *edges);
+                                 int index[], int edges[]);
 OMPI_DECLSPEC  int MPI_Graph_map(MPI_Comm comm, int nnodes, int *index, int *edges,
                                 int *newrank);
 OMPI_DECLSPEC  int MPI_Graph_neighbors_count(MPI_Comm comm, int rank, int *nneighbors);
 OMPI_DECLSPEC  int MPI_Graph_neighbors(MPI_Comm comm, int rank, int maxneighbors,
-                                       int *neighbors);
+                                       int neighbors[]);
 OMPI_DECLSPEC  int MPI_Graphdims_get(MPI_Comm comm, int *nnodes, int *nedges);
 OMPI_DECLSPEC  int MPI_Grequest_complete(MPI_Request request);
 OMPI_DECLSPEC  int MPI_Grequest_start(MPI_Grequest_query_function *query_fn,
@ -1310,11 +1311,11 @@ OMPI_DECLSPEC  MPI_Fint MPI_Group_c2f(MPI_Group group);
 OMPI_DECLSPEC  int MPI_Group_compare(MPI_Group group1, MPI_Group group2, int *result);
 OMPI_DECLSPEC  int MPI_Group_difference(MPI_Group group1, MPI_Group group2,
                                        MPI_Group *newgroup);
-OMPI_DECLSPEC  int MPI_Group_excl(MPI_Group group, int n, int *ranks,
+OMPI_DECLSPEC  int MPI_Group_excl(MPI_Group group, int n, int ranks[],
                                  MPI_Group *newgroup);
 OMPI_DECLSPEC  MPI_Group MPI_Group_f2c(MPI_Fint group);
 OMPI_DECLSPEC  int MPI_Group_free(MPI_Group *group);
-OMPI_DECLSPEC  int MPI_Group_incl(MPI_Group group, int n, int *ranks,
+OMPI_DECLSPEC  int MPI_Group_incl(MPI_Group group, int n, int ranks[],
                                  MPI_Group *newgroup);
 OMPI_DECLSPEC  int MPI_Group_intersection(MPI_Group group1, MPI_Group group2,
                                          MPI_Group *newgroup);
@ -1324,8 +1325,8 @@ OMPI_DECLSPEC  int MPI_Group_range_incl(MPI_Group group, int n, int ranges[][3],
                                        MPI_Group *newgroup);
 OMPI_DECLSPEC  int MPI_Group_rank(MPI_Group group, int *rank);
 OMPI_DECLSPEC  int MPI_Group_size(MPI_Group group, int *size);
-OMPI_DECLSPEC  int MPI_Group_translate_ranks(MPI_Group group1, int n, int *ranks1,
-                                             MPI_Group group2, int *ranks2);
+OMPI_DECLSPEC  int MPI_Group_translate_ranks(MPI_Group group1, int n, int ranks1[],
+                                             MPI_Group group2, int ranks2[]);
 OMPI_DECLSPEC  int MPI_Group_union(MPI_Group group1, MPI_Group group2,
                                   MPI_Group *newgroup);
 OMPI_DECLSPEC  int MPI_Ibsend(void *buf, int count, MPI_Datatype datatype, int dest,
--- a/ompi/mpi/c/cart_coords.c
+++ b/ompi/mpi/c/cart_coords.c
@ -10,6 +10,7 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012      Los Alamos Nat Security, LLC. All rights reserved.
 * $COPYRIGHT$
 * 
 * Additional copyrights may follow
@ -38,7 +39,7 @@
 static const char FUNC_NAME[] = "MPI_Cart_coords";


-int MPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int *coords) 
+int MPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int coords[]) 
 {
    int err;
    mca_topo_base_module_cart_coords_fn_t func;
--- a/ompi/mpi/c/cart_get.c
+++ b/ompi/mpi/c/cart_get.c
@ -10,6 +10,7 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012      Los Alamos Nat Security, LLC. All rights reserved.
 * $COPYRIGHT$
 * 
 * Additional copyrights may follow
@ -37,8 +38,8 @@
 static const char FUNC_NAME[] = "MPI_Cart_get";


-int MPI_Cart_get(MPI_Comm comm, int maxdims, int *dims,
-                 int *periods, int *coords) 
+int MPI_Cart_get(MPI_Comm comm, int maxdims, int dims[],
+                 int periods[], int coords[]) 
 {
    /* local variables */
    mca_topo_base_module_cart_get_fn_t func;
--- a/ompi/mpi/c/graph_get.c
+++ b/ompi/mpi/c/graph_get.c
@ -10,6 +10,7 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2007-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012      Los Alamos Nat Security, LLC. All rights reserved.
 * $COPYRIGHT$
 * 
 * Additional copyrights may follow
@ -38,7 +39,7 @@ static const char FUNC_NAME[] = "MPI_Graph_get";


 int MPI_Graph_get(MPI_Comm comm, int maxindx, int maxedges,
-                  int *indx, int *edges) 
+                  int indx[], int edges[]) 
 {
    int err;
    mca_topo_base_module_graph_get_fn_t func;
--- a/ompi/mpi/c/graph_neighbors.c
+++ b/ompi/mpi/c/graph_neighbors.c
@ -10,6 +10,7 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012      Los Alamos Nat Security, LLC. All rights reserved.
 * $COPYRIGHT$
 * 
 * Additional copyrights may follow
@ -38,7 +39,7 @@ static const char FUNC_NAME[] = "MPI_Graph_neighbors";


 int MPI_Graph_neighbors(MPI_Comm comm, int rank, int maxneighbors,
-                        int *neighbors) 
+                        int neighbors[]) 
 {
    int err;
    mca_topo_base_module_graph_neighbors_fn_t func;
--- a/ompi/mpi/c/group_excl.c
+++ b/ompi/mpi/c/group_excl.c
@ -11,6 +11,7 @@
 *                         All rights reserved.
 * Copyright (c) 2006      University of Houston. All rights reserved.
 * Copyright (c) 2006-2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012      Los Alamos Nat Security, LLC. All rights reserved.
 * $COPYRIGHT$
 * 
 * Additional copyrights may follow
@ -37,7 +38,7 @@
 static const char FUNC_NAME[] = "MPI_Group_excl";


-int MPI_Group_excl(MPI_Group group, int n, int *ranks,
+int MPI_Group_excl(MPI_Group group, int n, int ranks[],
                   MPI_Group *new_group) 
 {
    ompi_group_t *group_pointer = (ompi_group_t *)group;
--- a/ompi/mpi/c/group_incl.c
+++ b/ompi/mpi/c/group_incl.c
@ -11,6 +11,7 @@
 *                         All rights reserved.
 * Copyright (c) 2006      University of Houston. All rights reserved.
 * Copyright (c) 2006-2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012      Los Alamos Nat Security, LLC. All rights reserved.
 * $COPYRIGHT$
 * 
 * Additional copyrights may follow
@ -37,7 +38,7 @@
 static const char FUNC_NAME[] = "MPI_Group_incl";


-int MPI_Group_incl(MPI_Group group, int n, int *ranks, MPI_Group *new_group) 
+int MPI_Group_incl(MPI_Group group, int n, int ranks[], MPI_Group *new_group) 
 {
  int i, group_size, err;
  ompi_group_t *group_pointer;
--- a/ompi/mpi/c/group_translate_ranks.c
+++ b/ompi/mpi/c/group_translate_ranks.c
@ -10,6 +10,7 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012      Los Alamos Nat Security, LLC. All rights reserved.
 * $COPYRIGHT$
 * 
 * Additional copyrights may follow
@ -36,8 +37,8 @@
 static const char FUNC_NAME[] = "MPI_Group_translate_ranks";


-int MPI_Group_translate_ranks(MPI_Group group1, int n_ranks, int *ranks1,
-                              MPI_Group group2, int *ranks2) 
+int MPI_Group_translate_ranks(MPI_Group group1, int n_ranks, int ranks1[],
+                              MPI_Group group2, int ranks2[]) 
 {
    int err;