- No, we don't want to have a notion of an MPI_Comm in this layer

We want ompi_communicator_t instead, rrrrrr. This commit was SVN r20770.
2009-03-12 22:38:14 +00:00 · 2009-03-12 22:38:14 +00:00 · 6fca443a71
--- a/ompi/mca/topo/base/base.h
+++ b/ompi/mca/topo/base/base.h
@ -10,6 +10,7 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
 * $COPYRIGHT$
 * 
 * Additional copyrights may follow
@ -22,10 +23,11 @@

 #include "ompi_config.h"

-#include "mpi.h"
 #include "opal/class/opal_list.h"
+#include "opal/mca/mca.h"
 #include "ompi/mca/topo/topo.h"
 #include "ompi/proc/proc.h"
+#include "ompi/communicator/communicator.h"

 /*
 * All stuff goes in here
@ -33,24 +35,23 @@

 BEGIN_C_DECLS

-#include "opal/mca/mca.h"

 OMPI_DECLSPEC    int mca_topo_base_open(void);
    
 OMPI_DECLSPEC    int mca_topo_base_close(void);
    
-int mca_topo_base_comm_select(struct ompi_communicator_t *comm,
+int mca_topo_base_comm_select(ompi_communicator_t *comm,
                              mca_base_component_t *preferred);

-int mca_topo_base_comm_unselect(struct ompi_communicator_t *comm);
+int mca_topo_base_comm_unselect(ompi_communicator_t *comm);
    
 int mca_topo_base_find_available (bool enable_progress_threads,
                                  bool enable_mpi_threads);


-OMPI_DECLSPEC    int mca_topo_base_init_comm (struct ompi_communicator_t *comm);
+OMPI_DECLSPEC    int mca_topo_base_init_comm (ompi_communicator_t *comm);
    
-OMPI_DECLSPEC    int mca_topo_base_get_param (struct ompi_communicator_t *comm, int keyval);
+OMPI_DECLSPEC    int mca_topo_base_get_param (ompi_communicator_t *comm, int keyval);

    /*
     * All the glue functions which we will provide to the users by
@ -59,7 +60,7 @@ OMPI_DECLSPEC    int mca_topo_base_get_param (struct ompi_communicator_t *comm,
     * components.  But they can implement these glue functions if
     * they want.
     */
