ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Change a bunch of error handlers to invoke on a relevant communicator,

Просмотр исходного кода 
not MPI_COMM_WORLD

This commit was SVN r5427.
Этот коммит содержится в:
Jeff Squyres 2005-04-19 00:45:29 +00:00
родитель 213da2abd0
Коммит f2806bdb03
13 изменённых файлов: 56 добавлений и 56 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
src/mpi/c/cart_coords.c
Просмотреть файл

@ -47,19 +47,19 @@ int MPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int *coords)
FUNC_NAME);
}
if (OMPI_COMM_IS_INTER(comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_COMM,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_COMM,
FUNC_NAME);
}
if (!OMPI_COMM_IS_CART(comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_TOPOLOGY,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_TOPOLOGY,
FUNC_NAME);
}
if ( (0 > maxdims) || ((0 < maxdims) && (NULL == coords))) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_ARG,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_ARG,
FUNC_NAME);
}
if ((0 > rank) || (rank > ompi_group_size(comm->c_local_group))) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_RANK,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_RANK,
FUNC_NAME);
}
}
@ -70,7 +70,7 @@ int MPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int *coords)
/* call the function */
if ( MPI_SUCCESS !=
(err = func(comm, rank, maxdims, coords))) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, err, FUNC_NAME);
return OMPI_ERRHANDLER_INVOKE(comm, err, FUNC_NAME);
}
/* all done */

12
src/mpi/c/cart_create.c
Просмотреть файл

@ -48,19 +48,19 @@ int MPI_Cart_create(MPI_Comm old_comm, int ndims, int *dims,
FUNC_NAME);
}
if (OMPI_COMM_IS_INTER(old_comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_COMM,
return OMPI_ERRHANDLER_INVOKE (old_comm, MPI_ERR_COMM,
FUNC_NAME);
}
if (1 > ndims) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_ARG,
return OMPI_ERRHANDLER_INVOKE (old_comm, MPI_ERR_ARG,
FUNC_NAME);
}
if (NULL == dims || NULL == periods || NULL == comm_cart) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_ARG,
return OMPI_ERRHANDLER_INVOKE (old_comm, MPI_ERR_ARG,
FUNC_NAME);
}
if (0 > reorder || 1 < reorder) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_ARG,
return OMPI_ERRHANDLER_INVOKE (old_comm, MPI_ERR_ARG,
FUNC_NAME);
}
@ -77,7 +77,7 @@ int MPI_Cart_create(MPI_Comm old_comm, int ndims, int *dims,
}
if (parent_procs < count_nodes) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_ARG,
return OMPI_ERRHANDLER_INVOKE (old_comm, MPI_ERR_ARG,
FUNC_NAME);
}
}
@ -117,7 +117,7 @@ int MPI_Cart_create(MPI_Comm old_comm, int ndims, int *dims,
/* check the error status */
if (MPI_SUCCESS != err) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, err, FUNC_NAME);
return OMPI_ERRHANDLER_INVOKE(old_comm, err, FUNC_NAME);
}
/* All done */

6
src/mpi/c/cart_get.c
Просмотреть файл

@ -48,13 +48,13 @@ int MPI_Cart_get(MPI_Comm comm, int maxdims, int *dims,
FUNC_NAME);
}
if (!OMPI_COMM_IS_CART(comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_TOPOLOGY,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_TOPOLOGY,
FUNC_NAME);
}
if ((0 > maxdims) || (0 < maxdims &&
((NULL == dims) || (NULL == periods) ||
(NULL == coords)))) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_ARG,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_ARG,
FUNC_NAME);
}
}
@ -64,7 +64,7 @@ int MPI_Cart_get(MPI_Comm comm, int maxdims, int *dims,
/* all arguments are checked and now call the back end function */
if ( MPI_SUCCESS !=
(err = func(comm, maxdims, dims, periods, coords))) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, err, FUNC_NAME);
return OMPI_ERRHANDLER_INVOKE(comm, err, FUNC_NAME);
}
/* All done */

6
src/mpi/c/cart_map.c
Просмотреть файл

@ -47,11 +47,11 @@ int MPI_Cart_map(MPI_Comm comm, int ndims, int *dims,
FUNC_NAME);
}
if (OMPI_COMM_IS_INTER(comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_COMM,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_COMM,
FUNC_NAME);
}
if ((NULL == dims) || (NULL == periods) || (NULL == newrank)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_ARG,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_ARG,
FUNC_NAME);
}
}
@ -69,7 +69,7 @@ int MPI_Cart_map(MPI_Comm comm, int ndims, int *dims,
/* call the function */
if ( MPI_SUCCESS !=
(err = func(comm, ndims, dims, periods, newrank))) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, err, FUNC_NAME);
return OMPI_ERRHANDLER_INVOKE(comm, err, FUNC_NAME);
}
}

