25249c9843
This has turned into an MPI spec interpretation issue. :-( Open MPI has intrepreted the spec one way for the past several years; these commits reflect a different interpretation that changes how we treat the EXTRA_STATE parameter to the Fortran attribute copy and delete callbacks. This new way breaks our internal copy of the Intel Fortran attribute tests. So after talking with Terry/Sun, we're going to back out these changes (both here and on the v1.3 branch) until we get further clarification from the Forum. This commit was SVN r21028. The following SVN revision numbers were found above: r20926 --> open-mpi/ompi@0a24eadaad r20941 --> open-mpi/ompi@045b0e8871 r20950 --> open-mpi/ompi@73af921c22
95 строки
3.7 KiB
C
95 строки
3.7 KiB
C
/*
|
|
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
|
* University Research and Technology
|
|
* Corporation. All rights reserved.
|
|
* Copyright (c) 2004-2005 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) 2007 Cisco Systems, Inc. All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "ompi_config.h"
|
|
|
|
#include "ompi/mpi/f77/bindings.h"
|
|
#include "ompi/communicator/communicator.h"
|
|
|
|
#if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER
|
|
#pragma weak PMPI_KEYVAL_CREATE = mpi_keyval_create_f
|
|
#pragma weak pmpi_keyval_create = mpi_keyval_create_f
|
|
#pragma weak pmpi_keyval_create_ = mpi_keyval_create_f
|
|
#pragma weak pmpi_keyval_create__ = mpi_keyval_create_f
|
|
#elif OMPI_PROFILE_LAYER
|
|
OMPI_GENERATE_F77_BINDINGS (PMPI_KEYVAL_CREATE,
|
|
pmpi_keyval_create,
|
|
pmpi_keyval_create_,
|
|
pmpi_keyval_create__,
|
|
pmpi_keyval_create_f,
|
|
(ompi_mpi1_fortran_copy_attr_function* copy_fn, ompi_mpi1_fortran_delete_attr_function* delete_fn, MPI_Fint *keyval, MPI_Fint *extra_state, MPI_Fint *ierr),
|
|
(copy_fn, delete_fn, keyval, extra_state, ierr) )
|
|
#endif
|
|
|
|
#if OMPI_HAVE_WEAK_SYMBOLS
|
|
#pragma weak MPI_KEYVAL_CREATE = mpi_keyval_create_f
|
|
#pragma weak mpi_keyval_create = mpi_keyval_create_f
|
|
#pragma weak mpi_keyval_create_ = mpi_keyval_create_f
|
|
#pragma weak mpi_keyval_create__ = mpi_keyval_create_f
|
|
#endif
|
|
|
|
#if ! OMPI_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER
|
|
OMPI_GENERATE_F77_BINDINGS (MPI_KEYVAL_CREATE,
|
|
mpi_keyval_create,
|
|
mpi_keyval_create_,
|
|
mpi_keyval_create__,
|
|
mpi_keyval_create_f,
|
|
(ompi_mpi1_fortran_copy_attr_function* copy_fn, ompi_mpi1_fortran_delete_attr_function* delete_fn, MPI_Fint *keyval, MPI_Fint *extra_state, MPI_Fint *ierr),
|
|
(copy_fn, delete_fn, keyval, extra_state, ierr) )
|
|
#endif
|
|
|
|
|
|
#if OMPI_PROFILE_LAYER && ! OMPI_HAVE_WEAK_SYMBOLS
|
|
#include "ompi/mpi/f77/profile/defines.h"
|
|
#endif
|
|
|
|
static const char FUNC_NAME[] = "MPI_keyval_create_f";
|
|
|
|
void mpi_keyval_create_f(ompi_mpi1_fortran_copy_attr_function* copy_attr_fn,
|
|
ompi_mpi1_fortran_delete_attr_function* delete_attr_fn,
|
|
MPI_Fint *keyval, MPI_Fint *extra_state,
|
|
MPI_Fint *ierr)
|
|
{
|
|
int ret, c_err;
|
|
ompi_attribute_fn_ptr_union_t copy_fn;
|
|
ompi_attribute_fn_ptr_union_t del_fn;
|
|
|
|
copy_fn.attr_mpi1_fortran_copy_fn = copy_attr_fn;
|
|
del_fn.attr_mpi1_fortran_delete_fn = delete_attr_fn;
|
|
|
|
/* Set the "F77_OLD" bit to denote that the callbacks should use
|
|
the old MPI-1 INTEGER-parameter functions (as opposed to the
|
|
new MPI-2 INTEGER(KIND=MPI_ADDRESS_KIND)-parameter
|
|
functions). */
|
|
|
|
ret = ompi_attr_create_keyval(COMM_ATTR, copy_fn, del_fn,
|
|
keyval, extra_state,
|
|
OMPI_KEYVAL_F77 | OMPI_KEYVAL_F77_MPI1,
|
|
NULL);
|
|
|
|
if (MPI_SUCCESS != ret) {
|
|
c_err = OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD,
|
|
MPI_ERR_OTHER,
|
|
FUNC_NAME);
|
|
*ierr = OMPI_INT_2_FINT(c_err);
|
|
} else {
|
|
*ierr = OMPI_INT_2_FINT(MPI_SUCCESS);
|
|
}
|
|
}
|