[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.2-18-gb76ebc6
Service Account
noreply at mpich.org
Wed Jul 30 13:05:48 CDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".
The branch, master has been updated
via b76ebc6f2820d2d0a194abc8e2da3dab080bbea2 (commit)
from 1d3684ecd94a429fd1fd25659e5557fe9f2ecdc0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/b76ebc6f2820d2d0a194abc8e2da3dab080bbea2
commit b76ebc6f2820d2d0a194abc8e2da3dab080bbea2
Author: Wesley Bland <wbland at anl.gov>
Date: Fri Mar 28 10:59:20 2014 -0500
Remove old FT functions
A few MPIX functions pertaining to fault tolerance were added to MPICH a while
back. These functions are no longer applicable given the new ULFM
implementation so they are being removed here.
Signed-off-by: Junchao Zhang <jczhang at mcs.anl.gov>
diff --git a/src/include/mpi.h.in b/src/include/mpi.h.in
index 20a9c33..c12e38c 100644
--- a/src/include/mpi.h.in
+++ b/src/include/mpi.h.in
@@ -1528,9 +1528,6 @@ int MPI_T_category_changed(int *stamp);
/* Non-standard but public extensions to MPI */
/* Fault Tolerance Extensions */
-int MPIX_Comm_group_failed(MPI_Comm comm, MPI_Group *failed_group);
-int MPIX_Comm_remote_group_failed(MPI_Comm comm, MPI_Group *failed_group);
-int MPIX_Comm_reenable_anysource(MPI_Comm comm, MPI_Group *failed_group);
/* End Prototypes */
@@ -2166,9 +2163,6 @@ int PMPI_T_category_changed(int *stamp);
/* Non-standard but public extensions to MPI */
/* Fault Tolerance Extensions */
-int PMPIX_Comm_group_failed(MPI_Comm comm, MPI_Group *failed_group);
-int PMPIX_Comm_remote_group_failed(MPI_Comm comm, MPI_Group *failed_group);
-int PMPIX_Comm_reenable_anysource(MPI_Comm comm, MPI_Group *failed_group);
#endif /* MPI_BUILD_PROFILING */
diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h
index b07f448..105d7b3 100644
--- a/src/include/mpiimpl.h
+++ b/src/include/mpiimpl.h
@@ -2754,48 +2754,6 @@ int MPID_Comm_spawn_multiple(int, char *[], char **[], const int [], MPID_Info*
int, MPID_Comm *, MPID_Comm **, int []);
/*@
- MPID_Comm_group_failed - MPID entry point for MPI_Comm_group_failed
-
- Input Parameters:
-. comm - communicator
-
- Output Parameters
-. failed_group_ptr - group of failed processes
-
- Return Value:
- 'MPI_SUCCESS' or a valid MPI error code.
-@*/
-int MPID_Comm_group_failed(MPID_Comm *comm, MPID_Group **failed_group_ptr);
-
-/*@
- MPID_Comm_remote_group_failed - MPID entry point for MPI_Comm_remote_group_failed
-
- Input Parameters:
-. comm - intercommunicator
-
- Output Parameters
-. failed_group_ptr - group of failed processes in comm's remote group
-
- Return Value:
- 'MPI_SUCCESS' or a valid MPI error code.
-@*/
-int MPID_Comm_remote_group_failed(MPID_Comm *comm, MPID_Group **failed_group_ptr);
-
-/*@
- MPID_Comm_reenable_anysource - MPID entry point for MPI_Comm_reenable_anysource
-
- Input Parameters:
-. comm - communicator
-
- Output Parameters
-. failed_group_ptr - group of failed processes
-
- Return Value:
- 'MPI_SUCCESS' or a valid MPI error code.
-@*/
-int MPID_Comm_reenable_anysource(MPID_Comm *comm, MPID_Group **failed_group_ptr);
-
-/*@
MPID_Send - MPID entry point for MPI_Send
Notes:
diff --git a/src/mpi/comm/Makefile.mk b/src/mpi/comm/Makefile.mk
index 7c40af5..a14b695 100644
--- a/src/mpi/comm/Makefile.mk
+++ b/src/mpi/comm/Makefile.mk
@@ -26,10 +26,7 @@ mpi_sources += \
src/mpi/comm/comm_test_inter.c \
src/mpi/comm/intercomm_create.c \
src/mpi/comm/intercomm_merge.c \
- src/mpi/comm/comm_split_type.c \
- src/mpi/comm/comm_group_failed.c \
- src/mpi/comm/comm_reenable_anysource.c \
- src/mpi/comm/comm_remote_group_failed.c
+ src/mpi/comm/comm_split_type.c
mpi_core_sources += \
src/mpi/comm/commutil.c
diff --git a/src/mpi/comm/comm_group_failed.c b/src/mpi/comm/comm_group_failed.c
deleted file mode 100644
index a5c3b72..0000000
--- a/src/mpi/comm/comm_group_failed.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */
-/*
- *
- * (C) 2008 by Argonne National Laboratory.
- * See COPYRIGHT in top-level directory.
- */
-
-#include "mpiimpl.h"
-#include "mpicomm.h"
-
-/* -- Begin Profiling Symbol Block for routine MPIX_Comm_group_failed */
-#if defined(HAVE_PRAGMA_WEAK)
-#pragma weak MPIX_Comm_group_failed = PMPIX_Comm_group_failed
-#elif defined(HAVE_PRAGMA_HP_SEC_DEF)
-#pragma _HP_SECONDARY_DEF PMPIX_Comm_group_failed MPIX_Comm_group_failed
-#elif defined(HAVE_PRAGMA_CRI_DUP)
-#pragma _CRI duplicate MPIX_Comm_group_failed as PMPIX_Comm_group_failed
-#elif defined(HAVE_WEAK_ATTRIBUTE)
-int MPIX_Comm_group_failed(MPI_Comm comm, MPI_Group *failed_group) __attribute__((weak,alias("PMPIX_Comm_group_failed")));
-#endif
-/* -- End Profiling Symbol Block */
-
-/* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build
- the MPI routines */
-#ifndef MPICH_MPI_FROM_PMPI
-#undef MPIX_Comm_group_failed
-#define MPIX_Comm_group_failed PMPIX_Comm_group_failed
-
-#endif
-
-#undef FUNCNAME
-#define FUNCNAME MPIX_Comm_group_failed
-#undef FCNAME
-#define FCNAME MPIU_QUOTE(FUNCNAME)
-/*@
-
-MPIX_Comm_group_failed - Accesses the group associated with given communicator
-
-Input Parameters:
-. comm - Communicator (handle)
-
-Output Parameters:
-. failed_group - Group of failed processes communicator (handle)
-
-Notes:
-.N COMMNULL
-
-.N ThreadSafe
-
-.N Fortran
-
-.N Errors
-.N MPI_SUCCESS
-.N MPI_ERR_COMM
-@*/
-int MPIX_Comm_group_failed(MPI_Comm comm, MPI_Group *failed_group)
-{
- int mpi_errno = MPI_SUCCESS;
- MPID_Comm *comm_ptr = NULL;
- MPID_Group *failed_group_ptr;
- MPID_MPI_STATE_DECL(MPID_STATE_MPIX_COMM_GROUP_FAILED);
-
- MPIR_ERRTEST_INITIALIZED_ORDIE();
-
- MPIU_THREAD_CS_ENTER(ALLFUNC,);
- MPID_MPI_FUNC_ENTER(MPID_STATE_MPIX_COMM_GROUP_FAILED);
-
- /* Validate parameters, especially handles needing to be converted */
-# ifdef HAVE_ERROR_CHECKING
- {
- MPID_BEGIN_ERROR_CHECKS;
- {
- MPIR_ERRTEST_COMM(comm, mpi_errno);
- }
- MPID_END_ERROR_CHECKS;
- }
-
-# endif /* HAVE_ERROR_CHECKING */
-
- /* Convert MPI object handles to object pointers */
- MPID_Comm_get_ptr( comm, comm_ptr );
-
- /* Validate parameters and objects (post conversion) */
-# ifdef HAVE_ERROR_CHECKING
- {
- MPID_BEGIN_ERROR_CHECKS;
- {
- /* Validate comm_ptr */
- MPID_Comm_valid_ptr( comm_ptr, mpi_errno );
- /* If comm_ptr is not valid, it will be reset to null */
- if (mpi_errno) goto fn_fail;
- }
- MPID_END_ERROR_CHECKS;
- }
-# endif /* HAVE_ERROR_CHECKING */
-
- /* ... body of routine ... */
-
- mpi_errno = MPID_Comm_group_failed(comm_ptr, &failed_group_ptr);
- if (mpi_errno) goto fn_fail;
-
- MPIU_OBJ_PUBLISH_HANDLE(*failed_group, failed_group_ptr->handle);
-
- /* ... end of body of routine ... */
-
- fn_exit:
- MPID_MPI_FUNC_EXIT(MPID_STATE_MPIX_COMM_GROUP_FAILED);
- MPIU_THREAD_CS_EXIT(ALLFUNC,);
- return mpi_errno;
-
- fn_fail:
- /* --BEGIN ERROR HANDLING-- */
-# ifdef HAVE_ERROR_CHECKING
- {
- mpi_errno = MPIR_Err_create_code(
- mpi_errno, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OTHER, "**mpix_comm_group_failed",
- "**mpix_comm_group_failed %C %p", comm, failed_group);
- }
-# endif
- mpi_errno = MPIR_Err_return_comm( comm_ptr, FCNAME, mpi_errno );
- goto fn_exit;
- /* --END ERROR HANDLING-- */
-}
-
diff --git a/src/mpi/comm/comm_reenable_anysource.c b/src/mpi/comm/comm_reenable_anysource.c
deleted file mode 100644
index 05cf847..0000000
--- a/src/mpi/comm/comm_reenable_anysource.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */
-/*
- *
- * (C) 2008 by Argonne National Laboratory.
- * See COPYRIGHT in top-level directory.
- */
-
-#include "mpiimpl.h"
-
-/* -- Begin Profiling Symbol Block for routine MPIX_Comm_reenable_anysource */
-#if defined(HAVE_PRAGMA_WEAK)
-#pragma weak MPIX_Comm_reenable_anysource = PMPIX_Comm_reenable_anysource
-#elif defined(HAVE_PRAGMA_HP_SEC_DEF)
-#pragma _HP_SECONDARY_DEF PMPIX_Comm_reenable_anysource MPIX_Comm_reenable_anysource
-#elif defined(HAVE_PRAGMA_CRI_DUP)
-#pragma _CRI duplicate MPIX_Comm_reenable_anysource as PMPIX_Comm_reenable_anysource
-#elif defined(HAVE_WEAK_ATTRIBUTE)
-int MPIX_Comm_reenable_anysource(MPI_Comm comm, MPI_Group *failed_group) __attribute__((weak,alias("PMPIX_Comm_reenable_anysource")));
-#endif
-/* -- End Profiling Symbol Block */
-
-/* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build
- the MPI routines */
-#ifndef MPICH_MPI_FROM_PMPI
-#undef MPIX_Comm_reenable_anysource
-#define MPIX_Comm_reenable_anysource PMPIX_Comm_reenable_anysource
-
-#endif
-
-#undef FUNCNAME
-#define FUNCNAME MPIX_Comm_reenable_anysource
-#undef FCNAME
-#define FCNAME MPIU_QUOTE(FUNCNAME)
-/*@
-
-MPIX_Comm_reenable_anysource - Re-enable the ability to post receives using MPI_ANY_SOURCE on the communicator
-
-Input Parameters:
-. comm - Communicator (handle)
-
-Output Parameters:
-. failed_group - Group of failed processes communicator (handle)
-
-Notes:
-.N COMMNULL
-
-.N ThreadSafe
-
-.N Fortran
-
-.N Errors
-.N MPI_SUCCESS
-.N MPI_ERR_COMM
-@*/
-int MPIX_Comm_reenable_anysource(MPI_Comm comm, MPI_Group *failed_group)
-{
- int mpi_errno = MPI_SUCCESS;
- MPID_Comm *comm_ptr = NULL;
- MPID_Group *failed_group_ptr = NULL;
- MPIDI_STATE_DECL(MPID_STATE_MPIX_COMM_REENABLE_ANYSOURCE);
-
- MPIR_ERRTEST_INITIALIZED_ORDIE();
-
- MPIU_THREAD_CS_ENTER(ALLFUNC,);
- MPIDI_FUNC_ENTER(MPID_STATE_MPIX_COMM_REENABLE_ANYSOURCE);
-
- /* Validate parameters, especially handles needing to be converted */
-# ifdef HAVE_ERROR_CHECKING
- {
- MPID_BEGIN_ERROR_CHECKS;
- {
- MPIR_ERRTEST_COMM(comm, mpi_errno);
- }
- MPID_END_ERROR_CHECKS;
- }
-
-# endif /* HAVE_ERROR_CHECKING */
-
- /* Convert MPI object handles to object pointers */
- MPID_Comm_get_ptr( comm, comm_ptr );
-
- /* Validate parameters and objects (post conversion) */
-# ifdef HAVE_ERROR_CHECKING
- {
- MPID_BEGIN_ERROR_CHECKS;
- {
- /* Validate comm_ptr */
- MPID_Comm_valid_ptr( comm_ptr, mpi_errno );
- /* If comm_ptr is not valid, it will be reset to null */
- if (mpi_errno) goto fn_fail;
- }
- MPID_END_ERROR_CHECKS;
- }
-# endif /* HAVE_ERROR_CHECKING */
-
- /* ... body of routine ... */
-
- mpi_errno = MPID_Comm_reenable_anysource(comm_ptr, &failed_group_ptr);
- if (mpi_errno) goto fn_fail;
-
- MPIU_OBJ_PUBLISH_HANDLE(*failed_group, failed_group_ptr->handle);
-
- /* ... end of body of routine ... */
-
- fn_exit:
- MPIDI_FUNC_EXIT(MPID_STATE_MPIX_COMM_REENABLE_ANYSOURCE);
- MPIU_THREAD_CS_EXIT(ALLFUNC,);
- return mpi_errno;
- fn_fail:
- /* --BEGIN ERROR HANDLING-- */
-# ifdef HAVE_ERROR_CHECKING
- {
- mpi_errno = MPIR_Err_create_code(
- mpi_errno, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OTHER, "**mpix_comm_reenable_anysource",
- "**mpix_comm_reenable_anysource %C %p", comm, failed_group);
- }
-# endif
- mpi_errno = MPIR_Err_return_comm( comm_ptr, FCNAME, mpi_errno );
- goto fn_exit;
- /* --END ERROR HANDLING-- */
-}
diff --git a/src/mpi/comm/comm_remote_group_failed.c b/src/mpi/comm/comm_remote_group_failed.c
deleted file mode 100644
index 30635e6..0000000
--- a/src/mpi/comm/comm_remote_group_failed.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */
-/*
- *
- * (C) 2008 by Argonne National Laboratory.
- * See COPYRIGHT in top-level directory.
- */
-
-#include "mpiimpl.h"
-#include "mpicomm.h"
-
-/* -- Begin Profiling Symbol Block for routine MPIX_Comm_remote_group_failed */
-#if defined(HAVE_PRAGMA_WEAK)
-#pragma weak MPIX_Comm_remote_group_failed = PMPIX_Comm_remote_group_failed
-#elif defined(HAVE_PRAGMA_HP_SEC_DEF)
-#pragma _HP_SECONDARY_DEF PMPIX_Comm_remote_group_failed MPIX_Comm_remote_group_failed
-#elif defined(HAVE_PRAGMA_CRI_DUP)
-#pragma _CRI duplicate MPIX_Comm_remote_group_failed as PMPIX_Comm_remote_group_failed
-#elif defined(HAVE_WEAK_ATTRIBUTE)
-int MPIX_Comm_remote_group_failed(MPI_Comm comm, MPI_Group *failed_group) __attribute__((weak,alias("PMPIX_Comm_remote_group_failed")));
-#endif
-/* -- End Profiling Symbol Block */
-
-/* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build
- the MPI routines */
-#ifndef MPICH_MPI_FROM_PMPI
-#undef MPIX_Comm_remote_group_failed
-#define MPIX_Comm_remote_group_failed PMPIX_Comm_remote_group_failed
-
-#endif
-
-#undef FUNCNAME
-#define FUNCNAME MPIX_Comm_remote_group_failed
-#undef FCNAME
-#define FCNAME MPIU_QUOTE(FUNCNAME)
-/*@
-
-MPIX_Comm_remote_group_failed - Accesses the group associated with given communicator
-
-Input Parameters:
-. comm - Communicator (handle)
-
-Output Parameters:
-. failed_group - Group of failed processes communicator (handle)
-
-Notes:
-.N COMMNULL
-
-.N ThreadSafe
-
-.N Fortran
-
-.N Errors
-.N MPI_SUCCESS
-.N MPI_ERR_COMM
-@*/
-int MPIX_Comm_remote_group_failed(MPI_Comm comm, MPI_Group *failed_group)
-{
- int mpi_errno = MPI_SUCCESS;
- MPID_Comm *comm_ptr = NULL;
- MPID_Group *failed_group_ptr;
- MPID_MPI_STATE_DECL(MPID_STATE_MPIX_COMM_REMOTE_GROUP_FAILED);
-
- MPIR_ERRTEST_INITIALIZED_ORDIE();
-
- MPIU_THREAD_CS_ENTER(ALLFUNC,);
- MPID_MPI_FUNC_ENTER(MPID_STATE_MPIX_COMM_REMOTE_GROUP_FAILED);
-
- /* Validate parameters, especially handles needing to be converted */
-# ifdef HAVE_ERROR_CHECKING
- {
- MPID_BEGIN_ERROR_CHECKS;
- {
- MPIR_ERRTEST_COMM(comm, mpi_errno);
- }
- MPID_END_ERROR_CHECKS;
- }
-
-# endif /* HAVE_ERROR_CHECKING */
-
- /* Convert MPI object handles to object pointers */
- MPID_Comm_get_ptr( comm, comm_ptr );
-
- /* Validate parameters and objects (post conversion) */
-# ifdef HAVE_ERROR_CHECKING
- {
- MPID_BEGIN_ERROR_CHECKS;
- {
- /* Validate comm_ptr */
- MPID_Comm_valid_ptr( comm_ptr, mpi_errno );
- /* If comm_ptr is not valid, it will be reset to null */
- if (mpi_errno) goto fn_fail;
- }
- MPID_END_ERROR_CHECKS;
- }
-# endif /* HAVE_ERROR_CHECKING */
-
- /* ... body of routine ... */
-
- mpi_errno = MPID_Comm_remote_group_failed(comm_ptr, &failed_group_ptr);
- if (mpi_errno) goto fn_fail;
-
- MPIU_OBJ_PUBLISH_HANDLE(*failed_group, failed_group_ptr->handle);
-
- /* ... end of body of routine ... */
-
- fn_exit:
- MPID_MPI_FUNC_EXIT(MPID_STATE_MPIX_COMM_REMOTE_GROUP_FAILED);
- MPIU_THREAD_CS_EXIT(ALLFUNC,);
- return mpi_errno;
-
- fn_fail:
- /* --BEGIN ERROR HANDLING-- */
-# ifdef HAVE_ERROR_CHECKING
- {
- mpi_errno = MPIR_Err_create_code(
- mpi_errno, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OTHER, "**mpix_comm_remote_group_failed",
- "**mpix_comm_remote_group_failed %C %p", comm, failed_group);
- }
-# endif
- mpi_errno = MPIR_Err_return_comm( comm_ptr, FCNAME, mpi_errno );
- goto fn_exit;
- /* --END ERROR HANDLING-- */
-}
-
diff --git a/src/mpi/errhan/errnames.txt b/src/mpi/errhan/errnames.txt
index d5de9f9..0cbe441 100644
--- a/src/mpi/errhan/errnames.txt
+++ b/src/mpi/errhan/errnames.txt
@@ -1095,12 +1095,6 @@ is too big (> MPIU_SHMW_GHND_SZ)
**mpi_comm_remote_size %C %p:MPI_Comm_remote_size(%C, size=%p) failed
**mpi_comm_remote_group:MPI_Comm_remote_group failed
**mpi_comm_remote_group %C %p:MPI_Comm_remote_group(%C, group=%p) failed
-**mpix_comm_remote_group_failed:MPIX_Comm_remote_group_failed failed
-**mpix_comm_remote_group_failed %C %p:MPIX_Comm_remote_group_failed(%C, group=%p) failed
-**mpix_comm_group_failed:MPIX_Comm_group_failed failed
-**mpix_comm_group_failed %C %p:MPIX_Comm_group_failed(%C, group=%p) failed
-**mpix_comm_reenable_anysource:MPIX_Comm_reenable_anysource
-**mpix_comm_reenable_anysource %C %p:MPIX_Comm_reenable_anysource(%C, group=%p) failed
**mpi_intercomm_create:MPI_Intercomm_create failed
**mpi_intercomm_create %C %d %C %d %d %p:MPI_Intercomm_create(%C, local_leader=%d, %C, remote_leader=%d, tag=%d, newintercomm=%p) failed
**mpi_intercomm_merge:MPI_Intercomm_merge failed
diff --git a/src/mpid/ch3/src/Makefile.mk b/src/mpid/ch3/src/Makefile.mk
index 64b075e..a69106a 100644
--- a/src/mpid/ch3/src/Makefile.mk
+++ b/src/mpid/ch3/src/Makefile.mk
@@ -28,8 +28,6 @@ mpi_core_sources += \
src/mpid/ch3/src/mpid_cancel_recv.c \
src/mpid/ch3/src/mpid_cancel_send.c \
src/mpid/ch3/src/mpid_comm_disconnect.c \
- src/mpid/ch3/src/mpid_comm_group_failed.c \
- src/mpid/ch3/src/mpid_comm_reenable_anysource.c \
src/mpid/ch3/src/mpid_comm_spawn_multiple.c \
src/mpid/ch3/src/mpid_finalize.c \
src/mpid/ch3/src/mpid_get_universe_size.c \
diff --git a/src/mpid/ch3/src/mpid_comm_group_failed.c b/src/mpid/ch3/src/mpid_comm_group_failed.c
deleted file mode 100644
index 1979928..0000000
--- a/src/mpid/ch3/src/mpid_comm_group_failed.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */
-/*
- * (C) 2011 by Argonne National Laboratory.
- * See COPYRIGHT in top-level directory.
- */
-
-#include "mpidimpl.h"
-
-#undef FUNCNAME
-#define FUNCNAME MPID_Comm_group_failed
-#undef FCNAME
-#define FCNAME MPIU_QUOTE(FUNCNAME)
-int MPID_Comm_group_failed(MPID_Comm *comm_ptr, MPID_Group **failed_group_ptr)
-{
- int mpi_errno = MPI_SUCCESS;
- MPID_Group *group_ptr;
- MPIDI_STATE_DECL(MPID_STATE_MPID_COMM_GROUP_FAILED);
-
- MPIDI_FUNC_ENTER(MPID_STATE_MPID_COMM_GROUP_FAILED);
-
- mpi_errno = MPIR_Comm_group_impl(comm_ptr, &group_ptr);
- if (mpi_errno) MPIU_ERR_POP(mpi_errno);
-
- mpi_errno = MPIR_Group_intersection_impl(group_ptr, MPIDI_Failed_procs_group, failed_group_ptr);
- if (mpi_errno) MPIU_ERR_POP(mpi_errno);
-
- mpi_errno = MPIR_Group_free_impl(group_ptr);
- if (mpi_errno) MPIU_ERR_POP(mpi_errno);
-
- fn_exit:
- MPIDI_FUNC_EXIT(MPID_STATE_MPID_COMM_GROUP_FAILED);
- return mpi_errno;
- fn_fail:
- goto fn_exit;
-}
-
-
-#undef FUNCNAME
-#define FUNCNAME MPID_Comm_remote_group_failed
-#undef FCNAME
-#define FCNAME MPIU_QUOTE(FUNCNAME)
-int MPID_Comm_remote_group_failed(MPID_Comm *comm_ptr, MPID_Group **failed_group_ptr)
-{
- int mpi_errno = MPI_SUCCESS;
- MPID_Group *group_ptr;
- MPIDI_STATE_DECL(MPID_STATE_MPID_COMM_REMOTE_GROUP_FAILED);
-
- MPIDI_FUNC_ENTER(MPID_STATE_MPID_COMM_REMOTE_GROUP_FAILED);
-
- mpi_errno = MPIR_Comm_remote_group_impl(comm_ptr, &group_ptr);
- if (mpi_errno) MPIU_ERR_POP(mpi_errno);
-
- mpi_errno = MPIR_Group_intersection_impl(group_ptr, MPIDI_Failed_procs_group, failed_group_ptr);
- if (mpi_errno) MPIU_ERR_POP(mpi_errno);
-
- mpi_errno = MPIR_Group_free_impl(group_ptr);
- if (mpi_errno) MPIU_ERR_POP(mpi_errno);
-
- fn_exit:
- MPIDI_FUNC_EXIT(MPID_STATE_MPID_COMM_REMOTE_GROUP_FAILED);
- return mpi_errno;
- fn_fail:
- goto fn_exit;
-}
diff --git a/src/mpid/ch3/src/mpid_comm_reenable_anysource.c b/src/mpid/ch3/src/mpid_comm_reenable_anysource.c
deleted file mode 100644
index c6bfdc3..0000000
--- a/src/mpid/ch3/src/mpid_comm_reenable_anysource.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */
-/*
- * (C) 2012 by Argonne National Laboratory.
- * See COPYRIGHT in top-level directory.
- */
-
-#include "mpidimpl.h"
-
-#undef FUNCNAME
-#define FUNCNAME MPID_Comm_reenable_anysource
-#undef FCNAME
-#define FCNAME MPIU_QUOTE(FUNCNAME)
-int MPID_Comm_reenable_anysource(MPID_Comm *comm_ptr, MPID_Group **failed_group_ptr)
-{
- int mpi_errno = MPI_SUCCESS;
- MPID_Group *group_ptr;
- MPIDI_STATE_DECL(MPID_STATE_MPID_COMM_REENABLE_ANYSOURCE);
-
- MPIDI_FUNC_ENTER(MPID_STATE_MPID_COMM_REENABLE_ANYSOURCE);
-
- mpi_errno = MPIR_Comm_group_impl(comm_ptr, &group_ptr);
- if (mpi_errno) MPIU_ERR_POP(mpi_errno);
-
- mpi_errno = MPIR_Group_intersection_impl(group_ptr, MPIDI_Failed_procs_group, failed_group_ptr);
- if (mpi_errno) MPIU_ERR_POP(mpi_errno);
-
- mpi_errno = MPIR_Group_free_impl(group_ptr);
- if (mpi_errno) MPIU_ERR_POP(mpi_errno);
-
- comm_ptr->ch.anysource_enabled = TRUE;
-
- fn_exit:
- MPIDI_FUNC_EXIT(MPID_STATE_MPID_COMM_REENABLE_ANYSOURCE);
- return mpi_errno;
- fn_fail:
- goto fn_exit;
-}
diff --git a/src/mpid/pamid/src/misc/mpid_unimpl.c b/src/mpid/pamid/src/misc/mpid_unimpl.c
index 1009566..ff52890 100644
--- a/src/mpid/pamid/src/misc/mpid_unimpl.c
+++ b/src/mpid/pamid/src/misc/mpid_unimpl.c
@@ -71,22 +71,3 @@ int MPID_Comm_spawn_multiple(int count,
return 0;
}
#endif
-
-int MPID_Comm_reenable_anysource(MPID_Comm *comm,
- MPID_Group **failed_group_ptr)
-{
- MPID_abort();
- return 0;
-}
-
-int MPID_Comm_remote_group_failed(MPID_Comm *comm, MPID_Group **failed_group_ptr)
-{
- MPID_abort();
- return 0;
-}
-
-int MPID_Comm_group_failed(MPID_Comm *comm_ptr, MPID_Group **failed_group_ptr)
-{
- MPID_abort();
- return 0;
-}
-----------------------------------------------------------------------
Summary of changes:
src/include/mpi.h.in | 6 -
src/include/mpiimpl.h | 42 --------
src/mpi/comm/Makefile.mk | 5 +-
src/mpi/comm/comm_group_failed.c | 124 -----------------------
src/mpi/comm/comm_reenable_anysource.c | 121 ----------------------
src/mpi/comm/comm_remote_group_failed.c | 124 -----------------------
src/mpi/errhan/errnames.txt | 6 -
src/mpid/ch3/src/Makefile.mk | 2 -
src/mpid/ch3/src/mpid_comm_group_failed.c | 64 ------------
src/mpid/ch3/src/mpid_comm_reenable_anysource.c | 37 -------
src/mpid/pamid/src/misc/mpid_unimpl.c | 19 ----
11 files changed, 1 insertions(+), 549 deletions(-)
delete mode 100644 src/mpi/comm/comm_group_failed.c
delete mode 100644 src/mpi/comm/comm_reenable_anysource.c
delete mode 100644 src/mpi/comm/comm_remote_group_failed.c
delete mode 100644 src/mpid/ch3/src/mpid_comm_group_failed.c
delete mode 100644 src/mpid/ch3/src/mpid_comm_reenable_anysource.c
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list