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

Revert "coll/basic: fix segmentation fault in neighborhood collectives if the degree"

Просмотр исходного кода 
This reverts commit 9c788ff940.
Этот коммит содержится в:
Gilles Gouaillardet 2014-10-10 11:29:06 +09:00
родитель 169a1866b8
Коммит 2f67f29b85
7 изменённых файлов: 11 добавлений и 122 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

21
ompi/mca/coll/basic/coll_basic.h
Просмотреть файл

@ -12,7 +12,7 @@
* All rights reserved.
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2012 Sandia National Laboratories. All rights reserved.
* Copyright (c) 2013-2014 Los Alamos National Security, LLC. All rights
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
*
@ -354,25 +354,6 @@ struct mca_coll_basic_module_t {
int mccb_num_reqs;
};
typedef struct mca_coll_basic_module_t mca_coll_basic_module_t;
static inline int mca_coll_basic_check_for_requests (mca_coll_basic_module_t *basic_module, int max_reqs)
{
if (basic_module->mccb_num_reqs < max_reqs) {
void *tmp;
basic_module->mccb_num_reqs = max_reqs;
tmp = realloc (basic_module->mccb_reqs, sizeof(ompi_request_t *) * basic_module->mccb_num_reqs);
if (NULL == tmp) {
return OMPI_ERR_OUT_OF_RESOURCE;
}
basic_module->mccb_reqs = tmp;
}
return OMPI_SUCCESS;
}
OBJ_CLASS_DECLARATION(mca_coll_basic_module_t);
END_C_DECLS

13
ompi/mca/coll/basic/coll_basic_module.c
Просмотреть файл

