From f7a71772a7a533000a45f38649f0e7018ad94fd4 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 12 Jul 2006 03:52:17 +0000 Subject: [PATCH] Remove long-defunct "openmpi" tool from orte. It was apparently an early generation of the orted, and is now long-dead. This commit was SVN r10754. --- configure.ac | 1 - orte/tools/Makefile.am | 3 +- orte/tools/openmpi/Makefile.am | 32 ----- orte/tools/openmpi/openmpi.c | 220 --------------------------------- orte/tools/openmpi/openmpi.h | 29 ----- 5 files changed, 1 insertion(+), 284 deletions(-) delete mode 100644 orte/tools/openmpi/Makefile.am delete mode 100644 orte/tools/openmpi/openmpi.c delete mode 100644 orte/tools/openmpi/openmpi.h diff --git a/configure.ac b/configure.ac index 0b9ff27503..7a2eb0e7dd 100644 --- a/configure.ac +++ b/configure.ac @@ -1099,7 +1099,6 @@ AC_CONFIG_FILES([ orte/tools/orted/Makefile orte/tools/orteprobe/Makefile orte/tools/orterun/Makefile - orte/tools/openmpi/Makefile orte/tools/wrappers/Makefile orte/tools/wrappers/ortecc-wrapper-data.txt orte/tools/wrappers/ortec++-wrapper-data.txt diff --git a/orte/tools/Makefile.am b/orte/tools/Makefile.am index 63706c94e2..fd36d3fdd7 100644 --- a/orte/tools/Makefile.am +++ b/orte/tools/Makefile.am @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -21,7 +22,6 @@ SUBDIRS += \ tools/console \ - tools/openmpi \ tools/orted \ tools/orteprobe \ tools/orterun \ @@ -31,7 +31,6 @@ SUBDIRS += \ DIST_SUBDIRS += \ tools/console \ - tools/openmpi \ tools/orted \ tools/orteprobe \ tools/orterun \ diff --git a/orte/tools/openmpi/Makefile.am b/orte/tools/openmpi/Makefile.am deleted file mode 100644 index aebfcca26e..0000000000 --- a/orte/tools/openmpi/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -# -*- makefile -*- -# -# 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$ -# - -libs = \ - $(top_builddir)/orte/liborte.la - -if OMPI_INSTALL_BINARIES - -bin_PROGRAMS = openmpi - -endif - -openmpi_SOURCES = openmpi.h openmpi.c -openmpi_LDADD = $(libs) -openmpi_DFLAGS = -openmpi_DEPENDENCIES = $(libs) diff --git a/orte/tools/openmpi/openmpi.c b/orte/tools/openmpi/openmpi.c deleted file mode 100644 index 1f6867a5b1..0000000000 --- a/orte/tools/openmpi/openmpi.c +++ /dev/null @@ -1,220 +0,0 @@ -/* - 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$ - - openmpi.c - main program for spawning persistent universe. - - -------------------------------------------------------------------------- - - Authors: Ralph H. Castain - - -------------------------------------------------------------------------- - -*/ -#include "orte_config.h" - -#include -#include -#ifdef HAVE_UNISTD_H -#include -#endif -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_SYS_PARAM_H -#include -#endif -#include - -#if 0 - /* for some reason, including this header and never calling opal_init - causes linker errors with XLC on OS X. sigh. - */ -#include "opal/event/event.h" -#endif -#include "orte/orte_constants.h" - -#include "opal/util/argv.h" -#include "opal/util/output.h" -#include "opal/util/os_path.h" -#include "orte/util/sys_info.h" -#include "orte/util/univ_info.h" -#include "opal/util/cmd_line.h" -#include "orte/util/proc_info.h" -#include "orte/util/session_dir.h" -#include "orte/util/universe_setup_file_io.h" - -#include "opal/mca/base/base.h" -#include "orte/mca/oob/base/base.h" -#include "orte/mca/ns/ns.h" -#include "orte/mca/gpr/gpr.h" - -#include "orte/runtime/runtime.h" - - -int main(int argc, char **argv) -{ -#if 0 - opal_cmd_line_t *cmd_line = NULL; - char *universe = NULL; - pid_t pid; - bool multi_thread = false; - bool hidden_thread = false; - int ret=0; - - /* - * Intialize the Open MPI environment - */ - if (ORTE_SUCCESS != ompi_init(argc, argv)) { - /* BWB show_help */ - printf("show_help: ompi_init failed\n"); - return ret; - } - - /* setup to read common command line options that span all Open MPI programs */ - cmd_line = OBJ_NEW(opal_cmd_line_t); - - opal_cmd_line_make_opt(cmd_line, 'v', "version", 0, - "Show version of Open MPI and this program"); - - opal_cmd_line_make_opt(cmd_line, 'h', "help", 0, - "Show help for this function"); - - - /* setup rte command line arguments */ - ompi_rte_cmd_line_setup(cmd_line); - - /* - * setup mca command line arguments - */ - if (ORTE_SUCCESS != (ret = mca_base_cmd_line_setup(cmd_line))) { - /* BWB show_help */ - printf("show_help: mca_base_cmd_line_setup failed\n"); - return ret; - } - - if (ORTE_SUCCESS != mca_base_cmd_line_process_args(cmd_line)) { - /* BWB show_help */ - printf("show_help: mca_base_cmd_line_process_args\n"); - return ret; - } - - /* parse the local commands */ - if (ORTE_SUCCESS != opal_cmd_line_parse(cmd_line, true, argc, argv)) { - exit(ret); - } - - if (opal_cmd_line_is_taken(cmd_line, "help") || - opal_cmd_line_is_taken(cmd_line, "h")) { - printf("...showing ompi_info help message...\n"); - exit(1); - } - - if (opal_cmd_line_is_taken(cmd_line, "version") || - opal_cmd_line_is_taken(cmd_line, "v")) { - printf("...showing off my version!\n"); - exit(1); - } - - /* start the initial barebones RTE (just OOB) so we can check universe existence */ - if (ORTE_SUCCESS != (ret = mca_base_open())) { - /* JMS show_help */ - printf("show_help: mca_base_open failed\n"); - exit(ret); - } - - multi_thread = true; - hidden_thread = false; -/* if (ORTE_SUCCESS != ompi_rte_init_stage1(&multi_thread, &hidden_thread)) { */ -/* printf("show_help: openmpi failed in ompi_rte_init\n"); */ -/* exit(1); */ -/* } */ - - /* parse environmental variables and fill corresponding info structures - * need the oob to be open so we can pass the contact info we extract - */ - ompi_rte_parse_environ(); - - /* parse the cmd_line for rte options - override settings from enviro, where necessary - * copy everything into enviro variables for passing later on - */ - ompi_rte_parse_cmd_line(cmd_line); - - /* parse the cmd_line for daemon options - gets all the options relating - * specifically to seed behavior, but also gets - * options about scripts and hostfiles that might be of use to me - * puts everything into enviro variables for future passing - */ - ompi_rte_parse_daemon_cmd_line(cmd_line); - - /* check for local universe existence */ - if (0 != strncmp(ompi_universe_info.host, ompi_system_info.nodename, strlen(ompi_system_info.nodename))) { - fprintf(stderr, "remote universe operations not supported at this time\n"); - exit(1); - } - - if (ORTE_SUCCESS != (ret = ompi_rte_universe_exists()) && - (ORTE_ERR_NOT_IMPLEMENTED != ret)) { - - if (ORTE_ERR_NOT_FOUND != ret) { - /* if not found, then keep current name. otherwise, - * define unique name based on current one. - * either way, start new universe - */ - universe = strdup(ompi_universe_info.name); - free(ompi_universe_info.name); - ompi_universe_info.name = NULL; - pid = getpid(); - if (0 < asprintf(&ompi_universe_info.name, "%s-%d", universe, pid)) { - fprintf(stderr, "error creating unique universe name - please report error to bugs@open-mpi.org\n"); - exit(1); - } - } - - if (NULL != ompi_process_info.my_universe) { - free(ompi_process_info.my_universe); - ompi_process_info.my_universe = NULL; - } - ompi_process_info.my_universe = strdup(ompi_universe_info.name); - - /* ensure the enviro variables do NOT specify any replicas so that seed - * will start them up. set seed flag - */ - setenv("OMPI_universe_seed", "1", 1); - unsetenv("OMPI_MCA_ns_base_replica"); - unsetenv("OMPI_MCA_gpr_base_replica"); - - /* we're set - fork/exec ompid for local start of seed - */ - if ((pid = fork()) < 0) { - fprintf(stderr, "unable to fork - please report error to bugs@open-mpi.org\n"); - exit(1); - } else if (pid != 0) { - exit(0); /* parent goes bye-bye */ - } - if (0 > execvp("ompid", argv)) { - fprintf(stderr, "unable to exec daemon - please report error to bugs@open-mpi.org\n"); - fprintf(stderr, "errno: %s\n", strerror(errno)); - exit(1); - - } - } else { - fprintf(stderr, "local universe check reports not implemented code\n"); - } -/* ompi_rte_init_stage2(&multi_thread, &hidden_thread); /\* stick this in for now just for static compiles *\/ */ -#endif - return -1; -} diff --git a/orte/tools/openmpi/openmpi.h b/orte/tools/openmpi/openmpi.h deleted file mode 100644 index cb88b10acb..0000000000 --- a/orte/tools/openmpi/openmpi.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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$ - */ - -#ifdef HAVE_SYS_PARAM_H -#include -#endif -#include - -#ifndef OMPI_UNIVERSE_H -#define OMPI_UNIVERSE_H - -#define OMPI_RIDICULOUS_NAMELEN 1024 - -#endif