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

Revert "fortran: optimize testall and waitall when MPI_STATUSES_IGNORE is used"

Просмотр исходного кода 
Optimization was incorrect, so revert this commit.

This reverts commit 83375bcc5c69121ebad7c1df67211ac08729c570.
Этот коммит содержится в:
Gilles Gouaillardet 2015-08-03 08:45:12 +09:00
родитель e6017c802d
Коммит 2fa8f4d53a
2 изменённых файлов: 6 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
ompi/mpi/fortran/mpif-h/testall_f.c
Просмотреть файл

@ -10,8 +10,6 @@
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -109,10 +107,11 @@ void ompi_testall_f(MPI_Fint *count, MPI_Fint *array_of_requests, ompi_fortran_l
/* All Fortran Compilers have FALSE == 0, so just check for any
nonzero value (because TRUE is not always == 1) */
if (MPI_SUCCESS == c_ierr && !OMPI_IS_FORTRAN_STATUSES_IGNORE(array_of_statuses) && *flag) {
if (MPI_SUCCESS == c_ierr && *flag) {
for (i = 0; i < OMPI_FINT_2_INT(*count); ++i) {
array_of_requests[i] = c_req[i]->req_f_to_c_index;
if (!OMPI_IS_FORTRAN_STATUS_IGNORE(&array_of_statuses[i])) {
if (!OMPI_IS_FORTRAN_STATUSES_IGNORE(array_of_statuses) &&
!OMPI_IS_FORTRAN_STATUS_IGNORE(&array_of_statuses[i])) {
MPI_Status_c2f(&c_status[i], &array_of_statuses[i * (sizeof(MPI_Status) / sizeof(int))]);
}
}

7
ompi/mpi/fortran/mpif-h/waitall_f.c
Просмотреть файл

@ -10,8 +10,6 @@
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -104,10 +102,11 @@ void ompi_waitall_f(MPI_Fint *count, MPI_Fint *array_of_requests,
c_ierr = MPI_Waitall(OMPI_FINT_2_INT(*count), c_req, c_status);
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
if (MPI_SUCCESS == c_ierr && !OMPI_IS_FORTRAN_STATUSES_IGNORE(array_of_statuses)) {
if (MPI_SUCCESS == c_ierr) {
for (i = 0; i < OMPI_FINT_2_INT(*count); ++i) {
array_of_requests[i] = c_req[i]->req_f_to_c_index;
if (!OMPI_IS_FORTRAN_STATUS_IGNORE(&array_of_statuses[i])) {
if (!OMPI_IS_FORTRAN_STATUSES_IGNORE(array_of_statuses) &&
!OMPI_IS_FORTRAN_STATUS_IGNORE(&array_of_statuses[i])) {
MPI_Status_c2f( &c_status[i], &array_of_statuses[i * (sizeof(MPI_Status) / sizeof(int))]);
}
}