Commit a541fbf6 authored by David Goodell's avatar David Goodell
Browse files

[svn-r3733] Minor cleanups in the SMP collectives where preprocessor macros were incorrectly used.

Reviewed by thakur@.
parent 67e147c9
......@@ -680,7 +680,7 @@ int MPI_Allreduce ( void *sendbuf, void *recvbuf, int count,
{
if (comm_ptr->comm_kind == MPID_INTRACOMM) {
/* intracommunicator */
#if USE_SMP_COLLECTIVES
#if defined(USE_SMP_COLLECTIVES)
MPID_Op *op_ptr;
int is_commutative;
......
......@@ -410,7 +410,7 @@ int MPI_Barrier( MPI_Comm comm )
MPIU_THREADPRIV_GET;
MPIR_Nest_incr();
if (comm_ptr->comm_kind == MPID_INTRACOMM) {
#if USE_SMP_COLLECTIVES
#if defined(USE_SMP_COLLECTIVES)
if (MPIR_Comm_is_node_aware(comm_ptr)) {
/* do the intranode barrier on all nodes */
......
......@@ -755,7 +755,9 @@ int MPI_Reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
#if defined(USE_SMP_COLLECTIVES)
MPIU_CHKLMEM_DECL(1);
#endif
MPID_MPI_STATE_DECL(MPID_STATE_MPI_REDUCE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......@@ -872,7 +874,7 @@ int MPI_Reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
{
if (comm_ptr->comm_kind == MPID_INTRACOMM) {
/* intracommunicator */
#if USE_SMP_COLLECTIVES
#if defined(USE_SMP_COLLECTIVES)
MPID_Op *op_ptr;
int is_commutative;
......@@ -983,7 +985,9 @@ int MPI_Reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
/* ... end of body of routine ... */
fn_exit:
#if defined(USE_SMP_COLLECTIVES)
MPIU_CHKLMEM_FREEALL();
#endif
MPID_MPI_COLL_FUNC_EXIT(MPID_STATE_MPI_REDUCE);
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
......
......@@ -131,7 +131,7 @@ int MPI_File_call_errhandler(MPI_File fh, int errorcode)
#endif
/* ... end of body of routine ... */
#ifdef HAVE_CXX_BINDING
#if defined(HAVE_CXX_BINDING) && defined(MPI_MODE_RDONLY)
fn_exit:
#endif
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_FILE_CALL_ERRHANDLER);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment