ports/openmpi
ports/openmpi
1
1
Fork 0
Code Releases Activity

Remove the old configure option for disabling full rte support - we now use the OMPI rte framework for such purposes

Browse Source 
This commit was SVN r28134.
This commit is contained in:
Ralph Castain 2013-02-28 01:35:55 +00:00
parent b5a2cd1cce
commit cf9796accd
103 changed files with 112 additions and 898 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
config/orte_configure_options.m4
View File

@ -13,7 +13,7 @@ dnl All rights reserved.
dnl Copyright (c) 2006-2010 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
dnl Copyright (c) 2009 IBM Corporation. All rights reserved.
dnl Copyright (c) 2009-2012 Los Alamos National Security, LLC. All rights
dnl Copyright (c) 2009-2013 Los Alamos National Security, LLC. All rights
dnl reserved.
dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
dnl
@ -28,31 +28,6 @@ dnl
AC_DEFUN([ORTE_CONFIGURE_OPTIONS],[
ompi_show_subtitle "ORTE Configuration options"
#
# Minimal RTE support
#
AC_MSG_CHECKING([if want full RTE support])
AC_ARG_WITH([rte-support],
[AC_HELP_STRING([--without-rte-support],
[Build without RTE support for systems that do not require it (default: full RTE support built)])])
if test "$with_rte_support" = "no"; then
AC_MSG_RESULT([no])
orte_without_full_support=1
list_of_frameworks="db,errmgr,ess-singleton,ess-hnp,ess-tool,ess-env,filem,grpcomm-basic,grpcomm-bad,iof,odls,oob,plm,ras,rmaps,rml,routed,snapc,btl-sm,coll-sm,common-sm,mpool-sm,dpm-orte,pubsub-orte,rmcast,routed"
if test -z $enable_mca_no_build ; then
enable_mca_no_build="$list_of_frameworks"
else
enable_mca_no_build="$enable_mca_no_build,$list_of_frameworks"
fi
else
AC_MSG_RESULT([yes])
orte_without_full_support=0
fi
AC_DEFINE_UNQUOTED([ORTE_DISABLE_FULL_SUPPORT], [$orte_without_full_support],
[Build full RTE support])
AM_CONDITIONAL(ORTE_DISABLE_FULL_SUPPORT, test "$with_rte_support" = "no")
#
# Do we want orterun's --prefix behavior to be enabled by default?
#

4
orte/include/orte/types.h
View File

@ -140,8 +140,6 @@ typedef void* orte_iov_base_ptr_t;
#define ORTE_NAME (OPAL_DSS_ID_DYNAMIC + 2) /**< an orte_process_name_t */
#define ORTE_VPID (OPAL_DSS_ID_DYNAMIC + 3) /**< a vpid */
#define ORTE_JOBID (OPAL_DSS_ID_DYNAMIC + 4) /**< a jobid */
#if !ORTE_DISABLE_FULL_SUPPORT
/* State-related types */
#define ORTE_NODE_STATE (OPAL_DSS_ID_DYNAMIC + 6) /**< node status flag */
#define ORTE_PROC_STATE (OPAL_DSS_ID_DYNAMIC + 7) /**< process/resource status */
@ -170,6 +168,4 @@ typedef void* orte_iov_base_ptr_t;
/* provide a boundary for others to use */
#define ORTE_DSS_ID_DYNAMIC (OPAL_DSS_ID_DYNAMIC + 50)
#endif /* !ORTE_DISABLE_FULL_SUPPORT */
#endif

6
orte/mca/errmgr/base/errmgr_base_fns.c
View File

@ -11,7 +11,7 @@
* All rights reserved.
* Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2010-2011 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2011-2012 Los Alamos National Security, LLC.
* Copyright (c) 2011-2013 Los Alamos National Security, LLC.
* All rights reserved.
* $COPYRIGHT$
*
@ -211,7 +211,6 @@ void orte_errmgr_base_abort(int error_code, char *fmt, ...)
}
va_end(arglist);
#if !ORTE_DISABLE_FULL_SUPPORT
/* if I am a daemon or the HNP... */
if (ORTE_PROC_IS_HNP || ORTE_PROC_IS_DAEMON) {
/* whack my local procs */
@ -222,9 +221,6 @@ void orte_errmgr_base_abort(int error_code, char *fmt, ...)
/* cleanup my session directory */
orte_session_dir_finalize(ORTE_PROC_MY_NAME);
}
#else
orte_session_dir_finalize(ORTE_PROC_MY_NAME);
#endif
/* if a critical connection failed, or a sensor limit was exceeded, exit without dropping a core */
if (ORTE_ERR_CONNECTION_FAILED == error_code ||

7
orte/mca/ess/base/Makefile.am
View File

@ -24,11 +24,7 @@ headers += \
libmca_ess_la_SOURCES += \
base/ess_base_close.c \
base/ess_base_open.c \
base/ess_base_select.c
if !ORTE_DISABLE_FULL_SUPPORT
libmca_ess_la_SOURCES += \
base/ess_base_select.c \
base/ess_base_get.c \
base/ess_base_put.c \
base/ess_base_std_tool.c \
@ -36,5 +32,4 @@ libmca_ess_la_SOURCES += \
base/ess_base_std_orted.c \
base/ess_base_std_prolog.c \
base/ess_base_fns.c
endif

5
orte/mca/ess/base/base.h
View File

@ -11,6 +11,7 @@
* All rights reserved.
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2012 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -64,8 +65,6 @@ ORTE_DECLSPEC extern int orte_ess_base_std_buffering;
ORTE_DECLSPEC extern opal_list_t orte_ess_base_components_available;
#if !ORTE_DISABLE_FULL_SUPPORT
/*
* Internal helper functions used by components
*/
@ -95,8 +94,6 @@ ORTE_DECLSPEC int orte_ess_env_put(orte_std_cntr_t num_procs,
orte_std_cntr_t num_local_procs,
char ***env);
#endif /* ORTE_DISABLE_FULL_SUPPORT */
END_C_DECLS
#endif

4
orte/mca/ess/base/ess_base_select.c
View File

@ -10,6 +10,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -24,9 +25,8 @@
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"
#include "opal/mca/base/mca_base_component_repository.h"
#if !ORTE_DISABLE_FULL_SUPPORT
#include "orte/util/nidmap.h"
#endif
#include "orte/runtime/orte_globals.h"
#include "orte/mca/ess/base/base.h"

2
orte/mca/ess/hnp/ess_hnp_module.c
View File

@ -412,7 +412,6 @@ static int rte_init(void)
/* we are also officially a daemon, so better update that field too */
orte_process_info.my_daemon_uri = orte_rml.get_contact_info();
#if !ORTE_DISABLE_FULL_SUPPORT
/* setup the orte_show_help system to recv remote output */
ret = orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD, ORTE_RML_TAG_SHOW_HELP,
ORTE_RML_PERSISTENT, orte_show_help_recv, NULL);
@ -421,7 +420,6 @@ static int rte_init(void)
error = "setup receive for orte_show_help";
goto error;
}
#endif
/* setup my session directory */
if (orte_create_session_dirs) {

11
orte/mca/filem/base/Makefile.am
View File

@ -20,15 +20,10 @@ headers += \
base/base.h
libmca_filem_la_SOURCES += \
base/filem_base_open.c
if !ORTE_DISABLE_FULL_SUPPORT
dist_pkgdata_DATA = base/help-orte-filem-base.txt
libmca_filem_la_SOURCES += \
base/filem_base_open.c \
base/filem_base_close.c \
base/filem_base_select.c \
base/filem_base_receive.c \
base/filem_base_fns.c
endif
dist_pkgdata_DATA = base/help-orte-filem-base.txt

20
orte/mca/filem/rsh/configure.m4
View File

@ -1,20 +0,0 @@
# -*- shell-script -*-
#
# Copyright (c) 2011 Los Alamos National Security, LLC.
# All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
# MCA_ess_env_CONFIG([action-if-found], [action-if-not-found])
# -----------------------------------------------------------
AC_DEFUN([MCA_orte_filem_rsh_CONFIG], [
AC_CONFIG_FILES([orte/mca/filem/rsh/Makefile])
AS_IF([test "$orte_without_full_support" = 0],
[$1],
[$2])
])

21
orte/mca/grpcomm/bad/configure.m4
View File

@ -1,21 +0,0 @@
# -*- shell-script -*-
#
# Copyright (c) 2011 Los Alamos National Security, LLC.
# All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
AC_DEFUN([MCA_orte_grpcomm_bad_PRIORITY], [10])
# MCA_grpcomm_bad_CONFIG([action-if-found], [action-if-not-found])
# -----------------------------------------------------------
AC_DEFUN([MCA_orte_grpcomm_bad_CONFIG], [
AC_CONFIG_FILES([orte/mca/grpcomm/bad/Makefile])
AS_IF([test "$orte_without_full_support" = 0],
[$1],
[$2])
])

7
orte/mca/grpcomm/base/Makefile.am
View File

@ -24,13 +24,8 @@ headers += \
libmca_grpcomm_la_SOURCES += \
base/grpcomm_base_close.c \
base/grpcomm_base_select.c \
base/grpcomm_base_open.c
if !ORTE_DISABLE_FULL_SUPPORT
libmca_grpcomm_la_SOURCES += \
base/grpcomm_base_open.c \
base/grpcomm_base_modex.c \
base/grpcomm_base_receive.c \
base/grpcomm_base_xcast.c \
base/grpcomm_base_rollup.c
endif

13
orte/mca/grpcomm/configure.m4
View File

@ -1,13 +0,0 @@
dnl -*- shell-script -*-
dnl
dnl Copyright (c) 2007 Los Alamos National Security, LLC.
dnl All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
dnl
dnl $HEADER$
dnl
dnl we only want same priority level components
m4_define(MCA_orte_grpcomm_CONFIGURE_MODE, STOP_AT_FIRST_PRIORITY)

21
orte/mca/grpcomm/hier/configure.m4
View File

@ -1,21 +0,0 @@
# -*- shell-script -*-
#
# Copyright (c) 2011 Los Alamos National Security, LLC.
# All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
AC_DEFUN([MCA_orte_grpcomm_hier_PRIORITY], [10])
# MCA_grpcomm_hier_CONFIG([action-if-found], [action-if-not-found])
# -----------------------------------------------------------
AC_DEFUN([MCA_orte_grpcomm_hier_CONFIG], [
AC_CONFIG_FILES([orte/mca/grpcomm/hier/Makefile])
AS_IF([test "$orte_without_full_support" = 0],
[$1],
[$2])
])

3
orte/mca/grpcomm/pmi/configure.m4
View File

@ -9,7 +9,6 @@
#
# $HEADER$
#
AC_DEFUN([MCA_orte_grpcomm_pmi_PRIORITY], [10])
# MCA_grpcomm_pmi_CONFIG([action-if-found], [action-if-not-found])
# -----------------------------------------------------------
@ -19,7 +18,7 @@ AC_DEFUN([MCA_orte_grpcomm_pmi_CONFIG], [
OPAL_CHECK_PMI([grpcomm_pmi], [grpcomm_pmi_good=1], [grpcomm_pmi_good=0])
# Evaluate succeed / fail
AS_IF([test "$grpcomm_pmi_good" = 1 -a "$orte_without_full_support" = 0],
AS_IF([test "$grpcomm_pmi_good" = 1],
[$1],
[$2])

13
orte/mca/iof/base/Makefile.am
View File

@ -9,6 +9,7 @@
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
@ -17,20 +18,12 @@
#
headers += \
base/base.h
libmca_iof_la_SOURCES += \
base/iof_base_open.c
if !ORTE_DISABLE_FULL_SUPPORT
headers += \
base/base.h \
base/iof_base_setup.h
libmca_iof_la_SOURCES += \
base/iof_base_open.c \
base/iof_base_close.c \
base/iof_base_select.c \
base/iof_base_output.c \
base/iof_base_setup.c
endif

4
orte/mca/iof/base/base.h
View File

@ -56,8 +56,6 @@ BEGIN_C_DECLS
ORTE_DECLSPEC int orte_iof_base_open(void);
#if !ORTE_DISABLE_FULL_SUPPORT
/* track xon/xoff of processes */
typedef struct {
opal_object_t super;
@ -200,8 +198,6 @@ ORTE_DECLSPEC int orte_iof_base_write_output(orte_process_name_t *name, orte_iof
orte_iof_write_event_t *channel);
ORTE_DECLSPEC void orte_iof_base_write_handler(int fd, short event, void *cbdata);
#endif /* ORTE_DISABLE_FULL_SUPPORT */
END_C_DECLS
#endif /* MCA_IOF_BASE_H */

14
orte/mca/iof/base/iof_base_open.c
View File

@ -9,6 +9,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -50,18 +51,6 @@
orte_iof_base_module_t orte_iof = {0};
#if ORTE_DISABLE_FULL_SUPPORT
/* have to include a bogus function here so that
* the build system sees at least one function
* in the library
*/
int orte_iof_base_open(void)
{
return ORTE_SUCCESS;
}
#else
/* class instances */
static void orte_iof_job_construct(orte_iof_job_t *ptr)
{
@ -288,4 +277,3 @@ int orte_iof_base_open(void)
/* All done */
return ORTE_SUCCESS;
}
#endif

19
orte/mca/iof/hnp/configure.m4
View File

@ -1,19 +0,0 @@
# -*- shell-script -*-
#
# Copyright (c) 2011 Los Alamos National Security, LLC.
# All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
# MCA_iof_hnp_CONFIG([action-if-found], [action-if-not-found])
# -----------------------------------------------------------
AC_DEFUN([MCA_orte_iof_hnp_CONFIG], [
AC_CONFIG_FILES([orte/mca/iof/hnp/Makefile])
AS_IF([test "$orte_without_full_support" = 0],
[$1],
[$2])
])

19
orte/mca/iof/orted/configure.m4
View File

@ -1,19 +0,0 @@
# -*- shell-script -*-
#
# Copyright (c) 2011 Los Alamos National Security, LLC.
# All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
# MCA_iof_orted_CONFIG([action-if-found], [action-if-not-found])
# -----------------------------------------------------------
AC_DEFUN([MCA_orte_iof_orted_CONFIG], [
AC_CONFIG_FILES([orte/mca/iof/orted/Makefile])
AS_IF([test "$orte_without_full_support" = 0],
[$1],
[$2])
])

19
orte/mca/iof/tool/configure.m4
View File

@ -1,19 +0,0 @@
# -*- shell-script -*-
#
# Copyright (c) 2011 Los Alamos National Security, LLC.
# All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
# MCA_iof_tool_CONFIG([action-if-found], [action-if-not-found])
# -----------------------------------------------------------
AC_DEFUN([MCA_orte_iof_tool_CONFIG], [
AC_CONFIG_FILES([orte/mca/iof/tool/Makefile])
AS_IF([test "$orte_without_full_support" = 0],
[$1],
[$2])
])

5
orte/mca/odls/base/base.h
View File

@ -10,6 +10,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -40,8 +41,6 @@ BEGIN_C_DECLS
*/
ORTE_DECLSPEC int orte_odls_base_open(void);
#if !ORTE_DISABLE_FULL_SUPPORT
/**
* Struct to hold globals for the odls framework
*/
@ -76,7 +75,5 @@ ORTE_DECLSPEC int orte_odls_base_select(void);
ORTE_DECLSPEC int orte_odls_base_finalize(void);
ORTE_DECLSPEC int orte_odls_base_close(void);
#endif /* ORTE_DISABLE_FULL_SUPPORT */
END_C_DECLS
#endif

22
orte/mca/odls/base/odls_base_open.c
View File

@ -10,8 +10,8 @@
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2010-2011 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011-2012 Los Alamos National Security, LLC.
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011-2013 Los Alamos National Security, LLC.
* All rights reserved.
* $COPYRIGHT$
*
@ -28,7 +28,6 @@
#include <string.h>
#endif
#if !ORTE_DISABLE_FULL_SUPPORT
#include "opal/class/opal_ring_buffer.h"
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"
@ -47,9 +46,6 @@
#include "orte/mca/ess/ess.h"
#include "orte/mca/odls/base/odls_private.h"
#endif
#include "orte/mca/odls/base/base.h"
@ -61,18 +57,6 @@
#include "orte/mca/odls/base/static-components.h"
#if ORTE_DISABLE_FULL_SUPPORT
/* have to include a bogus function here so that
* the build system sees at least one function
* in the library
*/
int orte_odls_base_open(void)
{
return ORTE_SUCCESS;
}
#else
/*
* Instantiate globals
*/
@ -200,5 +184,3 @@ OBJ_CLASS_INSTANCE(orte_odls_launch_local_t,
opal_object_t,
launch_local_const,
launch_local_dest);
#endif

2
orte/mca/odls/default/configure.m4
View File

@ -27,7 +27,7 @@ AC_DEFUN([MCA_orte_odls_default_CONFIG],[
AC_CHECK_FUNC([fork], [odls_default_happy="yes"], [odls_default_happy="no"])
AS_IF([test "$odls_default_happy" = "yes" -a "$orte_without_full_support" = 0], [$1], [$2])
AS_IF([test "$odls_default_happy" = "yes"], [$1], [$2])
])dnl

7
orte/mca/oob/base/Makefile.am
View File

@ -20,11 +20,6 @@ headers += \
base/base.h
libmca_oob_la_SOURCES += \
base/oob_base_open.c
if !ORTE_DISABLE_FULL_SUPPORT
libmca_oob_la_SOURCES += \
base/oob_base_open.c \
base/oob_base_close.c \
base/oob_base_init.c
endif

5
orte/mca/oob/base/base.h
View File

@ -9,6 +9,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -43,8 +44,6 @@ BEGIN_C_DECLS
ORTE_DECLSPEC int mca_oob_base_open(void);
#if !ORTE_DISABLE_FULL_SUPPORT
/*
* global flag for use in timing tests
*/
@ -100,8 +99,6 @@ extern char* mca_oob_base_exclude;
ORTE_DECLSPEC extern opal_list_t mca_oob_base_components;
ORTE_DECLSPEC extern opal_list_t mca_oob_base_modules;
#endif /* ORTE_DISABLE_FULL_SUPPORT */
END_C_DECLS
#endif

15
orte/mca/oob/base/oob_base_open.c
View File

@ -10,6 +10,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -37,18 +38,6 @@
#include "orte/mca/oob/base/static-components.h"
#if ORTE_DISABLE_FULL_SUPPORT
/* have to include a bogus function here so that
* the build system sees at least one function
* in the library
*/
int mca_oob_base_open(void)
{
return ORTE_SUCCESS;
}
#else
/*
* Global variables
*/
@ -94,5 +83,3 @@ int mca_oob_base_open(void)
return ORTE_SUCCESS;
}
#endif /* ORTE_DISABLE_FULL_SUPPORT */

4
orte/mca/oob/tcp/configure.m4
View File

@ -10,7 +10,7 @@
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2011 Los Alamos National Security, LLC.
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
# All rights reserved.
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$
@ -34,5 +34,5 @@ AC_DEFUN([MCA_orte_oob_tcp_CONFIG],[
#include <netinet/in.h>
#endif])
AS_IF([test "$oob_tcp_happy" = "yes" -a "$orte_without_full_support" = 0], [$1], [$2])
AS_IF([test "$oob_tcp_happy" = "yes"], [$1], [$2])
])dnl

4
orte/mca/plm/alps/configure.m4
View File

@ -11,7 +11,7 @@
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2011 Los Alamos National Security, LLC.
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
# All rights reserved.
# $COPYRIGHT$
#
@ -27,5 +27,5 @@ AC_DEFUN([MCA_orte_plm_alps_CONFIG],[
ORTE_CHECK_ALPS([plm_alps], [plm_alps_happy="yes"], [plm_alps_happy="no"])
AS_IF([test "$plm_alps_happy" = "yes" -a "$orte_without_full_support" = 0], [$1], [$2])
AS_IF([test "$plm_alps_happy" = "yes"], [$1], [$2])
])dnl

15
orte/mca/plm/base/Makefile.am
View File

@ -18,19 +18,11 @@
#
headers += \
base/base.h
libmca_plm_la_SOURCES += \
base/plm_base_open.c
if !ORTE_DISABLE_FULL_SUPPORT
dist_pkgdata_DATA += base/help-plm-base.txt
headers += \
base/base.h \
base/plm_private.h
libmca_plm_la_SOURCES += \
base/plm_base_open.c \
base/plm_base_close.c \
base/plm_base_select.c \
base/plm_base_receive.c \
@ -38,4 +30,5 @@ libmca_plm_la_SOURCES += \
base/plm_base_jobid.c \
base/plm_base_proxy.c \
base/plm_base_orted_cmds.c
endif
dist_pkgdata_DATA += base/help-plm-base.txt

5
orte/mca/plm/base/base.h
View File

@ -9,6 +9,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -39,8 +40,6 @@ BEGIN_C_DECLS
*/
ORTE_DECLSPEC int orte_plm_base_open(void);
#if !ORTE_DISABLE_FULL_SUPPORT
/**
* Struct to hold data for public access
*/
@ -94,8 +93,6 @@ ORTE_DECLSPEC void orte_plm_base_launch_apps(int fd, short args, void *cbdata);
ORTE_DECLSPEC void orte_plm_base_post_launch(int fd, short args, void *cbdata);
ORTE_DECLSPEC void orte_plm_base_registered(int fd, short args, void *cbdata);
#endif /* ORTE_DISABLE_FULL_SUPPORT */
END_C_DECLS
#endif

20
orte/mca/plm/base/plm_base_open.c
View File

@ -22,8 +22,6 @@
#include "orte_config.h"
#include "orte/constants.h"
#if !ORTE_DISABLE_FULL_SUPPORT
#include "opal/util/output.h"
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"
@ -31,9 +29,6 @@
#include "orte/mca/plm/plm.h"
#include "orte/mca/plm/base/plm_private.h"
#endif
#include "orte/mca/plm/base/base.h"
/*
@ -44,19 +39,6 @@
#include "orte/mca/plm/base/static-components.h"
#if ORTE_DISABLE_FULL_SUPPORT
/* have to include a bogus function here so that
* the build system sees at least one function
* in the library
*/
int orte_plm_base_open(void)
{
return ORTE_SUCCESS;
}
#else
/*
* Global public variables
*/
@ -115,5 +97,3 @@ int orte_plm_base_open(void)
return ORTE_SUCCESS;
}
#endif

4
orte/mca/plm/lsf/configure.m4
View File

@ -11,7 +11,7 @@
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2011 Los Alamos National Security, LLC.
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
# All rights reserved.
# $COPYRIGHT$
#
@ -29,7 +29,7 @@ AC_DEFUN([MCA_orte_plm_lsf_CONFIG],[
# if check worked, set wrapper flags if so.
# Evaluate succeed / fail
AS_IF([test "$plm_lsf_good" = "1" -a "$orte_without_full_support" = 0],
AS_IF([test "$plm_lsf_good" = "1"],
[$1],
[$2])

4
orte/mca/plm/rsh/configure.m4
View File

@ -10,7 +10,7 @@
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2011 Los Alamos National Security, LLC.
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
# All rights reserved.
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$
@ -27,5 +27,5 @@ AC_DEFUN([MCA_orte_plm_rsh_CONFIG],[
AC_CHECK_FUNC([fork], [plm_rsh_happy="yes"], [plm_rsh_happy="no"])
AS_IF([test "$plm_rsh_happy" = "yes" -a "$orte_without_full_support" = 0], [$1], [$2])
AS_IF([test "$plm_rsh_happy" = "yes"], [$1], [$2])
])dnl

4
orte/mca/plm/slurm/configure.m4
View File

@ -11,7 +11,7 @@
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2011 Los Alamos National Security, LLC.
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
# All rights reserved.
# $COPYRIGHT$
#
@ -29,7 +29,7 @@ AC_DEFUN([MCA_orte_plm_slurm_CONFIG],[
# if check worked, set wrapper flags if so.
# Evaluate succeed / fail
AS_IF([test "$plm_slurm_good" = "1" -a "$orte_without_full_support" = 0],
AS_IF([test "$plm_slurm_good" = "1"],
[$1],
[$2])

4
orte/mca/plm/tm/configure.m4
View File

@ -10,7 +10,7 @@
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2011 Los Alamos National Security, LLC.
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
# All rights reserved.
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$
@ -29,7 +29,7 @@ AC_DEFUN([MCA_orte_plm_tm_CONFIG],[
# if check worked, set wrapper flags if so.
# Evaluate succeed / fail
AS_IF([test "$plm_tm_good" = "1" -a "$orte_without_full_support" = 0],
AS_IF([test "$plm_tm_good" = "1"],
[$1],
[$2])

4
orte/mca/ras/alps/configure.m4
View File

@ -12,7 +12,7 @@
# All rights reserved.
# Copyright (c) 2008 UT-Battelle, LLC
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2011 Los Alamos National Security, LLC.
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
# All rights reserved.
# $COPYRIGHT$
#
@ -42,5 +42,5 @@ AC_DEFUN([MCA_orte_ras_alps_CONFIG],[
AC_SUBST([ras_alps_CPPFLAGS])
AS_IF([test "$ras_alps_happy" = "yes" -a "$orte_without_full_support" = 0], [$1], [$2])
AS_IF([test "$ras_alps_happy" = "yes"], [$1], [$2])
])dnl

12
orte/mca/ras/base/Makefile.am
View File

@ -19,20 +19,12 @@
dist_pkgdata_DATA += base/help-ras-base.txt
headers += \
base/base.h
libmca_ras_la_SOURCES += \
base/ras_base_open.c
if !ORTE_DISABLE_FULL_SUPPORT
headers += \
base/base.h \
base/ras_private.h
libmca_ras_la_SOURCES += \
base/ras_base_open.c \
base/ras_base_close.c \
base/ras_base_select.c \
base/ras_base_allocate.c \
base/ras_base_node.c
endif

5
orte/mca/ras/base/base.h
View File

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2011-2012 Los Alamos National Security, LLC. All rights
* Copyright (c) 2011-2013 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
*
@ -37,7 +37,6 @@ BEGIN_C_DECLS
ORTE_DECLSPEC int orte_ras_base_open(void);
#if !ORTE_DISABLE_FULL_SUPPORT
/*
* globals that might be needed
*/
@ -64,8 +63,6 @@ ORTE_DECLSPEC void orte_ras_base_allocate(int fd, short args, void *cbdata);
ORTE_DECLSPEC int orte_ras_base_add_hosts(orte_job_t *jdata);
#endif /* ORTE_DISABLE_FULL_SUPPORT */
END_C_DECLS
#endif

21
orte/mca/ras/base/ras_base_open.c
View File

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2011-2012 Los Alamos National Security, LLC. All rights
* Copyright (c) 2011-2013 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
*
@ -22,17 +22,12 @@
#include "orte_config.h"
#include "orte/constants.h"
#if !ORTE_DISABLE_FULL_SUPPORT
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"
#include "opal/mca/base/mca_base_param.h"
#include "opal/mca/event/event.h"
#include "orte/mca/ras/base/ras_private.h"
#endif
#include "orte/mca/ras/base/base.h"
@ -49,18 +44,6 @@
#include "orte/mca/ras/base/static-components.h"
#if ORTE_DISABLE_FULL_SUPPORT
/* have to include a bogus function here so that
* the build system sees at least one function
* in the library
*/
int orte_ras_base_open(void)
{
return ORTE_SUCCESS;
}
#else
/*
* Global variables
*/
@ -92,5 +75,3 @@ int orte_ras_base_open(void)
/* All done */
return ORTE_SUCCESS;
}
#endif /* ORTE_DISABLE_FULL_SUPPORT */

4
orte/mca/ras/gridengine/configure.m4
View File

@ -13,7 +13,7 @@
# Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2011 Los Alamos National Security, LLC.
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
# All rights reserved.
# $COPYRIGHT$
#
@ -29,5 +29,5 @@ AC_DEFUN([MCA_orte_ras_gridengine_CONFIG],[
ORTE_CHECK_GRIDENGINE([ras_gridengine], [ras_gridengine_happy="yes"], [ras_gridengine_happy="no"])
AS_IF([test "$ras_gridengine_happy" = "yes" -a "$orte_without_full_support" = 0], [$1], [$2])
AS_IF([test "$ras_gridengine_happy" = "yes"], [$1], [$2])
])dnl

4
orte/mca/ras/loadleveler/configure.m4
View File

@ -11,7 +11,7 @@
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2011 Los Alamos National Security, LLC.
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
# All rights reserved.
# $COPYRIGHT$
#
@ -29,7 +29,7 @@ AC_DEFUN([MCA_orte_ras_loadleveler_CONFIG],[
# if check worked, set wrapper flags if so.
# Evaluate succeed / fail
AS_IF([test "$ras_loadleveler_good" = "1" -a "$orte_without_full_support" = 0],
AS_IF([test "$ras_loadleveler_good" = "1"],
[$1],
[$2])

4
orte/mca/ras/lsf/configure.m4
View File

@ -11,7 +11,7 @@
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2011 Los Alamos National Security, LLC.
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
# All rights reserved.
# $COPYRIGHT$
#
@ -29,7 +29,7 @@ AC_DEFUN([MCA_orte_ras_lsf_CONFIG],[
# if check worked, set wrapper flags if so.
# Evaluate succeed / fail
AS_IF([test "$ras_lsf_good" = "1" -a "$orte_without_full_support" = 0],
AS_IF([test "$ras_lsf_good" = "1"],
[$1],
[$2])

19
orte/mca/ras/simulator/configure.m4
View File

@ -1,19 +0,0 @@
# -*- shell-script -*-
#
# Copyright (c) 2011 Los Alamos National Security, LLC.
# All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
# MCA_ras_simulator_CONFIG([action-if-found], [action-if-not-found])
# -----------------------------------------------------------
AC_DEFUN([MCA_orte_ras_simulator_CONFIG], [
AC_CONFIG_FILES([orte/mca/ras/simulator/Makefile])
AS_IF([test "$orte_without_full_support" = 0],
[$1],
[$2])
])

4
orte/mca/ras/slurm/configure.m4
View File

@ -11,7 +11,7 @@
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2011 Los Alamos National Security, LLC.
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
# All rights reserved.
# $COPYRIGHT$
#
@ -29,7 +29,7 @@ AC_DEFUN([MCA_orte_ras_slurm_CONFIG],[
# if check worked, set wrapper flags if so.
# Evaluate succeed / fail
AS_IF([test "$ras_slurm_good" = "1" -a "$orte_without_full_support" = 0],
AS_IF([test "$ras_slurm_good" = "1"],
[$1],
[$2])

4
orte/mca/ras/tm/configure.m4
View File

@ -11,7 +11,7 @@
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2011 Los Alamos National Security, LLC.
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
# All rights reserved.
# $COPYRIGHT$
#
@ -29,7 +29,7 @@ AC_DEFUN([MCA_orte_ras_tm_CONFIG],[
# if check worked, set wrapper flags if so.
# Evaluate succeed / fail
AS_IF([test "$ras_tm_good" = "1" -a "$orte_without_full_support" = 0],
AS_IF([test "$ras_tm_good" = "1"],
[$1],
[$2])

16
orte/mca/rmaps/base/Makefile.am
View File

@ -20,19 +20,11 @@
#
headers += \
base/base.h
libmca_rmaps_la_SOURCES += \
base/rmaps_base_open.c
if !ORTE_DISABLE_FULL_SUPPORT
dist_pkgdata_DATA = base/help-orte-rmaps-base.txt
headers += \
base/base.h \
base/rmaps_private.h
libmca_rmaps_la_SOURCES += \
base/rmaps_base_open.c \
base/rmaps_base_close.c \
base/rmaps_base_select.c \
base/rmaps_base_map_job.c \
@ -40,9 +32,9 @@ libmca_rmaps_la_SOURCES += \
base/rmaps_base_ranking.c \
base/rmaps_base_print_fns.c
dist_pkgdata_DATA = base/help-orte-rmaps-base.txt
if OPAL_HAVE_HWLOC
libmca_rmaps_la_SOURCES += \
base/rmaps_base_binding.c
endif
endif

7
orte/mca/rmaps/base/base.h
View File

@ -9,8 +9,8 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011 Los Alamos National Security, LLC.
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011-2013 Los Alamos National Security, LLC.
* All rights reserved.
* $COPYRIGHT$
*
@ -45,7 +45,6 @@ BEGIN_C_DECLS
*/
ORTE_DECLSPEC int orte_rmaps_base_open(void);
#if !ORTE_DISABLE_FULL_SUPPORT
/*
* Global functions for MCA overall collective open and close
@ -123,8 +122,6 @@ ORTE_DECLSPEC int orte_rmaps_base_filter_nodes(orte_app_context_t *app,
opal_list_t *nodes,
bool remove);
#endif /* ORTE_DISABLE_FULL_SUPPORT */
END_C_DECLS
#endif

21
orte/mca/rmaps/base/rmaps_base_open.c
View File

@ -10,7 +10,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2006-2011 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011 Los Alamos National Security, LLC.
* Copyright (c) 2011-2013 Los Alamos National Security, LLC.
* All rights reserved.
* $COPYRIGHT$
*
@ -26,8 +26,6 @@
#include <string.h>
#endif
#if !ORTE_DISABLE_FULL_SUPPORT
#include "opal/mca/mca.h"
#include "opal/util/output.h"
#include "opal/mca/base/base.h"
@ -37,9 +35,6 @@
#include "orte/util/show_help.h"
#include "orte/mca/rmaps/base/rmaps_private.h"
#endif
#include "orte/mca/rmaps/base/base.h"
@ -51,18 +46,6 @@
#include "orte/mca/rmaps/base/static-components.h"
#if ORTE_DISABLE_FULL_SUPPORT
/* have to include a bogus function here so that
* the build system sees at least one function
* in the library
*/
int orte_rmaps_base_open(void)
{
return ORTE_SUCCESS;
}
#else
/*
* Global variables