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

configury: remove the --disable-mpi-io option

Просмотр исходного кода 
Fixes open-mpi/ompi#2185

Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
Этот коммит содержится в:
Gilles Gouaillardet 2017-09-20 13:02:39 +09:00
родитель ab68aced23
Коммит b9315edb85
36 изменённых файлов: 413 добавлений и 629 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
config/ompi_configure_options.m4
Просмотреть файл

@ -231,14 +231,6 @@ AC_DEFINE_UNQUOTED(MPI_PARAM_CHECK, $mpi_param_check,
AC_DEFINE_UNQUOTED(OMPI_PARAM_CHECK, $ompi_param_check, AC_DEFINE_UNQUOTED(OMPI_PARAM_CHECK, $ompi_param_check,
[Whether we want to check MPI parameters never or possible (an integer constant)]) [Whether we want to check MPI parameters never or possible (an integer constant)])
AC_ARG_ENABLE([mpi-io],
[AC_HELP_STRING([--disable-mpi-io],
[Disable built-in support for MPI-2 I/O, likely because
an externally-provided MPI I/O package will be used.
Default is to use the internal framework system that uses
the ompio component and a specially modified version of ROMIO
that fits inside the romio314 component])])
AC_ARG_ENABLE([io-ompio], AC_ARG_ENABLE([io-ompio],
[AC_HELP_STRING([--disable-io-ompio], [AC_HELP_STRING([--disable-io-ompio],
[Disable the ompio MPI-IO component])]) [Disable the ompio MPI-IO component])])

28
ompi/include/mpi.h.in
Просмотреть файл

@ -195,9 +195,6 @@
/* Whether C compiler supports -fvisibility */ /* Whether C compiler supports -fvisibility */
#undef OPAL_C_HAVE_VISIBILITY #undef OPAL_C_HAVE_VISIBILITY
/* Whether OMPI should provide MPI File interface */
#undef OMPI_PROVIDE_MPI_FILE_INTERFACE
#ifndef OMPI_DECLSPEC #ifndef OMPI_DECLSPEC
# if defined(WIN32) || defined(_WIN32) # if defined(WIN32) || defined(_WIN32)
# if defined(OMPI_IMPORTS) # if defined(OMPI_IMPORTS)
@ -293,7 +290,7 @@
* 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
*/ */
#if !OMPI_BUILDING && OMPI_PROVIDE_MPI_FILE_INTERFACE #if !OMPI_BUILDING
#define MPIO_Request MPI_Request #define MPIO_Request MPI_Request
#define MPIO_Test MPI_Test #define MPIO_Test MPI_Test
#define MPIO_Wait MPI_Wait #define MPIO_Wait MPI_Wait
@ -329,9 +326,7 @@ typedef OMPI_MPI_COUNT_TYPE MPI_Count;
typedef struct ompi_communicator_t *MPI_Comm; typedef struct ompi_communicator_t *MPI_Comm;
typedef struct ompi_datatype_t *MPI_Datatype; typedef struct ompi_datatype_t *MPI_Datatype;
typedef struct ompi_errhandler_t *MPI_Errhandler; typedef struct ompi_errhandler_t *MPI_Errhandler;
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
typedef struct ompi_file_t *MPI_File; typedef struct ompi_file_t *MPI_File;
#endif
typedef struct ompi_group_t *MPI_Group; typedef struct ompi_group_t *MPI_Group;
typedef struct ompi_info_t *MPI_Info; typedef struct ompi_info_t *MPI_Info;
typedef struct ompi_op_t *MPI_Op; typedef struct ompi_op_t *MPI_Op;
@ -380,7 +375,6 @@ typedef void (MPI_Comm_errhandler_function)(MPI_Comm *, int *, ...);
typedef MPI_Comm_errhandler_function MPI_Comm_errhandler_fn typedef MPI_Comm_errhandler_function MPI_Comm_errhandler_fn
__mpi_interface_deprecated__("MPI_Comm_errhandler_fn was deprecated in MPI-2.2; use MPI_Comm_errhandler_function instead"); __mpi_interface_deprecated__("MPI_Comm_errhandler_fn was deprecated in MPI-2.2; use MPI_Comm_errhandler_function instead");
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
/* This is a little hackish, but errhandler.h needs space for a /* This is a little hackish, but errhandler.h needs space for a
MPI_File_errhandler_fn. While it could just be removed, this MPI_File_errhandler_fn. While it could just be removed, this
allows us to maintain a stable ABI within OMPI, at least for allows us to maintain a stable ABI within OMPI, at least for
@ -389,10 +383,6 @@ typedef void (ompi_file_errhandler_fn)(MPI_File *, int *, ...);
typedef ompi_file_errhandler_fn MPI_File_errhandler_fn typedef ompi_file_errhandler_fn MPI_File_errhandler_fn
__mpi_interface_deprecated__("MPI_File_errhandler_fn was deprecated in MPI-2.2; use MPI_File_errhandler_function instead"); __mpi_interface_deprecated__("MPI_File_errhandler_fn was deprecated in MPI-2.2; use MPI_File_errhandler_function instead");
typedef ompi_file_errhandler_fn MPI_File_errhandler_function; typedef ompi_file_errhandler_fn MPI_File_errhandler_function;
#else
struct ompi_file_t;
typedef void (ompi_file_errhandler_fn)(struct ompi_file_t**, int *, ...);
#endif
typedef void (MPI_Win_errhandler_function)(MPI_Win *, int *, ...); typedef void (MPI_Win_errhandler_function)(MPI_Win *, int *, ...);
typedef MPI_Win_errhandler_function MPI_Win_errhandler_fn typedef MPI_Win_errhandler_function MPI_Win_errhandler_fn
__mpi_interface_deprecated__("MPI_Win_errhandler_fn was deprecated in MPI-2.2; use MPI_Win_errhandler_function instead"); __mpi_interface_deprecated__("MPI_Win_errhandler_fn was deprecated in MPI-2.2; use MPI_Win_errhandler_function instead");
@ -453,7 +443,6 @@ typedef int (MPI_Grequest_cancel_function)(void *, int);
#define MPI_DISTRIBUTE_NONE 2 /* not distributed */ #define MPI_DISTRIBUTE_NONE 2 /* not distributed */
#define MPI_DISTRIBUTE_DFLT_DARG (-1) /* default distribution arg */ #define MPI_DISTRIBUTE_DFLT_DARG (-1) /* default distribution arg */
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
/* /*
* Since these values are arbitrary to Open MPI, we might as well make * Since these values are arbitrary to Open MPI, we might as well make
* them the same as ROMIO for ease of mapping. These values taken * them the same as ROMIO for ease of mapping. These values taken
@ -478,8 +467,6 @@ typedef int (MPI_Grequest_cancel_function)(void *, int);
/* Max data representation length */ /* Max data representation length */
#define MPI_MAX_DATAREP_STRING OPAL_MAX_DATAREP_STRING #define MPI_MAX_DATAREP_STRING OPAL_MAX_DATAREP_STRING
#endif /* #if OMPI_PROVIDE_MPI_FILE_INTERFACE */
/* /*
* MPI-2 One-Sided Communications asserts * MPI-2 One-Sided Communications asserts
*/ */
@ -758,9 +745,7 @@ enum {
#define MPI_ERRHANDLER_NULL OMPI_PREDEFINED_GLOBAL(MPI_Errhandler, ompi_mpi_errhandler_null) #define MPI_ERRHANDLER_NULL OMPI_PREDEFINED_GLOBAL(MPI_Errhandler, ompi_mpi_errhandler_null)
#define MPI_INFO_NULL OMPI_PREDEFINED_GLOBAL(MPI_Info, ompi_mpi_info_null) #define MPI_INFO_NULL OMPI_PREDEFINED_GLOBAL(MPI_Info, ompi_mpi_info_null)
#define MPI_WIN_NULL OMPI_PREDEFINED_GLOBAL(MPI_Win, ompi_mpi_win_null) #define MPI_WIN_NULL OMPI_PREDEFINED_GLOBAL(MPI_Win, ompi_mpi_win_null)
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
#define MPI_FILE_NULL OMPI_PREDEFINED_GLOBAL(MPI_File, ompi_mpi_file_null) #define MPI_FILE_NULL OMPI_PREDEFINED_GLOBAL(MPI_File, ompi_mpi_file_null)
#endif
#define MPI_T_ENUM_NULL ((MPI_T_enum) NULL) #define MPI_T_ENUM_NULL ((MPI_T_enum) NULL)
/* /*
@ -1359,7 +1344,6 @@ OMPI_DECLSPEC int MPI_Fetch_and_op(const void *origin_addr, void *result_addr,
int target_rank, MPI_Aint target_disp, MPI_Op op, MPI_Win win); int target_rank, MPI_Aint target_disp, MPI_Op op, MPI_Win win);
OMPI_DECLSPEC int MPI_Iexscan(const void *sendbuf, void *recvbuf, int count, OMPI_DECLSPEC int MPI_Iexscan(const void *sendbuf, void *recvbuf, int count,
MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request); MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request);
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
OMPI_DECLSPEC MPI_Fint MPI_File_c2f(MPI_File file); OMPI_DECLSPEC MPI_Fint MPI_File_c2f(MPI_File file);
OMPI_DECLSPEC MPI_File MPI_File_f2c(MPI_Fint file); OMPI_DECLSPEC MPI_File MPI_File_f2c(MPI_Fint file);
OMPI_DECLSPEC int MPI_File_call_errhandler(MPI_File fh, int errorcode); OMPI_DECLSPEC int MPI_File_call_errhandler(MPI_File fh, int errorcode);
@ -1456,7 +1440,6 @@ OMPI_DECLSPEC int MPI_File_get_type_extent(MPI_File fh, MPI_Datatype datatype,
OMPI_DECLSPEC int MPI_File_set_atomicity(MPI_File fh, int flag); OMPI_DECLSPEC int MPI_File_set_atomicity(MPI_File fh, int flag);
OMPI_DECLSPEC int MPI_File_get_atomicity(MPI_File fh, int *flag); OMPI_DECLSPEC int MPI_File_get_atomicity(MPI_File fh, int *flag);
OMPI_DECLSPEC int MPI_File_sync(MPI_File fh); OMPI_DECLSPEC int MPI_File_sync(MPI_File fh);
#endif /* #if OMPI_PROVIDE_MPI_FILE_INTERFACE */
OMPI_DECLSPEC int MPI_Finalize(void); OMPI_DECLSPEC int MPI_Finalize(void);
OMPI_DECLSPEC int MPI_Finalized(int *flag); OMPI_DECLSPEC int MPI_Finalized(int *flag);
OMPI_DECLSPEC int MPI_Free_mem(void *base); OMPI_DECLSPEC int MPI_Free_mem(void *base);
@ -2059,7 +2042,6 @@ OMPI_DECLSPEC int PMPI_Fetch_and_op(const void *origin_addr, void *result_addr,
int target_rank, MPI_Aint target_disp, MPI_Op op, MPI_Win win); int target_rank, MPI_Aint target_disp, MPI_Op op, MPI_Win win);
OMPI_DECLSPEC int PMPI_Iexscan(const void *sendbuf, void *recvbuf, int count, OMPI_DECLSPEC int PMPI_Iexscan(const void *sendbuf, void *recvbuf, int count,
MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request); MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request);
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
OMPI_DECLSPEC MPI_Fint PMPI_File_c2f(MPI_File file); OMPI_DECLSPEC MPI_Fint PMPI_File_c2f(MPI_File file);
OMPI_DECLSPEC MPI_File PMPI_File_f2c(MPI_Fint file); OMPI_DECLSPEC MPI_File PMPI_File_f2c(MPI_Fint file);
OMPI_DECLSPEC int PMPI_File_call_errhandler(MPI_File fh, int errorcode); OMPI_DECLSPEC int PMPI_File_call_errhandler(MPI_File fh, int errorcode);
@ -2156,7 +2138,6 @@ OMPI_DECLSPEC int PMPI_File_get_type_extent(MPI_File fh, MPI_Datatype datatype,
OMPI_DECLSPEC int PMPI_File_set_atomicity(MPI_File fh, int flag); OMPI_DECLSPEC int PMPI_File_set_atomicity(MPI_File fh, int flag);
OMPI_DECLSPEC int PMPI_File_get_atomicity(MPI_File fh, int *flag); OMPI_DECLSPEC int PMPI_File_get_atomicity(MPI_File fh, int *flag);
OMPI_DECLSPEC int PMPI_File_sync(MPI_File fh); OMPI_DECLSPEC int PMPI_File_sync(MPI_File fh);
#endif /* #if OMPI_PROVIDE_MPI_FILE_INTERFACE */
OMPI_DECLSPEC int PMPI_Finalize(void); OMPI_DECLSPEC int PMPI_Finalize(void);
OMPI_DECLSPEC int PMPI_Finalized(int *flag); OMPI_DECLSPEC int PMPI_Finalized(int *flag);
OMPI_DECLSPEC int PMPI_Free_mem(void *base); OMPI_DECLSPEC int PMPI_Free_mem(void *base);
@ -2703,11 +2684,4 @@ OMPI_DECLSPEC int MPI_T_enum_get_item(MPI_T_enum enumtype, int index, int *valu
#endif #endif
#endif #endif
#if !OMPI_PROVIDE_MPI_FILE_INTERFACE && !OMPI_BUILDING
/* ROMIO requires MPI implementations to set this to 1 if they provide
MPI_OFFSET. We need to provide it because its used throughout the
DDT engine */
#define HAVE_MPI_OFFSET 1
#endif
#endif /* OMPI_MPI_H */ #endif /* OMPI_MPI_H */

8
ompi/include/mpif-values.pl
Просмотреть файл

@ -1,7 +1,7 @@
#!/usr/bin/env perl #!/usr/bin/env perl
# #
# Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2016 Research Organization for Information Science # Copyright (c) 2016-2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved. # and Technology (RIST). All rights reserved.
# Copyright (c) 2016 FUJITSU LIMITED. All rights reserved. # Copyright (c) 2016 FUJITSU LIMITED. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
@ -511,7 +511,6 @@ foreach my $key (sort(keys(%{$handles}))) {
$output .= "#define OMPI_$key $handles->{$key}\n"; $output .= "#define OMPI_$key $handles->{$key}\n";
} }
$output .= "\n#if OMPI_PROVIDE_MPI_FILE_INTERFACE\n";
foreach my $key (sort(keys(%{$io_constants}))) { foreach my $key (sort(keys(%{$io_constants}))) {
$output .= "#define OMPI_$key $io_constants->{$key}\n"; $output .= "#define OMPI_$key $io_constants->{$key}\n";
} }
@ -522,9 +521,8 @@ $output .= "\n";
foreach my $key (sort(keys(%{$io_handles}))) { foreach my $key (sort(keys(%{$io_handles}))) {
$output .= "#define OMPI_$key $io_handles->{$key}\n"; $output .= "#define OMPI_$key $io_handles->{$key}\n";
} }
$output .= "#endif /* OMPI_PROVIDE_MPI_FILE_INTERFACE */ $output .= "\n";
$output .= "#endif /* USE_MPI_F08_CONSTANTS_H */\n";
#endif /* USE_MPI_F08_CONSTANTS_H */\n";
write_file("$topdir/ompi/mpi/fortran/use-mpi-f08/constants.h", $output); write_file("$topdir/ompi/mpi/fortran/use-mpi-f08/constants.h", $output);

6
ompi/include/mpif.h.in
Просмотреть файл

@ -11,6 +11,8 @@
! Copyright (c) 2004-2005 The Regents of the University of California. ! Copyright (c) 2004-2005 The Regents of the University of California.
! All rights reserved. ! All rights reserved.
! Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved. ! Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved.
! Copyright (c) 2017 Research Organization for Information Science
! and Technology (RIST). All rights reserved.
! $COPYRIGHT$ ! $COPYRIGHT$
! !
! Additional copyrights may follow ! Additional copyrights may follow
@ -54,8 +56,8 @@
include 'mpif-config.h' include 'mpif-config.h'
include 'mpif-constants.h' include 'mpif-constants.h'
include 'mpif-handles.h' include 'mpif-handles.h'
@OMPI_MPIF_IO_CONSTANTS_INCLUDE@ include 'mpif-io-constants.h'
@OMPI_MPIF_IO_HANDLES_INCLUDE@ include 'mpif-io-handles.h'
include 'mpif-externals.h' include 'mpif-externals.h'
include 'mpif-sentinels.h' include 'mpif-sentinels.h'
include 'mpif-sizeof.h' include 'mpif-sizeof.h'

15
ompi/mca/common/ompio/Makefile.am
Просмотреть файл

@ -11,6 +11,8 @@
# All rights reserved. # All rights reserved.
# Copyright (c) 2008-2016 University of Houston. All rights reserved. # Copyright (c) 2008-2016 University of Houston. All rights reserved.
# Copyright (c) 2016 IBM Corporation. All rights reserved. # Copyright (c) 2016 IBM Corporation. All rights reserved.
# Copyright (c) 2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# #
# $COPYRIGHT$ # $COPYRIGHT$
# #
@ -19,8 +21,6 @@
# $HEADER$ # $HEADER$
# #
if OMPI_PROVIDE_MPI_FILE_INTERFACE
headers = \ headers = \
common_ompio_print_queue.h \ common_ompio_print_queue.h \
common_ompio.h common_ompio.h
@ -88,14 +88,3 @@ clean-local:
if test -z "$(lib_LTLIBRARIES)"; then \ if test -z "$(lib_LTLIBRARIES)"; then \
rm -f "$(comp_inst)"; \ rm -f "$(comp_inst)"; \
fi fi
else
# Need to have empty targets because AM can't handle having an
# AM_CONDITIONAL was targets in the "if" statement but not in the
# "else". :-(
all-local:
clean-local:
endif

5
ompi/mca/common/ompio/configure.m4
Просмотреть файл

@ -1,6 +1,6 @@
# -*- shell-script -*- # -*- shell-script -*-
# #
# Copyright (c) 2016 Research Organization for Information Science # Copyright (c) 2016-2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved. # and Technology (RIST). All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
@ -15,8 +15,7 @@
AC_DEFUN([MCA_ompi_common_ompio_CONFIG],[ AC_DEFUN([MCA_ompi_common_ompio_CONFIG],[
AC_CONFIG_FILES([ompi/mca/common/ompio/Makefile]) AC_CONFIG_FILES([ompi/mca/common/ompio/Makefile])
AS_IF([test "$enable_mpi_io" != "no" && AS_IF([test "$enable_io_ompio" != "no"],
test "$enable_io_ompio" != "no"],
[$1], [$1],
[$2]) [$2])
])dnl ])dnl

5
ompi/mca/fbtl/configure.m4
Просмотреть файл

@ -1,7 +1,7 @@
# -*- shell-script -*- # -*- shell-script -*-
# #
# Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2016 Research Organization for Information Science # Copyright (c) 2016-2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved. # and Technology (RIST). All rights reserved.
# #
# $COPYRIGHT$ # $COPYRIGHT$
@ -17,8 +17,7 @@ AC_DEFUN([MCA_ompi_fbtl_CONFIG],
[ [
OPAL_VAR_SCOPE_PUSH([want_io_ompio]) OPAL_VAR_SCOPE_PUSH([want_io_ompio])
AS_IF([test "$enable_mpi_io" != "no" && AS_IF([test "$enable_io_ompio" != "no"],
test "$enable_io_ompio" != "no"],
[want_io_ompio=1], [want_io_ompio=1],
[want_io_ompio=0]) [want_io_ompio=0])

5
ompi/mca/fcoll/configure.m4
Просмотреть файл

@ -1,7 +1,7 @@
# -*- shell-script -*- # -*- shell-script -*-
# #
# Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2016 Research Organization for Information Science # Copyright (c) 2016-2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved. # and Technology (RIST). All rights reserved.
# #
# $COPYRIGHT$ # $COPYRIGHT$
@ -17,8 +17,7 @@ AC_DEFUN([MCA_ompi_fcoll_CONFIG],
[ [
OPAL_VAR_SCOPE_PUSH([want_io_ompio]) OPAL_VAR_SCOPE_PUSH([want_io_ompio])
AS_IF([test "$enable_mpi_io" != "no" && AS_IF([test "$enable_io_ompio" != "no"],
test "$enable_io_ompio" != "no"],
[want_io_ompio=1], [want_io_ompio=1],
[want_io_ompio=0]) [want_io_ompio=0])

5
ompi/mca/fs/configure.m4
Просмотреть файл

@ -1,7 +1,7 @@
# -*- shell-script -*- # -*- shell-script -*-
# #
# Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2016 Research Organization for Information Science # Copyright (c) 2016-2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved. # and Technology (RIST). All rights reserved.
# #
# $COPYRIGHT$ # $COPYRIGHT$
@ -17,8 +17,7 @@ AC_DEFUN([MCA_ompi_fs_CONFIG],
[ [
OPAL_VAR_SCOPE_PUSH([want_io_ompio]) OPAL_VAR_SCOPE_PUSH([want_io_ompio])
AS_IF([test "$enable_mpi_io" != "no" && AS_IF([test "$enable_io_ompio" != "no"],
test "$enable_io_ompio" != "no"],
[want_io_ompio=1], [want_io_ompio=1],
[want_io_ompio=0]) [want_io_ompio=0])

40
ompi/mca/io/configure.m4
Просмотреть файл

@ -1,40 +0,0 @@
# -*- shell-script -*-
#
# Copyright (c) 2006-2007 Los Alamos National Security, LLC.
# All rights reserved.
# Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2016 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
# MCA_ompi_io_CONFIG(project_name, framework_name)
# -------------------------------------------
AC_DEFUN([MCA_ompi_io_CONFIG],
[
OPAL_VAR_SCOPE_PUSH([define_mpi_io])
AS_IF([test "$enable_mpi_io" != "no"],
[OMPI_MPIF_IO_CONSTANTS_INCLUDE="include \"mpif-io-constants.h\""
OMPI_MPIF_IO_HANDLES_INCLUDE="include \"mpif-io-handles.h\""
define_mpi_io=1],
[OMPI_MPIF_IO_CONSTANTS_INCLUDE=
OMPI_MPIF_IO_HANDLES_INCLUDE=
define_mpi_io=0])
AC_SUBST(OMPI_MPIF_IO_CONSTANTS_INCLUDE)
AC_SUBST(OMPI_MPIF_IO_HANDLES_INCLUDE)
MCA_CONFIGURE_FRAMEWORK([$1], [$2], [$define_mpi_io])
OMPI_PROVIDE_MPI_FILE_INTERFACE=$define_mpi_io
AC_SUBST(OMPI_PROVIDE_MPI_FILE_INTERFACE)
AC_DEFINE_UNQUOTED([OMPI_PROVIDE_MPI_FILE_INTERFACE], [$define_mpi_io],
[Whether OMPI should provide MPI File interface])
AM_CONDITIONAL([OMPI_PROVIDE_MPI_FILE_INTERFACE], [test "$enable_mpi_io" != "no"])
OPAL_VAR_SCOPE_POP
])

5
ompi/mca/sharedfp/configure.m4
Просмотреть файл

@ -1,7 +1,7 @@
# -*- shell-script -*- # -*- shell-script -*-
# #
# Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2016 Research Organization for Information Science # Copyright (c) 2016-2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved. # and Technology (RIST). All rights reserved.
# #
# $COPYRIGHT$ # $COPYRIGHT$
@ -17,8 +17,7 @@ AC_DEFUN([MCA_ompi_sharedfp_CONFIG],
[ [
OPAL_VAR_SCOPE_PUSH([want_io_ompio]) OPAL_VAR_SCOPE_PUSH([want_io_ompio])
AS_IF([test "$enable_mpi_io" != "no" && AS_IF([test "$enable_io_ompio" != "no"],
test "$enable_io_ompio" != "no"],
[want_io_ompio=1], [want_io_ompio=1],
[want_io_ompio=0]) [want_io_ompio=0])

130
ompi/mpi/c/Makefile.am
Просмотреть файл

@ -15,7 +15,7 @@
# Copyright (c) 2012-2013 Inria. All rights reserved. # Copyright (c) 2012-2013 Inria. All rights reserved.
# Copyright (c) 2013 Los Alamos National Security, LLC. All rights # Copyright (c) 2013 Los Alamos National Security, LLC. All rights
# reserved. # reserved.
# Copyright (c) 2015 Research Organization for Information Science # Copyright (c) 2015-2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved. # and Technology (RIST). All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
@ -154,6 +154,67 @@ libmpi_c_mpi_la_SOURCES = \
exscan.c \ exscan.c \
fetch_and_op.c \ fetch_and_op.c \
iexscan.c \ iexscan.c \
file_c2f.c \
file_call_errhandler.c \
file_close.c \
file_create_errhandler.c \
file_delete.c \
file_f2c.c \
file_get_amode.c \
file_get_atomicity.c \
file_get_byte_offset.c \
file_get_errhandler.c \
file_get_group.c \
file_get_info.c \
file_get_position.c \
file_get_position_shared.c \
file_get_size.c \
file_get_type_extent.c \
file_get_view.c \
file_iread_at.c \
file_iread_at_all.c \
file_iread.c \
file_iread_all.c \
file_iread_shared.c \
file_iwrite_at.c \
file_iwrite_at_all.c \
file_iwrite.c \
file_iwrite_all.c \
file_iwrite_shared.c \
file_open.c \
file_preallocate.c \
file_read_all_begin.c \
file_read_all.c \
file_read_all_end.c \
file_read_at_all_begin.c \
file_read_at_all.c \
file_read_at_all_end.c \
file_read_at.c \
file_read.c \
file_read_ordered_begin.c \
file_read_ordered.c \
file_read_ordered_end.c \
file_read_shared.c \
file_seek.c \
file_seek_shared.c \
file_set_atomicity.c \
file_set_errhandler.c \
file_set_info.c \
file_set_size.c \
file_set_view.c \
file_sync.c \
file_write_all_begin.c \
file_write_all.c \
file_write_all_end.c \
file_write_at_all_begin.c \
file_write_at_all.c \
file_write_at_all_end.c \
file_write_at.c \
file_write.c \
file_write_ordered_begin.c \
file_write_ordered.c \
file_write_ordered_end.c \
file_write_shared.c \
finalize.c \ finalize.c \
finalized.c \ finalized.c \
free_mem.c \ free_mem.c \
@ -251,6 +312,7 @@ libmpi_c_mpi_la_SOURCES = \
recv_init.c \ recv_init.c \
recv.c \ recv.c \
reduce.c \ reduce.c \
register_datarep.c \
ireduce.c \ ireduce.c \
reduce_local.c \ reduce_local.c \
reduce_scatter.c \ reduce_scatter.c \
@ -384,72 +446,6 @@ libmpi_c_mpi_la_SOURCES = \
win_unlock_all.c \ win_unlock_all.c \
win_wait.c win_wait.c
if OMPI_PROVIDE_MPI_FILE_INTERFACE
libmpi_c_mpi_la_SOURCES += \
file_c2f.c \
file_call_errhandler.c \
file_close.c \
file_create_errhandler.c \
file_delete.c \
file_f2c.c \
file_get_amode.c \
file_get_atomicity.c \
file_get_byte_offset.c \
file_get_errhandler.c \
file_get_group.c \
file_get_info.c \
file_get_position.c \
file_get_position_shared.c \
file_get_size.c \
file_get_type_extent.c \
file_get_view.c \
file_iread_at.c \
file_iread_at_all.c \
file_iread.c \
file_iread_all.c \
file_iread_shared.c \
file_iwrite_at.c \
file_iwrite_at_all.c \
file_iwrite.c \
file_iwrite_all.c \
file_iwrite_shared.c \
file_open.c \
file_preallocate.c \
file_read_all_begin.c \
file_read_all.c \
file_read_all_end.c \
file_read_at_all_begin.c \
file_read_at_all.c \
file_read_at_all_end.c \
file_read_at.c \
file_read.c \
file_read_ordered_begin.c \
file_read_ordered.c \
file_read_ordered_end.c \
file_read_shared.c \
file_seek.c \
file_seek_shared.c \
file_set_atomicity.c \
file_set_errhandler.c \
file_set_info.c \
file_set_size.c \
file_set_view.c \
file_sync.c \
file_write_all_begin.c \
file_write_all.c \
file_write_all_end.c \
file_write_at_all_begin.c \
file_write_at_all.c \
file_write_at_all_end.c \
file_write_at.c \
file_write.c \
file_write_ordered_begin.c \
file_write_ordered.c \
file_write_ordered_end.c \
file_write_shared.c \
register_datarep.c
endif
# Conditionally install the header files # Conditionally install the header files
if WANT_INSTALL_HEADERS if WANT_INSTALL_HEADERS

130
ompi/mpi/c/profile/Makefile.am
Просмотреть файл

@ -16,7 +16,7 @@
# Copyright (c) 2012-2013 Inria. All rights reserved. # Copyright (c) 2012-2013 Inria. All rights reserved.
# Copyright (c) 2013 Los Alamos National Security, LLC. All rights # Copyright (c) 2013 Los Alamos National Security, LLC. All rights
# reserved. # reserved.
# Copyright (c) 2015 Research Organization for Information Science # Copyright (c) 2015-2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved. # and Technology (RIST). All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
@ -134,6 +134,67 @@ nodist_libmpi_c_pmpi_la_SOURCES = \
pexscan.c \ pexscan.c \
pfetch_and_op.c \ pfetch_and_op.c \
piexscan.c \ piexscan.c \
pfile_c2f.c \
pfile_call_errhandler.c \
pfile_close.c \
pfile_create_errhandler.c \
pfile_delete.c \
pfile_f2c.c \
pfile_get_amode.c \
pfile_get_atomicity.c \
pfile_get_byte_offset.c \
pfile_get_errhandler.c \
pfile_get_group.c \
pfile_get_info.c \
pfile_get_position.c \
pfile_get_position_shared.c \
pfile_get_size.c \
pfile_get_type_extent.c \
pfile_get_view.c \
pfile_iread_at.c \
pfile_iread.c \
pfile_iread_at_all.c \
pfile_iread_all.c \
pfile_iread_shared.c \
pfile_iwrite_at.c \
pfile_iwrite.c \
pfile_iwrite_at_all.c \
pfile_iwrite_all.c \
pfile_iwrite_shared.c \
pfile_open.c \
pfile_preallocate.c \
pfile_read_all_begin.c \
pfile_read_all.c \
pfile_read_all_end.c \
pfile_read_at_all_begin.c \
pfile_read_at_all.c \
pfile_read_at_all_end.c \
pfile_read_at.c \
pfile_read.c \
pfile_read_ordered_begin.c \
pfile_read_ordered.c \
pfile_read_ordered_end.c \
pfile_read_shared.c \
pfile_seek.c \
pfile_seek_shared.c \
pfile_set_atomicity.c \
pfile_set_errhandler.c \
pfile_set_info.c \
pfile_set_size.c \
pfile_set_view.c \
pfile_sync.c \
pfile_write_all_begin.c \
pfile_write_all.c \
pfile_write_all_end.c \
pfile_write_at_all_begin.c \
pfile_write_at_all.c \
pfile_write_at_all_end.c \
pfile_write_at.c \
pfile_write.c \
pfile_write_ordered_begin.c \
pfile_write_ordered.c \
pfile_write_ordered_end.c \
pfile_write_shared.c \
pfinalize.c \ pfinalize.c \
pfinalized.c \ pfinalized.c \
pfree_mem.c \ pfree_mem.c \
@ -231,6 +292,7 @@ nodist_libmpi_c_pmpi_la_SOURCES = \
precv_init.c \ precv_init.c \
precv.c \ precv.c \
preduce.c \ preduce.c \
pregister_datarep.c \
pireduce.c \ pireduce.c \
preduce_local.c \ preduce_local.c \
preduce_scatter.c \ preduce_scatter.c \
@ -364,72 +426,6 @@ nodist_libmpi_c_pmpi_la_SOURCES = \
pwin_unlock_all.c \ pwin_unlock_all.c \
pwin_wait.c pwin_wait.c
if OMPI_PROVIDE_MPI_FILE_INTERFACE
nodist_libmpi_c_pmpi_la_SOURCES += \
pfile_c2f.c \
pfile_call_errhandler.c \
pfile_close.c \
pfile_create_errhandler.c \
pfile_delete.c \
pfile_f2c.c \
pfile_get_amode.c \
pfile_get_atomicity.c \
pfile_get_byte_offset.c \
pfile_get_errhandler.c \
pfile_get_group.c \
pfile_get_info.c \
pfile_get_position.c \
pfile_get_position_shared.c \
pfile_get_size.c \
pfile_get_type_extent.c \
pfile_get_view.c \
pfile_iread_at.c \
pfile_iread.c \
pfile_iread_at_all.c \
pfile_iread_all.c \
pfile_iread_shared.c \
pfile_iwrite_at.c \
pfile_iwrite.c \
pfile_iwrite_at_all.c \
pfile_iwrite_all.c \
pfile_iwrite_shared.c \
pfile_open.c \
pfile_preallocate.c \
pfile_read_all_begin.c \
pfile_read_all.c \
pfile_read_all_end.c \
pfile_read_at_all_begin.c \
pfile_read_at_all.c \
pfile_read_at_all_end.c \
pfile_read_at.c \
pfile_read.c \
pfile_read_ordered_begin.c \
pfile_read_ordered.c \
pfile_read_ordered_end.c \
pfile_read_shared.c \
pfile_seek.c \
pfile_seek_shared.c \
pfile_set_atomicity.c \
pfile_set_errhandler.c \
pfile_set_info.c \
pfile_set_size.c \
pfile_set_view.c \
pfile_sync.c \
pfile_write_all_begin.c \
pfile_write_all.c \
pfile_write_all_end.c \
pfile_write_at_all_begin.c \
pfile_write_at_all.c \
pfile_write_at_all_end.c \
pfile_write_at.c \
pfile_write.c \
pfile_write_ordered_begin.c \
pfile_write_ordered.c \
pfile_write_ordered_end.c \
pfile_write_shared.c \
pregister_datarep.c
endif
# #
# Sym link in the sources from the real MPI directory # Sym link in the sources from the real MPI directory
# #

8
ompi/mpi/cxx/Makefile.am
Просмотреть файл

@ -12,6 +12,8 @@
# All rights reserved. # All rights reserved.
# Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2016 IBM Corporation. All rights reserved. # Copyright (c) 2016 IBM Corporation. All rights reserved.
# Copyright (c) 2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow
@ -36,14 +38,10 @@ lib@OMPI_LIBMPI_NAME@_cxx_la_SOURCES = \
intercepts.cc \ intercepts.cc \
comm.cc \ comm.cc \
datatype.cc \ datatype.cc \
file.cc \
win.cc \ win.cc \
cxx_glue.c cxx_glue.c
if OMPI_PROVIDE_MPI_FILE_INTERFACE
lib@OMPI_LIBMPI_NAME@_cxx_la_SOURCES += \
file.cc
endif
lib@OMPI_LIBMPI_NAME@_cxx_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la lib@OMPI_LIBMPI_NAME@_cxx_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la
lib@OMPI_LIBMPI_NAME@_cxx_la_LDFLAGS = -version-info $(libmpi_cxx_so_version) lib@OMPI_LIBMPI_NAME@_cxx_la_LDFLAGS = -version-info $(libmpi_cxx_so_version)

6
ompi/mpi/cxx/constants.h
Просмотреть файл

@ -12,6 +12,8 @@
// All rights reserved. // All rights reserved.
// Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved. // Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved.
// Copyright (c) 2011 FUJITSU LIMITED. All rights reserved. // Copyright (c) 2011 FUJITSU LIMITED. All rights reserved.
// Copyright (c) 2017 Research Organization for Information Science
// and Technology (RIST). All rights reserved.
// $COPYRIGHT$ // $COPYRIGHT$
// //
// Additional copyrights may follow // Additional copyrights may follow
@ -246,9 +248,7 @@ OMPI_DECLSPEC extern const Datatype DATATYPE_NULL;
OMPI_DECLSPEC extern Request REQUEST_NULL; OMPI_DECLSPEC extern Request REQUEST_NULL;
OMPI_DECLSPEC extern const Op OP_NULL; OMPI_DECLSPEC extern const Op OP_NULL;
OMPI_DECLSPEC extern const Errhandler ERRHANDLER_NULL; OMPI_DECLSPEC extern const Errhandler ERRHANDLER_NULL;
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
OMPI_DECLSPEC extern const File FILE_NULL; OMPI_DECLSPEC extern const File FILE_NULL;
#endif
// constants specifying empty or ignored input // constants specifying empty or ignored input
OMPI_DECLSPEC extern const char** ARGV_NULL; OMPI_DECLSPEC extern const char** ARGV_NULL;
@ -261,7 +261,6 @@ OMPI_DECLSPEC extern const Group GROUP_EMPTY;
static const int GRAPH = MPI_GRAPH; static const int GRAPH = MPI_GRAPH;
static const int CART = MPI_CART; static const int CART = MPI_CART;
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
// MPI-2 IO // MPI-2 IO
static const int MODE_CREATE = MPI_MODE_CREATE; static const int MODE_CREATE = MPI_MODE_CREATE;
static const int MODE_RDONLY = MPI_MODE_RDONLY; static const int MODE_RDONLY = MPI_MODE_RDONLY;
@ -282,7 +281,6 @@ static const int SEEK_END = ::SEEK_END;
#endif #endif
static const int MAX_DATAREP_STRING = MPI_MAX_DATAREP_STRING; static const int MAX_DATAREP_STRING = MPI_MAX_DATAREP_STRING;
#endif
// one-sided constants // one-sided constants
static const int MODE_NOCHECK = MPI_MODE_NOCHECK; static const int MODE_NOCHECK = MPI_MODE_NOCHECK;

8
ompi/mpi/cxx/cxx_glue.c
Просмотреть файл

@ -2,7 +2,7 @@
/* /*
* Copyright (c) 2016 Los Alamos National Security, LLC. All rights * Copyright (c) 2016 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2016 Research Organization for Information Science * Copyright (c) 2016-2017 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -49,12 +49,10 @@ int ompi_cxx_errhandler_invoke_comm (MPI_Comm comm, int ret, const char *message
return OMPI_ERRHANDLER_INVOKE (comm, ret, message); return OMPI_ERRHANDLER_INVOKE (comm, ret, message);
} }
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
int ompi_cxx_errhandler_invoke_file (MPI_File file, int ret, const char *message) int ompi_cxx_errhandler_invoke_file (MPI_File file, int ret, const char *message)
{ {
return OMPI_ERRHANDLER_INVOKE (file, ret, message); return OMPI_ERRHANDLER_INVOKE (file, ret, message);
} }
#endif
int ompi_cxx_attr_create_keyval_comm (MPI_Comm_copy_attr_function *copy_fn, int ompi_cxx_attr_create_keyval_comm (MPI_Comm_copy_attr_function *copy_fn,
MPI_Comm_delete_attr_function* delete_fn, int *keyval, void *extra_state, MPI_Comm_delete_attr_function* delete_fn, int *keyval, void *extra_state,
@ -114,7 +112,6 @@ MPI_Errhandler ompi_cxx_errhandler_create_win (ompi_cxx_dummy_fn_t *fn)
return errhandler; return errhandler;
} }
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
MPI_Errhandler ompi_cxx_errhandler_create_file (ompi_cxx_dummy_fn_t *fn) MPI_Errhandler ompi_cxx_errhandler_create_file (ompi_cxx_dummy_fn_t *fn)
{ {
ompi_errhandler_t *errhandler; ompi_errhandler_t *errhandler;
@ -125,7 +122,6 @@ MPI_Errhandler ompi_cxx_errhandler_create_file (ompi_cxx_dummy_fn_t *fn)
(ompi_errhandler_cxx_dispatch_fn_t *) ompi_mpi_cxx_file_errhandler_invoke; (ompi_errhandler_cxx_dispatch_fn_t *) ompi_mpi_cxx_file_errhandler_invoke;
return errhandler; return errhandler;
} }
#endif
ompi_cxx_intercept_file_extra_state_t ompi_cxx_intercept_file_extra_state_t
*ompi_cxx_new_intercept_state (void *read_fn_cxx, void *write_fn_cxx, void *extent_fn_cxx, *ompi_cxx_new_intercept_state (void *read_fn_cxx, void *write_fn_cxx, void *extent_fn_cxx,
@ -151,8 +147,6 @@ void ompi_cxx_errhandler_set_callbacks (struct ompi_errhandler_t *errhandler, MP
ompi_file_errhandler_fn *eh_file_fn, MPI_Win_errhandler_function *eh_win_fn) ompi_file_errhandler_fn *eh_file_fn, MPI_Win_errhandler_function *eh_win_fn)
{ {
errhandler->eh_comm_fn = eh_comm_fn; errhandler->eh_comm_fn = eh_comm_fn;
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
errhandler->eh_file_fn = eh_file_fn; errhandler->eh_file_fn = eh_file_fn;
#endif
errhandler->eh_win_fn = eh_win_fn; errhandler->eh_win_fn = eh_win_fn;
} }

4
ompi/mpi/cxx/cxx_glue.h
Просмотреть файл

@ -2,7 +2,7 @@
/* /*
* Copyright (c) 2016-2017 Los Alamos National Security, LLC. All rights * Copyright (c) 2016-2017 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2016 Research Organization for Information Science * Copyright (c) 2016-2017 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -66,11 +66,9 @@ void ompi_mpi_cxx_comm_errhandler_invoke (MPI_Comm *mpi_comm, int *err,
const char *message, void *comm_fn); const char *message, void *comm_fn);
void ompi_mpi_cxx_win_errhandler_invoke (MPI_Win *mpi_comm, int *err, void ompi_mpi_cxx_win_errhandler_invoke (MPI_Win *mpi_comm, int *err,
const char *message, void *win_fn); const char *message, void *win_fn);
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
int ompi_cxx_errhandler_invoke_file (MPI_File file, int ret, const char *message); int ompi_cxx_errhandler_invoke_file (MPI_File file, int ret, const char *message);
void ompi_mpi_cxx_file_errhandler_invoke (MPI_File *mpi_comm, int *err, void ompi_mpi_cxx_file_errhandler_invoke (MPI_File *mpi_comm, int *err,
const char *message, void *file_fn); const char *message, void *file_fn);
#endif
MPI_Errhandler ompi_cxx_errhandler_create_comm (ompi_cxx_dummy_fn_t *fn); MPI_Errhandler ompi_cxx_errhandler_create_comm (ompi_cxx_dummy_fn_t *fn);
MPI_Errhandler ompi_cxx_errhandler_create_win (ompi_cxx_dummy_fn_t *fn); MPI_Errhandler ompi_cxx_errhandler_create_win (ompi_cxx_dummy_fn_t *fn);

10
ompi/mpi/cxx/intercepts.cc
Просмотреть файл

@ -14,6 +14,8 @@
// Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. // Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
// Copyright (c) 2016 Los Alamos National Security, LLC. All rights // Copyright (c) 2016 Los Alamos National Security, LLC. All rights
// reserved. // reserved.
// Copyright (c) 2017 Research Organization for Information Science
// and Technology (RIST). All rights reserved.
// $COPYRIGHT$ // $COPYRIGHT$
// //
// Additional copyrights may follow // Additional copyrights may follow
@ -54,7 +56,6 @@ void ompi_mpi_cxx_comm_throw_excptn_fctn(MPI_Comm *, int *errcode, ...)
va_end(ap); va_end(ap);
} }
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
extern "C" extern "C"
void ompi_mpi_cxx_file_throw_excptn_fctn(MPI_File *, int *errcode, ...) void ompi_mpi_cxx_file_throw_excptn_fctn(MPI_File *, int *errcode, ...)
{ {
@ -63,7 +64,6 @@ void ompi_mpi_cxx_file_throw_excptn_fctn(MPI_File *, int *errcode, ...)
ompi_mpi_cxx_throw_exception(errcode); ompi_mpi_cxx_throw_exception(errcode);
va_end(ap); va_end(ap);
} }
#endif
extern "C" extern "C"
void ompi_mpi_cxx_win_throw_excptn_fctn(MPI_Win *, int *errcode, ...) void ompi_mpi_cxx_win_throw_excptn_fctn(MPI_Win *, int *errcode, ...)
@ -80,11 +80,7 @@ MPI::InitializeIntercepts()
{ {
ompi_cxx_errhandler_set_callbacks ((struct ompi_errhandler_t *) &ompi_mpi_errors_throw_exceptions, ompi_cxx_errhandler_set_callbacks ((struct ompi_errhandler_t *) &ompi_mpi_errors_throw_exceptions,
ompi_mpi_cxx_comm_throw_excptn_fctn, ompi_mpi_cxx_comm_throw_excptn_fctn,
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
ompi_mpi_cxx_file_throw_excptn_fctn, ompi_mpi_cxx_file_throw_excptn_fctn,
#else
NULL,
#endif
ompi_mpi_cxx_win_throw_excptn_fctn); ompi_mpi_cxx_win_throw_excptn_fctn);
} }
@ -106,7 +102,6 @@ void ompi_mpi_cxx_comm_errhandler_invoke(MPI_Comm *c_comm, int *err,
cxx_fn((MPI::Comm&) cxx_comm, err, message); cxx_fn((MPI::Comm&) cxx_comm, err, message);
} }
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
// This function uses OMPI types, and is invoked with C linkage for // This function uses OMPI types, and is invoked with C linkage for
// the express purpose of having a C++ entity call back the C++ // the express purpose of having a C++ entity call back the C++
// function (so that types can be converted, etc.). // function (so that types can be converted, etc.).
@ -120,7 +115,6 @@ void ompi_mpi_cxx_file_errhandler_invoke(MPI_File *c_file, int *err,
cxx_fn(cxx_file, err, message); cxx_fn(cxx_file, err, message);
} }
#endif
// This function uses OMPI types, and is invoked with C linkage for // This function uses OMPI types, and is invoked with C linkage for
// the express purpose of having a C++ entity call back the C++ // the express purpose of having a C++ entity call back the C++

4
ompi/mpi/cxx/mpicxx.cc
Просмотреть файл

@ -13,6 +13,8 @@
// Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved. // Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved.
// Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. // Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
// Copyright (c) 2011 FUJITSU LIMITED. All rights reserved. // Copyright (c) 2011 FUJITSU LIMITED. All rights reserved.
// Copyright (c) 2017 Research Organization for Information Science
// and Technology (RIST). All rights reserved.
// $COPYRIGHT$ // $COPYRIGHT$
// //
// Additional copyrights may follow // Additional copyrights may follow
@ -152,9 +154,7 @@ const Datatype DATATYPE_NULL = MPI_DATATYPE_NULL;
Request REQUEST_NULL = MPI_REQUEST_NULL; Request REQUEST_NULL = MPI_REQUEST_NULL;
const Op OP_NULL = MPI_OP_NULL; const Op OP_NULL = MPI_OP_NULL;
const Errhandler ERRHANDLER_NULL; const Errhandler ERRHANDLER_NULL;
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
const File FILE_NULL = MPI_FILE_NULL; const File FILE_NULL = MPI_FILE_NULL;
#endif
// constants specifying empty or ignored input // constants specifying empty or ignored input
const char** ARGV_NULL = (const char**) MPI_ARGV_NULL; const char** ARGV_NULL = (const char**) MPI_ARGV_NULL;

14
ompi/mpi/cxx/mpicxx.h
Просмотреть файл

@ -15,6 +15,8 @@
// Copyright (c) 2011 FUJITSU LIMITED. All rights reserved. // Copyright (c) 2011 FUJITSU LIMITED. All rights reserved.
// Copyright (c) 2016 Los Alamos National Security, LLC. All rights // Copyright (c) 2016 Los Alamos National Security, LLC. All rights
// reserved. // reserved.
// Copyright (c) 2017 Research Organization for Information Science
// and Technology (RIST). All rights reserved.
// $COPYRIGHT$ // $COPYRIGHT$
// //
// Additional copyrights may follow // Additional copyrights may follow
@ -42,7 +44,7 @@
#include <stdarg.h> #include <stdarg.h>
#if OMPI_PROVIDE_MPI_FILE_INTERFACE && !defined(OMPI_IGNORE_CXX_SEEK) & OMPI_WANT_MPI_CXX_SEEK #if !defined(OMPI_IGNORE_CXX_SEEK) & OMPI_WANT_MPI_CXX_SEEK
// We need to include the header files that define SEEK_* or use them // We need to include the header files that define SEEK_* or use them
// in ways that require them to be #defines so that if the user // in ways that require them to be #defines so that if the user
// includes them later, the double inclusion logic in the headers will // includes them later, the double inclusion logic in the headers will
@ -175,9 +177,7 @@ namespace MPI {
class Status; class Status;
class Info; class Info;
class Win; class Win;
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
class File; class File;
#endif
typedef MPI_Aint Aint; typedef MPI_Aint Aint;
typedef MPI_Fint Fint; typedef MPI_Fint Fint;
@ -207,9 +207,7 @@ namespace MPI {
#include "ompi/mpi/cxx/group.h" #include "ompi/mpi/cxx/group.h"
#include "ompi/mpi/cxx/comm.h" #include "ompi/mpi/cxx/comm.h"
#include "ompi/mpi/cxx/win.h" #include "ompi/mpi/cxx/win.h"
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
#include "ompi/mpi/cxx/file.h" #include "ompi/mpi/cxx/file.h"
#endif
#include "ompi/mpi/cxx/errhandler.h" #include "ompi/mpi/cxx/errhandler.h"
#include "ompi/mpi/cxx/intracomm.h" #include "ompi/mpi/cxx/intracomm.h"
#include "ompi/mpi/cxx/topology.h" //includes Cartcomm and Graphcomm #include "ompi/mpi/cxx/topology.h" //includes Cartcomm and Graphcomm
@ -223,9 +221,7 @@ namespace MPI {
#include "openmpi/ompi/mpi/cxx/group.h" #include "openmpi/ompi/mpi/cxx/group.h"
#include "openmpi/ompi/mpi/cxx/comm.h" #include "openmpi/ompi/mpi/cxx/comm.h"
#include "openmpi/ompi/mpi/cxx/win.h" #include "openmpi/ompi/mpi/cxx/win.h"
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
#include "openmpi/ompi/mpi/cxx/file.h" #include "openmpi/ompi/mpi/cxx/file.h"
#endif
#include "openmpi/ompi/mpi/cxx/errhandler.h" #include "openmpi/ompi/mpi/cxx/errhandler.h"
#include "openmpi/ompi/mpi/cxx/intracomm.h" #include "openmpi/ompi/mpi/cxx/intracomm.h"
#include "openmpi/ompi/mpi/cxx/topology.h" //includes Cartcomm and Graphcomm #include "openmpi/ompi/mpi/cxx/topology.h" //includes Cartcomm and Graphcomm
@ -268,9 +264,7 @@ namespace MPI {
#include "ompi/mpi/cxx/status_inln.h" #include "ompi/mpi/cxx/status_inln.h"
#include "ompi/mpi/cxx/info_inln.h" #include "ompi/mpi/cxx/info_inln.h"
#include "ompi/mpi/cxx/win_inln.h" #include "ompi/mpi/cxx/win_inln.h"
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
#include "ompi/mpi/cxx/file_inln.h" #include "ompi/mpi/cxx/file_inln.h"
#endif
#else #else
#include "openmpi/ompi/mpi/cxx/datatype_inln.h" #include "openmpi/ompi/mpi/cxx/datatype_inln.h"
#include "openmpi/ompi/mpi/cxx/functions_inln.h" #include "openmpi/ompi/mpi/cxx/functions_inln.h"
@ -285,10 +279,8 @@ namespace MPI {
#include "openmpi/ompi/mpi/cxx/status_inln.h" #include "openmpi/ompi/mpi/cxx/status_inln.h"
#include "openmpi/ompi/mpi/cxx/info_inln.h" #include "openmpi/ompi/mpi/cxx/info_inln.h"
#include "openmpi/ompi/mpi/cxx/win_inln.h" #include "openmpi/ompi/mpi/cxx/win_inln.h"
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
#include "openmpi/ompi/mpi/cxx/file_inln.h" #include "openmpi/ompi/mpi/cxx/file_inln.h"
#endif #endif
#endif
#endif // #if defined(c_plusplus) || defined(__cplusplus) #endif // #if defined(c_plusplus) || defined(__cplusplus)
#endif // #ifndef MPIPP_H_ #endif // #ifndef MPIPP_H_

4
ompi/mpi/cxx/status.h
Просмотреть файл

@ -11,6 +11,8 @@
// Copyright (c) 2004-2005 The Regents of the University of California. // Copyright (c) 2004-2005 The Regents of the University of California.
// All rights reserved. // All rights reserved.
// Copyright (c) 2006-2008 Cisco Systems, Inc. All rights reserved. // Copyright (c) 2006-2008 Cisco Systems, Inc. All rights reserved.
// Copyright (c) 2017 Research Organization for Information Science
// and Technology (RIST). All rights reserved.
// $COPYRIGHT$ // $COPYRIGHT$
// //
// Additional copyrights may follow // Additional copyrights may follow
@ -25,9 +27,7 @@ class Status {
#endif #endif
friend class MPI::Comm; //so I can access pmpi_status data member in comm.cc friend class MPI::Comm; //so I can access pmpi_status data member in comm.cc
friend class MPI::Request; //and also from request.cc friend class MPI::Request; //and also from request.cc
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
friend class MPI::File; friend class MPI::File;
#endif
public: public:
#if 0 /* OMPI_ENABLE_MPI_PROFILING */ #if 0 /* OMPI_ENABLE_MPI_PROFILING */

5
ompi/mpi/fortran/configure-fortran-output.h.in
Просмотреть файл

@ -3,6 +3,8 @@
! Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved. ! Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved.
! Copyright (c) 2009-2012 Los Alamos National Security, LLC. ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
! All rights reserved. ! All rights reserved.
! Copyright (c) 2017 Research Organization for Information Science
! and Technology (RIST). All rights reserved.
! !
! $COPYRIGHT$ ! $COPYRIGHT$
! !
@ -17,9 +19,6 @@
#ifndef OMPI_FORTRAN_CONFIGURE_OUTPUT_H #ifndef OMPI_FORTRAN_CONFIGURE_OUTPUT_H
#define OMPI_FORTRAN_CONFIGURE_OUTPUT_H #define OMPI_FORTRAN_CONFIGURE_OUTPUT_H
! Whether we're building the MPI IO interface or not
#define OMPI_PROVIDE_MPI_FILE_INTERFACE @OMPI_PROVIDE_MPI_FILE_INTERFACE@
! Whether we're using wrapper F08 functions or not ! Whether we're using wrapper F08 functions or not
#define OMPI_FORTRAN_NEED_WRAPPER_ROUTINES @OMPI_FORTRAN_NEED_WRAPPER_ROUTINES@ #define OMPI_FORTRAN_NEED_WRAPPER_ROUTINES @OMPI_FORTRAN_NEED_WRAPPER_ROUTINES@

125
ompi/mpi/fortran/mpif-h/Makefile.am
Просмотреть файл

@ -14,7 +14,7 @@
# Copyright (c) 2011-2013 Universite Bordeaux 1 # Copyright (c) 2011-2013 Universite Bordeaux 1
# Copyright (c) 2013-2014 Los Alamos National Security, LLC. All rights # Copyright (c) 2013-2014 Los Alamos National Security, LLC. All rights
# reserved. # reserved.
# Copyright (c) 2015 Research Organization for Information Science # Copyright (c) 2015-2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved. # and Technology (RIST). All rights reserved.
# Copyright (c) 2016 IBM Corporation. All rights reserved. # Copyright (c) 2016 IBM Corporation. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
@ -206,6 +206,65 @@ lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \
error_string_f.c \ error_string_f.c \
exscan_f.c \ exscan_f.c \
f_sync_reg_f.c \ f_sync_reg_f.c \
file_call_errhandler_f.c \
file_close_f.c \
file_create_errhandler_f.c \
file_delete_f.c \
file_get_amode_f.c \
file_get_atomicity_f.c \
file_get_byte_offset_f.c \
file_get_errhandler_f.c \
file_get_group_f.c \
file_get_info_f.c \
file_get_position_f.c \
file_get_position_shared_f.c \
file_get_size_f.c \
file_get_type_extent_f.c \
file_get_view_f.c \
file_iread_at_f.c \
file_iread_f.c \
file_iread_at_all_f.c \
file_iread_all_f.c \
file_iread_shared_f.c \
file_iwrite_at_f.c \
file_iwrite_f.c \
file_iwrite_at_all_f.c \
file_iwrite_all_f.c \
file_iwrite_shared_f.c \
file_open_f.c \
file_preallocate_f.c \
file_read_all_begin_f.c \
file_read_all_end_f.c \
file_read_all_f.c \
file_read_at_all_begin_f.c \
file_read_at_all_end_f.c \
file_read_at_all_f.c \
file_read_at_f.c \
file_read_f.c \
file_read_ordered_begin_f.c \
file_read_ordered_end_f.c \
file_read_ordered_f.c \
file_read_shared_f.c \
file_seek_f.c \
file_seek_shared_f.c \
file_set_atomicity_f.c \
file_set_errhandler_f.c \
file_set_info_f.c \
file_set_size_f.c \
file_set_view_f.c \
file_sync_f.c \
file_write_all_begin_f.c \
file_write_all_end_f.c \
file_write_all_f.c \
file_write_at_all_begin_f.c \
file_write_at_all_end_f.c \
file_write_at_all_f.c \
file_write_at_f.c \
file_write_f.c \
file_write_ordered_begin_f.c \
file_write_ordered_end_f.c \
file_write_ordered_f.c \
file_write_shared_f.c \
finalized_f.c \ finalized_f.c \
finalize_f.c \ finalize_f.c \
free_mem_f.c \ free_mem_f.c \
@ -311,6 +370,7 @@ lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \
reduce_local_f.c \ reduce_local_f.c \
reduce_scatter_f.c \ reduce_scatter_f.c \
reduce_scatter_block_f.c \ reduce_scatter_block_f.c \
register_datarep_f.c \
request_free_f.c \ request_free_f.c \
request_get_status_f.c \ request_get_status_f.c \
rsend_f.c \ rsend_f.c \
@ -431,69 +491,6 @@ lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \
win_flush_local_f.c \ win_flush_local_f.c \
win_flush_local_all_f.c win_flush_local_all_f.c
if OMPI_PROVIDE_MPI_FILE_INTERFACE
lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \
file_call_errhandler_f.c \
file_close_f.c \
file_create_errhandler_f.c \
file_delete_f.c \
file_get_amode_f.c \
file_get_atomicity_f.c \
file_get_byte_offset_f.c \
file_get_errhandler_f.c \
file_get_group_f.c \
file_get_info_f.c \
file_get_position_f.c \
file_get_position_shared_f.c \
file_get_size_f.c \
file_get_type_extent_f.c \
file_get_view_f.c \
file_iread_at_f.c \
file_iread_f.c \
file_iread_at_all_f.c \
file_iread_all_f.c \
file_iread_shared_f.c \
file_iwrite_at_f.c \
file_iwrite_f.c \
file_iwrite_at_all_f.c \
file_iwrite_all_f.c \
file_iwrite_shared_f.c \
file_open_f.c \
file_preallocate_f.c \
file_read_all_begin_f.c \
file_read_all_end_f.c \
file_read_all_f.c \
file_read_at_all_begin_f.c \
file_read_at_all_end_f.c \
file_read_at_all_f.c \
file_read_at_f.c \
file_read_f.c \
file_read_ordered_begin_f.c \
file_read_ordered_end_f.c \
file_read_ordered_f.c \
file_read_shared_f.c \
file_seek_f.c \
file_seek_shared_f.c \
file_set_atomicity_f.c \
file_set_errhandler_f.c \
file_set_info_f.c \
file_set_size_f.c \
file_set_view_f.c \
file_sync_f.c \
file_write_all_begin_f.c \
file_write_all_end_f.c \
file_write_all_f.c \
file_write_at_all_begin_f.c \
file_write_at_all_end_f.c \
file_write_at_all_f.c \
file_write_at_f.c \
file_write_f.c \
file_write_ordered_begin_f.c \
file_write_ordered_end_f.c \
file_write_ordered_f.c \
file_write_shared_f.c \
register_datarep_f.c
endif
endif endif
# #

127
ompi/mpi/fortran/mpif-h/profile/Makefile.am
Просмотреть файл

@ -15,7 +15,7 @@
# Copyright (c) 2011-2013 Universite Bordeaux 1 # Copyright (c) 2011-2013 Universite Bordeaux 1
# Copyright (c) 2013-2014 Los Alamos National Security, LLC. All rights # Copyright (c) 2013-2014 Los Alamos National Security, LLC. All rights
# reserved. # reserved.
# Copyright (c) 2015 Research Organization for Information Science # Copyright (c) 2015-2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved. # and Technology (RIST). All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
@ -122,6 +122,65 @@ linked_files = \
perror_string_f.c \ perror_string_f.c \
pexscan_f.c \ pexscan_f.c \
pf_sync_reg_f.c \ pf_sync_reg_f.c \
pfile_call_errhandler_f.c \
pfile_close_f.c \
pfile_create_errhandler_f.c \
pfile_delete_f.c \
pfile_get_amode_f.c \
pfile_get_atomicity_f.c \
pfile_get_byte_offset_f.c \
pfile_get_errhandler_f.c \
pfile_get_group_f.c \
pfile_get_info_f.c \
pfile_get_position_f.c \
pfile_get_position_shared_f.c \
pfile_get_size_f.c \
pfile_get_type_extent_f.c \
pfile_get_view_f.c \
pfile_iread_at_f.c \
pfile_iread_f.c \
pfile_iread_at_all_f.c \
pfile_iread_all_f.c \
pfile_iread_shared_f.c \
pfile_iwrite_at_f.c \
pfile_iwrite_f.c \
pfile_iwrite_at_all_f.c \
pfile_iwrite_all_f.c \
pfile_iwrite_shared_f.c \
pfile_open_f.c \
pfile_preallocate_f.c \
pfile_read_all_begin_f.c \
pfile_read_all_end_f.c \
pfile_read_all_f.c \
pfile_read_at_all_begin_f.c \
pfile_read_at_all_end_f.c \
pfile_read_at_all_f.c \
pfile_read_at_f.c \
pfile_read_f.c \
pfile_read_ordered_begin_f.c \
pfile_read_ordered_end_f.c \
pfile_read_ordered_f.c \
pfile_read_shared_f.c \
pfile_seek_f.c \
pfile_seek_shared_f.c \
pfile_set_atomicity_f.c \
pfile_set_errhandler_f.c \
pfile_set_info_f.c \
pfile_set_size_f.c \
pfile_set_view_f.c \
pfile_sync_f.c \
pfile_write_all_begin_f.c \
pfile_write_all_end_f.c \
pfile_write_all_f.c \
pfile_write_at_all_begin_f.c \
pfile_write_at_all_end_f.c \
pfile_write_at_all_f.c \
pfile_write_at_f.c \
pfile_write_f.c \
pfile_write_ordered_begin_f.c \
pfile_write_ordered_end_f.c \
pfile_write_ordered_f.c \
pfile_write_shared_f.c \
pfinalized_f.c \ pfinalized_f.c \
pfinalize_f.c \ pfinalize_f.c \
pfree_mem_f.c \ pfree_mem_f.c \
@ -301,6 +360,7 @@ linked_files = \
pwtime_f.c \ pwtime_f.c \
paccumulate_f.c \ paccumulate_f.c \
praccumulate_f.c \ praccumulate_f.c \
pregister_datarep_f.c \
pget_f.c \ pget_f.c \
prget_f.c \ prget_f.c \
pget_accumulate_f.c \ pget_accumulate_f.c \
@ -347,71 +407,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_PROVIDE_MPI_FILE_INTERFACE
linked_files += \
pfile_call_errhandler_f.c \
pfile_close_f.c \
pfile_create_errhandler_f.c \
pfile_delete_f.c \
pfile_get_amode_f.c \
pfile_get_atomicity_f.c \
pfile_get_byte_offset_f.c \
pfile_get_errhandler_f.c \
pfile_get_group_f.c \
pfile_get_info_f.c \
pfile_get_position_f.c \
pfile_get_position_shared_f.c \
pfile_get_size_f.c \
pfile_get_type_extent_f.c \
pfile_get_view_f.c \
pfile_iread_at_f.c \
pfile_iread_f.c \
pfile_iread_at_all_f.c \
pfile_iread_all_f.c \
pfile_iread_shared_f.c \
pfile_iwrite_at_f.c \
pfile_iwrite_f.c \
pfile_iwrite_at_all_f.c \
pfile_iwrite_all_f.c \
pfile_iwrite_shared_f.c \
pfile_open_f.c \
pfile_preallocate_f.c \
pfile_read_all_begin_f.c \
pfile_read_all_end_f.c \
pfile_read_all_f.c \
pfile_read_at_all_begin_f.c \
pfile_read_at_all_end_f.c \
pfile_read_at_all_f.c \
pfile_read_at_f.c \
pfile_read_f.c \
pfile_read_ordered_begin_f.c \
pfile_read_ordered_end_f.c \
pfile_read_ordered_f.c \
pfile_read_shared_f.c \
pfile_seek_f.c \
pfile_seek_shared_f.c \
pfile_set_atomicity_f.c \
pfile_set_errhandler_f.c \
pfile_set_info_f.c \
pfile_set_size_f.c \
pfile_set_view_f.c \
pfile_sync_f.c \
pfile_write_all_begin_f.c \
pfile_write_all_end_f.c \
pfile_write_all_f.c \
pfile_write_at_all_begin_f.c \
pfile_write_at_all_end_f.c \
pfile_write_at_all_f.c \
pfile_write_at_f.c \
pfile_write_f.c \
pfile_write_ordered_begin_f.c \
pfile_write_ordered_end_f.c \
pfile_write_ordered_f.c \
pfile_write_shared_f.c \
pregister_datarep_f.c
endif
# #
# Sym link in the sources from the real MPI directory # Sym link in the sources from the real MPI directory
# #

240
ompi/mpi/fortran/use-mpi-f08/Makefile.am
Просмотреть файл

@ -161,6 +161,65 @@ mpi_api_files = \
exscan_f08.F90 \ exscan_f08.F90 \
f_sync_reg_f08.F90 \ f_sync_reg_f08.F90 \
fetch_and_op_f08.F90 \ fetch_and_op_f08.F90 \
file_call_errhandler_f08.F90 \
file_close_f08.F90 \
file_create_errhandler_f08.F90 \
file_delete_f08.F90 \
file_get_amode_f08.F90 \
file_get_atomicity_f08.F90 \
file_get_byte_offset_f08.F90 \
file_get_errhandler_f08.F90 \
file_get_group_f08.F90 \
file_get_info_f08.F90 \
file_get_position_f08.F90 \
file_get_position_shared_f08.F90 \
file_get_size_f08.F90 \
file_get_type_extent_f08.F90 \
file_get_view_f08.F90 \
file_iread_at_f08.F90 \
file_iread_f08.F90 \
file_iread_at_all_f08.F90 \
file_iread_all_f08.F90 \
file_iread_shared_f08.F90 \
file_iwrite_at_f08.F90 \
file_iwrite_f08.F90 \
file_iwrite_at_all_f08.F90 \
file_iwrite_all_f08.F90 \
file_iwrite_shared_f08.F90 \
file_open_f08.F90 \
file_preallocate_f08.F90 \
file_read_all_begin_f08.F90 \
file_read_all_end_f08.F90 \
file_read_all_f08.F90 \
file_read_at_all_begin_f08.F90 \
file_read_at_all_end_f08.F90 \
file_read_at_all_f08.F90 \
file_read_at_f08.F90 \
file_read_f08.F90 \
file_read_ordered_begin_f08.F90 \
file_read_ordered_end_f08.F90 \
file_read_ordered_f08.F90 \
file_read_shared_f08.F90 \
file_seek_f08.F90 \
file_seek_shared_f08.F90 \
file_set_atomicity_f08.F90 \
file_set_errhandler_f08.F90 \
file_set_info_f08.F90 \
file_set_size_f08.F90 \
file_set_view_f08.F90 \
file_sync_f08.F90 \
file_write_all_begin_f08.F90 \
file_write_all_end_f08.F90 \
file_write_all_f08.F90 \
file_write_at_all_begin_f08.F90 \
file_write_at_all_end_f08.F90 \
file_write_at_all_f08.F90 \
file_write_at_f08.F90 \
file_write_f08.F90 \
file_write_ordered_begin_f08.F90 \
file_write_ordered_end_f08.F90 \
file_write_ordered_f08.F90 \
file_write_shared_f08.F90 \
finalized_f08.F90 \ finalized_f08.F90 \
finalize_f08.F90 \ finalize_f08.F90 \
free_mem_f08.F90 \ free_mem_f08.F90 \
@ -268,6 +327,7 @@ mpi_api_files = \
reduce_local_f08.F90 \ reduce_local_f08.F90 \
reduce_scatter_f08.F90 \ reduce_scatter_f08.F90 \
reduce_scatter_block_f08.F90 \ reduce_scatter_block_f08.F90 \
register_datarep_f08.F90 \
request_free_f08.F90 \ request_free_f08.F90 \
request_get_status_f08.F90 \ request_get_status_f08.F90 \
rget_f08.F90 \ rget_f08.F90 \
@ -373,70 +433,6 @@ mpi_api_files = \
win_unlock_all_f08.F90 \ win_unlock_all_f08.F90 \
win_wait_f08.F90 win_wait_f08.F90
if OMPI_PROVIDE_MPI_FILE_INTERFACE
mpi_api_files += \
file_call_errhandler_f08.F90 \
file_close_f08.F90 \
file_create_errhandler_f08.F90 \
file_delete_f08.F90 \
file_get_amode_f08.F90 \
file_get_atomicity_f08.F90 \
file_get_byte_offset_f08.F90 \
file_get_errhandler_f08.F90 \
file_get_group_f08.F90 \
file_get_info_f08.F90 \
file_get_position_f08.F90 \
file_get_position_shared_f08.F90 \
file_get_size_f08.F90 \
file_get_type_extent_f08.F90 \
file_get_view_f08.F90 \
file_iread_at_f08.F90 \
file_iread_f08.F90 \
file_iread_at_all_f08.F90 \
file_iread_all_f08.F90 \
file_iread_shared_f08.F90 \
file_iwrite_at_f08.F90 \
file_iwrite_f08.F90 \
file_iwrite_at_all_f08.F90 \
file_iwrite_all_f08.F90 \
file_iwrite_shared_f08.F90 \
file_open_f08.F90 \
file_preallocate_f08.F90 \
file_read_all_begin_f08.F90 \
file_read_all_end_f08.F90 \
file_read_all_f08.F90 \
file_read_at_all_begin_f08.F90 \
file_read_at_all_end_f08.F90 \
file_read_at_all_f08.F90 \
file_read_at_f08.F90 \
file_read_f08.F90 \
file_read_ordered_begin_f08.F90 \
file_read_ordered_end_f08.F90 \
file_read_ordered_f08.F90 \
file_read_shared_f08.F90 \
file_seek_f08.F90 \
file_seek_shared_f08.F90 \
file_set_atomicity_f08.F90 \
file_set_errhandler_f08.F90 \
file_set_info_f08.F90 \
file_set_size_f08.F90 \
file_set_view_f08.F90 \
file_sync_f08.F90 \
file_write_all_begin_f08.F90 \
file_write_all_end_f08.F90 \
file_write_all_f08.F90 \
file_write_at_all_begin_f08.F90 \
file_write_at_all_end_f08.F90 \
file_write_at_all_f08.F90 \
file_write_at_f08.F90 \
file_write_f08.F90 \
file_write_ordered_begin_f08.F90 \
file_write_ordered_end_f08.F90 \
file_write_ordered_f08.F90 \
file_write_shared_f08.F90 \
register_datarep_f08.F90
endif
# JMS Somehow this variable substitution isn't quite working, and I # JMS Somehow this variable substitution isn't quite working, and I
# don't have time to figure it out. So just wholesale copy the file # don't have time to figure it out. So just wholesale copy the file
# list. :-( # list. :-(
@ -520,6 +516,61 @@ pmpi_api_files = \
profile/pexscan_f08.F90 \ profile/pexscan_f08.F90 \
profile/pf_sync_reg_f08.F90 \ profile/pf_sync_reg_f08.F90 \
profile/pfetch_and_op_f08.F90 \ profile/pfetch_and_op_f08.F90 \
profile/pfile_call_errhandler_f08.F90 \
profile/pfile_close_f08.F90 \
profile/pfile_create_errhandler_f08.F90 \
profile/pfile_delete_f08.F90 \
profile/pfile_get_amode_f08.F90 \
profile/pfile_get_atomicity_f08.F90 \
profile/pfile_get_byte_offset_f08.F90 \
profile/pfile_get_errhandler_f08.F90 \
profile/pfile_get_group_f08.F90 \
profile/pfile_get_info_f08.F90 \
profile/pfile_get_position_f08.F90 \
profile/pfile_get_position_shared_f08.F90 \
profile/pfile_get_size_f08.F90 \
profile/pfile_get_type_extent_f08.F90 \
profile/pfile_get_view_f08.F90 \
profile/pfile_iread_at_f08.F90 \
profile/pfile_iread_f08.F90 \
profile/pfile_iread_shared_f08.F90 \
profile/pfile_iwrite_at_f08.F90 \
profile/pfile_iwrite_f08.F90 \
profile/pfile_iwrite_shared_f08.F90 \
profile/pfile_open_f08.F90 \
profile/pfile_preallocate_f08.F90 \
profile/pfile_read_all_begin_f08.F90 \
profile/pfile_read_all_end_f08.F90 \
profile/pfile_read_all_f08.F90 \
profile/pfile_read_at_all_begin_f08.F90 \
profile/pfile_read_at_all_end_f08.F90 \
profile/pfile_read_at_all_f08.F90 \
profile/pfile_read_at_f08.F90 \
profile/pfile_read_f08.F90 \
profile/pfile_read_ordered_begin_f08.F90 \
profile/pfile_read_ordered_end_f08.F90 \
profile/pfile_read_ordered_f08.F90 \
profile/pfile_read_shared_f08.F90 \
profile/pfile_seek_f08.F90 \
profile/pfile_seek_shared_f08.F90 \
profile/pfile_set_atomicity_f08.F90 \
profile/pfile_set_errhandler_f08.F90 \
profile/pfile_set_info_f08.F90 \
profile/pfile_set_size_f08.F90 \
profile/pfile_set_view_f08.F90 \
profile/pfile_sync_f08.F90 \
profile/pfile_write_all_begin_f08.F90 \
profile/pfile_write_all_end_f08.F90 \
profile/pfile_write_all_f08.F90 \
profile/pfile_write_at_all_begin_f08.F90 \
profile/pfile_write_at_all_end_f08.F90 \
profile/pfile_write_at_all_f08.F90 \
profile/pfile_write_at_f08.F90 \
profile/pfile_write_f08.F90 \
profile/pfile_write_ordered_begin_f08.F90 \
profile/pfile_write_ordered_end_f08.F90 \
profile/pfile_write_ordered_f08.F90 \
profile/pfile_write_shared_f08.F90 \
profile/pfinalized_f08.F90 \ profile/pfinalized_f08.F90 \
profile/pfinalize_f08.F90 \ profile/pfinalize_f08.F90 \
profile/pfree_mem_f08.F90 \ profile/pfree_mem_f08.F90 \
@ -627,6 +678,7 @@ pmpi_api_files = \
profile/preduce_local_f08.F90 \ profile/preduce_local_f08.F90 \
profile/preduce_scatter_f08.F90 \ profile/preduce_scatter_f08.F90 \
profile/preduce_scatter_block_f08.F90 \ profile/preduce_scatter_block_f08.F90 \
profile/pregister_datarep_f08.F90 \
profile/prequest_free_f08.F90 \ profile/prequest_free_f08.F90 \
profile/prequest_get_status_f08.F90 \ profile/prequest_get_status_f08.F90 \
profile/prget_f08.F90 \ profile/prget_f08.F90 \
@ -732,66 +784,6 @@ pmpi_api_files = \
profile/pwin_unlock_all_f08.F90 \ profile/pwin_unlock_all_f08.F90 \
profile/pwin_wait_f08.F90 profile/pwin_wait_f08.F90
if OMPI_PROVIDE_MPI_FILE_INTERFACE
pmpi_api_files += \
profile/pfile_call_errhandler_f08.F90 \
profile/pfile_close_f08.F90 \
profile/pfile_create_errhandler_f08.F90 \
profile/pfile_delete_f08.F90 \
profile/pfile_get_amode_f08.F90 \
profile/pfile_get_atomicity_f08.F90 \
profile/pfile_get_byte_offset_f08.F90 \
profile/pfile_get_errhandler_f08.F90 \
profile/pfile_get_group_f08.F90 \
profile/pfile_get_info_f08.F90 \
profile/pfile_get_position_f08.F90 \
profile/pfile_get_position_shared_f08.F90 \
profile/pfile_get_size_f08.F90 \
profile/pfile_get_type_extent_f08.F90 \
profile/pfile_get_view_f08.F90 \
profile/pfile_iread_at_f08.F90 \
profile/pfile_iread_f08.F90 \
profile/pfile_iread_shared_f08.F90 \
profile/pfile_iwrite_at_f08.F90 \
profile/pfile_iwrite_f08.F90 \
profile/pfile_iwrite_shared_f08.F90 \
profile/pfile_open_f08.F90 \
profile/pfile_preallocate_f08.F90 \
profile/pfile_read_all_begin_f08.F90 \
profile/pfile_read_all_end_f08.F90 \
profile/pfile_read_all_f08.F90 \
profile/pfile_read_at_all_begin_f08.F90 \
profile/pfile_read_at_all_end_f08.F90 \
profile/pfile_read_at_all_f08.F90 \
profile/pfile_read_at_f08.F90 \
profile/pfile_read_f08.F90 \
profile/pfile_read_ordered_begin_f08.F90 \
profile/pfile_read_ordered_end_f08.F90 \
profile/pfile_read_ordered_f08.F90 \
profile/pfile_read_shared_f08.F90 \
profile/pfile_seek_f08.F90 \
profile/pfile_seek_shared_f08.F90 \
profile/pfile_set_atomicity_f08.F90 \
profile/pfile_set_errhandler_f08.F90 \
profile/pfile_set_info_f08.F90 \
profile/pfile_set_size_f08.F90 \
profile/pfile_set_view_f08.F90 \
profile/pfile_sync_f08.F90 \
profile/pfile_write_all_begin_f08.F90 \
profile/pfile_write_all_end_f08.F90 \
profile/pfile_write_all_f08.F90 \
profile/pfile_write_at_all_begin_f08.F90 \
profile/pfile_write_at_all_end_f08.F90 \
profile/pfile_write_at_all_f08.F90 \
profile/pfile_write_at_f08.F90 \
profile/pfile_write_f08.F90 \
profile/pfile_write_ordered_begin_f08.F90 \
profile/pfile_write_ordered_end_f08.F90 \
profile/pfile_write_ordered_f08.F90 \
profile/pfile_write_shared_f08.F90 \
profile/pregister_datarep_f08.F90
endif
lib@OMPI_LIBMPI_NAME@_usempif08_la_SOURCES = \ lib@OMPI_LIBMPI_NAME@_usempif08_la_SOURCES = \
$(mpi_api_files) \ $(mpi_api_files) \
$(pmpi_api_files) \ $(pmpi_api_files) \

4
ompi/mpi/fortran/use-mpi-f08/constants.c
Просмотреть файл

@ -1,6 +1,6 @@
/* /*
* Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science * Copyright (c) 2015-2017 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* *
* $COPYRIGHT$ * $COPYRIGHT$
@ -62,9 +62,7 @@ OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_mess
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_op_null = {OMPI_MPI_OP_NULL}; OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_op_null = {OMPI_MPI_OP_NULL};
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_request_null = {OMPI_MPI_REQUEST_NULL}; OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_request_null = {OMPI_MPI_REQUEST_NULL};
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_win_null = {OMPI_MPI_WIN_NULL}; OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_win_null = {OMPI_MPI_WIN_NULL};
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_file_null = {OMPI_MPI_FILE_NULL}; OMPI_DECLSPEC ompi_fortran_08_handle_t OMPI_F08_HANDLE_ALIGNED ompi_f08_mpi_file_null = {OMPI_MPI_FILE_NULL};
#endif
/* /*
* common block items from ompi/include/mpif-common.h * common block items from ompi/include/mpif-common.h

6
ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-interfaces-callbacks.F90
Просмотреть файл

@ -2,7 +2,7 @@
! Copyright (c) 2009-2013 Cisco Systems, Inc. All rights reserved. ! Copyright (c) 2009-2013 Cisco Systems, Inc. All rights reserved.
! Copyright (c) 2009-2012 Los Alamos National Security, LLC. ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
! All rights reserved. ! All rights reserved.
! Copyright (c) 2015-2016 Research Organization for Information Science ! Copyright (c) 2015-2017 Research Organization for Information Science
! and Technology (RIST). All rights reserved. ! and Technology (RIST). All rights reserved.
! $COPYRIGHT$ ! $COPYRIGHT$
@ -151,8 +151,6 @@ SUBROUTINE MPI_Win_errhandler_function(win, error_code)
END SUBROUTINE END SUBROUTINE
END INTERFACE END INTERFACE
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
OMPI_ABSTRACT INTERFACE OMPI_ABSTRACT INTERFACE
SUBROUTINE MPI_File_errhandler_function(file, error_code) SUBROUTINE MPI_File_errhandler_function(file, error_code)
USE mpi_f08_types USE mpi_f08_types
@ -162,8 +160,6 @@ SUBROUTINE MPI_File_errhandler_function(file, error_code)
END SUBROUTINE END SUBROUTINE
END INTERFACE END INTERFACE
#endif
OMPI_ABSTRACT INTERFACE OMPI_ABSTRACT INTERFACE
SUBROUTINE MPI_Grequest_query_function(extra_state,status,ierror) SUBROUTINE MPI_Grequest_query_function(extra_state,status,ierror)
USE mpi_f08_types USE mpi_f08_types

12
ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-interfaces.F90
Просмотреть файл

@ -7,7 +7,7 @@
! of Tennessee Research Foundation. All rights ! of Tennessee Research Foundation. All rights
! reserved. ! reserved.
! Copyright (c) 2012 Inria. All rights reserved. ! Copyright (c) 2012 Inria. All rights reserved.
! Copyright (c) 2015 Research Organization for Information Science ! Copyright (c) 2015-2017 Research Organization for Information Science
! and Technology (RIST). All rights reserved. ! and Technology (RIST). All rights reserved.
! $COPYRIGHT$ ! $COPYRIGHT$
! !
@ -2616,8 +2616,6 @@ subroutine MPI_Error_string_f08(errorcode,string,resultlen,ierror)
end subroutine MPI_Error_string_f08 end subroutine MPI_Error_string_f08
end interface MPI_Error_string end interface MPI_Error_string
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
interface MPI_File_call_errhandler interface MPI_File_call_errhandler
subroutine MPI_File_call_errhandler_f08(fh,errorcode,ierror) subroutine MPI_File_call_errhandler_f08(fh,errorcode,ierror)
use :: mpi_f08_types, only : MPI_File use :: mpi_f08_types, only : MPI_File
@ -2659,9 +2657,6 @@ subroutine MPI_File_set_errhandler_f08(file,errhandler,ierror)
end subroutine MPI_File_set_errhandler_f08 end subroutine MPI_File_set_errhandler_f08
end interface MPI_File_set_errhandler end interface MPI_File_set_errhandler
! endif for OMPI_PROVIDE_MPI_FILE_INTERFACE
#endif
interface MPI_Finalize interface MPI_Finalize
subroutine MPI_Finalize_f08(ierror) subroutine MPI_Finalize_f08(ierror)
implicit none implicit none
@ -3534,8 +3529,6 @@ subroutine MPI_Status_set_elements_x_f08(status,datatype,count,ierror)
end subroutine MPI_Status_set_elements_x_f08 end subroutine MPI_Status_set_elements_x_f08
end interface MPI_Status_set_elements_x end interface MPI_Status_set_elements_x
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
interface MPI_File_close interface MPI_File_close
subroutine MPI_File_close_f08(fh,ierror) subroutine MPI_File_close_f08(fh,ierror)
use :: mpi_f08_types, only : MPI_File use :: mpi_f08_types, only : MPI_File
@ -4362,9 +4355,6 @@ subroutine MPI_File_write_shared_f08(fh,buf,count,datatype,status,ierror)
end subroutine MPI_File_write_shared_f08 end subroutine MPI_File_write_shared_f08
end interface MPI_File_write_shared end interface MPI_File_write_shared
! endif for OMPI_PROVIDE_MPI_FILE_INTERFACE
#endif
interface MPI_Register_datarep interface MPI_Register_datarep
subroutine MPI_Register_datarep_f08(datarep,read_conversion_fn,write_conversion_fn, & subroutine MPI_Register_datarep_f08(datarep,read_conversion_fn,write_conversion_fn, &
dtype_file_extent_fn,extra_state,ierror) dtype_file_extent_fn,extra_state,ierror)

16
ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-types.F90
Просмотреть файл

@ -3,7 +3,7 @@
! Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved. ! Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
! Copyright (c) 2009-2012 Los Alamos National Security, LLC. ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
! All rights reserved. ! All rights reserved.
! Copyright (c) 2015 Research Organization for Information Science ! Copyright (c) 2015-2017 Research Organization for Information Science
! and Technology (RIST). All rights reserved. ! and Technology (RIST). All rights reserved.
! $COPYRIGHT$ ! $COPYRIGHT$
! !
@ -19,9 +19,7 @@ module mpi_f08_types
include "mpif-config.h" include "mpif-config.h"
include "mpif-constants.h" include "mpif-constants.h"
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
include "mpif-io-constants.h" include "mpif-io-constants.h"
#endif
! !
! derived types ! derived types
@ -39,11 +37,9 @@ module mpi_f08_types
integer :: MPI_VAL integer :: MPI_VAL
end type MPI_Errhandler end type MPI_Errhandler
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
type, BIND(C) :: MPI_File type, BIND(C) :: MPI_File
integer :: MPI_VAL integer :: MPI_VAL
end type MPI_File end type MPI_File
#endif
type, BIND(C) :: MPI_Group type, BIND(C) :: MPI_Group
integer :: MPI_VAL integer :: MPI_VAL
@ -120,9 +116,7 @@ module mpi_f08_types
type(MPI_Op), bind(C, name="ompi_f08_mpi_op_null") OMPI_PROTECTED :: MPI_OP_NULL; type(MPI_Op), bind(C, name="ompi_f08_mpi_op_null") OMPI_PROTECTED :: MPI_OP_NULL;
type(MPI_Request), bind(C, name="ompi_f08_mpi_request_null") OMPI_PROTECTED :: MPI_REQUEST_NULL; type(MPI_Request), bind(C, name="ompi_f08_mpi_request_null") OMPI_PROTECTED :: MPI_REQUEST_NULL;
type(MPI_Win), bind(C, name="ompi_f08_mpi_win_null") OMPI_PROTECTED :: MPI_WIN_NULL; type(MPI_Win), bind(C, name="ompi_f08_mpi_win_null") OMPI_PROTECTED :: MPI_WIN_NULL;
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
type(MPI_File), bind(C, name="ompi_f08_mpi_file_null") OMPI_PROTECTED :: MPI_FILE_NULL; type(MPI_File), bind(C, name="ompi_f08_mpi_file_null") OMPI_PROTECTED :: MPI_FILE_NULL;
#endif
! !
! Pre-defined datatype bindings ! Pre-defined datatype bindings
@ -175,9 +169,7 @@ interface operator (.EQ.)
module procedure ompi_comm_op_eq module procedure ompi_comm_op_eq
module procedure ompi_datatype_op_eq module procedure ompi_datatype_op_eq
module procedure ompi_errhandler_op_eq module procedure ompi_errhandler_op_eq
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
module procedure ompi_file_op_eq module procedure ompi_file_op_eq
#endif
module procedure ompi_group_op_eq module procedure ompi_group_op_eq
module procedure ompi_info_op_eq module procedure ompi_info_op_eq
module procedure ompi_message_op_eq module procedure ompi_message_op_eq
@ -190,9 +182,7 @@ interface operator (.NE.)
module procedure ompi_comm_op_ne module procedure ompi_comm_op_ne
module procedure ompi_datatype_op_ne module procedure ompi_datatype_op_ne
module procedure ompi_errhandler_op_ne module procedure ompi_errhandler_op_ne
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
module procedure ompi_file_op_ne module procedure ompi_file_op_ne
#endif
module procedure ompi_group_op_ne module procedure ompi_group_op_ne
module procedure ompi_info_op_ne module procedure ompi_info_op_ne
module procedure ompi_message_op_ne module procedure ompi_message_op_ne
@ -220,12 +210,10 @@ contains
ompi_errhandler_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL) ompi_errhandler_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
end function ompi_errhandler_op_eq end function ompi_errhandler_op_eq
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
logical function ompi_file_op_eq(a, b) logical function ompi_file_op_eq(a, b)
type(MPI_File), intent(in) :: a, b type(MPI_File), intent(in) :: a, b
ompi_file_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL) ompi_file_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
end function ompi_file_op_eq end function ompi_file_op_eq
#endif
logical function ompi_group_op_eq(a, b) logical function ompi_group_op_eq(a, b)
type(MPI_Group), intent(in) :: a, b type(MPI_Group), intent(in) :: a, b
@ -274,12 +262,10 @@ contains
ompi_errhandler_op_ne = (a%MPI_VAL .NE. b%MPI_VAL) ompi_errhandler_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
end function ompi_errhandler_op_ne end function ompi_errhandler_op_ne
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
logical function ompi_file_op_ne(a, b) logical function ompi_file_op_ne(a, b)
type(MPI_File), intent(in) :: a, b type(MPI_File), intent(in) :: a, b
ompi_file_op_ne = (a%MPI_VAL .NE. b%MPI_VAL) ompi_file_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
end function ompi_file_op_ne end function ompi_file_op_ne
#endif
logical function ompi_group_op_ne(a, b) logical function ompi_group_op_ne(a, b)
type(MPI_Group), intent(in) :: a, b type(MPI_Group), intent(in) :: a, b

12
ompi/mpi/fortran/use-mpi-f08/mod/pmpi-f08-interfaces.F90
Просмотреть файл

@ -7,7 +7,7 @@
! of Tennessee Research Foundation. All rights ! of Tennessee Research Foundation. All rights
! reserved. ! reserved.
! Copyright (c) 2012 Inria. All rights reserved. ! Copyright (c) 2012 Inria. All rights reserved.
! Copyright (c) 2015 Research Organization for Information Science ! Copyright (c) 2015-2017 Research Organization for Information Science
! and Technology (RIST). All rights reserved. ! and Technology (RIST). All rights reserved.
! $COPYRIGHT$ ! $COPYRIGHT$
! !
@ -2568,8 +2568,6 @@ subroutine PMPI_Error_string_f08(errorcode,string,resultlen,ierror)
end subroutine PMPI_Error_string_f08 end subroutine PMPI_Error_string_f08
end interface PMPI_Error_string end interface PMPI_Error_string
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
interface PMPI_File_call_errhandler interface PMPI_File_call_errhandler
subroutine PMPI_File_call_errhandler_f08(fh,errorcode,ierror) subroutine PMPI_File_call_errhandler_f08(fh,errorcode,ierror)
use :: mpi_f08_types, only : MPI_File use :: mpi_f08_types, only : MPI_File
@ -2611,9 +2609,6 @@ subroutine PMPI_File_set_errhandler_f08(file,errhandler,ierror)
end subroutine PMPI_File_set_errhandler_f08 end subroutine PMPI_File_set_errhandler_f08
end interface PMPI_File_set_errhandler end interface PMPI_File_set_errhandler
! endif for OMPI_PROVIDE_MPI_FILE_INTERFACE
#endif
interface PMPI_Finalize interface PMPI_Finalize
subroutine PMPI_Finalize_f08(ierror) subroutine PMPI_Finalize_f08(ierror)
implicit none implicit none
@ -3431,8 +3426,6 @@ subroutine PMPI_Status_set_elements_x_f08(status,datatype,count,ierror)
end subroutine PMPI_Status_set_elements_x_f08 end subroutine PMPI_Status_set_elements_x_f08
end interface PMPI_Status_set_elements_x end interface PMPI_Status_set_elements_x
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
interface PMPI_File_close interface PMPI_File_close
subroutine PMPI_File_close_f08(fh,ierror) subroutine PMPI_File_close_f08(fh,ierror)
use :: mpi_f08_types, only : MPI_File use :: mpi_f08_types, only : MPI_File
@ -4259,9 +4252,6 @@ subroutine PMPI_File_write_shared_f08(fh,buf,count,datatype,status,ierror)
end subroutine PMPI_File_write_shared_f08 end subroutine PMPI_File_write_shared_f08
end interface PMPI_File_write_shared end interface PMPI_File_write_shared
! endif for OMPI_PROVIDE_MPI_FILE_INTERFACE
#endif
interface PMPI_Register_datarep interface PMPI_Register_datarep
subroutine PMPI_Register_datarep_f08(datarep,read_conversion_fn,write_conversion_fn, & subroutine PMPI_Register_datarep_f08(datarep,read_conversion_fn,write_conversion_fn, &
dtype_file_extent_fn,extra_state,ierror) dtype_file_extent_fn,extra_state,ierror)

12
ompi/mpi/fortran/use-mpi-f08/mpi-f-interfaces-bind.h
Просмотреть файл

@ -7,7 +7,7 @@
! of Tennessee Research Foundation. All rights ! of Tennessee Research Foundation. All rights
! reserved. ! reserved.
! Copyright (c) 2012 Inria. All rights reserved. ! Copyright (c) 2012 Inria. All rights reserved.
! Copyright (c) 2015 Research Organization for Information Science ! Copyright (c) 2015-2017 Research Organization for Information Science
! and Technology (RIST). All rights reserved. ! and Technology (RIST). All rights reserved.
! $COPYRIGHT$ ! $COPYRIGHT$
! !
@ -1908,8 +1908,6 @@ subroutine ompi_error_string_f(errorcode,string,resultlen,ierror,str_len) &
INTEGER, VALUE, INTENT(IN) :: str_len INTEGER, VALUE, INTENT(IN) :: str_len
end subroutine ompi_error_string_f end subroutine ompi_error_string_f
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
subroutine ompi_file_call_errhandler_f(fh,errorcode,ierror) & subroutine ompi_file_call_errhandler_f(fh,errorcode,ierror) &
BIND(C, name="ompi_file_call_errhandler_f") BIND(C, name="ompi_file_call_errhandler_f")
implicit none implicit none
@ -1943,9 +1941,6 @@ subroutine ompi_file_set_errhandler_f(file,errhandler,ierror) &
INTEGER, INTENT(OUT) :: ierror INTEGER, INTENT(OUT) :: ierror
end subroutine ompi_file_set_errhandler_f end subroutine ompi_file_set_errhandler_f
! OMPI_PROFILE_MPI_FILE_INTERFACE
#endif
subroutine ompi_finalize_f(ierror) & subroutine ompi_finalize_f(ierror) &
BIND(C, name="ompi_finalize_f") BIND(C, name="ompi_finalize_f")
implicit none implicit none
@ -2625,8 +2620,6 @@ subroutine ompi_status_set_elements_x_f(status,datatype,count,ierror) &
INTEGER, INTENT(OUT) :: ierror INTEGER, INTENT(OUT) :: ierror
end subroutine ompi_status_set_elements_x_f end subroutine ompi_status_set_elements_x_f
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
subroutine ompi_file_close_f(fh,ierror) & subroutine ompi_file_close_f(fh,ierror) &
BIND(C, name="ompi_file_close_f") BIND(C, name="ompi_file_close_f")
implicit none implicit none
@ -3200,9 +3193,6 @@ subroutine ompi_file_write_shared_f(fh,buf,count,datatype,status,ierror) &
INTEGER, INTENT(OUT) :: ierror INTEGER, INTENT(OUT) :: ierror
end subroutine ompi_file_write_shared_f end subroutine ompi_file_write_shared_f
! OMPI_PROVIDE_MPI_FILE_INTERFACE
#endif
subroutine ompi_register_datarep_f(datarep,read_conversion_fn, & subroutine ompi_register_datarep_f(datarep,read_conversion_fn, &
write_conversion_fn,dtype_file_extent_fn, & write_conversion_fn,dtype_file_extent_fn, &
extra_state,ierror,datarep_len) & extra_state,ierror,datarep_len) &

12
ompi/mpi/fortran/use-mpi-f08/pmpi-f-interfaces-bind.h
Просмотреть файл

@ -7,7 +7,7 @@
! of Tennessee Research Foundation. All rights ! of Tennessee Research Foundation. All rights
! reserved. ! reserved.
! Copyright (c) 2012 Inria. All rights reserved. ! Copyright (c) 2012 Inria. All rights reserved.
! Copyright (c) 2015 Research Organization for Information Science ! Copyright (c) 2015-2017 Research Organization for Information Science
! and Technology (RIST). All rights reserved. ! and Technology (RIST). All rights reserved.
! $COPYRIGHT$ ! $COPYRIGHT$
! !
@ -1745,8 +1745,6 @@ subroutine pompi_error_string_f(errorcode,string,resultlen,ierror,str_len) &
INTEGER, VALUE, INTENT(IN) :: str_len INTEGER, VALUE, INTENT(IN) :: str_len
end subroutine pompi_error_string_f end subroutine pompi_error_string_f
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
subroutine pompi_file_call_errhandler_f(fh,errorcode,ierror) & subroutine pompi_file_call_errhandler_f(fh,errorcode,ierror) &
BIND(C, name="pompi_file_call_errhandler_f") BIND(C, name="pompi_file_call_errhandler_f")
implicit none implicit none
@ -1780,9 +1778,6 @@ subroutine pompi_file_set_errhandler_f(file,errhandler,ierror) &
INTEGER, INTENT(OUT) :: ierror INTEGER, INTENT(OUT) :: ierror
end subroutine pompi_file_set_errhandler_f end subroutine pompi_file_set_errhandler_f
! OMPI_PROVIDE_MPI_FILE_INTERFACE
#endif
subroutine pompi_finalize_f(ierror) & subroutine pompi_finalize_f(ierror) &
BIND(C, name="pompi_finalize_f") BIND(C, name="pompi_finalize_f")
implicit none implicit none
@ -2408,8 +2403,6 @@ subroutine pompi_status_set_elements_f(status,datatype,count,ierror) &
INTEGER, INTENT(OUT) :: ierror INTEGER, INTENT(OUT) :: ierror
end subroutine pompi_status_set_elements_f end subroutine pompi_status_set_elements_f
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
subroutine pompi_file_close_f(fh,ierror) & subroutine pompi_file_close_f(fh,ierror) &
BIND(C, name="pompi_file_close_f") BIND(C, name="pompi_file_close_f")
implicit none implicit none
@ -2983,9 +2976,6 @@ subroutine pompi_file_write_shared_f(fh,buf,count,datatype,status,ierror) &
INTEGER, INTENT(OUT) :: ierror INTEGER, INTENT(OUT) :: ierror
end subroutine pompi_file_write_shared_f end subroutine pompi_file_write_shared_f
! OMPI_PROVIDE_MPI_FILE_INTERFACE
#endif
subroutine pompi_register_datarep_f(datarep,read_conversion_fn, & subroutine pompi_register_datarep_f(datarep,read_conversion_fn, &
write_conversion_fn,dtype_file_extent_fn, & write_conversion_fn,dtype_file_extent_fn, &
extra_state,ierror,datarep_len) & extra_state,ierror,datarep_len) &

6
ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr.F90
Просмотреть файл

@ -11,6 +11,8 @@
! Copyright (c) 2004-2005 The Regents of the University of California. ! Copyright (c) 2004-2005 The Regents of the University of California.
! All rights reserved. ! All rights reserved.
! Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved. ! Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved.
! Copyright (c) 2017 Research Organization for Information Science
! and Technology (RIST). All rights reserved.
! $COPYRIGHT$ ! $COPYRIGHT$
! !
! Additional copyrights may follow ! Additional copyrights may follow
@ -25,10 +27,8 @@ module mpi
include "mpif-config.h" include "mpif-config.h"
include "mpif-constants.h" include "mpif-constants.h"
include "mpif-handles.h" include "mpif-handles.h"
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
include "mpif-io-constants.h" include "mpif-io-constants.h"
include "mpif-io-handles.h" include "mpif-io-handles.h"
#endif
include "mpif-sentinels.h" include "mpif-sentinels.h"
! The MPI attribute callback functions ! The MPI attribute callback functions
@ -42,9 +42,7 @@ module mpi
! The ignore-TKR version of the MPI interfaces ! The ignore-TKR version of the MPI interfaces
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"
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
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"
#endif
include 'mpi-ignore-tkr-sizeof.h' include 'mpi-ignore-tkr-sizeof.h'

4
ompi/mpi/fortran/use-mpi-tkr/mpi.F90
Просмотреть файл

@ -11,7 +11,7 @@
! Copyright (c) 2004-2005 The Regents of the University of California. ! Copyright (c) 2004-2005 The Regents of the University of California.
! All rights reserved. ! All rights reserved.
! Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved. ! Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved.
! Copyright (c) 2016 Research Organization for Information Science ! Copyright (c) 2016-2017 Research Organization for Information Science
! and Technology (RIST). All rights reserved. ! and Technology (RIST). All rights reserved.
! $COPYRIGHT$ ! $COPYRIGHT$
! !
@ -27,10 +27,8 @@ module mpi
include "mpif-config.h" include "mpif-config.h"
include "mpif-constants.h" include "mpif-constants.h"
include "mpif-handles.h" include "mpif-handles.h"
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
include "mpif-io-constants.h" include "mpif-io-constants.h"
include "mpif-io-handles.h" include "mpif-io-handles.h"
#endif
include "mpif-sentinels.h" include "mpif-sentinels.h"
! The MPI attribute callback functions ! The MPI attribute callback functions

10
ompi/tools/ompi_info/param.c
Просмотреть файл

@ -11,7 +11,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2007-2017 Cisco Systems, Inc. All rights reserved * Copyright (c) 2007-2017 Cisco Systems, Inc. All rights reserved
* Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2014-2016 Research Organization for Information Science * Copyright (c) 2014-2017 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2015 Intel, Inc. All rights reserved * Copyright (c) 2015 Intel, Inc. All rights reserved
* $COPYRIGHT$ * $COPYRIGHT$
@ -126,7 +126,6 @@ void ompi_info_do_config(bool want_all)
char *mpirun_prefix_by_default; char *mpirun_prefix_by_default;
#endif #endif
char *sparse_groups; char *sparse_groups;
char *have_mpi_io;
char *wtime_support; char *wtime_support;
char *symbol_visibility; char *symbol_visibility;
char *ft_support; char *ft_support;
@ -281,7 +280,6 @@ void ompi_info_do_config(bool want_all)
mpirun_prefix_by_default = ORTE_WANT_ORTERUN_PREFIX_BY_DEFAULT ? "yes" : "no"; mpirun_prefix_by_default = ORTE_WANT_ORTERUN_PREFIX_BY_DEFAULT ? "yes" : "no";
#endif #endif
sparse_groups = OMPI_GROUP_SPARSE ? "yes" : "no"; sparse_groups = OMPI_GROUP_SPARSE ? "yes" : "no";
have_mpi_io = OMPI_PROVIDE_MPI_FILE_INTERFACE ? "yes" : "no";
wtime_support = OPAL_TIMER_USEC_NATIVE ? "native" : "gettimeofday"; wtime_support = OPAL_TIMER_USEC_NATIVE ? "native" : "gettimeofday";
symbol_visibility = OPAL_C_HAVE_VISIBILITY ? "yes" : "no"; symbol_visibility = OPAL_C_HAVE_VISIBILITY ? "yes" : "no";
topology_support = "yes"; topology_support = "yes";
@ -638,7 +636,6 @@ void ompi_info_do_config(bool want_all)
opal_info_out("mpirun default --prefix", "mpirun:prefix_by_default", opal_info_out("mpirun default --prefix", "mpirun:prefix_by_default",
mpirun_prefix_by_default); mpirun_prefix_by_default);
#endif #endif
opal_info_out("MPI I/O support", "options:mpi-io", have_mpi_io);
opal_info_out("MPI_WTIME support", "options:mpi-wtime", wtime_support); opal_info_out("MPI_WTIME support", "options:mpi-wtime", wtime_support);
opal_info_out("Symbol vis. support", "options:visibility", symbol_visibility); opal_info_out("Symbol vis. support", "options:visibility", symbol_visibility);
opal_info_out("Host topology support", "options:host-topology", opal_info_out("Host topology support", "options:host-topology",
@ -664,12 +661,7 @@ void ompi_info_do_config(bool want_all)
MPI_MAX_INFO_VAL); MPI_MAX_INFO_VAL);
opal_info_out_int("MPI_MAX_PORT_NAME", "options:mpi-max-port-name", opal_info_out_int("MPI_MAX_PORT_NAME", "options:mpi-max-port-name",
MPI_MAX_PORT_NAME); MPI_MAX_PORT_NAME);
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
opal_info_out_int("MPI_MAX_DATAREP_STRING", "options:mpi-max-datarep-string", opal_info_out_int("MPI_MAX_DATAREP_STRING", "options:mpi-max-datarep-string",
MPI_MAX_DATAREP_STRING); MPI_MAX_DATAREP_STRING);
#else
opal_info_out("MPI_MAX_DATAREP_STRING", "options:mpi-max-datarep-string",
"IO interface not provided");
#endif
} }

3
oshmem/tools/oshmem_info/param.c
Просмотреть файл

@ -79,7 +79,6 @@ void oshmem_info_do_config(bool want_all)
char *mpirun_prefix_by_default; char *mpirun_prefix_by_default;
#endif #endif
char *sparse_groups; char *sparse_groups;
char *have_mpi_io;
char *wtime_support; char *wtime_support;
char *symbol_visibility; char *symbol_visibility;
char *ft_support; char *ft_support;
@ -124,7 +123,6 @@ void oshmem_info_do_config(bool want_all)
mpirun_prefix_by_default = ORTE_WANT_ORTERUN_PREFIX_BY_DEFAULT ? "yes" : "no"; mpirun_prefix_by_default = ORTE_WANT_ORTERUN_PREFIX_BY_DEFAULT ? "yes" : "no";
#endif #endif
sparse_groups = OMPI_GROUP_SPARSE ? "yes" : "no"; sparse_groups = OMPI_GROUP_SPARSE ? "yes" : "no";
have_mpi_io = OMPI_PROVIDE_MPI_FILE_INTERFACE ? "yes" : "no";
wtime_support = OPAL_TIMER_USEC_NATIVE ? "native" : "gettimeofday"; wtime_support = OPAL_TIMER_USEC_NATIVE ? "native" : "gettimeofday";
symbol_visibility = OPAL_C_HAVE_VISIBILITY ? "yes" : "no"; symbol_visibility = OPAL_C_HAVE_VISIBILITY ? "yes" : "no";
topology_support = "yes"; topology_support = "yes";
@ -393,7 +391,6 @@ void oshmem_info_do_config(bool want_all)
opal_info_out("mpirun default --prefix", "mpirun:prefix_by_default", opal_info_out("mpirun default --prefix", "mpirun:prefix_by_default",
mpirun_prefix_by_default); mpirun_prefix_by_default);
#endif #endif
opal_info_out("MPI I/O support", "options:mpi-io", have_mpi_io);
opal_info_out("MPI_WTIME support", "options:mpi-wtime", wtime_support); opal_info_out("MPI_WTIME support", "options:mpi-wtime", wtime_support);
opal_info_out("Symbol vis. support", "options:visibility", symbol_visibility); opal_info_out("Symbol vis. support", "options:visibility", symbol_visibility);
opal_info_out("Host topology support", "options:host-topology", opal_info_out("Host topology support", "options:host-topology",