* remove the cofs pcm code. It hasn't been used in a very long time (the
shell script mpirun doesn't use it - it uses the env pcmclient) and it appears to be causing badness indirectly... This commit was SVN r2548.
Этот коммит содержится в:
Brian Barrett
родитель
a5058ba981
Коммит
a16d070b2b
@ -1,32 +0,0 @@
|
||||
#
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
# Use the top-level Makefile.options
|
||||
|
||||
include $(top_ompi_srcdir)/config/Makefile.options
|
||||
|
||||
SUBDIRS = src
|
||||
|
||||
# Make the output library in this directory, and name it either
|
||||
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
|
||||
# (for static builds).
|
||||
|
||||
if OMPI_BUILD_pcm_cofs_DSO
|
||||
component_noinst =
|
||||
component_install = mca_pcm_cofs.la
|
||||
else
|
||||
component_noinst = libmca_pcm_cofs.la
|
||||
component_install =
|
||||
endif
|
||||
|
||||
mcacomponentdir = $(libdir)/openmpi
|
||||
mcacomponent_LTLIBRARIES = $(component_install)
|
||||
mca_pcm_cofs_la_SOURCES =
|
||||
mca_pcm_cofs_la_LIBADD = src/libmca_pcm_cofs.la
|
||||
mca_pcm_cofs_la_LDFLAGS = -module -avoid-version
|
||||
|
||||
noinst_LTLIBRARIES = $(component_noinst)
|
||||
libmca_pcm_cofs_la_SOURCES =
|
||||
libmca_pcm_cofs_la_LIBADD = src/libmca_pcm_cofs.la
|
||||
libmca_pcm_cofs_la_LDFLAGS = -module -avoid-version
|
||||
@ -1,9 +0,0 @@
|
||||
# -*- shell-script -*-
|
||||
#
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
# Specific to this module
|
||||
|
||||
PARAM_INIT_FILE=src/pcm_cofs.c
|
||||
PARAM_CONFIG_FILES="Makefile src/Makefile"
|
||||
@ -1,12 +0,0 @@
|
||||
#
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
include $(top_ompi_srcdir)/config/Makefile.options
|
||||
|
||||
noinst_LTLIBRARIES = libmca_pcm_cofs.la
|
||||
libmca_pcm_cofs_la_SOURCES = \
|
||||
pcm_cofs.h \
|
||||
pcm_cofs_module.c \
|
||||
pcm_cofs.c
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
/* -*- C -*-
|
||||
*
|
||||
* $HEADER$
|
||||
*
|
||||
*/
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "mca/pcm/pcm.h"
|
||||
#include "mca/pcm/cofs/src/pcm_cofs.h"
|
||||
#include "include/types.h"
|
||||
#include "include/constants.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
int
|
||||
mca_pcm_cofs_get_peers(ompi_process_name_t **procs, size_t *num_procs)
|
||||
{
|
||||
*num_procs = mca_pcm_cofs_num_procs;
|
||||
*procs = mca_pcm_cofs_procs;
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
ompi_process_name_t* mca_pcm_cofs_get_self(void)
|
||||
{
|
||||
return &mca_pcm_cofs_procs[mca_pcm_cofs_procid];
|
||||
}
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
/* -*- C -*-
|
||||
*
|
||||
* $HEADER$
|
||||
*
|
||||
*/
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "mca/pcm/pcm.h"
|
||||
#include "include/types.h"
|
||||
|
||||
/*
|
||||
* Module open / close
|
||||
*/
|
||||
int mca_pcm_cofs_open(void);
|
||||
int mca_pcm_cofs_close(void);
|
||||
|
||||
/*
|
||||
* Startup / Shutdown
|
||||
*/
|
||||
struct mca_pcm_base_module_1_0_0_t* mca_pcm_cofs_init(int *priority, bool *allow_multi_user_threads, bool *have_hidden_threads);
|
||||
int mca_pcm_cofs_finalize(void);
|
||||
|
||||
|
||||
/*
|
||||
* "Action" functions
|
||||
*/
|
||||
int mca_pcm_cofs_get_peers(ompi_process_name_t **peers, size_t *npeers);
|
||||
ompi_process_name_t* mca_pcm_cofs_get_self(void);
|
||||
|
||||
extern ompi_process_name_t *mca_pcm_cofs_procs;
|
||||
extern size_t mca_pcm_cofs_num_procs;
|
||||
extern size_t mca_pcm_cofs_procid;
|
||||
|
||||
@ -1,161 +0,0 @@
|
||||
/* -*- C -*-
|
||||
*
|
||||
* $HEADER$
|
||||
*
|
||||
*/
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "include/constants.h"
|
||||
#include "include/types.h"
|
||||
#include "util/output.h"
|
||||
#include "mca/mca.h"
|
||||
#include "mca/pcm/pcm.h"
|
||||
#include "mca/pcm/base/base.h"
|
||||
#include "mca/pcm/cofs/src/pcm_cofs.h"
|
||||
#include "mca/base/mca_base_param.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
/*
|
||||
* Struct of function pointers and all that to let us be initialized
|
||||
*/
|
||||
mca_pcm_base_component_1_0_0_t mca_pcm_cofs_component = {
|
||||
{
|
||||
MCA_PCM_BASE_VERSION_1_0_0,
|
||||
|
||||
"cofs", /* MCA component name */
|
||||
1, /* MCA component major version */
|
||||
0, /* MCA component minor version */
|
||||
0, /* MCA component release version */
|
||||
mca_pcm_cofs_open, /* component open */
|
||||
mca_pcm_cofs_close /* component close */
|
||||
},
|
||||
{
|
||||
false /* checkpoint / restart */
|
||||
},
|
||||
mca_pcm_cofs_init, /* component init */
|
||||
mca_pcm_cofs_finalize
|
||||
};
|
||||
|
||||
|
||||
struct mca_pcm_base_module_1_0_0_t mca_pcm_cofs_1_0_0 = {
|
||||
mca_pcm_base_no_unique_name, /* unique_string */
|
||||
NULL, /* allocate_resources */
|
||||
NULL, /* can_spawn */
|
||||
NULL, /* spawn_procs */
|
||||
NULL, /* kill_proc */
|
||||
NULL, /* kill_job */
|
||||
NULL /* deallocate_resources */
|
||||
};
|
||||
|
||||
|
||||
char mca_pcm_cofs_comm_loc[OMPI_PATH_MAX];
|
||||
char *mca_pcm_cofs_my_handle = NULL;
|
||||
ompi_process_name_t *mca_pcm_cofs_procs = NULL;
|
||||
size_t mca_pcm_cofs_num_procs = 0;
|
||||
size_t mca_pcm_cofs_procid = 0;
|
||||
static int mca_pcm_cofs_num_procs_param;
|
||||
static int mca_pcm_cofs_cellid_param;
|
||||
static int mca_pcm_cofs_jobid_param;
|
||||
static int mca_pcm_cofs_procid_param;
|
||||
|
||||
int
|
||||
mca_pcm_cofs_open(void)
|
||||
{
|
||||
mca_pcm_cofs_num_procs_param = mca_base_param_register_int("pcm","cofs","num_procs",NULL,-1);
|
||||
mca_pcm_cofs_cellid_param = mca_base_param_register_int("pcm","cofs","cellid",NULL,-1);
|
||||
mca_pcm_cofs_jobid_param = mca_base_param_register_int("pcm","cofs","jobid",NULL,-1);
|
||||
mca_pcm_cofs_procid_param = mca_base_param_register_int("pcm","cofs","procid",NULL,-1);
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
mca_pcm_cofs_close(void)
|
||||
{
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
struct mca_pcm_base_module_1_0_0_t *
|
||||
mca_pcm_cofs_init(int *priority, bool *allow_multi_user_threads,
|
||||
bool *have_hidden_threads)
|
||||
{
|
||||
int i,value;
|
||||
mca_ns_base_cellid_t cellid;
|
||||
mca_ns_base_jobid_t jobid;
|
||||
|
||||
*priority = 2;
|
||||
*allow_multi_user_threads = true;
|
||||
*have_hidden_threads = false;
|
||||
|
||||
/* lookup parameters for local name */
|
||||
mca_base_param_lookup_int(mca_pcm_cofs_num_procs_param, &value);
|
||||
if(value <= 0) {
|
||||
ompi_output_verbose(1001, 0,
|
||||
"pcm: cofs: init: missing/invalid "
|
||||
"value for OMPI_MCA_pcm_cofs_num_procs");
|
||||
return NULL;
|
||||
}
|
||||
mca_pcm_cofs_num_procs = value;
|
||||
|
||||
mca_base_param_lookup_int(mca_pcm_cofs_cellid_param, &value);
|
||||
if(value < 0) {
|
||||
ompi_output_verbose(1001, 0,
|
||||
"pcm: cofs: init: missing/invalid "
|
||||
"value for OMPI_MCA_pcm_cofs_cellid");
|
||||
return NULL;
|
||||
}
|
||||
cellid = value;
|
||||
|
||||
mca_base_param_lookup_int(mca_pcm_cofs_jobid_param, &value);
|
||||
if(value < 0) {
|
||||
ompi_output_verbose(1001, 0,
|
||||
"pcm: cofs: init: missing/invalid "
|
||||
"value for OMPI_MCA_pcm_cofs_jobid");
|
||||
return NULL;
|
||||
}
|
||||
jobid = value;
|
||||
|
||||
mca_base_param_lookup_int(mca_pcm_cofs_procid_param, &value);
|
||||
if(value < 0) {
|
||||
ompi_output_verbose(1001, 0,
|
||||
"pcm: cofs: init: "
|
||||
"missing value for OMPI_MCA_pcm_cofs_procid");
|
||||
return NULL;
|
||||
}
|
||||
mca_pcm_cofs_procid = value;
|
||||
|
||||
mca_pcm_cofs_procs = (ompi_process_name_t*)malloc(sizeof(ompi_process_name_t) * mca_pcm_cofs_num_procs);
|
||||
if(NULL == mca_pcm_cofs_procs) {
|
||||
ompi_output_verbose(1001, 0,
|
||||
"pcm: cofs: init: "
|
||||
"missing value for OMPI_MCA_pcm_cofs_num_procs");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
for(i=0; i<mca_pcm_cofs_num_procs; i++) {
|
||||
mca_pcm_cofs_procs[i].cellid = cellid;
|
||||
mca_pcm_cofs_procs[i].jobid = jobid;
|
||||
mca_pcm_cofs_procs[i].vpid = i;
|
||||
}
|
||||
return &mca_pcm_cofs_1_0_0;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
mca_pcm_cofs_finalize(void)
|
||||
{
|
||||
if (mca_pcm_cofs_procs != NULL) {
|
||||
free(mca_pcm_cofs_procs);
|
||||
mca_pcm_cofs_procs = NULL;
|
||||
mca_pcm_cofs_num_procs = 0;
|
||||
}
|
||||
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user