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

cxx bindings: fix support for --disable-mpi-io configure option

Просмотр исходного кода 
Fixes open-mpi/ompi#2179
Этот коммит содержится в:
Gilles Gouaillardet 2016-10-06 09:33:27 +09:00
родитель 67684be7c9
Коммит 95e63d7803
2 изменённых файлов: 9 добавлений и 1 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -2,6 +2,8 @@
/* /*
* 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
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -47,10 +49,12 @@ 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,
@ -110,6 +114,7 @@ MPI_Errhandler ompi_cxx_errhandler_create_win (void *fn)
return errhandler; return errhandler;
} }
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
MPI_Errhandler ompi_cxx_errhandler_create_file (void *fn) MPI_Errhandler ompi_cxx_errhandler_create_file (void *fn)
{ {
ompi_errhandler_t *errhandler; ompi_errhandler_t *errhandler;
@ -120,6 +125,7 @@ MPI_Errhandler ompi_cxx_errhandler_create_file (void *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,

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

@ -2,6 +2,8 @@
/* /*
* 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
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -50,7 +52,6 @@ typedef void (ompi_errhandler_cxx_dispatch_fn_t)(void *handle, int *err_code,
ompi_cxx_communicator_type_t ompi_cxx_comm_get_type (MPI_Comm comm); ompi_cxx_communicator_type_t ompi_cxx_comm_get_type (MPI_Comm comm);
int ompi_cxx_errhandler_invoke_comm (MPI_Comm comm, int ret, const char *message); int ompi_cxx_errhandler_invoke_comm (MPI_Comm comm, int ret, const char *message);
int ompi_cxx_errhandler_invoke_file (MPI_File file, int ret, const char *message);
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,
@ -67,6 +68,7 @@ void ompi_mpi_cxx_comm_errhandler_invoke (MPI_Comm *mpi_comm, int *err,
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 #if OMPI_PROVIDE_MPI_FILE_INTERFACE
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 #endif