8
src/mpi/c/cart_rank.c
Просмотреть файл

@ -46,15 +46,15 @@ int MPI_Cart_rank(MPI_Comm comm, int *coords, int *rank)
FUNC_NAME);
}
if (OMPI_COMM_IS_INTER(comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_COMM,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_COMM,
FUNC_NAME);
}
if (!OMPI_COMM_IS_CART(comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_TOPOLOGY,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_TOPOLOGY,
FUNC_NAME);
}
if ((NULL == coords) || (NULL == rank)){
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_ARG,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_ARG,
FUNC_NAME);
}
}
@ -65,7 +65,7 @@ int MPI_Cart_rank(MPI_Comm comm, int *coords, int *rank)
/* call the function */
if ( MPI_SUCCESS !=
(err = func(comm, coords, rank))) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, err, FUNC_NAME);
return OMPI_ERRHANDLER_INVOKE(comm, err, FUNC_NAME);
}
return MPI_SUCCESS;

10
src/mpi/c/cart_shift.c
Просмотреть файл

@ -47,19 +47,19 @@ int MPI_Cart_shift(MPI_Comm comm, int direction, int disp,
FUNC_NAME);
}
if (OMPI_COMM_IS_INTER(comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_COMM,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_COMM,
FUNC_NAME);
}
if (!OMPI_COMM_IS_CART(comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_TOPOLOGY,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_TOPOLOGY,
FUNC_NAME);
}
if (0 > direction) { /* yet to detect direction >= comm->c_topo_ndims */
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_DIMS,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_DIMS,
FUNC_NAME);
}
if (NULL == rank_source || NULL == rank_dest) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_ARG,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_ARG,
FUNC_NAME);
}
}
@ -70,7 +70,7 @@ int MPI_Cart_shift(MPI_Comm comm, int direction, int disp,
/* call the function */
if ( MPI_SUCCESS !=
(err = func(comm, direction, disp, rank_source, rank_dest))) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, err, FUNC_NAME);
return OMPI_ERRHANDLER_INVOKE(comm, err, FUNC_NAME);
}
/* all done */

8
src/mpi/c/cart_sub.c
Просмотреть файл

@ -46,15 +46,15 @@ int MPI_Cart_sub(MPI_Comm comm, int *remain_dims, MPI_Comm *new_comm)
FUNC_NAME);
}
if (OMPI_COMM_IS_INTER(comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_COMM,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_COMM,
FUNC_NAME);
}
if (!OMPI_COMM_IS_CART(comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_TOPOLOGY,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_TOPOLOGY,
FUNC_NAME);
}
if (NULL == remain_dims || NULL == new_comm) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_ARG,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_ARG,
FUNC_NAME);
}
}
@ -65,7 +65,7 @@ int MPI_Cart_sub(MPI_Comm comm, int *remain_dims, MPI_Comm *new_comm)
/* call the function */
if ( MPI_SUCCESS !=
(err = func(comm, remain_dims, new_comm))) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, err, FUNC_NAME);
return OMPI_ERRHANDLER_INVOKE(comm, err, FUNC_NAME);
}
/* all done */

10
src/mpi/c/graph_create.c
Просмотреть файл

@ -49,21 +49,21 @@ int MPI_Graph_create(MPI_Comm old_comm, int nnodes, int *index,
FUNC_NAME);
}
if (OMPI_COMM_IS_INTER(old_comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_COMM,
return OMPI_ERRHANDLER_INVOKE (old_comm, MPI_ERR_COMM,
FUNC_NAME);
}
if ( (1 > nnodes) || (NULL == index) || (NULL == edges) ) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_ARG,
return OMPI_ERRHANDLER_INVOKE (old_comm, MPI_ERR_ARG,
FUNC_NAME);
}
if (nnodes > ompi_comm_size(old_comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_ARG,
return OMPI_ERRHANDLER_INVOKE (old_comm, MPI_ERR_ARG,
FUNC_NAME);
}
if ((0 > reorder) || (1 < reorder)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_ARG,
return OMPI_ERRHANDLER_INVOKE (old_comm, MPI_ERR_ARG,
FUNC_NAME);
}
}
@ -103,7 +103,7 @@ int MPI_Graph_create(MPI_Comm old_comm, int nnodes, int *index,
/* check the error status */
if (MPI_SUCCESS != err) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, err, FUNC_NAME);
return OMPI_ERRHANDLER_INVOKE(old_comm, err, FUNC_NAME);
}
/* All done */

8
src/mpi/c/graph_get.c
Просмотреть файл

@ -46,15 +46,15 @@ int MPI_Graph_get(MPI_Comm comm, int maxindex, int maxedges,
FUNC_NAME);
}
if (OMPI_COMM_IS_INTER(comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_COMM,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_COMM,
FUNC_NAME);
}
if (!OMPI_COMM_IS_GRAPH(comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_TOPOLOGY,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_TOPOLOGY,
FUNC_NAME);
}
if (0 > maxindex || 0 > maxedges || NULL == index || NULL == edges) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_ARG,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_ARG,
FUNC_NAME);
}
}
@ -64,7 +64,7 @@ int MPI_Graph_get(MPI_Comm comm, int maxindex, int maxedges,
/* call the function */
if ( MPI_SUCCESS !=
(err = func(comm, maxindex, maxedges, index, edges))) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, err, FUNC_NAME);
return OMPI_ERRHANDLER_INVOKE(comm, err, FUNC_NAME);
}
/* All done */

6
src/mpi/c/graph_map.c
Просмотреть файл

@ -47,11 +47,11 @@ int MPI_Graph_map(MPI_Comm comm, int nnodes, int *index, int *edges,
FUNC_NAME);
}
if (OMPI_COMM_IS_INTER(comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_COMM,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_COMM,
FUNC_NAME);
}
if (1 > nnodes || NULL == index || NULL == edges || NULL == newrank) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_ARG,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_ARG,
FUNC_NAME);
}
}
@ -70,7 +70,7 @@ int MPI_Graph_map(MPI_Comm comm, int nnodes, int *index, int *edges,
/* call the function */
if ( MPI_SUCCESS !=
(err = func(comm, nnodes, index, edges, newrank))) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, err, FUNC_NAME);
return OMPI_ERRHANDLER_INVOKE(comm, err, FUNC_NAME);
}
}

10
src/mpi/c/graph_neighbors.c
Просмотреть файл

@ -47,20 +47,20 @@ int MPI_Graph_neighbors(MPI_Comm comm, int rank, int maxneighbors,
FUNC_NAME);
}
if (OMPI_COMM_IS_INTER(comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_COMM,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_COMM,
FUNC_NAME);
}
if (!OMPI_COMM_IS_GRAPH(comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_TOPOLOGY,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_TOPOLOGY,
FUNC_NAME);
}
if ((0 > maxneighbors) || ((0 < maxneighbors) && NULL == neighbors)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_ARG,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_ARG,
FUNC_NAME);
}
if ((0 > rank) || (rank > ompi_group_size(comm->c_local_group))) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_RANK,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_RANK,
FUNC_NAME);
}
}
@ -70,7 +70,7 @@ int MPI_Graph_neighbors(MPI_Comm comm, int rank, int maxneighbors,
/* call the function */
if ( MPI_SUCCESS !=
(err = func(comm, rank, maxneighbors, neighbors))) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, err, FUNC_NAME);
return OMPI_ERRHANDLER_INVOKE(comm, err, FUNC_NAME);
}
/* All done */

10
src/mpi/c/graph_neighbors_count.c
Просмотреть файл

@ -46,19 +46,19 @@ int MPI_Graph_neighbors_count(MPI_Comm comm, int rank, int *nneighbors)
FUNC_NAME);
}
if (OMPI_COMM_IS_INTER(comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_COMM,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_COMM,
FUNC_NAME);
}
if (!OMPI_COMM_IS_GRAPH(comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_TOPOLOGY,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_TOPOLOGY,
FUNC_NAME);
}
if ((0 > rank) || (rank > ompi_group_size(comm->c_local_group))) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_RANK,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_RANK,
FUNC_NAME);
}
if (NULL == nneighbors) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_ARG,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_ARG,
FUNC_NAME);
}
}
@ -68,7 +68,7 @@ int MPI_Graph_neighbors_count(MPI_Comm comm, int rank, int *nneighbors)
/* call the function */
if ( MPI_SUCCESS !=
(err = func(comm, rank, nneighbors))) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, err, FUNC_NAME);
return OMPI_ERRHANDLER_INVOKE(comm, err, FUNC_NAME);
}
/* All done */

8
src/mpi/c/graphdims_get.c
Просмотреть файл

@ -46,15 +46,15 @@ int MPI_Graphdims_get(MPI_Comm comm, int *nnodes, int *nedges)
FUNC_NAME);
}
if (OMPI_COMM_IS_INTER(comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_COMM,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_COMM,
FUNC_NAME);
}
if (!OMPI_COMM_IS_GRAPH(comm)) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_TOPOLOGY,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_TOPOLOGY,
FUNC_NAME);
}
if (NULL == nnodes || NULL == nedges) {
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_ARG,
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_ARG,
FUNC_NAME);
}
}
@ -64,7 +64,7 @@ int MPI_Graphdims_get(MPI_Comm comm, int *nnodes, int *nedges)
/* call the function */
if ( MPI_SUCCESS !=
(err = func(comm, nnodes, nedges))) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, err, FUNC_NAME);
return OMPI_ERRHANDLER_INVOKE(comm, err, FUNC_NAME);
}
/* All done */