ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

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

Просмотр исходного кода 
This commit was SVN r28134.
Этот коммит содержится в:
Ralph Castain 2013-02-28 01:35:55 +00:00
родитель b5a2cd1cce
Коммит cf9796accd
103 изменённых файлов: 112 добавлений и 898 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

27
config/orte_configure_options.m4
Просмотреть файл

@ -13,7 +13,7 @@ dnl All rights reserved.
dnl Copyright (c) 2006-2010 Cisco Systems, Inc. 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) 2007 Sun Microsystems, Inc. All rights reserved.
dnl Copyright (c) 2009 IBM Corporation. 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 reserved.
dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
dnl dnl
@ -28,31 +28,6 @@ dnl
AC_DEFUN([ORTE_CONFIGURE_OPTIONS],[ AC_DEFUN([ORTE_CONFIGURE_OPTIONS],[
ompi_show_subtitle "ORTE Configuration 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? # Do we want orterun's --prefix behavior to be enabled by default?
# #

4
orte/include/orte/types.h
Просмотреть файл

@ -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_NAME (OPAL_DSS_ID_DYNAMIC + 2) /**< an orte_process_name_t */
#define ORTE_VPID (OPAL_DSS_ID_DYNAMIC + 3) /**< a vpid */ #define ORTE_VPID (OPAL_DSS_ID_DYNAMIC + 3) /**< a vpid */
#define ORTE_JOBID (OPAL_DSS_ID_DYNAMIC + 4) /**< a jobid */ #define ORTE_JOBID (OPAL_DSS_ID_DYNAMIC + 4) /**< a jobid */
#if !ORTE_DISABLE_FULL_SUPPORT
/* State-related types */ /* State-related types */
#define ORTE_NODE_STATE (OPAL_DSS_ID_DYNAMIC + 6) /**< node status flag */ #define ORTE_NODE_STATE (OPAL_DSS_ID_DYNAMIC + 6) /**< node status flag */
#define ORTE_PROC_STATE (OPAL_DSS_ID_DYNAMIC + 7) /**< process/resource status */ #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 */ /* provide a boundary for others to use */
#define ORTE_DSS_ID_DYNAMIC (OPAL_DSS_ID_DYNAMIC + 50) #define ORTE_DSS_ID_DYNAMIC (OPAL_DSS_ID_DYNAMIC + 50)
#endif /* !ORTE_DISABLE_FULL_SUPPORT */
#endif #endif

6
orte/mca/errmgr/base/errmgr_base_fns.c
Просмотреть файл

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

7
orte/mca/ess/base/Makefile.am
Просмотреть файл

@ -24,11 +24,7 @@ headers += \
libmca_ess_la_SOURCES += \ libmca_ess_la_SOURCES += \
base/ess_base_close.c \ base/ess_base_close.c \
base/ess_base_open.c \ base/ess_base_open.c \
base/ess_base_select.c base/ess_base_select.c \
if !ORTE_DISABLE_FULL_SUPPORT
libmca_ess_la_SOURCES += \
base/ess_base_get.c \ base/ess_base_get.c \
base/ess_base_put.c \ base/ess_base_put.c \
base/ess_base_std_tool.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_orted.c \
base/ess_base_std_prolog.c \ base/ess_base_std_prolog.c \
base/ess_base_fns.c base/ess_base_fns.c
endif

5
orte/mca/ess/base/base.h
Просмотреть файл

@ -11,6 +11,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2011-2012 Cisco Systems, Inc. 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) 2012 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * 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; ORTE_DECLSPEC extern opal_list_t orte_ess_base_components_available;
#if !ORTE_DISABLE_FULL_SUPPORT
/* /*
* Internal helper functions used by components * 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, orte_std_cntr_t num_local_procs,
char ***env); char ***env);
#endif /* ORTE_DISABLE_FULL_SUPPORT */
END_C_DECLS END_C_DECLS
#endif #endif

4
orte/mca/ess/base/ess_base_select.c
Просмотреть файл

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

2
orte/mca/ess/hnp/ess_hnp_module.c
Просмотреть файл

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

11
orte/mca/filem/base/Makefile.am
Просмотреть файл

@ -20,15 +20,10 @@ headers += \
base/base.h base/base.h
libmca_filem_la_SOURCES += \ libmca_filem_la_SOURCES += \
base/filem_base_open.c 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_close.c \ base/filem_base_close.c \
base/filem_base_select.c \ base/filem_base_select.c \
base/filem_base_receive.c \ base/filem_base_receive.c \
base/filem_base_fns.c base/filem_base_fns.c
endif
dist_pkgdata_DATA = base/help-orte-filem-base.txt

20
orte/mca/filem/rsh/configure.m4
Просмотреть файл

@ -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
Просмотреть файл

@ -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
Просмотреть файл

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

13
orte/mca/grpcomm/configure.m4
Просмотреть файл

@ -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
Просмотреть файл

@ -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
Просмотреть файл

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

13
orte/mca/iof/base/Makefile.am
Просмотреть файл

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

4
orte/mca/iof/base/base.h
Просмотреть файл

@ -56,8 +56,6 @@ BEGIN_C_DECLS
ORTE_DECLSPEC int orte_iof_base_open(void); ORTE_DECLSPEC int orte_iof_base_open(void);
#if !ORTE_DISABLE_FULL_SUPPORT
/* track xon/xoff of processes */ /* track xon/xoff of processes */
typedef struct { typedef struct {
opal_object_t super; 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_iof_write_event_t *channel);
ORTE_DECLSPEC void orte_iof_base_write_handler(int fd, short event, void *cbdata); ORTE_DECLSPEC void orte_iof_base_write_handler(int fd, short event, void *cbdata);
#endif /* ORTE_DISABLE_FULL_SUPPORT */
END_C_DECLS END_C_DECLS
#endif /* MCA_IOF_BASE_H */ #endif /* MCA_IOF_BASE_H */

14
orte/mca/iof/base/iof_base_open.c
Просмотреть файл

@ -9,6 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -50,18 +51,6 @@
orte_iof_base_module_t orte_iof = {0}; 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 */ /* class instances */
static void orte_iof_job_construct(orte_iof_job_t *ptr) static void orte_iof_job_construct(orte_iof_job_t *ptr)
{ {
@ -288,4 +277,3 @@ int orte_iof_base_open(void)
/* All done */ /* All done */
return ORTE_SUCCESS; return ORTE_SUCCESS;
} }
#endif

19
orte/mca/iof/hnp/configure.m4
Просмотреть файл

@ -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
Просмотреть файл

@ -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
Просмотреть файл

@ -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
Просмотреть файл

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

22
orte/mca/odls/base/odls_base_open.c
Просмотреть файл

@ -10,8 +10,8 @@
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2010-2011 Oracle and/or its affiliates. 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 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011-2012 Los Alamos National Security, LLC. * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -28,7 +28,6 @@
#include <string.h> #include <string.h>
#endif #endif
#if !ORTE_DISABLE_FULL_SUPPORT
#include "opal/class/opal_ring_buffer.h" #include "opal/class/opal_ring_buffer.h"
#include "opal/mca/mca.h" #include "opal/mca/mca.h"
#include "opal/mca/base/base.h" #include "opal/mca/base/base.h"
@ -47,9 +46,6 @@
#include "orte/mca/ess/ess.h" #include "orte/mca/ess/ess.h"
#include "orte/mca/odls/base/odls_private.h" #include "orte/mca/odls/base/odls_private.h"
#endif
#include "orte/mca/odls/base/base.h" #include "orte/mca/odls/base/base.h"
@ -61,18 +57,6 @@
#include "orte/mca/odls/base/static-components.h" #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 * Instantiate globals
*/ */
@ -200,5 +184,3 @@ OBJ_CLASS_INSTANCE(orte_odls_launch_local_t,
opal_object_t, opal_object_t,
launch_local_const, launch_local_const,
launch_local_dest); launch_local_dest);
#endif

2
orte/mca/odls/default/configure.m4
Просмотреть файл

@ -27,7 +27,7 @@ AC_DEFUN([MCA_orte_odls_default_CONFIG],[
AC_CHECK_FUNC([fork], [odls_default_happy="yes"], [odls_default_happy="no"]) 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 ])dnl

7
orte/mca/oob/base/Makefile.am
Просмотреть файл

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

5
orte/mca/oob/base/base.h
Просмотреть файл

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

15
orte/mca/oob/base/oob_base_open.c
Просмотреть файл

@ -10,6 +10,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -37,18 +38,6 @@
#include "orte/mca/oob/base/static-components.h" #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 * Global variables
*/ */
@ -94,5 +83,3 @@ int mca_oob_base_open(void)
return ORTE_SUCCESS; return ORTE_SUCCESS;
} }
#endif /* ORTE_DISABLE_FULL_SUPPORT */

4
orte/mca/oob/tcp/configure.m4
Просмотреть файл

@ -10,7 +10,7 @@
# University of Stuttgart. All rights reserved. # University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California. # Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved. # All rights reserved.
# Copyright (c) 2011 Los Alamos National Security, LLC. # Copyright (c) 2011-2013 Los Alamos National Security, LLC.
# All rights reserved. # All rights reserved.
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
@ -34,5 +34,5 @@ AC_DEFUN([MCA_orte_oob_tcp_CONFIG],[
#include <netinet/in.h> #include <netinet/in.h>
#endif]) #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 ])dnl

4
orte/mca/plm/alps/configure.m4
Просмотреть файл

@ -11,7 +11,7 @@
# Copyright (c) 2004-2005 The Regents of the University of California. # Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved. # All rights reserved.
# Copyright (c) 2009-2010 Cisco Systems, Inc. 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. # All rights reserved.
# $COPYRIGHT$ # $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"]) 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 ])dnl

15
orte/mca/plm/base/Makefile.am
Просмотреть файл

@ -18,19 +18,11 @@
# #
headers += \ headers += \
base/base.h 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/plm_private.h base/plm_private.h
libmca_plm_la_SOURCES += \ libmca_plm_la_SOURCES += \
base/plm_base_open.c \
base/plm_base_close.c \ base/plm_base_close.c \
base/plm_base_select.c \ base/plm_base_select.c \
base/plm_base_receive.c \ base/plm_base_receive.c \
@ -38,4 +30,5 @@ libmca_plm_la_SOURCES += \
base/plm_base_jobid.c \ base/plm_base_jobid.c \
base/plm_base_proxy.c \ base/plm_base_proxy.c \
base/plm_base_orted_cmds.c base/plm_base_orted_cmds.c
endif
dist_pkgdata_DATA += base/help-plm-base.txt

5
orte/mca/plm/base/base.h
Просмотреть файл

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

20
orte/mca/plm/base/plm_base_open.c
Просмотреть файл

@ -22,8 +22,6 @@
#include "orte_config.h" #include "orte_config.h"
#include "orte/constants.h" #include "orte/constants.h"
#if !ORTE_DISABLE_FULL_SUPPORT
#include "opal/util/output.h" #include "opal/util/output.h"
#include "opal/mca/mca.h" #include "opal/mca/mca.h"
#include "opal/mca/base/base.h" #include "opal/mca/base/base.h"
@ -31,9 +29,6 @@
#include "orte/mca/plm/plm.h" #include "orte/mca/plm/plm.h"
#include "orte/mca/plm/base/plm_private.h" #include "orte/mca/plm/base/plm_private.h"
#endif
#include "orte/mca/plm/base/base.h" #include "orte/mca/plm/base/base.h"
/* /*
@ -44,19 +39,6 @@
#include "orte/mca/plm/base/static-components.h" #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 * Global public variables
*/ */
@ -115,5 +97,3 @@ int orte_plm_base_open(void)
return ORTE_SUCCESS; return ORTE_SUCCESS;
} }
#endif

4
orte/mca/plm/lsf/configure.m4
Просмотреть файл

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

4
orte/mca/plm/rsh/configure.m4
Просмотреть файл

@ -10,7 +10,7 @@
# University of Stuttgart. All rights reserved. # University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California. # Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved. # All rights reserved.
# Copyright (c) 2011 Los Alamos National Security, LLC. # Copyright (c) 2011-2013 Los Alamos National Security, LLC.
# All rights reserved. # All rights reserved.
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
@ -27,5 +27,5 @@ AC_DEFUN([MCA_orte_plm_rsh_CONFIG],[
AC_CHECK_FUNC([fork], [plm_rsh_happy="yes"], [plm_rsh_happy="no"]) 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 ])dnl

4
orte/mca/plm/slurm/configure.m4
Просмотреть файл

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

4
orte/mca/plm/tm/configure.m4
Просмотреть файл

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

4
orte/mca/ras/alps/configure.m4
Просмотреть файл

@ -12,7 +12,7 @@
# All rights reserved. # All rights reserved.
# Copyright (c) 2008 UT-Battelle, LLC # Copyright (c) 2008 UT-Battelle, LLC
# Copyright (c) 2009-2010 Cisco Systems, Inc. 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. # All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
@ -42,5 +42,5 @@ AC_DEFUN([MCA_orte_ras_alps_CONFIG],[
AC_SUBST([ras_alps_CPPFLAGS]) 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 ])dnl

12
orte/mca/ras/base/Makefile.am
Просмотреть файл

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

5
orte/mca/ras/base/base.h
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * 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. * reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -37,7 +37,6 @@ BEGIN_C_DECLS
ORTE_DECLSPEC int orte_ras_base_open(void); ORTE_DECLSPEC int orte_ras_base_open(void);
#if !ORTE_DISABLE_FULL_SUPPORT
/* /*
* globals that might be needed * 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); ORTE_DECLSPEC int orte_ras_base_add_hosts(orte_job_t *jdata);
#endif /* ORTE_DISABLE_FULL_SUPPORT */
END_C_DECLS END_C_DECLS
#endif #endif

21
orte/mca/ras/base/ras_base_open.c
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * 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. * reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -22,17 +22,12 @@
#include "orte_config.h" #include "orte_config.h"
#include "orte/constants.h" #include "orte/constants.h"
#if !ORTE_DISABLE_FULL_SUPPORT
#include "opal/mca/mca.h" #include "opal/mca/mca.h"
#include "opal/mca/base/base.h" #include "opal/mca/base/base.h"
#include "opal/mca/base/mca_base_param.h" #include "opal/mca/base/mca_base_param.h"
#include "opal/mca/event/event.h" #include "opal/mca/event/event.h"
#include "orte/mca/ras/base/ras_private.h" #include "orte/mca/ras/base/ras_private.h"
#endif
#include "orte/mca/ras/base/base.h" #include "orte/mca/ras/base/base.h"
@ -49,18 +44,6 @@
#include "orte/mca/ras/base/static-components.h" #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 * Global variables
*/ */
@ -92,5 +75,3 @@ int orte_ras_base_open(void)
/* All done */ /* All done */
return ORTE_SUCCESS; return ORTE_SUCCESS;
} }
#endif /* ORTE_DISABLE_FULL_SUPPORT */

