99144db970
Some MPI C interface files saw some spacing changes to conform to the coding standards of Open MPI.
Changed MPI C interface files to use {{{OPAL_CR_ENTER_LIBRARY()}}} and {{{OPAL_CR_EXIT_LIBRARY()}}} instead of just {{{OPAL_CR_TEST_CHECKPOINT_READY()}}}. This will allow the checkpoint/restart system more flexibility in how it is to behave.
Fixed the configure check for {{{--enable-ft-thread}}} so it has a know dependance on {{{--enable-mpi-thread}}} (and/or {{{--enable-progress-thread}}}).
Added a line for Checkpoint/Restart support to {{{ompi_info}}}.
Added some options to choose at runtime whether or not to use the checkpoint polling thread. By default, if the user asked for it to be compiled in, then it is used. But some users will want the ability to toggle its use at runtime.
There are still some places for improvement, but the feature works correctly. As always with Checkpoint/Restart, it is compiled out unless explicitly asked for at configure time. Further, if it was configured in, then it is not used unless explicitly asked for by the user at runtime.
This commit was SVN r17516.
120 строки
3.9 KiB
C
120 строки
3.9 KiB
C
/*
|
|
* Copyright (c) 2004-2007 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-2008 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 (c) 2007 Cisco, Inc. All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
#include "ompi_config.h"
|
|
#include <stdio.h>
|
|
|
|
#include "ompi/mpi/c/bindings.h"
|
|
#include "ompi/mca/topo/topo.h"
|
|
#include "ompi/mca/topo/base/base.h"
|
|
#include "ompi/memchecker.h"
|
|
|
|
#if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
|
|
#pragma weak MPI_Graph_create = PMPI_Graph_create
|
|
#endif
|
|
|
|
#if OMPI_PROFILING_DEFINES
|
|
#include "ompi/mpi/c/profile/defines.h"
|
|
#endif
|
|
|
|
static const char FUNC_NAME[] = "MPI_Graph_create";
|
|
|
|
|
|
int MPI_Graph_create(MPI_Comm old_comm, int nnodes, int *index,
|
|
int *edges, int reorder, MPI_Comm *comm_graph)
|
|
{
|
|
|
|
int err;
|
|
bool re_order = false;
|
|
|
|
MEMCHECKER(
|
|
memchecker_comm(old_comm);
|
|
);
|
|
|
|
/* check the arguments */
|
|
if (MPI_PARAM_CHECK) {
|
|
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
|
|
if (ompi_comm_invalid(old_comm)) {
|
|
return OMPI_ERRHANDLER_INVOKE (MPI_COMM_WORLD, MPI_ERR_COMM,
|
|
FUNC_NAME);
|
|
}
|
|
if (OMPI_COMM_IS_INTER(old_comm)) {
|
|
return OMPI_ERRHANDLER_INVOKE (old_comm, MPI_ERR_COMM,
|
|
FUNC_NAME);
|
|
}
|
|
if ( (1 > nnodes) || (NULL == index) || (NULL == edges) ) {
|
|
return OMPI_ERRHANDLER_INVOKE (old_comm, MPI_ERR_ARG,
|
|
FUNC_NAME);
|
|
}
|
|
|
|
if (nnodes > ompi_comm_size(old_comm)) {
|
|
return OMPI_ERRHANDLER_INVOKE (old_comm, MPI_ERR_ARG,
|
|
FUNC_NAME);
|
|
}
|
|
|
|
if ((0 > reorder) || (1 < reorder)) {
|
|
return OMPI_ERRHANDLER_INVOKE (old_comm, MPI_ERR_ARG,
|
|
FUNC_NAME);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Now we have to check if the topo module exists or not. This has been
|
|
* removed from initialization since most of the MPI calls do not use
|
|
* this module
|
|
*/
|
|
if (!(mca_topo_base_components_opened_valid ||
|
|
mca_topo_base_components_available_valid)) {
|
|
if (OMPI_SUCCESS != (err = mca_topo_base_open())) {
|
|
return OMPI_ERRHANDLER_INVOKE(old_comm, err, FUNC_NAME);
|
|
}
|
|
if (OMPI_SUCCESS !=
|
|
(err = mca_topo_base_find_available(OMPI_ENABLE_PROGRESS_THREADS,
|
|
OMPI_ENABLE_MPI_THREADS))) {
|
|
return OMPI_ERRHANDLER_INVOKE(old_comm, err, FUNC_NAME);
|
|
}
|
|
}
|
|
|
|
OPAL_CR_ENTER_LIBRARY();
|
|
|
|
/*
|
|
* everything seems to be alright with the communicator, we can go
|
|
* ahead and select a topology module for this purpose and create
|
|
* the new graph communicator
|
|
*/
|
|
|
|
re_order = (1 == reorder) ? true:false;
|
|
|
|
err = ompi_topo_create ((struct ompi_communicator_t *)old_comm,
|
|
nnodes,
|
|
index,
|
|
edges,
|
|
re_order,
|
|
(struct ompi_communicator_t **)comm_graph,
|
|
OMPI_COMM_GRAPH);
|
|
|
|
OPAL_CR_EXIT_LIBRARY();
|
|
/* check the error status */
|
|
if (MPI_SUCCESS != err) {
|
|
return OMPI_ERRHANDLER_INVOKE(old_comm, err, FUNC_NAME);
|
|
}
|
|
|
|
/* All done */
|
|
return MPI_SUCCESS;
|
|
}
|