9613b3176c
After much work by Jeff and myself, and quite a lot of discussion, it has become clear that we simply cannot resolve the infinite loops caused by RML-involved subsystems calling orte_output. The original rationale for the change to orte_output has also been reduced by shifting the output of XML-formatted vs human readable messages to an alternative approach. I have globally replaced the orte_output/ORTE_OUTPUT calls in the code base, as well as the corresponding .h file name. I have test compiled and run this on the various environments within my reach, so hopefully this will prove minimally disruptive. This commit was SVN r18619.
65 строки
2.0 KiB
C
65 строки
2.0 KiB
C
/*
|
|
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
|
* University Research and Technology
|
|
* Corporation. All rights reserved.
|
|
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
|
* of Tennessee Research Foundation. All rights
|
|
* reserved.
|
|
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
|
* University of Stuttgart. All rights reserved.
|
|
* Copyright (c) 2004-2005 The Regents of the University of California.
|
|
* All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "ompi_config.h"
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "mpi.h"
|
|
#include "ompi/communicator/communicator.h"
|
|
#include "orte/util/show_help.h"
|
|
#include "opal/mca/mca.h"
|
|
#include "opal/mca/base/base.h"
|
|
#include "ompi/mca/coll/coll.h"
|
|
#include "ompi/mca/coll/base/base.h"
|
|
|
|
#define CLOSE(comm, func) \
|
|
do { \
|
|
if (NULL != comm->c_coll.coll_ ## func ## _module) { \
|
|
OBJ_RELEASE(comm->c_coll.coll_ ## func ## _module); \
|
|
comm->c_coll.coll_## func = NULL; \
|
|
comm->c_coll.coll_## func ## _module = NULL; \
|
|
} \
|
|
} while (0)
|
|
|
|
int mca_coll_base_comm_unselect(ompi_communicator_t *comm)
|
|
{
|
|
CLOSE(comm, allgather);
|
|
CLOSE(comm, allgatherv);
|
|
CLOSE(comm, allreduce);
|
|
CLOSE(comm, alltoall);
|
|
CLOSE(comm, alltoallv);
|
|
CLOSE(comm, alltoallw);
|
|
CLOSE(comm, barrier);
|
|
CLOSE(comm, bcast);
|
|
CLOSE(comm, exscan);
|
|
CLOSE(comm, gather);
|
|
CLOSE(comm, gatherv);
|
|
CLOSE(comm, reduce);
|
|
CLOSE(comm, reduce_scatter);
|
|
CLOSE(comm, scan);
|
|
CLOSE(comm, scatter);
|
|
CLOSE(comm, scatterv);
|
|
|
|
/* All done */
|
|
return OMPI_SUCCESS;
|
|
}
|
|
|