4
orte/mca/ras/gridengine/configure.m4
Просмотреть файл

@ -13,7 +13,7 @@
# Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved. # Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms. # Use is subject to license terms.
# Copyright (c) 2009-2010 Cisco Systems, Inc. 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. # All rights reserved.
# $COPYRIGHT$ # $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"]) 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 ])dnl

4
orte/mca/ras/loadleveler/configure.m4
Просмотреть файл

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

4
orte/mca/ras/lsf/configure.m4
Просмотреть файл

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

19
orte/mca/ras/simulator/configure.m4
Просмотреть файл

@ -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
Просмотреть файл

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

4
orte/mca/ras/tm/configure.m4
Просмотреть файл

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

16
orte/mca/rmaps/base/Makefile.am
Просмотреть файл

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

7
orte/mca/rmaps/base/base.h
Просмотреть файл

@ -9,8 +9,8 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. * Copyright (c) 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. * All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -45,7 +45,6 @@ BEGIN_C_DECLS
*/ */
ORTE_DECLSPEC int orte_rmaps_base_open(void); ORTE_DECLSPEC int orte_rmaps_base_open(void);
#if !ORTE_DISABLE_FULL_SUPPORT
/* /*
* Global functions for MCA overall collective open and close * 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, opal_list_t *nodes,
bool remove); bool remove);
#endif /* ORTE_DISABLE_FULL_SUPPORT */
END_C_DECLS END_C_DECLS
#endif #endif

21
orte/mca/rmaps/base/rmaps_base_open.c
Просмотреть файл

@ -10,7 +10,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2006-2011 Cisco Systems, Inc. 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. * All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -26,8 +26,6 @@
#include <string.h> #include <string.h>
#endif #endif
#if !ORTE_DISABLE_FULL_SUPPORT
#include "opal/mca/mca.h" #include "opal/mca/mca.h"
#include "opal/util/output.h" #include "opal/util/output.h"
#include "opal/mca/base/base.h" #include "opal/mca/base/base.h"
@ -37,9 +35,6 @@
#include "orte/util/show_help.h" #include "orte/util/show_help.h"
#include "orte/mca/rmaps/base/rmaps_private.h" #include "orte/mca/rmaps/base/rmaps_private.h"
#endif
#include "orte/mca/rmaps/base/base.h" #include "orte/mca/rmaps/base/base.h"
@ -51,18 +46,6 @@
#include "orte/mca/rmaps/base/static-components.h" #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 * Global variables
*/ */
@ -410,5 +393,3 @@ int orte_rmaps_base_open(void)
OBJ_CLASS_INSTANCE(orte_rmaps_base_selected_module_t, OBJ_CLASS_INSTANCE(orte_rmaps_base_selected_module_t,
opal_list_item_t, opal_list_item_t,
NULL, NULL); NULL, NULL);
#endif /* ORTE_DISABLE_FULL_SUPPORT */