@ -11,7 +11,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2012 Sandia National Laboratories. All rights reserved.
* Copyright (c) 2013-2014 Los Alamos National Security, LLC. All rights
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
*
@ -55,7 +55,7 @@ mca_coll_base_module_t *
mca_coll_basic_comm_query(struct ompi_communicator_t *comm,
int *priority)
{
int size, ret;
int size;
mca_coll_basic_module_t *basic_module;
basic_module = OBJ_NEW(mca_coll_basic_module_t);
@ -70,12 +70,9 @@ mca_coll_basic_comm_query(struct ompi_communicator_t *comm,
} else {
size = ompi_comm_size(comm);
}
ret = mca_coll_basic_check_for_requests (basic_module, size * 2);
if (OMPI_SUCCESS != ret) {
OBJ_RELEASE(basic_module);
return NULL;
}
basic_module->mccb_num_reqs = size * 2;
basic_module->mccb_reqs = (ompi_request_t**)
malloc(sizeof(ompi_request_t *) * basic_module->mccb_num_reqs);
/* Choose whether to use [intra|inter], and [linear|log]-based
* algorithms. */

20
ompi/mca/coll/basic/coll_basic_neighbor_allgather.c
Просмотреть файл

@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2013-2014 Los Alamos National Security, LLC. All rights
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
@ -49,12 +49,6 @@ mca_coll_basic_neighbor_allgather_cart(const void *sbuf, int scount,
ptrdiff_t lb, extent;
int rc = MPI_SUCCESS, dim, nreqs;
/* ensure we have enough storage for requests */
rc = mca_coll_basic_check_for_requests (basic_module, cart->ndims * 4);
if (OMPI_SUCCESS != rc) {
return rc;
}
ompi_datatype_get_extent(rdtype, &lb, &extent);
/* The ordering is defined as -1 then +1 in each dimension in
@ -132,12 +126,6 @@ mca_coll_basic_neighbor_allgather_graph(const void *sbuf, int scount,
mca_topo_base_graph_neighbors_count (comm, rank, &degree);
/* ensure we have enough storage for requests */
rc = mca_coll_basic_check_for_requests (basic_module, degree * 2);
if (OMPI_SUCCESS != rc) {
return rc;
}
edges = graph->edges;
if (rank > 0) {
edges += graph->index[rank - 1];
@ -185,12 +173,6 @@ mca_coll_basic_neighbor_allgather_dist_graph(const void *sbuf, int scount,
indegree = dist_graph->indegree;
outdegree = dist_graph->outdegree;
/* ensure we have enough storage for requests */
rc = mca_coll_basic_check_for_requests (basic_module, indegree + outdegree);
if (OMPI_SUCCESS != rc) {
return rc;
}
inedges = dist_graph->in;
outedges = dist_graph->out;

20
ompi/mca/coll/basic/coll_basic_neighbor_allgatherv.c
Просмотреть файл

@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2013-2014 Los Alamos National Security, LLC. All rights
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
@ -48,12 +48,6 @@ mca_coll_basic_neighbor_allgatherv_cart(const void *sbuf, int scount, struct omp
ptrdiff_t lb, extent;
int rc = MPI_SUCCESS, dim, i, nreqs;
/* ensure we have enough storage for requests */
rc = mca_coll_basic_check_for_requests (basic_module, cart->ndims * 4);
if (OMPI_SUCCESS != rc) {
return rc;
}
ompi_datatype_get_extent(rdtype, &lb, &extent);
reqs = basic_module->mccb_reqs;
@ -119,12 +113,6 @@ mca_coll_basic_neighbor_allgatherv_graph(const void *sbuf, int scount, struct om
mca_topo_base_graph_neighbors_count (comm, rank, &degree);
/* ensure we have enough storage for requests */
rc = mca_coll_basic_check_for_requests (basic_module, degree * 2);
if (OMPI_SUCCESS != rc) {
return rc;
}
edges = graph->edges;
if (rank > 0) {
edges += graph->index[rank - 1];
@ -170,12 +158,6 @@ mca_coll_basic_neighbor_allgatherv_dist_graph(const void *sbuf, int scount, stru
indegree = dist_graph->indegree;
outdegree = dist_graph->outdegree;
/* ensure we have enough storage for requests */
rc = mca_coll_basic_check_for_requests (basic_module, indegree + outdegree);
if (OMPI_SUCCESS != rc) {
return rc;
}
inedges = dist_graph->in;
outedges = dist_graph->out;

20
ompi/mca/coll/basic/coll_basic_neighbor_alltoall.c
Просмотреть файл

@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2013-2014 Los Alamos National Security, LLC. All rights
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
@ -47,12 +47,6 @@ mca_coll_basic_neighbor_alltoall_cart(const void *sbuf, int scount, struct ompi_
ptrdiff_t lb, rdextent, sdextent;
int rc = MPI_SUCCESS, dim, nreqs;
/* ensure we have enough storage for requests */
rc = mca_coll_basic_check_for_requests (basic_module, cart->ndims * 4);
if (OMPI_SUCCESS != rc) {
return rc;
}
ompi_datatype_get_extent(rdtype, &lb, &rdextent);
ompi_datatype_get_extent(sdtype, &lb, &sdextent);
@ -149,12 +143,6 @@ mca_coll_basic_neighbor_alltoall_graph(const void *sbuf, int scount, struct ompi
mca_topo_base_graph_neighbors_count (comm, rank, &degree);
/* ensure we have enough storage for requests */
rc = mca_coll_basic_check_for_requests (basic_module, degree * 2);
if (OMPI_SUCCESS != rc) {
return rc;
}
edges = graph->edges;
if (rank > 0) {
edges += graph->index[rank - 1];
@ -205,12 +193,6 @@ mca_coll_basic_neighbor_alltoall_dist_graph(const void *sbuf, int scount,struct
indegree = dist_graph->indegree;
outdegree = dist_graph->outdegree;
/* ensure we have enough storage for requests */
rc = mca_coll_basic_check_for_requests (basic_module, indegree + outdegree);
if (OMPI_SUCCESS != rc) {
return rc;
}
inedges = dist_graph->in;
outedges = dist_graph->out;

20
ompi/mca/coll/basic/coll_basic_neighbor_alltoallv.c
Просмотреть файл

@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2013-2014 Los Alamos National Security, LLC. All rights
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
@ -48,12 +48,6 @@ mca_coll_basic_neighbor_alltoallv_cart(const void *sbuf, const int scounts[], co
ptrdiff_t lb, rdextent, sdextent;
ompi_request_t **reqs;
/* ensure we have enough storage for requests */
rc = mca_coll_basic_check_for_requests (basic_module, cart->ndims * 4);
if (OMPI_SUCCESS != rc) {
return rc;
}
ompi_datatype_get_extent(rdtype, &lb, &rdextent);
ompi_datatype_get_extent(sdtype, &lb, &sdextent);
@ -136,12 +130,6 @@ mca_coll_basic_neighbor_alltoallv_graph(const void *sbuf, const int scounts[], c
mca_topo_base_graph_neighbors_count (comm, rank, &degree);
/* ensure we have enough storage for requests */
rc = mca_coll_basic_check_for_requests (basic_module, 2 * degree);
if (OMPI_SUCCESS != rc) {
return rc;
}
edges = graph->edges;
if (rank > 0) {
edges += graph->index[rank - 1];
@ -195,12 +183,6 @@ mca_coll_basic_neighbor_alltoallv_dist_graph(const void *sbuf, const int scounts
indegree = dist_graph->indegree;
outdegree = dist_graph->outdegree;
/* ensure we have enough storage for requests */
rc = mca_coll_basic_check_for_requests (basic_module, indegree + outdegree);
if (OMPI_SUCCESS != rc) {
return rc;
}
inedges = dist_graph->in;
outedges = dist_graph->out;

19
ompi/mca/coll/basic/coll_basic_neighbor_alltoallw.c
Просмотреть файл

@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2013-2014 Los Alamos National Security, LLC. All rights
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
@ -47,11 +47,6 @@ mca_coll_basic_neighbor_alltoallw_cart(const void *sbuf, const int scounts[], co
int rc = MPI_SUCCESS, dim, i, nreqs;
ompi_request_t **reqs;
/* ensure we have enough storage for requests */
rc = mca_coll_basic_check_for_requests (basic_module, cart->ndims * 4);
if (OMPI_SUCCESS != rc) {
return rc;
}
/* post receives first */
for (dim = 0, i = 0, nreqs = 0, reqs = basic_module->mccb_reqs ; dim < cart->ndims ; ++dim, i += 2) {
@ -131,12 +126,6 @@ mca_coll_basic_neighbor_alltoallw_graph(const void *sbuf, const int scounts[], c
mca_topo_base_graph_neighbors_count (comm, rank, &degree);
/* ensure we have enough storage for requests */
rc = mca_coll_basic_check_for_requests (basic_module, 2 * degree);
if (OMPI_SUCCESS != rc) {
return rc;
}
edges = graph->edges;
if (rank > 0) {
edges += graph->index[rank - 1];
@ -186,12 +175,6 @@ mca_coll_basic_neighbor_alltoallw_dist_graph(const void *sbuf, const int scounts
indegree = dist_graph->indegree;
outdegree = dist_graph->outdegree;
/* ensure we have enough storage for requests */
rc = mca_coll_basic_check_for_requests (basic_module, indegree + outdegree);
if (OMPI_SUCCESS != rc) {
return rc;
}
inedges = dist_graph->in;
outedges = dist_graph->out;