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

fix ompi_request_wait vs ompi_request_wait_all and

Просмотр исходного кода 
MPI_STATUS_IGNORE vs MPI_STATUSES_IGNORE
Этот коммит содержится в:
Gilles Gouaillardet 2014-11-04 12:16:30 +09:00
родитель afc60d26e7
Коммит 64c18686b7
12 изменённых файлов: 61 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
ompi/communicator/comm.c
Просмотреть файл

@ -118,7 +118,7 @@ int ompi_comm_set ( ompi_communicator_t **ncomm,
}
if (NULL != req) {
ompi_request_wait (&req, MPI_STATUS_IGNORE);
ompi_request_wait( &req, MPI_STATUS_IGNORE);
}
return OMPI_SUCCESS;
@ -1377,13 +1377,13 @@ static int ompi_comm_allgather_emulate_intra( void *inbuf, int incount,
}
if ( 0 == rank ) {
rc = ompi_request_wait_all (rsize, req, MPI_STATUSES_IGNORE);
rc = ompi_request_wait_all( rsize, req, MPI_STATUSES_IGNORE);
if ( OMPI_SUCCESS != rc ) {
goto exit;
}
}
rc = ompi_request_wait_all (1, &sendreq, MPI_STATUS_IGNORE);
rc = ompi_request_wait( &sendreq, MPI_STATUS_IGNORE);
if ( OMPI_SUCCESS != rc ) {
goto exit;
}
@ -1406,7 +1406,7 @@ static int ompi_comm_allgather_emulate_intra( void *inbuf, int incount,
}
}
rc = ompi_request_wait_all (1, &sendreq, MPI_STATUS_IGNORE );
rc = ompi_request_wait( &sendreq, MPI_STATUS_IGNORE );
exit:
if ( NULL != req ) {
@ -1571,7 +1571,7 @@ ompi_proc_t **ompi_comm_get_rprocs ( ompi_communicator_t *local_comm,
if ( OMPI_SUCCESS != rc ) {
goto err_exit;
}
rc = ompi_request_wait_all ( 1, &req, MPI_STATUS_IGNORE );
rc = ompi_request_wait( &req, MPI_STATUS_IGNORE );
if ( OMPI_SUCCESS != rc ) {
goto err_exit;
}
@ -1603,7 +1603,7 @@ ompi_proc_t **ompi_comm_get_rprocs ( ompi_communicator_t *local_comm,
if ( OMPI_SUCCESS != rc ) {
goto err_exit;
}
rc = ompi_request_wait_all ( 1, &req, MPI_STATUS_IGNORE );
rc = ompi_request_wait( &req, MPI_STATUS_IGNORE );
if ( OMPI_SUCCESS != rc ) {
goto err_exit;
}

4
ompi/communicator/comm_cid.c
Просмотреть файл

@ -18,6 +18,8 @@
* reserved.
* Copyright (c) 2012 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -1292,7 +1294,7 @@ static int ompi_comm_allreduce_intra_bridge (int *inbuf, int *outbuf,
if ( OMPI_SUCCESS != rc ) {
goto exit;
}
rc = ompi_request_wait_all ( 1, &req, MPI_STATUS_IGNORE);
rc = ompi_request_wait( &req, MPI_STATUS_IGNORE);
if ( OMPI_SUCCESS != rc ) {
goto exit;
}

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

@ -9,6 +9,8 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -179,7 +181,7 @@ mca_coll_basic_allgather_inter(void *sbuf, int scount,
goto exit;
}
err = ompi_request_wait_all(1, &req, MPI_STATUS_IGNORE);
err = ompi_request_wait( &req, MPI_STATUS_IGNORE);
if (OMPI_SUCCESS != err) {
goto exit;
}

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

@ -12,6 +12,8 @@
* All rights reserved.
* 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.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -104,7 +106,7 @@ mca_coll_basic_alltoall_intra_inplace(void *rbuf, int rcount,
}
/* Wait for the requests to complete */
err = ompi_request_wait_all (2, basic_module->mccb_reqs, MPI_STATUS_IGNORE);
err = ompi_request_wait_all (2, basic_module->mccb_reqs, MPI_STATUSES_IGNORE);
if (MPI_SUCCESS != err) { goto error_hndl; }
/* Free the requests. */

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

@ -13,6 +13,8 @@
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2013 FUJITSU LIMITED. All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -109,7 +111,7 @@ mca_coll_basic_alltoallv_intra_inplace(void *rbuf, const int *rcounts, const int
}
/* Wait for the requests to complete */
err = ompi_request_wait_all (2, basic_module->mccb_reqs, MPI_STATUS_IGNORE);
err = ompi_request_wait_all (2, basic_module->mccb_reqs, MPI_STATUSES_IGNORE);
if (MPI_SUCCESS != err) { goto error_hndl; }
/* Free the requests. */

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

@ -14,6 +14,8 @@
* Copyright (c) 2012 Oak Ridge National Labs. All rights reserved.
* 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.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -435,7 +437,7 @@ mca_coll_basic_reduce_scatter_inter(void *sbuf, void *rbuf, int *rcounts,
goto exit;
}
err = ompi_request_wait_all(1, &req, MPI_STATUS_IGNORE);
err = ompi_request_wait( &req, MPI_STATUS_IGNORE);
if (OMPI_SUCCESS != err) {
goto exit;
}

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

@ -12,6 +12,8 @@
* Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved.
* Copyright (c) 2012 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2012 Sandia National Laboratories. All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -176,7 +178,7 @@ mca_coll_basic_reduce_scatter_block_inter(void *sbuf, void *rbuf, int rcount,
goto exit;
}
err = ompi_request_wait_all(1, &req, MPI_STATUS_IGNORE);
err = ompi_request_wait( &req, MPI_STATUS_IGNORE);
if (OMPI_SUCCESS != err) {
goto exit;
}

10
ompi/mca/coll/hierarch/coll_hierarch_bcast.c
Просмотреть файл

@ -10,6 +10,8 @@
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2007-2008 University of Houston. All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -370,7 +372,7 @@ static int mca_coll_hierarch_bcast_intra_seg1 (void *buff,
}
}
else {
ret = ompi_request_wait_all(1, &rreq, MPI_STATUS_IGNORE);
ret = ompi_request_wait( &rreq, MPI_STATUS_IGNORE);
if ( OMPI_SUCCESS != ret ) {
return ret;
}
@ -528,7 +530,7 @@ static int mca_coll_hierarch_bcast_intra_seg2 (void *buff,
}
}
else {
ret = ompi_request_wait_all ( 1, &rreq, MPI_STATUS_IGNORE);
ret = ompi_request_wait( &rreq, MPI_STATUS_IGNORE);
if ( OMPI_SUCCESS != ret ) {
return ret;
}
@ -710,7 +712,7 @@ static int mca_coll_hierarch_bcast_intra_seg3 (void *buff,
}
}
else {
ret = ompi_request_wait_all ( 1, &rreq, MPI_STATUS_IGNORE );
ret = ompi_request_wait( &rreq, MPI_STATUS_IGNORE );
if ( OMPI_SUCCESS != ret ) {
goto exit;
}
@ -726,7 +728,7 @@ static int mca_coll_hierarch_bcast_intra_seg3 (void *buff,
}
}
else {
ret = ompi_request_wait_all( 1, &rreq1, MPI_STATUS_IGNORE);
ret = ompi_request_wait( &rreq1, MPI_STATUS_IGNORE);
if ( OMPI_SUCCESS != ret ) {
goto exit;
}

4
ompi/mca/coll/tuned/coll_tuned_alltoall.c
Просмотреть файл

@ -12,6 +12,8 @@
* All rights reserved.
* 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.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -126,7 +128,7 @@ mca_coll_tuned_alltoall_intra_basic_inplace(void *rbuf, int rcount,
}
/* Wait for the requests to complete */
err = ompi_request_wait_all (2, tuned_module->tuned_data->mcct_reqs, MPI_STATUS_IGNORE);
err = ompi_request_wait_all (2, tuned_module->tuned_data->mcct_reqs, MPI_STATUSES_IGNORE);
if (MPI_SUCCESS != err) { goto error_hndl; }
/* Free the requests. */

4
ompi/mca/coll/tuned/coll_tuned_alltoallv.c
Просмотреть файл

@ -14,6 +14,8 @@
* Copyright (c) 2013 Los Alamos National Security, LLC. All Rights
* reserved.
* Copyright (c) 2013 FUJITSU LIMITED. All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -125,7 +127,7 @@ mca_coll_tuned_alltoallv_intra_basic_inplace(void *rbuf, const int *rcounts, con
}
/* Wait for the requests to complete */
err = ompi_request_wait_all (2, tuned_module->tuned_data->mcct_reqs, MPI_STATUS_IGNORE);
err = ompi_request_wait_all (2, tuned_module->tuned_data->mcct_reqs, MPI_STATUSES_IGNORE);
if (MPI_SUCCESS != err) { goto error_hndl; }
/* Free the requests. */

23
ompi/mca/fcoll/two_phase/fcoll_two_phase_support_fns.c
Просмотреть файл

@ -1,3 +1,24 @@
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2006 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2008-2011 University of Houston. All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
*
* $HEADER$
*/
#include "ompi_config.h"
#include "fcoll_two_phase.h"
@ -302,7 +323,7 @@ int mca_fcoll_two_phase_calc_others_requests(mca_io_ompio_file_t *fh,
}
if (j) {
ret = ompi_request_wait_all ( j, requests, MPI_STATUS_IGNORE );
ret = ompi_request_wait_all ( j, requests, MPI_STATUSES_IGNORE );
if ( OMPI_SUCCESS != ret ) {
return ret;
}

4
ompi/mpi/c/intercomm_create.c
Просмотреть файл

@ -12,6 +12,8 @@
* Copyright (c) 2006-2007 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2006-2009 University of Houston. All rights reserved.
* Copyright (c) 2012-2013 Inria. All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -119,7 +121,7 @@ int MPI_Intercomm_create(MPI_Comm local_comm, int local_leader,
if ( rc != MPI_SUCCESS ) {
goto err_exit;
}
rc = ompi_request_wait_all ( 1, &req, MPI_STATUS_IGNORE);
rc = ompi_request_wait( &req, MPI_STATUS_IGNORE);
if ( rc != MPI_SUCCESS ) {
goto err_exit;
}