19
orte/mca/rmaps/ppr/configure.m4
Просмотреть файл

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

19
orte/mca/rmaps/rank_file/configure.m4
Просмотреть файл

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

19
orte/mca/rmaps/round_robin/configure.m4
Просмотреть файл

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

19
orte/mca/rmaps/seq/configure.m4
Просмотреть файл

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

13
orte/mca/rml/base/Makefile.am
Просмотреть файл

@ -17,18 +17,11 @@
# #
headers += \ headers += \
base/base.h base/base.h\
libmca_rml_la_SOURCES += \
base/rml_base_components.c \
base/rml_base_null_fns.c
if !ORTE_DISABLE_FULL_SUPPORT
headers += \
base/rml_contact.h base/rml_contact.h
libmca_rml_la_SOURCES += \ libmca_rml_la_SOURCES += \
base/rml_base_components.c \
base/rml_base_null_fns.c \
base/rml_base_receive.c \ base/rml_base_receive.c \
base/rml_base_contact.c base/rml_base_contact.c
endif

7
orte/mca/rml/base/rml_base_components.c
Просмотреть файл

@ -2,7 +2,7 @@
* Copyright (c) 2004-2011 The University of Tennessee and The University * Copyright (c) 2004-2011 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights * of Tennessee Research Foundation. All rights
* reserved. * reserved.
* Copyright (c) 2011 Los Alamos National Security, LLC. All rights * Copyright (c) 2011-2013 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -24,11 +24,6 @@
#include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml.h"
#include "orte/util/name_fns.h" #include "orte/util/name_fns.h"
#if !ORTE_DISABLE_FULL_SUPPORT
#endif
#include "orte/mca/rml/base/base.h" #include "orte/mca/rml/base/base.h"
/* The following file was created by configure. It contains extern /* The following file was created by configure. It contains extern

19
orte/mca/rml/oob/configure.m4
Просмотреть файл

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

9
orte/mca/routed/base/Makefile.am
Просмотреть файл

@ -1,5 +1,5 @@
# #
# Copyright (c) 2007 Los Alamos National Security, LLC. # Copyright (c) 2007-2013 Los Alamos National Security, LLC.
# All rights reserved. # All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
@ -12,10 +12,5 @@ headers += \
base/base.h base/base.h
libmca_routed_la_SOURCES += \ libmca_routed_la_SOURCES += \
base/routed_base_components.c base/routed_base_components.c \
if !ORTE_DISABLE_FULL_SUPPORT
libmca_routed_la_SOURCES += \
base/routed_base_fns.c base/routed_base_fns.c
endif

4
orte/mca/routed/base/base.h
Просмотреть файл

@ -25,8 +25,6 @@ BEGIN_C_DECLS
ORTE_DECLSPEC int orte_routed_base_open(void); ORTE_DECLSPEC int orte_routed_base_open(void);
#if !ORTE_DISABLE_FULL_SUPPORT
/* /*
* Global functions for the ROUTED * Global functions for the ROUTED
*/ */
@ -51,8 +49,6 @@ ORTE_DECLSPEC int orte_routed_base_process_callback(orte_jobid_t job,
opal_buffer_t *buffer); opal_buffer_t *buffer);
ORTE_DECLSPEC void orte_routed_base_update_hnps(opal_buffer_t *buf); ORTE_DECLSPEC void orte_routed_base_update_hnps(opal_buffer_t *buf);
#endif /* ORTE_DISABLE_FULL_SUPPORT */
END_C_DECLS END_C_DECLS
#endif /* MCA_ROUTED_BASE_H */ #endif /* MCA_ROUTED_BASE_H */

14
orte/mca/routed/base/routed_base_components.c
Просмотреть файл

@ -37,18 +37,6 @@
* component's public mca_base_component_t struct. */ * component's public mca_base_component_t struct. */
#include "orte/mca/routed/base/static-components.h" #include "orte/mca/routed/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_routed_base_open(void)
{
return ORTE_SUCCESS;
}
#else
static void construct(orte_routed_tree_t *rt) static void construct(orte_routed_tree_t *rt)
{ {
rt->vpid = ORTE_VPID_INVALID; rt->vpid = ORTE_VPID_INVALID;
@ -254,5 +242,3 @@ void orte_routed_base_update_hnps(opal_buffer_t *buf)
n=1; n=1;
} }
} }
#endif /* ORTE_DISABLE_FULL_SUPPORT */

19
orte/mca/routed/binomial/configure.m4
Просмотреть файл

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

19
orte/mca/routed/debruijn/configure.m4
Просмотреть файл

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

19
orte/mca/routed/direct/configure.m4
Просмотреть файл

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

19
orte/mca/routed/radix/configure.m4
Просмотреть файл

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

6
orte/mca/routed/routed_types.h
Просмотреть файл

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008-2012 Los Alamos National Security, LLC. * Copyright (c) 2008-2013 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* Copyright (c) 2004-2008 The Trustees of Indiana University. * Copyright (c) 2004-2008 The Trustees of Indiana University.
* All rights reserved. * All rights reserved.
@ -28,8 +28,6 @@
BEGIN_C_DECLS BEGIN_C_DECLS
#if !ORTE_DISABLE_FULL_SUPPORT
/* struct for tracking routing trees */ /* struct for tracking routing trees */
typedef struct { typedef struct {
opal_list_item_t super; opal_list_item_t super;
@ -47,8 +45,6 @@ typedef struct {
} orte_routed_jobfam_t; } orte_routed_jobfam_t;
ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_routed_jobfam_t); ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_routed_jobfam_t);
#endif
END_C_DECLS END_C_DECLS
#endif #endif

7
orte/mca/sensor/base/base.h
Просмотреть файл

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
* *
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -42,11 +43,5 @@ ORTE_DECLSPEC int orte_sensor_base_close(void);
ORTE_DECLSPEC extern opal_list_t mca_sensor_base_components_available; ORTE_DECLSPEC extern opal_list_t mca_sensor_base_components_available;
#if !ORTE_DISABLE_FULL_SUPPORT
/* no base functions to protect at this time */
#endif /* ORTE_DISABLE_FULL_SUPPORT */
END_C_DECLS END_C_DECLS
#endif #endif

4
orte/mca/sensor/file/configure.m4
Просмотреть файл

@ -1,7 +1,7 @@
# -*- shell-script -*- # -*- shell-script -*-
# #
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 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. # All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
@ -17,7 +17,7 @@ AC_DEFUN([MCA_orte_sensor_file_CONFIG], [
# if we don't want sensors, don't compile # if we don't want sensors, don't compile
# this component # this component
AS_IF([test "$orte_want_sensors" = "1" -a "$orte_without_full_support" = 0], AS_IF([test "$orte_want_sensors" = "1"],
[$1], [$2]) [$1], [$2])
])dnl ])dnl

4
orte/mca/sensor/ft_tester/configure.m4
Просмотреть файл

@ -1,7 +1,7 @@
# -*- shell-script -*- # -*- shell-script -*-
# #
# Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. # Copyright (c) 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. # All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
@ -17,7 +17,7 @@ AC_DEFUN([MCA_orte_sensor_ft_tester_CONFIG], [
# if we don't want sensors, don't compile # if we don't want sensors, don't compile
# this component # this component
AS_IF([test "$orte_want_sensors" = "1" -a "$orte_without_full_support" = 0], AS_IF([test "$orte_want_sensors" = "1"],
[$1], [$2]) [$1], [$2])
])dnl ])dnl

4
orte/mca/sensor/heartbeat/configure.m4
Просмотреть файл

@ -1,7 +1,7 @@
# -*- shell-script -*- # -*- shell-script -*-
# #
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2011-2012 Los Alamos National Security, LLC. # Copyright (c) 2011-2013 Los Alamos National Security, LLC.
# All rights reserved. # All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
@ -17,7 +17,7 @@ AC_DEFUN([MCA_orte_sensor_heartbeat_CONFIG], [
# if we don't want sensors, don't compile # if we don't want sensors, don't compile
# this component # this component
AS_IF([test "$orte_want_sensors" = "1" -a "$orte_without_full_support" = 0], AS_IF([test "$orte_want_sensors" = "1"],
[$1], [$2]) [$1], [$2])
])dnl ])dnl

4
orte/mca/sensor/resusage/configure.m4
Просмотреть файл

@ -1,7 +1,7 @@
# -*- shell-script -*- # -*- shell-script -*-
# #
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 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. # All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
@ -17,7 +17,7 @@ AC_DEFUN([MCA_orte_sensor_resusage_CONFIG], [
# if we don't want sensors, don't compile # if we don't want sensors, don't compile
# this component # this component
AS_IF([test "$orte_want_sensors" = "1" -a "$orte_without_full_support" = 0], AS_IF([test "$orte_want_sensors" = "1"],
[$1], [$2]) [$1], [$2])
])dnl ])dnl