-OMPI_DECLSPEC    int mca_topo_base_cart_coords (struct ompi_communicator_t *comm, 
+OMPI_DECLSPEC    int mca_topo_base_cart_coords (ompi_communicator_t *comm, 
                                   int rank, 
                                   int maxdims,
                                   int *coords);
@ -73,28 +74,28 @@ OMPI_DECLSPEC    int mca_topo_base_cart_create (mca_topo_base_comm_t *topo_data,
                                   int *periods, 
                                   bool reorder);

-OMPI_DECLSPEC    int mca_topo_base_cartdim_get (struct ompi_communicator_t *comm, 
+OMPI_DECLSPEC    int mca_topo_base_cartdim_get (ompi_communicator_t *comm, 
                                   int *ndims);

-OMPI_DECLSPEC    int mca_topo_base_cart_get (struct ompi_communicator_t *comm, 
+OMPI_DECLSPEC    int mca_topo_base_cart_get (ompi_communicator_t *comm, 
                                int maxdims, 
                                int *dims,
                                int *periods, 
                                int *coords);

-OMPI_DECLSPEC    int mca_topo_base_cart_rank (struct ompi_communicator_t *comm, 
+OMPI_DECLSPEC    int mca_topo_base_cart_rank (ompi_communicator_t *comm, 
                                 int *coords, 
                                 int *rank);

-OMPI_DECLSPEC    int mca_topo_base_cart_shift (struct ompi_communicator_t *comm, 
+OMPI_DECLSPEC    int mca_topo_base_cart_shift (ompi_communicator_t *comm, 
                                  int direction, 
                                  int disp,
                                  int *rank_source, 
                                  int *rank_dest);
  
-OMPI_DECLSPEC    int mca_topo_base_cart_sub (struct ompi_communicator_t *comm, 
+OMPI_DECLSPEC    int mca_topo_base_cart_sub (ompi_communicator_t *comm, 
                                int *remain_dims,
-                                struct ompi_communicator_t **new_comm);
+                                ompi_communicator_t **new_comm);
  
 OMPI_DECLSPEC    int mca_topo_base_graph_create (mca_topo_base_comm_t *topo_data,
                                    int *proc_count,
@ -105,22 +106,22 @@ OMPI_DECLSPEC    int mca_topo_base_graph_create (mca_topo_base_comm_t *topo_data
                                    int *edges,
                                    bool reorder);

-OMPI_DECLSPEC    int mca_topo_base_graphdims_get (struct ompi_communicator_t *comm, 
+OMPI_DECLSPEC    int mca_topo_base_graphdims_get (ompi_communicator_t *comm, 
                                     int *nodes,
                                     int *nedges);
  
-OMPI_DECLSPEC    int mca_topo_base_graph_get (struct ompi_communicator_t *comm, 
+OMPI_DECLSPEC    int mca_topo_base_graph_get (ompi_communicator_t *comm, 
                                 int maxindex, 
                                 int maxedges, 
                                 int *index, 
                                 int *edges);

-OMPI_DECLSPEC    int mca_topo_base_graph_neighbors (struct ompi_communicator_t *comm, 
+OMPI_DECLSPEC    int mca_topo_base_graph_neighbors (ompi_communicator_t *comm, 
                                       int rank,
                                       int maxneighbors, 
                                       int *neighbors);

-OMPI_DECLSPEC    int mca_topo_base_graph_neighbors_count (struct ompi_communicator_t *comm, 
+OMPI_DECLSPEC    int mca_topo_base_graph_neighbors_count (ompi_communicator_t *comm, 
                                             int rank,
                                             int *nneighbors);

--- a/ompi/mca/topo/base/topo_base_cart_coords.c
+++ b/ompi/mca/topo/base/topo_base_cart_coords.c
@ -40,7 +40,7 @@
 * @retval MPI_ERR_ARG
 */                   

-int mca_topo_base_cart_coords (MPI_Comm comm,
+int mca_topo_base_cart_coords (ompi_communicator_t* comm,
                           int rank,
                           int maxdims,
                           int *coords){
--- a/ompi/mca/topo/base/topo_base_cart_create.c
+++ b/ompi/mca/topo/base/topo_base_cart_create.c
@ -22,7 +22,6 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/group/group.h"
 #include "ompi/mca/topo/topo.h"
-#include "mpi.h"

 /*
 * function - makes a new communicator to which topology information
--- a/ompi/mca/topo/base/topo_base_cart_get.c
+++ b/ompi/mca/topo/base/topo_base_cart_get.c
@ -42,7 +42,7 @@
 *
 * @retval MPI_SUCCESS
 */
-int mca_topo_base_cart_get (MPI_Comm comm,
+int mca_topo_base_cart_get (ompi_communicator_t* comm,
                        int maxdims,
                        int *dims,
                        int *periods,
--- a/ompi/mca/topo/base/topo_base_cart_rank.c
+++ b/ompi/mca/topo/base/topo_base_cart_rank.c
@ -37,7 +37,7 @@
 * @retval MPI_ERR_ARG
 */                   

-int mca_topo_base_cart_rank (MPI_Comm comm, 
+int mca_topo_base_cart_rank (ompi_communicator_t* comm, 
                         int *coords, 
                         int *rank){
   int prank;
--- a/ompi/mca/topo/base/topo_base_cart_shift.c
+++ b/ompi/mca/topo/base/topo_base_cart_shift.c
@ -41,7 +41,7 @@
 * @retval MPI_ERR_COMM
 * @retval MPI_ERR_ARG
 */                  
-int mca_topo_base_cart_shift (MPI_Comm comm,
+int mca_topo_base_cart_shift (ompi_communicator_t* comm,
                          int direction,
                          int disp,
                          int *rank_source,
--- a/ompi/mca/topo/base/topo_base_cart_sub.c
+++ b/ompi/mca/topo/base/topo_base_cart_sub.c
@ -37,9 +37,9 @@
 * @retval MPI_ERR_TOPOLOGY
 * @retval MPI_ERR_COMM
 */                
-int mca_topo_base_cart_sub (MPI_Comm comm,
+int mca_topo_base_cart_sub (ompi_communicator_t* comm,
                        int *remain_dims,
-                        MPI_Comm *new_comm){
+                        ompi_communicator_t** new_comm){

     struct ompi_communicator_t *temp_comm;
     int errcode;
--- a/ompi/mca/topo/base/topo_base_cartdim_get.c
+++ b/ompi/mca/topo/base/topo_base_cartdim_get.c
@ -31,7 +31,7 @@
 * @retval MPI_SUCCESS
 * @retval MPI_ERR_COMM
 */
-int mca_topo_base_cartdim_get (MPI_Comm comm,
+int mca_topo_base_cartdim_get (ompi_communicator_t* comm,
                           int *ndims){
 
    *ndims = comm->c_topo_comm->mtc_ndims_or_nnodes;
--- a/ompi/mca/topo/base/topo_base_comm_unselect.c
+++ b/ompi/mca/topo/base/topo_base_comm_unselect.c
@ -21,7 +21,6 @@
 #include <string.h>
 #include <stdlib.h>

-#include "mpi.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "ompi/mca/topo/topo.h"
--- a/ompi/mca/topo/base/topo_base_find_available.c
+++ b/ompi/mca/topo/base/topo_base_find_available.c
@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include "mpi.h"
 #include "opal/class/opal_list.h"
 #include "opal/util/output.h"
 #include "opal/mca/mca.h"
--- a/ompi/mca/topo/base/topo_base_graph_get.c
+++ b/ompi/mca/topo/base/topo_base_graph_get.c
@ -34,7 +34,7 @@
 * @retval MPI_SUCCESS
 */                 

-int mca_topo_base_graph_get (MPI_Comm comm,
+int mca_topo_base_graph_get (ompi_communicator_t* comm,
                         int maxindex,
                         int maxedges,
                         int *index,
--- a/ompi/mca/topo/base/topo_base_graph_neighbors.c
+++ b/ompi/mca/topo/base/topo_base_graph_neighbors.c
@ -34,7 +34,7 @@
 * @retval MPI_SUCCESS
 */

-int mca_topo_base_graph_neighbors (MPI_Comm comm,
+int mca_topo_base_graph_neighbors (ompi_communicator_t* comm,
                               int rank,
                               int maxneighbors,
                               int *neighbors){
--- a/ompi/mca/topo/base/topo_base_graph_neighbors_count.c
+++ b/ompi/mca/topo/base/topo_base_graph_neighbors_count.c
@ -32,7 +32,7 @@
 * @retval MPI_SUCCESS
 */                             

-int mca_topo_base_graph_neighbors_count (MPI_Comm comm,
+int mca_topo_base_graph_neighbors_count (ompi_communicator_t* comm,
                                     int rank,
                                     int *nneighbors){

--- a/ompi/mca/topo/base/topo_base_graphdims_get.c
+++ b/ompi/mca/topo/base/topo_base_graphdims_get.c
@ -34,7 +34,7 @@
 * @retval MPI_ERR_COMM
 * @retval MPI_ERR_ARG
 */
-int mca_topo_base_graphdims_get (MPI_Comm comm,
+int mca_topo_base_graphdims_get (ompi_communicator_t* comm,
                              int *nodes,
                              int *nedges){

--- a/ompi/mca/topo/topo.h
+++ b/ompi/mca/topo/topo.h
@ -9,6 +9,7 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
+ * Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
 * $COPYRIGHT$
 * 
 * Additional copyrights may follow
@ -21,9 +22,9 @@

 #include "ompi_config.h"

-#include "mpi.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
+#include "ompi/communicator/communicator.h"

 /*
 * ******************************************************************
--- a/ompi/mca/topo/unity/topo_unity_cart_map.c
+++ b/ompi/mca/topo/unity/topo_unity_cart_map.c
@ -37,7 +37,7 @@
 *  @retval MPI_ERR_DIMS               
 */

-int mca_topo_unity_cart_map (MPI_Comm comm,
+int mca_topo_unity_cart_map (ompi_communicator_t* comm,
                             int ndims,
                             int *dims,
                             int *periods,
--- a/ompi/mca/topo/unity/topo_unity_graph_map.c
+++ b/ompi/mca/topo/unity/topo_unity_graph_map.c
@ -36,7 +36,7 @@
 *  @retval MPI_UNDEFINED
 */ 

-int mca_topo_unity_graph_map (MPI_Comm comm,
+int mca_topo_unity_graph_map (ompi_communicator_t* comm,
                              int nnodes,
                              int *index,
                              int *edges,