Merge pull request #6358 from gpaulsen/topic/master/mpi1removal
Fix MPI1 function removal [master] Issue 6114 [API Change]
Этот коммит содержится в:
Geoff Paulsen
GitHub
Коммит
45fb0c1a9b
@ -36,7 +36,6 @@ AC_DEFUN([OMPI_CONFIG_FILES],[
|
|||||||
ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile
|
ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile
|
||||||
ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h
|
ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h
|
||||||
ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-file-interfaces.h
|
ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-file-interfaces.h
|
||||||
ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-removed-interfaces.h
|
|
||||||
ompi/mpi/fortran/use-mpi-f08/Makefile
|
ompi/mpi/fortran/use-mpi-f08/Makefile
|
||||||
ompi/mpi/fortran/use-mpi-f08/bindings/Makefile
|
ompi/mpi/fortran/use-mpi-f08/bindings/Makefile
|
||||||
ompi/mpi/fortran/use-mpi-f08/mod/Makefile
|
ompi/mpi/fortran/use-mpi-f08/mod/Makefile
|
||||||
|
|||||||
@ -841,25 +841,19 @@ ompi_datatype_t* ompi_datatype_get_single_predefined_type_from_args( ompi_dataty
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#if OMPI_ENABLE_MPI1_COMPAT
|
if( NULL == predef ) { /* This is the first iteration */
|
||||||
if (current_predef != MPI_LB && current_predef != MPI_UB) {
|
predef = current_predef;
|
||||||
#endif
|
} else {
|
||||||
if( NULL == predef ) { /* This is the first iteration */
|
/**
|
||||||
predef = current_predef;
|
* What exactly should we consider as identical types?
|
||||||
} else {
|
* If they are the same MPI level type, or if they map
|
||||||
/**
|
* to the same OPAL datatype? In other words, MPI_FLOAT
|
||||||
* What exactly should we consider as identical types?
|
* and MPI_REAL4 are they identical?
|
||||||
* If they are the same MPI level type, or if they map
|
*/
|
||||||
* to the same OPAL datatype? In other words, MPI_FLOAT
|
if( predef != current_predef ) {
|
||||||
* and MPI_REAL4 are they identical?
|
return NULL;
|
||||||
*/
|
|
||||||
if( predef != current_predef ) {
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
#if OMPI_ENABLE_MPI1_COMPAT
|
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
return predef;
|
return predef;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -19,7 +19,7 @@
|
|||||||
* Copyright (c) 2015 University of Houston. All rights reserved.
|
* Copyright (c) 2015 University of Houston. All rights reserved.
|
||||||
* Copyright (c) 2015-2018 Research Organization for Information Science
|
* Copyright (c) 2015-2018 Research Organization for Information Science
|
||||||
* and Technology (RIST). All rights reserved.
|
* and Technology (RIST). All rights reserved.
|
||||||
* Copyright (c) 2017-2018 IBM Corporation. All rights reserved.
|
* Copyright (c) 2017-2019 IBM Corporation. All rights reserved.
|
||||||
* Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
|
* Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
|
||||||
* $COPYRIGHT$
|
* $COPYRIGHT$
|
||||||
*
|
*
|
||||||
@ -137,9 +137,6 @@
|
|||||||
/* Whether we have FORTRAN REAL*8 or not */
|
/* Whether we have FORTRAN REAL*8 or not */
|
||||||
#undef OMPI_HAVE_FORTRAN_REAL8
|
#undef OMPI_HAVE_FORTRAN_REAL8
|
||||||
|
|
||||||
/* Whether in include MPI-1 compatibility */
|
|
||||||
#undef OMPI_ENABLE_MPI1_COMPAT
|
|
||||||
|
|
||||||
/* Whether we have float _Complex or not */
|
/* Whether we have float _Complex or not */
|
||||||
#undef HAVE_FLOAT__COMPLEX
|
#undef HAVE_FLOAT__COMPLEX
|
||||||
|
|
||||||
@ -280,10 +277,6 @@
|
|||||||
# define __mpi_interface_deprecated__(msg) __attribute__((__deprecated__))
|
# define __mpi_interface_deprecated__(msg) __attribute__((__deprecated__))
|
||||||
# endif
|
# endif
|
||||||
# endif
|
# endif
|
||||||
# if OMPI_ENABLE_MPI1_COMPAT
|
|
||||||
# define __mpi_interface_removed__(msg) __mpi_interface_deprecated__(msg)
|
|
||||||
# define OMPI_OMIT_MPI1_COMPAT_DECLS 0
|
|
||||||
# endif
|
|
||||||
# endif
|
# endif
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
@ -297,14 +290,6 @@
|
|||||||
# define __mpi_interface_deprecated__(msg)
|
# define __mpi_interface_deprecated__(msg)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(__mpi_interface_removed__)
|
|
||||||
# define __mpi_interface_removed__(msg)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if !defined(OMPI_OMIT_MPI1_COMPAT_DECLS)
|
|
||||||
# define OMPI_OMIT_MPI1_COMPAT_DECLS !OMPI_ENABLE_MPI1_COMPAT
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* To accomodate programs written for MPI implementations that use a
|
* To accomodate programs written for MPI implementations that use a
|
||||||
* straight ROMIO import
|
* straight ROMIO import
|
||||||
@ -1005,23 +990,6 @@ OMPI_DECLSPEC extern struct ompi_predefined_info_t ompi_mpi_info_env;
|
|||||||
OMPI_DECLSPEC extern MPI_Fint *MPI_F_STATUS_IGNORE;
|
OMPI_DECLSPEC extern MPI_Fint *MPI_F_STATUS_IGNORE;
|
||||||
OMPI_DECLSPEC extern MPI_Fint *MPI_F_STATUSES_IGNORE;
|
OMPI_DECLSPEC extern MPI_Fint *MPI_F_STATUSES_IGNORE;
|
||||||
|
|
||||||
#if !OMPI_OMIT_MPI1_COMPAT_DECLS
|
|
||||||
/*
|
|
||||||
* Removed datatypes. These datatypes are only available if Open MPI
|
|
||||||
* was configured with --enable-mpi1-compatibility.
|
|
||||||
*
|
|
||||||
* These datatypes were formally removed from the MPI specification
|
|
||||||
* and should no longer be used in MPI applications.
|
|
||||||
*/
|
|
||||||
#define MPI_UB OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_ub)
|
|
||||||
#define MPI_LB OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_lb)
|
|
||||||
|
|
||||||
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_lb
|
|
||||||
__mpi_interface_removed__("MPI_LB was removed in MPI-3.0; use MPI_Type_create_resized instead.");
|
|
||||||
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_ub
|
|
||||||
__mpi_interface_removed__("MPI_UB was removed in MPI-3.0; use MPI_Type_create_resized instead.");
|
|
||||||
#endif /* !OMPI_OMIT_MPI1_COMPAT_DECLS */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* MPI predefined handles
|
* MPI predefined handles
|
||||||
*/
|
*/
|
||||||
@ -2672,85 +2640,6 @@ OMPI_DECLSPEC int OMPI_C_MPI_NULL_DELETE_FN( MPI_Comm comm, int comm_keyval,
|
|||||||
void* extra_state )
|
void* extra_state )
|
||||||
__mpi_interface_deprecated__("MPI_NULL_DELETE_FN was deprecated in MPI-2.0; use MPI_COMM_NULL_DELETE_FN instead.");
|
__mpi_interface_deprecated__("MPI_NULL_DELETE_FN was deprecated in MPI-2.0; use MPI_COMM_NULL_DELETE_FN instead.");
|
||||||
|
|
||||||
#if !OMPI_OMIT_MPI1_COMPAT_DECLS
|
|
||||||
/*
|
|
||||||
* Removed typedefs. These typedefs are only available if Open MPI
|
|
||||||
* was configured with --enable-mpi1-compatibility.
|
|
||||||
*
|
|
||||||
* These typedefs were formally removed from the MPI specification
|
|
||||||
* and should no longer be used in MPI applications.
|
|
||||||
*
|
|
||||||
* Even though MPI_Handler_function is removed, we do not use the
|
|
||||||
* attributes marking it as such, because otherwise the compiler
|
|
||||||
* will warn for all the functions that are declared using them
|
|
||||||
* (e.g., MPI_Errhandler_create).
|
|
||||||
*/
|
|
||||||
typedef void (MPI_Handler_function)(MPI_Comm *, int *, ...);
|
|
||||||
/* MPI_Handler_function was removed in MPI-3.0; use MPI_Comm_use_errhandler_function instead. */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Removed prototypes. These prototypes are only available if Open
|
|
||||||
* MPI was configured with --enable-mpi1-compatibility.
|
|
||||||
*
|
|
||||||
* These functions were formally removed from the MPI specification
|
|
||||||
* and should no longer be used in MPI applications.
|
|
||||||
*/
|
|
||||||
OMPI_DECLSPEC int MPI_Address(void *location, MPI_Aint *address)
|
|
||||||
__mpi_interface_removed__("MPI_Address was removed in MPI-3.0; use MPI_Get_address instead.");
|
|
||||||
OMPI_DECLSPEC int PMPI_Address(void *location, MPI_Aint *address)
|
|
||||||
__mpi_interface_removed__("PMPI_Address was removed in MPI-3.0; use MPI_Get_address instead.");
|
|
||||||
OMPI_DECLSPEC int MPI_Errhandler_create(MPI_Handler_function *function,
|
|
||||||
MPI_Errhandler *errhandler)
|
|
||||||
__mpi_interface_removed__("MPI_Errhandler_create was removed in MPI-3.0; use MPI_Comm_create_errhandler instead.");
|
|
||||||
OMPI_DECLSPEC int PMPI_Errhandler_create(MPI_Handler_function *function,
|
|
||||||
MPI_Errhandler *errhandler)
|
|
||||||
__mpi_interface_removed__("PMPI_Errhandler_create was removed in MPI-3.0; use PMPI_Comm_create_errhandler instead.");
|
|
||||||
OMPI_DECLSPEC int MPI_Errhandler_get(MPI_Comm comm, MPI_Errhandler *errhandler)
|
|
||||||
__mpi_interface_removed__("MPI_Errhandler_get was removed in MPI-3.0; use MPI_Comm_get_errhandler instead.");
|
|
||||||
OMPI_DECLSPEC int PMPI_Errhandler_get(MPI_Comm comm, MPI_Errhandler *errhandler)
|
|
||||||
__mpi_interface_removed__("PMPI_Errhandler_get was removed in MPI-3.0; use PMPI_Comm_get_errhandler instead.");
|
|
||||||
OMPI_DECLSPEC int MPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler)
|
|
||||||
__mpi_interface_removed__("MPI_Errhandler_set was removed in MPI-3.0; use MPI_Comm_set_errhandler instead.");
|
|
||||||
OMPI_DECLSPEC int PMPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler)
|
|
||||||
__mpi_interface_removed__("PMPI_Errhandler_set was removed in MPI-3.0; use PMPI_Comm_set_errhandler instead.");
|
|
||||||
OMPI_DECLSPEC int MPI_Type_extent(MPI_Datatype type, MPI_Aint *extent)
|
|
||||||
__mpi_interface_removed__("MPI_Type_extent was removed in MPI-3.0; use MPI_Type_get_extent instead.");
|
|
||||||
OMPI_DECLSPEC int PMPI_Type_extent(MPI_Datatype type, MPI_Aint *extent)
|
|
||||||
__mpi_interface_removed__("PMPI_Type_extent was removed in MPI-3.0; use PMPI_Type_get_extent instead.");
|
|
||||||
OMPI_DECLSPEC int MPI_Type_hindexed(int count, int array_of_blocklengths[],
|
|
||||||
MPI_Aint array_of_displacements[],
|
|
||||||
MPI_Datatype oldtype, MPI_Datatype *newtype)
|
|
||||||
__mpi_interface_removed__("MPI_Type_hindexed was removed in MPI-3.0; use MPI_Type_create_hindexed instead.");
|
|
||||||
OMPI_DECLSPEC int PMPI_Type_hindexed(int count, int array_of_blocklengths[],
|
|
||||||
MPI_Aint array_of_displacements[],
|
|
||||||
MPI_Datatype oldtype, MPI_Datatype *newtype)
|
|
||||||
__mpi_interface_removed__("PMPI_Type_hindexed was removed in MPI-3.0; use PMPI_Type_create_hindexed instead.");
|
|
||||||
OMPI_DECLSPEC int MPI_Type_hvector(int count, int blocklength, MPI_Aint stride,
|
|
||||||
MPI_Datatype oldtype, MPI_Datatype *newtype)
|
|
||||||
__mpi_interface_removed__("MPI_Type_hvector was removed in MPI-3.0; use MPI_Type_create_hvector instead.");
|
|
||||||
OMPI_DECLSPEC int PMPI_Type_hvector(int count, int blocklength, MPI_Aint stride,
|
|
||||||
MPI_Datatype oldtype, MPI_Datatype *newtype)
|
|
||||||
__mpi_interface_removed__("PMPI_Type_hvector was removed in MPI-3.0; use PMPI_Type_create_hvector instead.");
|
|
||||||
OMPI_DECLSPEC int MPI_Type_lb(MPI_Datatype type, MPI_Aint *lb)
|
|
||||||
__mpi_interface_removed__("MPI_Type_lb has been removed in MPI-3.0; use MPI_Type_get_extent instead.");
|
|
||||||
OMPI_DECLSPEC int PMPI_Type_lb(MPI_Datatype type, MPI_Aint *lb)
|
|
||||||
__mpi_interface_removed__("PMPI_Type_lb has been removed in MPI-3.0; use PMPI_Type_get_extent instead.");
|
|
||||||
OMPI_DECLSPEC int MPI_Type_struct(int count, int array_of_blocklengths[],
|
|
||||||
MPI_Aint array_of_displacements[],
|
|
||||||
MPI_Datatype array_of_types[],
|
|
||||||
MPI_Datatype *newtype)
|
|
||||||
__mpi_interface_removed__("MPI_Type_struct was removed in MPI-3.0; use MPI_Type_create_struct instead.");
|
|
||||||
OMPI_DECLSPEC int PMPI_Type_struct(int count, int array_of_blocklengths[],
|
|
||||||
MPI_Aint array_of_displacements[],
|
|
||||||
MPI_Datatype array_of_types[],
|
|
||||||
MPI_Datatype *newtype)
|
|
||||||
__mpi_interface_removed__("PMPI_Type_struct was removed in MPI-3.0; use PMPI_Type_create_struct instead.");
|
|
||||||
OMPI_DECLSPEC int MPI_Type_ub(MPI_Datatype mtype, MPI_Aint *ub)
|
|
||||||
__mpi_interface_removed__("MPI_Type_ub has been removed in MPI-3.0; use MPI_Type_get_extent instead.");
|
|
||||||
OMPI_DECLSPEC int PMPI_Type_ub(MPI_Datatype mtype, MPI_Aint *ub)
|
|
||||||
__mpi_interface_removed__("PMPI_Type_ub has been removed in MPI-3.0; use PMPI_Type_get_extent instead.");
|
|
||||||
#endif /* !OMPI_OMIT_MPI1_COMPAT_DECLS */
|
|
||||||
|
|
||||||
#if defined(c_plusplus) || defined(__cplusplus)
|
#if defined(c_plusplus) || defined(__cplusplus)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -437,20 +437,6 @@ libmpi_c_mpi_la_SOURCES = \
|
|||||||
win_wait.c
|
win_wait.c
|
||||||
|
|
||||||
|
|
||||||
if OMPI_ENABLE_MPI1_COMPAT
|
|
||||||
libmpi_c_mpi_la_SOURCES += \
|
|
||||||
address.c \
|
|
||||||
errhandler_create.c \
|
|
||||||
errhandler_get.c \
|
|
||||||
errhandler_set.c \
|
|
||||||
type_extent.c \
|
|
||||||
type_hindexed.c \
|
|
||||||
type_hvector.c \
|
|
||||||
type_lb.c \
|
|
||||||
type_struct.c \
|
|
||||||
type_ub.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Conditionally install the header files
|
# Conditionally install the header files
|
||||||
|
|
||||||
if WANT_INSTALL_HEADERS
|
if WANT_INSTALL_HEADERS
|
||||||
|
|||||||
@ -1,53 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2004-2007 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) 2015 Research Organization for Information Science
|
|
||||||
* and Technology (RIST). All rights reserved.
|
|
||||||
* $COPYRIGHT$
|
|
||||||
*
|
|
||||||
* Additional copyrights may follow
|
|
||||||
*
|
|
||||||
* $HEADER$
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ompi_config.h"
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
#include "ompi/mpi/c/bindings.h"
|
|
||||||
#include "ompi/runtime/params.h"
|
|
||||||
#include "ompi/communicator/communicator.h"
|
|
||||||
#include "ompi/errhandler/errhandler.h"
|
|
||||||
|
|
||||||
#if OMPI_BUILD_MPI_PROFILING
|
|
||||||
#if OPAL_HAVE_WEAK_SYMBOLS
|
|
||||||
#pragma weak MPI_Address = PMPI_Address
|
|
||||||
#endif
|
|
||||||
#define MPI_Address PMPI_Address
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static const char FUNC_NAME[] = "MPI_Address";
|
|
||||||
|
|
||||||
|
|
||||||
int MPI_Address(void *location, MPI_Aint *address)
|
|
||||||
{
|
|
||||||
|
|
||||||
OPAL_CR_NOOP_PROGRESS();
|
|
||||||
|
|
||||||
if( MPI_PARAM_CHECK ) {
|
|
||||||
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
|
|
||||||
if (NULL == location || NULL == address) {
|
|
||||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG, FUNC_NAME);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
*address = (MPI_Aint)location;
|
|
||||||
return MPI_SUCCESS;
|
|
||||||
}
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2004-2007 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) 2015 Research Organization for Information Science
|
|
||||||
* and Technology (RIST). All rights reserved.
|
|
||||||
* $COPYRIGHT$
|
|
||||||
*
|
|
||||||
* Additional copyrights may follow
|
|
||||||
*
|
|
||||||
* $HEADER$
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ompi_config.h"
|
|
||||||
|
|
||||||
#include "ompi/mpi/c/bindings.h"
|
|
||||||
#include "ompi/communicator/communicator.h"
|
|
||||||
#include "ompi/errhandler/errhandler.h"
|
|
||||||
|
|
||||||
#if OMPI_BUILD_MPI_PROFILING
|
|
||||||
#if OPAL_HAVE_WEAK_SYMBOLS
|
|
||||||
#pragma weak MPI_Errhandler_create = PMPI_Errhandler_create
|
|
||||||
#endif
|
|
||||||
#define MPI_Errhandler_create PMPI_Errhandler_create
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int MPI_Errhandler_create(MPI_Handler_function *function,
|
|
||||||
MPI_Errhandler *errhandler)
|
|
||||||
{
|
|
||||||
|
|
||||||
/* This is a deprecated -- just turn around and call the real
|
|
||||||
function */
|
|
||||||
|
|
||||||
return PMPI_Comm_create_errhandler(function, errhandler);
|
|
||||||
}
|
|
||||||
@ -1,55 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2004-2007 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-2008 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) 2015 Research Organization for Information Science
|
|
||||||
* and Technology (RIST). All rights reserved.
|
|
||||||
* $COPYRIGHT$
|
|
||||||
*
|
|
||||||
* Additional copyrights may follow
|
|
||||||
*
|
|
||||||
* $HEADER$
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ompi_config.h"
|
|
||||||
|
|
||||||
#include "ompi/mpi/c/bindings.h"
|
|
||||||
#include "ompi/runtime/params.h"
|
|
||||||
#include "ompi/communicator/communicator.h"
|
|
||||||
#include "ompi/errhandler/errhandler.h"
|
|
||||||
#include "ompi/memchecker.h"
|
|
||||||
|
|
||||||
#if OMPI_BUILD_MPI_PROFILING
|
|
||||||
#if OPAL_HAVE_WEAK_SYMBOLS
|
|
||||||
#pragma weak MPI_Errhandler_get = PMPI_Errhandler_get
|
|
||||||
#endif
|
|
||||||
#define MPI_Errhandler_get PMPI_Errhandler_get
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static const char FUNC_NAME[] = "MPI_Errhandler_get";
|
|
||||||
|
|
||||||
|
|
||||||
int MPI_Errhandler_get(MPI_Comm comm, MPI_Errhandler *errhandler)
|
|
||||||
{
|
|
||||||
MEMCHECKER(
|
|
||||||
memchecker_comm(comm);
|
|
||||||
);
|
|
||||||
|
|
||||||
OPAL_CR_NOOP_PROGRESS();
|
|
||||||
|
|
||||||
if (MPI_PARAM_CHECK) {
|
|
||||||
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* This is a deprecated -- just turn around and call the real
|
|
||||||
function */
|
|
||||||
|
|
||||||
return PMPI_Comm_get_errhandler(comm, errhandler);
|
|
||||||
}
|
|
||||||
@ -1,55 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2004-2007 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-2008 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) 2015 Research Organization for Information Science
|
|
||||||
* and Technology (RIST). All rights reserved.
|
|
||||||
* $COPYRIGHT$
|
|
||||||
*
|
|
||||||
* Additional copyrights may follow
|
|
||||||
*
|
|
||||||
* $HEADER$
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ompi_config.h"
|
|
||||||
|
|
||||||
#include "ompi/mpi/c/bindings.h"
|
|
||||||
#include "ompi/runtime/params.h"
|
|
||||||
#include "ompi/communicator/communicator.h"
|
|
||||||
#include "ompi/errhandler/errhandler.h"
|
|
||||||
#include "ompi/memchecker.h"
|
|
||||||
|
|
||||||
#if OMPI_BUILD_MPI_PROFILING
|
|
||||||
#if OPAL_HAVE_WEAK_SYMBOLS
|
|
||||||
#pragma weak MPI_Errhandler_set = PMPI_Errhandler_set
|
|
||||||
#endif
|
|
||||||
#define MPI_Errhandler_set PMPI_Errhandler_set
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static const char FUNC_NAME[] = "MPI_Errhandler_set";
|
|
||||||
|
|
||||||
|
|
||||||
int MPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler)
|
|
||||||
{
|
|
||||||
MEMCHECKER(
|
|
||||||
memchecker_comm(comm);
|
|
||||||
);
|
|
||||||
|
|
||||||
OPAL_CR_NOOP_PROGRESS();
|
|
||||||
|
|
||||||
if (MPI_PARAM_CHECK) {
|
|
||||||
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* This is a deprecated -- just turn around and call the real
|
|
||||||
function */
|
|
||||||
|
|
||||||
return PMPI_Comm_set_errhandler(comm, errhandler);
|
|
||||||
}
|
|
||||||
@ -416,20 +416,6 @@ nodist_libmpi_c_pmpi_la_SOURCES = \
|
|||||||
pwin_unlock_all.c \
|
pwin_unlock_all.c \
|
||||||
pwin_wait.c
|
pwin_wait.c
|
||||||
|
|
||||||
if OMPI_ENABLE_MPI1_COMPAT
|
|
||||||
nodist_libmpi_c_pmpi_la_SOURCES += \
|
|
||||||
paddress.c \
|
|
||||||
perrhandler_create.c \
|
|
||||||
perrhandler_get.c \
|
|
||||||
perrhandler_set.c \
|
|
||||||
ptype_extent.c \
|
|
||||||
ptype_hindexed.c \
|
|
||||||
ptype_hvector.c \
|
|
||||||
ptype_lb.c \
|
|
||||||
ptype_struct.c \
|
|
||||||
ptype_ub.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Sym link in the sources from the real MPI directory
|
# Sym link in the sources from the real MPI directory
|
||||||
#
|
#
|
||||||
|
|||||||
@ -1,62 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2004-2007 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-2008 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) 2015 Research Organization for Information Science
|
|
||||||
* and Technology (RIST). All rights reserved.
|
|
||||||
* $COPYRIGHT$
|
|
||||||
*
|
|
||||||
* Additional copyrights may follow
|
|
||||||
*
|
|
||||||
* $HEADER$
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ompi_config.h"
|
|
||||||
|
|
||||||
#include "ompi/mpi/c/bindings.h"
|
|
||||||
#include "ompi/runtime/params.h"
|
|
||||||
#include "ompi/communicator/communicator.h"
|
|
||||||
#include "ompi/errhandler/errhandler.h"
|
|
||||||
#include "ompi/datatype/ompi_datatype.h"
|
|
||||||
#include "ompi/memchecker.h"
|
|
||||||
|
|
||||||
#if OMPI_BUILD_MPI_PROFILING
|
|
||||||
#if OPAL_HAVE_WEAK_SYMBOLS
|
|
||||||
#pragma weak MPI_Type_extent = PMPI_Type_extent
|
|
||||||
#endif
|
|
||||||
#define MPI_Type_extent PMPI_Type_extent
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static const char FUNC_NAME[] = "MPI_Type_extent";
|
|
||||||
|
|
||||||
|
|
||||||
int MPI_Type_extent(MPI_Datatype type, MPI_Aint *extent)
|
|
||||||
{
|
|
||||||
int rc;
|
|
||||||
MPI_Aint lb;
|
|
||||||
|
|
||||||
MEMCHECKER(
|
|
||||||
memchecker_datatype(type);
|
|
||||||
);
|
|
||||||
|
|
||||||
if (MPI_PARAM_CHECK) {
|
|
||||||
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
|
|
||||||
if (NULL == type || MPI_DATATYPE_NULL == type) {
|
|
||||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_TYPE, FUNC_NAME);
|
|
||||||
} else if (NULL == extent) {
|
|
||||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG, FUNC_NAME);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
OPAL_CR_ENTER_LIBRARY();
|
|
||||||
|
|
||||||
rc = ompi_datatype_get_extent( type, &lb, extent );
|
|
||||||
OMPI_ERRHANDLER_RETURN(rc, MPI_COMM_WORLD, rc, FUNC_NAME );
|
|
||||||
}
|
|
||||||
@ -1,78 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
|
|
||||||
* University Research and Technology
|
|
||||||
* Corporation. All rights reserved.
|
|
||||||
* Copyright (c) 2004-2016 The University of Tennessee and The University
|
|
||||||
* of Tennessee Research Foundation. All rights
|
|
||||||
* reserved.
|
|
||||||
* Copyright (c) 2004-2008 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) 2015 Research Organization for Information Science
|
|
||||||
* and Technology (RIST). All rights reserved.
|
|
||||||
* $COPYRIGHT$
|
|
||||||
*
|
|
||||||
* Additional copyrights may follow
|
|
||||||
*
|
|
||||||
* $HEADER$
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ompi_config.h"
|
|
||||||
|
|
||||||
#include "ompi/mpi/c/bindings.h"
|
|
||||||
#include "ompi/runtime/params.h"
|
|
||||||
#include "ompi/communicator/communicator.h"
|
|
||||||
#include "ompi/errhandler/errhandler.h"
|
|
||||||
#include "ompi/memchecker.h"
|
|
||||||
|
|
||||||
#if OMPI_BUILD_MPI_PROFILING
|
|
||||||
#if OPAL_HAVE_WEAK_SYMBOLS
|
|
||||||
#pragma weak MPI_Type_hindexed = PMPI_Type_hindexed
|
|
||||||
#endif
|
|
||||||
#define MPI_Type_hindexed PMPI_Type_hindexed
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static const char FUNC_NAME[] = "MPI_Type_hindexed";
|
|
||||||
|
|
||||||
|
|
||||||
int MPI_Type_hindexed(int count,
|
|
||||||
int array_of_blocklengths[],
|
|
||||||
MPI_Aint array_of_displacements[],
|
|
||||||
MPI_Datatype oldtype,
|
|
||||||
MPI_Datatype *newtype)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
|
|
||||||
MEMCHECKER(
|
|
||||||
memchecker_datatype(oldtype);
|
|
||||||
);
|
|
||||||
|
|
||||||
if ( MPI_PARAM_CHECK ) {
|
|
||||||
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
|
|
||||||
if (NULL == oldtype || MPI_DATATYPE_NULL == oldtype ||
|
|
||||||
NULL == newtype) {
|
|
||||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_TYPE,
|
|
||||||
FUNC_NAME );
|
|
||||||
} else if (count < 0) {
|
|
||||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_COUNT,
|
|
||||||
FUNC_NAME );
|
|
||||||
} else if ((count > 0) && (NULL == array_of_blocklengths ||
|
|
||||||
NULL == array_of_displacements) ) {
|
|
||||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG,
|
|
||||||
FUNC_NAME );
|
|
||||||
}
|
|
||||||
for (i = 0; i < count; ++i) {
|
|
||||||
if (array_of_blocklengths[i] < 0) {
|
|
||||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG,
|
|
||||||
FUNC_NAME );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return PMPI_Type_create_hindexed(count,
|
|
||||||
array_of_blocklengths,
|
|
||||||
array_of_displacements,
|
|
||||||
oldtype,
|
|
||||||
newtype);
|
|
||||||
}
|
|
||||||
@ -1,69 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2004-2007 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-2008 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) 2015 Research Organization for Information Science
|
|
||||||
* and Technology (RIST). All rights reserved.
|
|
||||||
* $COPYRIGHT$
|
|
||||||
*
|
|
||||||
* Additional copyrights may follow
|
|
||||||
*
|
|
||||||
* $HEADER$
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ompi_config.h"
|
|
||||||
|
|
||||||
#include "ompi/mpi/c/bindings.h"
|
|
||||||
#include "ompi/runtime/params.h"
|
|
||||||
#include "ompi/communicator/communicator.h"
|
|
||||||
#include "ompi/errhandler/errhandler.h"
|
|
||||||
#include "ompi/memchecker.h"
|
|
||||||
|
|
||||||
#if OMPI_BUILD_MPI_PROFILING
|
|
||||||
#if OPAL_HAVE_WEAK_SYMBOLS
|
|
||||||
#pragma weak MPI_Type_hvector = PMPI_Type_hvector
|
|
||||||
#endif
|
|
||||||
#define MPI_Type_hvector PMPI_Type_hvector
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static const char FUNC_NAME[] = "MPI_Type_hvector";
|
|
||||||
|
|
||||||
|
|
||||||
int MPI_Type_hvector(int count,
|
|
||||||
int blocklength,
|
|
||||||
MPI_Aint stride,
|
|
||||||
MPI_Datatype oldtype,
|
|
||||||
MPI_Datatype *newtype)
|
|
||||||
{
|
|
||||||
MEMCHECKER(
|
|
||||||
memchecker_datatype(oldtype);
|
|
||||||
);
|
|
||||||
|
|
||||||
if ( MPI_PARAM_CHECK ) {
|
|
||||||
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
|
|
||||||
if (NULL == oldtype || MPI_DATATYPE_NULL == oldtype ||
|
|
||||||
NULL == newtype) {
|
|
||||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_TYPE,
|
|
||||||
FUNC_NAME );
|
|
||||||
} else if (count < 0) {
|
|
||||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_COUNT,
|
|
||||||
FUNC_NAME );
|
|
||||||
} else if (blocklength < 0) {
|
|
||||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG,
|
|
||||||
FUNC_NAME );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return PMPI_Type_create_hvector(count,
|
|
||||||
blocklength,
|
|
||||||
stride,
|
|
||||||
oldtype,
|
|
||||||
newtype);
|
|
||||||
}
|
|
||||||
@ -1,62 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2004-2007 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-2008 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) 2015 Research Organization for Information Science
|
|
||||||
* and Technology (RIST). All rights reserved.
|
|
||||||
* $COPYRIGHT$
|
|
||||||
*
|
|
||||||
* Additional copyrights may follow
|
|
||||||
*
|
|
||||||
* $HEADER$
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ompi_config.h"
|
|
||||||
|
|
||||||
#include "ompi/mpi/c/bindings.h"
|
|
||||||
#include "ompi/runtime/params.h"
|
|
||||||
#include "ompi/communicator/communicator.h"
|
|
||||||
#include "ompi/errhandler/errhandler.h"
|
|
||||||
#include "ompi/datatype/ompi_datatype.h"
|
|
||||||
#include "ompi/memchecker.h"
|
|
||||||
|
|
||||||
#if OMPI_BUILD_MPI_PROFILING
|
|
||||||
#if OPAL_HAVE_WEAK_SYMBOLS
|
|
||||||
#pragma weak MPI_Type_lb = PMPI_Type_lb
|
|
||||||
#endif
|
|
||||||
#define MPI_Type_lb PMPI_Type_lb
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static const char FUNC_NAME[] = "MPI_Type_lb";
|
|
||||||
|
|
||||||
|
|
||||||
int MPI_Type_lb(MPI_Datatype type, MPI_Aint *lb)
|
|
||||||
{
|
|
||||||
int rc;
|
|
||||||
MPI_Aint extent;
|
|
||||||
|
|
||||||
MEMCHECKER(
|
|
||||||
memchecker_datatype(type);
|
|
||||||
);
|
|
||||||
|
|
||||||
if (MPI_PARAM_CHECK) {
|
|
||||||
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
|
|
||||||
if (NULL == type || MPI_DATATYPE_NULL == type) {
|
|
||||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_TYPE, FUNC_NAME);
|
|
||||||
} else if (NULL == lb) {
|
|
||||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG, FUNC_NAME);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
OPAL_CR_ENTER_LIBRARY();
|
|
||||||
|
|
||||||
rc = ompi_datatype_get_extent( type, lb, &extent );
|
|
||||||
OMPI_ERRHANDLER_RETURN(rc, MPI_COMM_WORLD, rc, FUNC_NAME );
|
|
||||||
}
|
|
||||||
@ -1,44 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2004-2007 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) 2015 Research Organization for Information Science
|
|
||||||
* and Technology (RIST). All rights reserved.
|
|
||||||
* $COPYRIGHT$
|
|
||||||
*
|
|
||||||
* Additional copyrights may follow
|
|
||||||
*
|
|
||||||
* $HEADER$
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ompi_config.h"
|
|
||||||
|
|
||||||
#include "ompi/mpi/c/bindings.h"
|
|
||||||
|
|
||||||
#if OMPI_BUILD_MPI_PROFILING
|
|
||||||
#if OPAL_HAVE_WEAK_SYMBOLS
|
|
||||||
#pragma weak MPI_Type_struct = PMPI_Type_struct
|
|
||||||
#endif
|
|
||||||
#define MPI_Type_struct PMPI_Type_struct
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int MPI_Type_struct(int count,
|
|
||||||
int array_of_blocklengths[],
|
|
||||||
MPI_Aint array_of_displacements[],
|
|
||||||
MPI_Datatype array_of_types[],
|
|
||||||
MPI_Datatype *newtype)
|
|
||||||
{
|
|
||||||
/* the param check will be done if necessary on the MPI_Type_create_struct */
|
|
||||||
return PMPI_Type_create_struct(count,
|
|
||||||
array_of_blocklengths,
|
|
||||||
array_of_displacements,
|
|
||||||
array_of_types,
|
|
||||||
newtype);
|
|
||||||
}
|
|
||||||
@ -1,66 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2004-2007 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-2008 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) 2015 Research Organization for Information Science
|
|
||||||
* and Technology (RIST). All rights reserved.
|
|
||||||
* $COPYRIGHT$
|
|
||||||
*
|
|
||||||
* Additional copyrights may follow
|
|
||||||
*
|
|
||||||
* $HEADER$
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ompi_config.h"
|
|
||||||
|
|
||||||
#include "ompi/mpi/c/bindings.h"
|
|
||||||
#include "ompi/runtime/params.h"
|
|
||||||
#include "ompi/communicator/communicator.h"
|
|
||||||
#include "ompi/errhandler/errhandler.h"
|
|
||||||
#include "ompi/datatype/ompi_datatype.h"
|
|
||||||
#include "ompi/memchecker.h"
|
|
||||||
|
|
||||||
#if OMPI_BUILD_MPI_PROFILING
|
|
||||||
#if OPAL_HAVE_WEAK_SYMBOLS
|
|
||||||
#pragma weak MPI_Type_ub = PMPI_Type_ub
|
|
||||||
#endif
|
|
||||||
#define MPI_Type_ub PMPI_Type_ub
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static const char FUNC_NAME[] = "MPI_Type_ub";
|
|
||||||
|
|
||||||
|
|
||||||
int MPI_Type_ub(MPI_Datatype mtype, MPI_Aint *ub)
|
|
||||||
{
|
|
||||||
MPI_Aint lb;
|
|
||||||
MPI_Aint extent;
|
|
||||||
int status;
|
|
||||||
|
|
||||||
MEMCHECKER(
|
|
||||||
memchecker_datatype(mtype);
|
|
||||||
);
|
|
||||||
|
|
||||||
if (MPI_PARAM_CHECK) {
|
|
||||||
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
|
|
||||||
if (NULL == mtype || MPI_DATATYPE_NULL == mtype) {
|
|
||||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_TYPE, FUNC_NAME);
|
|
||||||
} else if (NULL == ub) {
|
|
||||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG, FUNC_NAME);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
OPAL_CR_ENTER_LIBRARY();
|
|
||||||
|
|
||||||
status = ompi_datatype_get_extent( mtype, &lb, &extent );
|
|
||||||
if (MPI_SUCCESS == status) {
|
|
||||||
*ub = lb + extent;
|
|
||||||
}
|
|
||||||
OMPI_ERRHANDLER_RETURN(status, MPI_COMM_WORLD, status, FUNC_NAME);
|
|
||||||
}
|
|
||||||
@ -163,10 +163,4 @@ const char*** ARGVS_NULL = (const char***) MPI_ARGVS_NULL;
|
|||||||
// empty group
|
// empty group
|
||||||
const Group GROUP_EMPTY(MPI_GROUP_EMPTY);
|
const Group GROUP_EMPTY(MPI_GROUP_EMPTY);
|
||||||
|
|
||||||
#if OMPI_ENABLE_MPI1_COMPAT
|
|
||||||
// special datatypes for contstruction of derived datatypes
|
|
||||||
const Datatype UB(MPI_UB);
|
|
||||||
const Datatype LB(MPI_LB);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
} /* namespace MPI */
|
} /* namespace MPI */
|
||||||
|
|||||||
@ -106,8 +106,6 @@
|
|||||||
#define OMPI_KIND_FORTRAN_COMPLEX32 @OMPI_KIND_FORTRAN_COMPLEX32@
|
#define OMPI_KIND_FORTRAN_COMPLEX32 @OMPI_KIND_FORTRAN_COMPLEX32@
|
||||||
#define OMPI_SIZEOF_FORTRAN_COMPLEX32 @OMPI_SIZEOF_FORTRAN_COMPLEX32@
|
#define OMPI_SIZEOF_FORTRAN_COMPLEX32 @OMPI_SIZEOF_FORTRAN_COMPLEX32@
|
||||||
|
|
||||||
#define OMPI_ENABLE_MPI1_COMPAT @OMPI_ENABLE_MPI1_COMPAT@
|
|
||||||
|
|
||||||
! Include some post-processing, based on the values from above
|
! Include some post-processing, based on the values from above
|
||||||
|
|
||||||
#include "ompi/mpi/fortran/configure-fortran-output-bottom.h"
|
#include "ompi/mpi/fortran/configure-fortran-output-bottom.h"
|
||||||
|
|||||||
@ -483,21 +483,6 @@ lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \
|
|||||||
win_flush_all_f.c \
|
win_flush_all_f.c \
|
||||||
win_flush_local_f.c \
|
win_flush_local_f.c \
|
||||||
win_flush_local_all_f.c
|
win_flush_local_all_f.c
|
||||||
|
|
||||||
|
|
||||||
if OMPI_ENABLE_MPI1_COMPAT
|
|
||||||
lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \
|
|
||||||
address_f.c \
|
|
||||||
errhandler_create_f.c \
|
|
||||||
errhandler_get_f.c \
|
|
||||||
errhandler_set_f.c \
|
|
||||||
type_extent_f.c \
|
|
||||||
type_hindexed_f.c \
|
|
||||||
type_hvector_f.c \
|
|
||||||
type_lb_f.c \
|
|
||||||
type_struct_f.c \
|
|
||||||
type_ub_f.c
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@ -398,20 +398,6 @@ linked_files = \
|
|||||||
pwin_flush_local_f.c \
|
pwin_flush_local_f.c \
|
||||||
pwin_flush_local_all_f.c
|
pwin_flush_local_all_f.c
|
||||||
|
|
||||||
if OMPI_ENABLE_MPI1_COMPAT
|
|
||||||
linked_files += \
|
|
||||||
paddress_f.c \
|
|
||||||
perrhandler_create_f.c \
|
|
||||||
perrhandler_get_f.c \
|
|
||||||
perrhandler_set_f.c \
|
|
||||||
ptype_extent_f.c \
|
|
||||||
ptype_hindexed_f.c \
|
|
||||||
ptype_hvector_f.c \
|
|
||||||
ptype_lb_f.c \
|
|
||||||
ptype_struct_f.c \
|
|
||||||
ptype_ub_f.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Sym link in the sources from the real MPI directory
|
# Sym link in the sources from the real MPI directory
|
||||||
#
|
#
|
||||||
|
|||||||
@ -28,13 +28,11 @@ lib_LTLIBRARIES = lib@OMPI_LIBMPI_NAME@_usempi_ignore_tkr.la
|
|||||||
|
|
||||||
mpi-ignore-tkr-interfaces.h: mpi-ignore-tkr-interfaces.h.in
|
mpi-ignore-tkr-interfaces.h: mpi-ignore-tkr-interfaces.h.in
|
||||||
mpi-ignore-tkr-file-interfaces.h: mpi-ignore-tkr-file-interfaces.h.in
|
mpi-ignore-tkr-file-interfaces.h: mpi-ignore-tkr-file-interfaces.h.in
|
||||||
mpi-ignore-tkr-removed-interfaces.h: mpi-ignore-tkr-removed-interfaces.h.in
|
|
||||||
|
|
||||||
mpi-ignore-tkr.lo: $(top_srcdir)/ompi/mpi/fortran/base/attr-fn-int-callback-interfaces.h
|
mpi-ignore-tkr.lo: $(top_srcdir)/ompi/mpi/fortran/base/attr-fn-int-callback-interfaces.h
|
||||||
mpi-ignore-tkr.lo: $(top_srcdir)/ompi/mpi/fortran/base/conversion-fn-null-int-interface.h
|
mpi-ignore-tkr.lo: $(top_srcdir)/ompi/mpi/fortran/base/conversion-fn-null-int-interface.h
|
||||||
mpi-ignore-tkr.lo: mpi-ignore-tkr-interfaces.h
|
mpi-ignore-tkr.lo: mpi-ignore-tkr-interfaces.h
|
||||||
mpi-ignore-tkr.lo: mpi-ignore-tkr-file-interfaces.h
|
mpi-ignore-tkr.lo: mpi-ignore-tkr-file-interfaces.h
|
||||||
mpi-ignore-tkr.lo: mpi-ignore-tkr-removed-interfaces.h
|
|
||||||
mpi-ignore-tkr.lo: mpi-ignore-tkr-sizeof.h
|
mpi-ignore-tkr.lo: mpi-ignore-tkr-sizeof.h
|
||||||
mpi-ignore-tkr.lo: mpi-ignore-tkr-sizeof.f90
|
mpi-ignore-tkr.lo: mpi-ignore-tkr-sizeof.f90
|
||||||
mpi-ignore-tkr.lo: mpi-ignore-tkr.F90
|
mpi-ignore-tkr.lo: mpi-ignore-tkr.F90
|
||||||
@ -43,8 +41,7 @@ lib@OMPI_LIBMPI_NAME@_usempi_ignore_tkr_la_SOURCES = \
|
|||||||
mpi-ignore-tkr.F90
|
mpi-ignore-tkr.F90
|
||||||
nodist_lib@OMPI_LIBMPI_NAME@_usempi_ignore_tkr_la_SOURCES = \
|
nodist_lib@OMPI_LIBMPI_NAME@_usempi_ignore_tkr_la_SOURCES = \
|
||||||
mpi-ignore-tkr-interfaces.h \
|
mpi-ignore-tkr-interfaces.h \
|
||||||
mpi-ignore-tkr-file-interfaces.h \
|
mpi-ignore-tkr-file-interfaces.h
|
||||||
mpi-ignore-tkr-removed-interfaces.h
|
|
||||||
|
|
||||||
if BUILD_FORTRAN_SIZEOF
|
if BUILD_FORTRAN_SIZEOF
|
||||||
# These files are generated; do not distribute them
|
# These files are generated; do not distribute them
|
||||||
|
|||||||
@ -43,14 +43,6 @@ module mpi
|
|||||||
|
|
||||||
include "ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h"
|
include "ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h"
|
||||||
include "ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-file-interfaces.h"
|
include "ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-file-interfaces.h"
|
||||||
#if !defined(OMPI_ENABLE_MPI1_COMPAT)
|
|
||||||
|
|
||||||
#error "Remove MPI-1 compat code"
|
|
||||||
|
|
||||||
#elif OMPI_ENABLE_MPI1_COMPAT
|
|
||||||
include "ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-removed-interfaces.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
include 'mpi-ignore-tkr-sizeof.h'
|
include 'mpi-ignore-tkr-sizeof.h'
|
||||||
|
|
||||||
end module mpi
|
end module mpi
|
||||||
|
|||||||
@ -60,12 +60,10 @@ lib_LTLIBRARIES += lib@OMPI_LIBMPI_NAME@_usempi.la
|
|||||||
mpi.lo: mpi.F90
|
mpi.lo: mpi.F90
|
||||||
mpi.lo: mpi-f90-interfaces.h
|
mpi.lo: mpi-f90-interfaces.h
|
||||||
mpi.lo: mpi-f90-file-interfaces.h
|
mpi.lo: mpi-f90-file-interfaces.h
|
||||||
mpi.lo: mpi-f90-removed-interfaces.h
|
|
||||||
mpi.lo: $(top_builddir)/ompi/mpi/fortran/configure-fortran-output.h
|
mpi.lo: $(top_builddir)/ompi/mpi/fortran/configure-fortran-output.h
|
||||||
mpi.lo: mpi-f90-cptr-interfaces.h
|
mpi.lo: mpi-f90-cptr-interfaces.h
|
||||||
mpi.lo: pmpi-f90-interfaces.h
|
mpi.lo: pmpi-f90-interfaces.h
|
||||||
mpi.lo: pmpi-f90-file-interfaces.h
|
mpi.lo: pmpi-f90-file-interfaces.h
|
||||||
mpi.lo: pmpi-f90-removed-interfaces.h
|
|
||||||
mpi.lo: pmpi-f90-cptr-interfaces.h
|
mpi.lo: pmpi-f90-cptr-interfaces.h
|
||||||
|
|
||||||
# Per MPI-3 p610:34-41, if we're building a TKR mpi module, we should
|
# Per MPI-3 p610:34-41, if we're building a TKR mpi module, we should
|
||||||
@ -175,10 +173,8 @@ endif
|
|||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
mpi-f90-interfaces.h \
|
mpi-f90-interfaces.h \
|
||||||
mpi-f90-file-interfaces.h \
|
mpi-f90-file-interfaces.h \
|
||||||
mpi-f90-removed-interfaces.h \
|
|
||||||
mpi-f90-cptr-interfaces.h \
|
mpi-f90-cptr-interfaces.h \
|
||||||
pmpi-f90-interfaces.h \
|
pmpi-f90-interfaces.h \
|
||||||
pmpi-f90-file-interfaces.h \
|
pmpi-f90-file-interfaces.h \
|
||||||
pmpi-f90-removed-interfaces.h \
|
|
||||||
pmpi-f90-cptr-interfaces.h
|
pmpi-f90-cptr-interfaces.h
|
||||||
|
|
||||||
|
|||||||
@ -60,13 +60,4 @@ module mpi
|
|||||||
include "mpi-tkr-sizeof.h"
|
include "mpi-tkr-sizeof.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(OMPI_ENABLE_MPI1_COMPAT)
|
|
||||||
|
|
||||||
#error "Remove MPI-1 compat code"
|
|
||||||
|
|
||||||
#elif OMPI_ENABLE_MPI1_COMPAT
|
|
||||||
include "mpi-f90-removed-interfaces.h"
|
|
||||||
include "pmpi-f90-removed-interfaces.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
end module mpi
|
end module mpi
|
||||||
|
|||||||
Загрузка…
x
Ссылка в новой задаче
Block a user