11
orte/mca/snapc/base/Makefile.am
Просмотреть файл

@ -20,14 +20,9 @@ headers += \
base/base.h base/base.h
libmca_snapc_la_SOURCES += \ libmca_snapc_la_SOURCES += \
base/snapc_base_open.c base/snapc_base_open.c \
if !ORTE_DISABLE_FULL_SUPPORT
dist_pkgdata_DATA = base/help-orte-snapc-base.txt
libmca_snapc_la_SOURCES += \
base/snapc_base_close.c \ base/snapc_base_close.c \
base/snapc_base_select.c \ base/snapc_base_select.c \
base/snapc_base_fns.c base/snapc_base_fns.c
endif
dist_pkgdata_DATA = base/help-orte-snapc-base.txt

5
orte/mca/snapc/base/base.h
Просмотреть файл

@ -10,6 +10,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2007 Evergrid, Inc. All rights reserved. * Copyright (c) 2007 Evergrid, Inc. All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
* *
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -42,8 +43,6 @@ BEGIN_C_DECLS
*/ */
ORTE_DECLSPEC int orte_snapc_base_open(void); ORTE_DECLSPEC int orte_snapc_base_open(void);
#if !ORTE_DISABLE_FULL_SUPPORT
/* /*
* Commands for command line tool and SnapC interaction * Commands for command line tool and SnapC interaction
*/ */
@ -160,8 +159,6 @@ ORTE_DECLSPEC extern orte_snapc_coord_type_t orte_snapc_coord_type;
ORTE_DECLSPEC int orte_snapc_base_pack_options(opal_buffer_t* buffer, ORTE_DECLSPEC int orte_snapc_base_pack_options(opal_buffer_t* buffer,
opal_crs_base_ckpt_options_t *options); opal_crs_base_ckpt_options_t *options);
#endif /* ORTE_DISABLE_FULL_SUPPORT */
END_C_DECLS END_C_DECLS
#endif /* ORTE_SNAPC_BASE_H */ #endif /* ORTE_SNAPC_BASE_H */

15
orte/mca/snapc/base/snapc_base_open.c
Просмотреть файл

@ -8,6 +8,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2007 Evergrid, Inc. All rights reserved. * Copyright (c) 2007 Evergrid, Inc. All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
* *
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -43,18 +44,6 @@
#include "orte/mca/snapc/base/static-components.h" #include "orte/mca/snapc/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_snapc_base_open(void)
{
return ORTE_SUCCESS;
}
#else
/* /*
* Globals * Globals
*/ */
@ -142,5 +131,3 @@ int orte_snapc_base_open(void)
return ORTE_SUCCESS; return ORTE_SUCCESS;
} }
#endif /* ORTE_DISABLE_FULL_SUPPORT */

4
orte/mca/snapc/full/configure.m4
Просмотреть файл

@ -9,7 +9,7 @@
# Copyright (c) 2004-2005 The Regents of the University of California. # Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved. # All rights reserved.
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 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. # All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
@ -24,7 +24,7 @@ AC_DEFUN([MCA_orte_snapc_full_CONFIG],[
AC_CONFIG_FILES([orte/mca/snapc/full/Makefile]) AC_CONFIG_FILES([orte/mca/snapc/full/Makefile])
# If we don't want FT, don't compile this component # If we don't want FT, don't compile this component
AS_IF([test "$opal_want_ft_cr" = "1" -a "$orte_without_full_support" = 0], AS_IF([test "$opal_want_ft_cr" = "1"],
[$1], [$1],
[$2]) [$2])
])dnl ])dnl

11
orte/mca/sstore/base/Makefile.am
Просмотреть файл

@ -13,14 +13,9 @@ headers += \
base/base.h base/base.h
libmca_sstore_la_SOURCES += \ libmca_sstore_la_SOURCES += \
base/sstore_base_open.c base/sstore_base_open.c \
if !ORTE_DISABLE_FULL_SUPPORT
dist_pkgdata_DATA = base/help-orte-sstore-base.txt
libmca_sstore_la_SOURCES += \
base/sstore_base_close.c \ base/sstore_base_close.c \
base/sstore_base_select.c \ base/sstore_base_select.c \
base/sstore_base_fns.c base/sstore_base_fns.c
endif
dist_pkgdata_DATA = base/help-orte-sstore-base.txt

6
orte/mca/sstore/base/base.h
Просмотреть файл

@ -2,6 +2,7 @@
* Copyright (c) 2010 The Trustees of Indiana University and Indiana * Copyright (c) 2010 The Trustees of Indiana University and Indiana
* University Research and Technology * University Research and Technology
* Corporation. All rights reserved. * Corporation. All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -13,9 +14,7 @@
#include "orte_config.h" #include "orte_config.h"
#if !ORTE_DISABLE_FULL_SUPPORT
#include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml.h"
#endif
#include "orte/mca/sstore/sstore.h" #include "orte/mca/sstore/sstore.h"
@ -35,7 +34,6 @@ BEGIN_C_DECLS
*/ */
ORTE_DECLSPEC int orte_sstore_base_open(void); ORTE_DECLSPEC int orte_sstore_base_open(void);
#if !ORTE_DISABLE_FULL_SUPPORT
/** /**
* Select an available component. * Select an available component.
* *
@ -140,8 +138,6 @@ ORTE_DECLSPEC int orte_sstore_base_tool_request_restart_handle(orte_sstore_base_
orte_sstore_base_global_snapshot_info_t *snapshot); orte_sstore_base_global_snapshot_info_t *snapshot);
ORTE_DECLSPEC int orte_sstore_base_tool_get_attr(orte_sstore_base_handle_t handle, orte_sstore_base_key_t key, char **value); ORTE_DECLSPEC int orte_sstore_base_tool_get_attr(orte_sstore_base_handle_t handle, orte_sstore_base_key_t key, char **value);
#endif /* ORTE_DISABLE_FULL_SUPPORT */
END_C_DECLS END_C_DECLS
#endif /* ORTE_SSTORE_BASE_H */ #endif /* ORTE_SSTORE_BASE_H */

15
orte/mca/sstore/base/sstore_base_open.c
Просмотреть файл

@ -3,6 +3,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2012 The University of Wisconsin-La Crosse. All rights * Copyright (c) 2012 The University of Wisconsin-La Crosse. All rights
* reserved. * reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -25,18 +26,6 @@
#include "orte/mca/sstore/base/static-components.h" #include "orte/mca/sstore/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_sstore_base_open(void)
{
return ORTE_SUCCESS;
}
#else
/* /*
* Globals * Globals
*/ */
@ -232,5 +221,3 @@ int orte_sstore_base_determine_context(void)
return ORTE_SUCCESS; return ORTE_SUCCESS;
} }
#endif

4
orte/mca/sstore/central/configure.m4
Просмотреть файл

@ -2,7 +2,7 @@
# #
# Copyright (c) 2010 The Trustees of Indiana University. # Copyright (c) 2010 The Trustees of Indiana University.
# All rights reserved. # All rights reserved.
# Copyright (c) 2011 Los Alamos National Security, LLC. # Copyright (c) 2011-2013 Los Alamos National Security, LLC.
# All rights reserved. # All rights reserved.
# #
# $COPYRIGHT$ # $COPYRIGHT$
@ -18,7 +18,7 @@ AC_DEFUN([MCA_orte_sstore_central_CONFIG],[
AC_CONFIG_FILES([orte/mca/sstore/central/Makefile]) AC_CONFIG_FILES([orte/mca/sstore/central/Makefile])
# If we don't want FT, don't compile this component # If we don't want FT, don't compile this component
AS_IF([test "$opal_want_ft_cr" = "1" -a "$orte_without_full_support" = 0], AS_IF([test "$opal_want_ft_cr" = "1"],
[$1], [$1],
[$2]) [$2])
])dnl ])dnl

4
orte/mca/sstore/stage/configure.m4
Просмотреть файл

@ -2,7 +2,7 @@
# #
# Copyright (c) 2010 The Trustees of Indiana University. # Copyright (c) 2010 The Trustees of Indiana University.
# All rights reserved. # All rights reserved.
# Copyright (c) 2011 Los Alamos National Security, LLC. # Copyright (c) 2011-2013 Los Alamos National Security, LLC.
# All rights reserved. # All rights reserved.
# #
# $COPYRIGHT$ # $COPYRIGHT$
@ -18,7 +18,7 @@ AC_DEFUN([MCA_orte_sstore_stage_CONFIG],[
AC_CONFIG_FILES([orte/mca/sstore/stage/Makefile]) AC_CONFIG_FILES([orte/mca/sstore/stage/Makefile])
# If we don't want FT, don't compile this component # If we don't want FT, don't compile this component
AS_IF([test "$opal_want_ft_cr" = "1" -a "$orte_without_full_support" = 0], AS_IF([test "$opal_want_ft_cr" = "1"],
[$1], [$1],
[$2]) [$2])
])dnl ])dnl

4
orte/mca/state/base/state_base_fns.c
Просмотреть файл

@ -27,8 +27,6 @@
#include "orte/mca/state/base/base.h" #include "orte/mca/state/base/base.h"
#include "orte/mca/state/base/state_private.h" #include "orte/mca/state/base/state_private.h"
#if !ORTE_DISABLE_FULL_SUPPORT
void orte_state_base_activate_job_state(orte_job_t *jdata, void orte_state_base_activate_job_state(orte_job_t *jdata,
orte_job_state_t state) orte_job_state_t state)
{ {
@ -213,7 +211,7 @@ void orte_state_base_print_job_state_machine(void)
(NULL == st->cbfunc) ? "NULL" : "DEFINED"); (NULL == st->cbfunc) ? "NULL" : "DEFINED");
} }
} }
#endif
/**** PROC STATE MACHINE ****/ /**** PROC STATE MACHINE ****/
void orte_state_base_activate_proc_state(orte_process_name_t *proc, void orte_state_base_activate_proc_state(orte_process_name_t *proc,

3
orte/orted/Makefile.am
Просмотреть файл

@ -19,8 +19,6 @@
# This makefile.am does not stand on its own - it is included from orte/Makefile.am # This makefile.am does not stand on its own - it is included from orte/Makefile.am
if !ORTE_DISABLE_FULL_SUPPORT
dist_pkgdata_DATA += orted/help-orted.txt dist_pkgdata_DATA += orted/help-orted.txt
headers += \ headers += \
@ -29,5 +27,4 @@ headers += \
libopen_rte_la_SOURCES += \ libopen_rte_la_SOURCES += \
orted/orted_main.c \ orted/orted_main.c \
orted/orted_comm.c orted/orted_comm.c
endif

5
orte/runtime/data_type_support/orte_dt_compare_fns.c
Просмотреть файл

@ -7,7 +7,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2011 Los Alamos National Security, LLC. * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -112,7 +112,6 @@ int orte_dt_compare_jobid(orte_jobid_t *value1,
return OPAL_EQUAL; return OPAL_EQUAL;
} }
#if !ORTE_DISABLE_FULL_SUPPORT
/** /**
* JOB * JOB
*/ */
@ -261,5 +260,3 @@ int orte_dt_compare_iof_tag(orte_iof_tag_t *value1, orte_iof_tag_t *value2, opal
return OPAL_EQUAL; return OPAL_EQUAL;
} }
#endif

6
orte/runtime/data_type_support/orte_dt_copy_fns.c
Просмотреть файл

@ -10,7 +10,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011-2012 Los Alamos National Security, LLC. * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -106,8 +106,6 @@ int orte_dt_copy_vpid(orte_vpid_t **dest, orte_vpid_t *src, opal_data_type_t typ
return ORTE_SUCCESS; return ORTE_SUCCESS;
} }
#if !ORTE_DISABLE_FULL_SUPPORT
/** /**
* JOB * JOB
*/ */
@ -369,5 +367,3 @@ int orte_dt_copy_iof_tag(orte_iof_tag_t **dest, orte_iof_tag_t *src, opal_data_t
return ORTE_SUCCESS; return ORTE_SUCCESS;
} }
#endif

4
orte/runtime/data_type_support/orte_dt_packing_fns.c
Просмотреть файл

@ -10,7 +10,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011-2012 Los Alamos National Security, LLC. * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -141,7 +141,6 @@ int orte_dt_pack_vpid(opal_buffer_t *buffer, const void *src,
return ret; return ret;
} }
#if !ORTE_DISABLE_FULL_SUPPORT
/* /*
* JOB * JOB
* NOTE: We do not pack all of the job object's fields as many of them have no * NOTE: We do not pack all of the job object's fields as many of them have no
@ -862,4 +861,3 @@ int orte_dt_pack_iof_tag(opal_buffer_t *buffer, const void *src, int32_t num_val
return ret; return ret;
} }
#endif

7
orte/runtime/data_type_support/orte_dt_print_fns.c
Просмотреть файл

@ -11,7 +11,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011-2012 Los Alamos National Security, LLC. * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -137,7 +137,6 @@ int orte_dt_std_print(char **output, char *prefix, void *src, opal_data_type_t t
ORTE_JOBID_PRINT(*(orte_jobid_t*)src)); ORTE_JOBID_PRINT(*(orte_jobid_t*)src));
break; break;
#if !ORTE_DISABLE_FULL_SUPPORT
case ORTE_PROC_STATE: case ORTE_PROC_STATE:
orte_dt_quick_print(output, "ORTE_PROC_STATE", prefix, src, ORTE_PROC_STATE_T); orte_dt_quick_print(output, "ORTE_PROC_STATE", prefix, src, ORTE_PROC_STATE_T);
break; break;
@ -165,7 +164,6 @@ int orte_dt_std_print(char **output, char *prefix, void *src, opal_data_type_t t
case ORTE_IOF_TAG: case ORTE_IOF_TAG:
orte_dt_quick_print(output, "ORTE_IOF_TAG", prefix, src, ORTE_IOF_TAG_T); orte_dt_quick_print(output, "ORTE_IOF_TAG", prefix, src, ORTE_IOF_TAG_T);
break; break;
#endif
default: default:
ORTE_ERROR_LOG(ORTE_ERR_UNKNOWN_DATA_TYPE); ORTE_ERROR_LOG(ORTE_ERR_UNKNOWN_DATA_TYPE);
@ -194,8 +192,6 @@ int orte_dt_print_name(char **output, char *prefix, orte_process_name_t *name, o
return ORTE_SUCCESS; return ORTE_SUCCESS;
} }
#if !ORTE_DISABLE_FULL_SUPPORT
/* /*
* JOB * JOB
*/ */
@ -728,4 +724,3 @@ int orte_dt_print_map(char **output, char *prefix, orte_job_map_t *src, opal_dat
free(pfx); free(pfx);
return ORTE_SUCCESS; return ORTE_SUCCESS;
} }
#endif

16
orte/runtime/data_type_support/orte_dt_support.h
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2011-2012 Los Alamos National Security, LLC. * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -53,8 +53,6 @@ int orte_dt_compare_jobid(orte_jobid_t *value1,
int orte_dt_compare_vpid(orte_vpid_t *value1, int orte_dt_compare_vpid(orte_vpid_t *value1,
orte_vpid_t *value2, orte_vpid_t *value2,
opal_data_type_t type); opal_data_type_t type);
#if !ORTE_DISABLE_FULL_SUPPORT
int orte_dt_compare_job(orte_job_t *value1, orte_job_t *value2, opal_data_type_t type); int orte_dt_compare_job(orte_job_t *value1, orte_job_t *value2, opal_data_type_t type);
int orte_dt_compare_node(orte_node_t *value1, orte_node_t *value2, opal_data_type_t type); int orte_dt_compare_node(orte_node_t *value1, orte_node_t *value2, opal_data_type_t type);
int orte_dt_compare_proc(orte_proc_t *value1, orte_proc_t *value2, opal_data_type_t type); int orte_dt_compare_proc(orte_proc_t *value1, orte_proc_t *value2, opal_data_type_t type);
@ -77,15 +75,12 @@ int orte_dt_compare_tags(orte_rml_tag_t *value1,
opal_data_type_t type); opal_data_type_t type);
int orte_dt_compare_daemon_cmd(orte_daemon_cmd_flag_t *value1, orte_daemon_cmd_flag_t *value2, opal_data_type_t type); int orte_dt_compare_daemon_cmd(orte_daemon_cmd_flag_t *value1, orte_daemon_cmd_flag_t *value2, opal_data_type_t type);
int orte_dt_compare_iof_tag(orte_iof_tag_t *value1, orte_iof_tag_t *value2, opal_data_type_t type); int orte_dt_compare_iof_tag(orte_iof_tag_t *value1, orte_iof_tag_t *value2, opal_data_type_t type);
#endif
/** Data type copy functions */ /** Data type copy functions */
int orte_dt_copy_std_cntr(orte_std_cntr_t **dest, orte_std_cntr_t *src, opal_data_type_t type); int orte_dt_copy_std_cntr(orte_std_cntr_t **dest, orte_std_cntr_t *src, opal_data_type_t type);
int orte_dt_copy_name(orte_process_name_t **dest, orte_process_name_t *src, opal_data_type_t type); int orte_dt_copy_name(orte_process_name_t **dest, orte_process_name_t *src, opal_data_type_t type);
int orte_dt_copy_jobid(orte_jobid_t **dest, orte_jobid_t *src, opal_data_type_t type); int orte_dt_copy_jobid(orte_jobid_t **dest, orte_jobid_t *src, opal_data_type_t type);
int orte_dt_copy_vpid(orte_vpid_t **dest, orte_vpid_t *src, opal_data_type_t type); int orte_dt_copy_vpid(orte_vpid_t **dest, orte_vpid_t *src, opal_data_type_t type);
#if !ORTE_DISABLE_FULL_SUPPORT
int orte_dt_copy_job(orte_job_t **dest, orte_job_t *src, opal_data_type_t type); int orte_dt_copy_job(orte_job_t **dest, orte_job_t *src, opal_data_type_t type);
int orte_dt_copy_node(orte_node_t **dest, orte_node_t *src, opal_data_type_t type); int orte_dt_copy_node(orte_node_t **dest, orte_node_t *src, opal_data_type_t type);
int orte_dt_copy_proc(orte_proc_t **dest, orte_proc_t *src, opal_data_type_t type); int orte_dt_copy_proc(orte_proc_t **dest, orte_proc_t *src, opal_data_type_t type);
@ -100,7 +95,6 @@ int orte_dt_copy_tag(orte_rml_tag_t **dest,
opal_data_type_t type); opal_data_type_t type);
int orte_dt_copy_daemon_cmd(orte_daemon_cmd_flag_t **dest, orte_daemon_cmd_flag_t *src, opal_data_type_t type); int orte_dt_copy_daemon_cmd(orte_daemon_cmd_flag_t **dest, orte_daemon_cmd_flag_t *src, opal_data_type_t type);
int orte_dt_copy_iof_tag(orte_iof_tag_t **dest, orte_iof_tag_t *src, opal_data_type_t type); int orte_dt_copy_iof_tag(orte_iof_tag_t **dest, orte_iof_tag_t *src, opal_data_type_t type);
#endif
/** Data type pack functions */ /** Data type pack functions */
int orte_dt_pack_std_cntr(opal_buffer_t *buffer, const void *src, int orte_dt_pack_std_cntr(opal_buffer_t *buffer, const void *src,
@ -113,8 +107,6 @@ int orte_dt_pack_jobid(opal_buffer_t *buffer, const void *src,
int32_t num_vals, opal_data_type_t type); int32_t num_vals, opal_data_type_t type);
int orte_dt_pack_vpid(opal_buffer_t *buffer, const void *src, int orte_dt_pack_vpid(opal_buffer_t *buffer, const void *src,
int32_t num_vals, opal_data_type_t type); int32_t num_vals, opal_data_type_t type);
#if !ORTE_DISABLE_FULL_SUPPORT
int orte_dt_pack_job(opal_buffer_t *buffer, const void *src, int orte_dt_pack_job(opal_buffer_t *buffer, const void *src,
int32_t num_vals, opal_data_type_t type); int32_t num_vals, opal_data_type_t type);
int orte_dt_pack_node(opal_buffer_t *buffer, const void *src, int orte_dt_pack_node(opal_buffer_t *buffer, const void *src,
@ -141,18 +133,15 @@ int orte_dt_pack_daemon_cmd(opal_buffer_t *buffer, const void *src,
int32_t num_vals, opal_data_type_t type); int32_t num_vals, opal_data_type_t type);
int orte_dt_pack_iof_tag(opal_buffer_t *buffer, const void *src, int32_t num_vals, int orte_dt_pack_iof_tag(opal_buffer_t *buffer, const void *src, int32_t num_vals,
opal_data_type_t type); opal_data_type_t type);
#endif
/** Data type print functions */ /** Data type print functions */
int orte_dt_std_print(char **output, char *prefix, void *src, opal_data_type_t type); int orte_dt_std_print(char **output, char *prefix, void *src, opal_data_type_t type);
int orte_dt_print_name(char **output, char *prefix, orte_process_name_t *name, opal_data_type_t type); int orte_dt_print_name(char **output, char *prefix, orte_process_name_t *name, opal_data_type_t type);
int orte_dt_print_job(char **output, char *prefix, orte_job_t *src, opal_data_type_t type); int orte_dt_print_job(char **output, char *prefix, orte_job_t *src, opal_data_type_t type);
#if !ORTE_DISABLE_FULL_SUPPORT
int orte_dt_print_node(char **output, char *prefix, orte_node_t *src, opal_data_type_t type); int orte_dt_print_node(char **output, char *prefix, orte_node_t *src, opal_data_type_t type);
int orte_dt_print_proc(char **output, char *prefix, orte_proc_t *src, opal_data_type_t type); int orte_dt_print_proc(char **output, char *prefix, orte_proc_t *src, opal_data_type_t type);
int orte_dt_print_app_context(char **output, char *prefix, orte_app_context_t *src, opal_data_type_t type); int orte_dt_print_app_context(char **output, char *prefix, orte_app_context_t *src, opal_data_type_t type);
int orte_dt_print_map(char **output, char *prefix, orte_job_map_t *src, opal_data_type_t type); int orte_dt_print_map(char **output, char *prefix, orte_job_map_t *src, opal_data_type_t type);
#endif
/** Data type unpack functions */ /** Data type unpack functions */
int orte_dt_unpack_std_cntr(opal_buffer_t *buffer, void *dest, int orte_dt_unpack_std_cntr(opal_buffer_t *buffer, void *dest,
@ -163,8 +152,6 @@ int orte_dt_unpack_jobid(opal_buffer_t *buffer, void *dest,
int32_t *num_vals, opal_data_type_t type); int32_t *num_vals, opal_data_type_t type);
int orte_dt_unpack_vpid(opal_buffer_t *buffer, void *dest, int orte_dt_unpack_vpid(opal_buffer_t *buffer, void *dest,
int32_t *num_vals, opal_data_type_t type); int32_t *num_vals, opal_data_type_t type);
#if !ORTE_DISABLE_FULL_SUPPORT
int orte_dt_unpack_job(opal_buffer_t *buffer, void *dest, int orte_dt_unpack_job(opal_buffer_t *buffer, void *dest,
int32_t *num_vals, opal_data_type_t type); int32_t *num_vals, opal_data_type_t type);
int orte_dt_unpack_node(opal_buffer_t *buffer, void *dest, int orte_dt_unpack_node(opal_buffer_t *buffer, void *dest,
@ -191,7 +178,6 @@ int orte_dt_unpack_daemon_cmd(opal_buffer_t *buffer, void *dest,
int32_t *num_vals, opal_data_type_t type); int32_t *num_vals, opal_data_type_t type);
int orte_dt_unpack_iof_tag(opal_buffer_t *buffer, void *dest, int32_t *num_vals, int orte_dt_unpack_iof_tag(opal_buffer_t *buffer, void *dest, int32_t *num_vals,
opal_data_type_t type); opal_data_type_t type);
#endif
END_C_DECLS END_C_DECLS

5
orte/runtime/data_type_support/orte_dt_unpacking_fns.c
Просмотреть файл

@ -10,7 +10,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011-2012 Los Alamos National Security, LLC. * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -142,7 +142,6 @@ int orte_dt_unpack_vpid(opal_buffer_t *buffer, void *dest,
return ret; return ret;
} }
#if !ORTE_DISABLE_FULL_SUPPORT
/* /*
* JOB * JOB
* NOTE: We do not pack all of the job object's fields as many of them have no * NOTE: We do not pack all of the job object's fields as many of them have no
@ -968,5 +967,3 @@ int orte_dt_unpack_iof_tag(opal_buffer_t *buffer, void *dest, int32_t *num_vals,
return ret; return ret;
} }
#endif

9
orte/runtime/orte_globals.c
Просмотреть файл

@ -57,8 +57,6 @@ opal_list_t orte_proc_states;
/* a clean output channel without prefix */ /* a clean output channel without prefix */
int orte_clean_output = -1; int orte_clean_output = -1;
#if !ORTE_DISABLE_FULL_SUPPORT
/* globals used by RTE */ /* globals used by RTE */
bool orte_timing; bool orte_timing;
FILE *orte_timing_output = NULL; FILE *orte_timing_output = NULL;
@ -205,8 +203,6 @@ opal_byte_object_t orte_pidmap;
char *orte_selected_oob_component = NULL; char *orte_selected_oob_component = NULL;
#endif /* !ORTE_DISABLE_FULL_RTE */
int orte_debug_output = -1; int orte_debug_output = -1;
bool orte_debug_daemons_flag = false; bool orte_debug_daemons_flag = false;
bool orte_xml_output = false; bool orte_xml_output = false;
@ -286,7 +282,6 @@ int orte_dt_init(void)
return rc; return rc;
} }
#if !ORTE_DISABLE_FULL_SUPPORT
tmp = ORTE_JOB; tmp = ORTE_JOB;
if (ORTE_SUCCESS != (rc = opal_dss.register_type(orte_dt_pack_job, if (ORTE_SUCCESS != (rc = opal_dss.register_type(orte_dt_pack_job,
orte_dt_unpack_job, orte_dt_unpack_job,
@ -430,13 +425,10 @@ int orte_dt_init(void)
ORTE_ERROR_LOG(rc); ORTE_ERROR_LOG(rc);
return rc; return rc;
} }
#endif /* !ORTE_DISABLE_FULL_SUPPORT */
return ORTE_SUCCESS; return ORTE_SUCCESS;
} }
#if !ORTE_DISABLE_FULL_SUPPORT
orte_job_t* orte_get_job_data_object(orte_jobid_t job) orte_job_t* orte_get_job_data_object(orte_jobid_t job)
{ {
int32_t ljob; int32_t ljob;
@ -1057,4 +1049,3 @@ OBJ_CLASS_INSTANCE(orte_job_map_t,
opal_object_t, opal_object_t,
orte_job_map_construct, orte_job_map_construct,
orte_job_map_destruct); orte_job_map_destruct);
#endif

20
orte/runtime/orte_globals.h
Просмотреть файл

@ -136,24 +136,6 @@ ORTE_DECLSPEC extern opal_list_t orte_proc_states;
/* a clean output channel without prefix */ /* a clean output channel without prefix */
ORTE_DECLSPEC extern int orte_clean_output; ORTE_DECLSPEC extern int orte_clean_output;
#if ORTE_DISABLE_FULL_SUPPORT
/* These types are used in interface functions that should never be
used or implemented in the non-full interface, but need to be
declared for various reasons. So have a dummy type to keep things
simple (and throw an error if someone does try to use them) */
struct orte_job_t;
struct orte_proc_t;
struct orte_node_t;
struct orte_app_context_t;
typedef struct orte_job_t orte_job_t;
typedef struct orte_proc_t orte_proc_t;
typedef struct orte_node_t orte_node_t;
typedef struct orte_app_context_t orte_app_context_t;
#else
#if ORTE_ENABLE_PROGRESS_THREADS #if ORTE_ENABLE_PROGRESS_THREADS
ORTE_DECLSPEC extern opal_thread_t orte_progress_thread; ORTE_DECLSPEC extern opal_thread_t orte_progress_thread;
#endif #endif
@ -746,8 +728,6 @@ ORTE_DECLSPEC extern char *orte_selected_oob_component;
ORTE_DECLSPEC extern opal_byte_object_t orte_nidmap; ORTE_DECLSPEC extern opal_byte_object_t orte_nidmap;
ORTE_DECLSPEC extern opal_byte_object_t orte_pidmap; ORTE_DECLSPEC extern opal_byte_object_t orte_pidmap;
#endif /* ORTE_DISABLE_FULL_SUPPORT */
END_C_DECLS END_C_DECLS
#endif /* ORTE_RUNTIME_ORTE_GLOBALS_H */ #endif /* ORTE_RUNTIME_ORTE_GLOBALS_H */

8
orte/runtime/orte_mca_params.c
Просмотреть файл

@ -11,7 +11,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2007-2011 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2007-2011 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2009-2010 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2009-2010 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012 Los Alamos National Security, LLC. * Copyright (c) 2012-2013 Los Alamos National Security, LLC.
* All rights reserved * All rights reserved
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -55,7 +55,6 @@ int orte_register_params(void)
} }
passed_thru = true; passed_thru = true;
#if !ORTE_DISABLE_FULL_SUPPORT
/* get a clean output channel too - need to do this here because /* get a clean output channel too - need to do this here because
* we use it below, and orterun and some other tools call this * we use it below, and orterun and some other tools call this
* function prior to calling orte_init * function prior to calling orte_init
@ -67,7 +66,6 @@ int orte_register_params(void)
orte_clean_output = opal_output_open(&lds); orte_clean_output = opal_output_open(&lds);
OBJ_DESTRUCT(&lds); OBJ_DESTRUCT(&lds);
} }
#endif /* !ORTE_DISABLE_FULL_SUPPORT */
mca_base_param_reg_int_name("orte", "base_help_aggregate", mca_base_param_reg_int_name("orte", "base_help_aggregate",
"If orte_base_help_aggregate is true, duplicate help messages will be aggregated rather than displayed individually. This can be helpful for parallel jobs that experience multiple identical failures; rather than print out the same help/failure message N times, display it once with a count of how many processes sent the same message.", "If orte_base_help_aggregate is true, duplicate help messages will be aggregated rather than displayed individually. This can be helpful for parallel jobs that experience multiple identical failures; rather than print out the same help/failure message N times, display it once with a count of how many processes sent the same message.",
@ -156,8 +154,6 @@ int orte_register_params(void)
false, false, (int) false, &value); false, false, (int) false, &value);
orte_report_silent_errors = OPAL_INT_TO_BOOL(value); orte_report_silent_errors = OPAL_INT_TO_BOOL(value);
#if !ORTE_DISABLE_FULL_SUPPORT
mca_base_param_reg_int_name("orte", "debug", mca_base_param_reg_int_name("orte", "debug",
"Top-level ORTE debug switch (default verbosity: 1)", "Top-level ORTE debug switch (default verbosity: 1)",
false, false, (int)false, &value); false, false, (int)false, &value);
@ -606,8 +602,6 @@ int orte_register_params(void)
"Treat -host directives as desired, but not required", "Treat -host directives as desired, but not required",
false, false, (int)false, &value); false, false, (int)false, &value);
orte_soft_locations = OPAL_INT_TO_BOOL(value); orte_soft_locations = OPAL_INT_TO_BOOL(value);
#endif /* ORTE_DISABLE_FULL_SUPPORT */
return ORTE_SUCCESS; return ORTE_SUCCESS;
} }

4
orte/runtime/orte_quit.c
Просмотреть файл

@ -12,7 +12,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2006-2011 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2006-2011 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2007-2009 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2007-2009 Sun Microsystems, Inc. All rights reserved.
* Copyright (c) 2007-2012 Los Alamos National Security, LLC. All rights * Copyright (c) 2007-2013 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2012 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2012 Oak Ridge National Labs. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
@ -65,7 +65,6 @@
/* /*
* Globals * Globals
*/ */
#if !ORTE_DISABLE_FULL_SUPPORT
static int num_aborted = 0; static int num_aborted = 0;
static int num_killed = 0; static int num_killed = 0;
static int num_failed_start = 0; static int num_failed_start = 0;
@ -389,4 +388,3 @@ static void dump_aborted_procs(void)
} }
} }
} }
#endif

2
orte/tools/orte-checkpoint/Makefile.am
Просмотреть файл

@ -24,7 +24,6 @@ include $(top_srcdir)/Makefile.man-page-rules
man_pages = orte-checkpoint.1 man_pages = orte-checkpoint.1
EXTRA_DIST = orte-checkpoint.1in CMakeLists.txt EXTRA_DIST = orte-checkpoint.1in CMakeLists.txt
if !ORTE_DISABLE_FULL_SUPPORT
if WANT_FT_CR if WANT_FT_CR
if OMPI_INSTALL_BINARIES if OMPI_INSTALL_BINARIES
@ -45,7 +44,6 @@ orte_checkpoint_SOURCES = orte-checkpoint.c
orte_checkpoint_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la orte_checkpoint_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
endif # WANT_FT_CR endif # WANT_FT_CR
endif # !ORTE_DISABLE_FULL_SUPPORT
distclean-local: distclean-local:
rm -f $(man_pages) rm -f $(man_pages)

3
orte/tools/orte-clean/Makefile.am
Просмотреть файл

@ -23,7 +23,6 @@ include $(top_srcdir)/Makefile.man-page-rules
man_pages = orte-clean.1 man_pages = orte-clean.1
EXTRA_DIST = $(man_pages:.1=.1in) CMakeLists.txt EXTRA_DIST = $(man_pages:.1=.1in) CMakeLists.txt
if !ORTE_DISABLE_FULL_SUPPORT
if OMPI_INSTALL_BINARIES if OMPI_INSTALL_BINARIES
bin_PROGRAMS = orte-clean bin_PROGRAMS = orte-clean
@ -42,7 +41,5 @@ endif # OMPI_INSTALL_BINARIES
orte_clean_SOURCES = orte-clean.c orte_clean_SOURCES = orte-clean.c
orte_clean_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la orte_clean_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
endif # !ORTE_DISABLE_FULL_SUPPORT
distclean-local: distclean-local:
rm -f $(man_pages) rm -f $(man_pages)

5
orte/tools/orte-info/orte-info.c
Просмотреть файл

@ -10,7 +10,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2010 Los Alamos National Security, LLC. * Copyright (c) 2010-2013 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -219,7 +219,6 @@ int main(int argc, char *argv[])
opal_pointer_array_add(&mca_types, "if"); opal_pointer_array_add(&mca_types, "if");
opal_pointer_array_add(&mca_types, "event"); opal_pointer_array_add(&mca_types, "event");
#if !ORTE_DISABLE_FULL_SUPPORT
opal_pointer_array_add(&mca_types, "iof"); opal_pointer_array_add(&mca_types, "iof");
opal_pointer_array_add(&mca_types, "oob"); opal_pointer_array_add(&mca_types, "oob");
opal_pointer_array_add(&mca_types, "odls"); opal_pointer_array_add(&mca_types, "odls");
@ -233,8 +232,6 @@ int main(int argc, char *argv[])
#endif #endif
opal_pointer_array_add(&mca_types, "sensor"); opal_pointer_array_add(&mca_types, "sensor");
opal_pointer_array_add(&mca_types, "filem"); opal_pointer_array_add(&mca_types, "filem");
#endif
/* these are always included */
opal_pointer_array_add(&mca_types, "state"); opal_pointer_array_add(&mca_types, "state");
opal_pointer_array_add(&mca_types, "errmgr"); opal_pointer_array_add(&mca_types, "errmgr");
opal_pointer_array_add(&mca_types, "ess"); opal_pointer_array_add(&mca_types, "ess");

2
orte/tools/orte-migrate/Makefile.am
Просмотреть файл

@ -16,7 +16,6 @@ include $(top_srcdir)/Makefile.man-page-rules
man_pages = orte-migrate.1 man_pages = orte-migrate.1
EXTRA_DIST = orte-migrate.1in CMakeLists.txt EXTRA_DIST = orte-migrate.1in CMakeLists.txt
if !ORTE_DISABLE_FULL_SUPPORT
if WANT_FT_CR if WANT_FT_CR
if OMPI_INSTALL_BINARIES if OMPI_INSTALL_BINARIES
@ -37,7 +36,6 @@ orte_migrate_SOURCES = orte-migrate.c
orte_migrate_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la orte_migrate_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
endif # WANT_FT_CR endif # WANT_FT_CR
endif # !ORTE_DISABLE_FULL_SUPPORT
distclean-local: distclean-local:
rm -f $(man_pages) rm -f $(man_pages)

3
orte/tools/orte-ps/Makefile.am
Просмотреть файл

@ -23,7 +23,6 @@ include $(top_srcdir)/Makefile.man-page-rules
man_pages = orte-ps.1 man_pages = orte-ps.1
EXTRA_DIST = $(man_pages:.1=.1in) CMakeLists.txt EXTRA_DIST = $(man_pages:.1=.1in) CMakeLists.txt
if !ORTE_DISABLE_FULL_SUPPORT
if OMPI_INSTALL_BINARIES if OMPI_INSTALL_BINARIES
bin_PROGRAMS = orte-ps bin_PROGRAMS = orte-ps
@ -42,7 +41,5 @@ endif # OMPI_INSTALL_BINARIES
orte_ps_SOURCES = orte-ps.c orte_ps_SOURCES = orte-ps.c
orte_ps_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la orte_ps_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
endif # !ORTE_DISABLE_FULL_SUPPORT
distclean-local: distclean-local:
rm -f $(man_pages) rm -f $(man_pages)

2
orte/tools/orte-restart/Makefile.am
Просмотреть файл

@ -24,7 +24,6 @@ include $(top_srcdir)/Makefile.man-page-rules
man_pages = orte-restart.1 man_pages = orte-restart.1
EXTRA_DIST = orte-restart.1in CMakeLists.txt EXTRA_DIST = orte-restart.1in CMakeLists.txt
if !ORTE_DISABLE_FULL_SUPPORT
if WANT_FT_CR if WANT_FT_CR
if OMPI_INSTALL_BINARIES if OMPI_INSTALL_BINARIES
@ -45,7 +44,6 @@ orte_restart_SOURCES = orte-restart.c
orte_restart_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la orte_restart_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
endif # WANT_FT_CR endif # WANT_FT_CR
endif # ORTE_DISABLE_FULL_SUPPORT
distclean-local: distclean-local:
rm -f $(man_pages) rm -f $(man_pages)

2
orte/tools/orte-server/Makefile.am
Просмотреть файл

@ -24,7 +24,6 @@ man_pages = orte-server.1
EXTRA_DIST = $(man_pages:.1=.1in) CMakeLists.txt EXTRA_DIST = $(man_pages:.1=.1in) CMakeLists.txt
if OMPI_INSTALL_BINARIES if OMPI_INSTALL_BINARIES
if !ORTE_DISABLE_FULL_SUPPORT
bin_PROGRAMS = orte-server bin_PROGRAMS = orte-server
@ -37,7 +36,6 @@ nodist_man_MANS = $(man_pages)
# therefore the release date or version may have changed) # therefore the release date or version may have changed)
$(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
endif # !ORTE_DISABLE_FULL_SUPPORT
endif # OMPI_INSTALL_BINARIES endif # OMPI_INSTALL_BINARIES
orte_server_SOURCES = orte-server.c orte_server_SOURCES = orte-server.c

3
orte/tools/orte-top/Makefile.am
Просмотреть файл

@ -23,7 +23,6 @@ include $(top_srcdir)/Makefile.man-page-rules
man_pages = orte-top.1 man_pages = orte-top.1
EXTRA_DIST = orte-top.1in EXTRA_DIST = orte-top.1in
if !ORTE_DISABLE_FULL_SUPPORT
if OMPI_INSTALL_BINARIES if OMPI_INSTALL_BINARIES
bin_PROGRAMS = orte-top bin_PROGRAMS = orte-top
@ -42,7 +41,5 @@ endif # OMPI_INSTALL_BINARIES
orte_top_SOURCES = orte-top.c orte_top_SOURCES = orte-top.c
orte_top_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la orte_top_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
endif # ORTE_DISABLE_FULL_SUPPORT
distclean-local: distclean-local:
rm -f $(man_pages) rm -f $(man_pages)

3
orte/tools/orted/Makefile.am
Просмотреть файл

@ -23,7 +23,6 @@ include $(top_srcdir)/Makefile.man-page-rules
man_pages = orted.1 man_pages = orted.1
EXTRA_DIST = $(man_pages:.1=.1in) CMakeLists.txt EXTRA_DIST = $(man_pages:.1=.1in) CMakeLists.txt
if !ORTE_DISABLE_FULL_SUPPORT
if OMPI_INSTALL_BINARIES if OMPI_INSTALL_BINARIES
bin_PROGRAMS = orted bin_PROGRAMS = orted
@ -47,7 +46,5 @@ orted_SOURCES = orted.c
orted_LDFLAGS = orted_LDFLAGS =
orted_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la orted_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
endif # !ORTE_DISABLE_FULL_SUPPORT
distclean-local: distclean-local:
rm -f $(man_pages) rm -f $(man_pages)

3
orte/tools/orterun/Makefile.am
Просмотреть файл

@ -32,7 +32,6 @@ include $(top_srcdir)/Makefile.man-page-rules
man_pages = orterun.1 man_pages = orterun.1
EXTRA_DIST = $(man_pages:.1=.1in) CMakeLists.txt EXTRA_DIST = $(man_pages:.1=.1in) CMakeLists.txt
if !ORTE_DISABLE_FULL_SUPPORT
if OMPI_INSTALL_BINARIES if OMPI_INSTALL_BINARIES
bin_PROGRAMS = orterun bin_PROGRAMS = orterun
@ -55,7 +54,5 @@ orterun_SOURCES = \
orterun_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la orterun_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
endif # !ORTE_DISABLE_FULL_SUPPORT
distclean-local: distclean-local:
rm -f $(man_pages) rm -f $(man_pages)

3
orte/tools/wrappers/Makefile.am
Просмотреть файл

@ -19,7 +19,6 @@
#man_pages = ortecc.1 ortec++.1 #man_pages = ortecc.1 ortec++.1
if !ORTE_DISABLE_FULL_SUPPORT
if !OPAL_WANT_SCRIPT_WRAPPER_COMPILERS if !OPAL_WANT_SCRIPT_WRAPPER_COMPILERS
if OMPI_INSTALL_BINARIES if OMPI_INSTALL_BINARIES
@ -77,5 +76,3 @@ distclean-local:
#ortec++.1: $(top_builddir)/opal/tools/wrappers/generic_wrapper.1 #ortec++.1: $(top_builddir)/opal/tools/wrappers/generic_wrapper.1
# rm -f ortec++.1 # rm -f ortec++.1
# sed -e 's/#COMMAND#/ortec++/g' -e 's/#PROJECT#/OpenRTE/g' -e 's/#PROJECT_SHORT#/ORTE/g' -e 's/#LANGUAGE#/C++/g' < $(top_builddir)/opal/tools/wrappers/generic_wrapper.1 > ortec++.1 # sed -e 's/#COMMAND#/ortec++/g' -e 's/#PROJECT#/OpenRTE/g' -e 's/#PROJECT_SHORT#/ORTE/g' -e 's/#LANGUAGE#/C++/g' < $(top_builddir)/opal/tools/wrappers/generic_wrapper.1 > ortec++.1
endif # !ORTE_DISABLE_FULL_SUPPORT

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше