diff --git a/ompi/debuggers/ompi_debuggers.c b/ompi/debuggers/ompi_debuggers.c index 1c3d68c869..392e695044 100644 --- a/ompi/debuggers/ompi_debuggers.c +++ b/ompi/debuggers/ompi_debuggers.c @@ -158,9 +158,14 @@ void ompi_wait_for_debugger(void) char *a, *b, **dirs; opal_buffer_t buf; + /* See lengthy comment in orte/tools/orterun/debuggers.c about orte_in_parallel_debugger */ +#if ORTE_DISABLE_FULL_SUPPORT + debugger = 0; +#else debugger = orte_in_parallel_debugger; +#endif /* Add in environment variables for other launchers, such as yod, srun, ...etc. */ diff --git a/orte/mca/ess/cnos/ess_cnos_module.c b/orte/mca/ess/cnos/ess_cnos_module.c index ddd8881629..786d9f11f7 100644 --- a/orte/mca/ess/cnos/ess_cnos_module.c +++ b/orte/mca/ess/cnos/ess_cnos_module.c @@ -29,6 +29,7 @@ #include "orte/util/proc_info.h" #include "orte/runtime/orte_globals.h" #include "orte/mca/grpcomm/base/base.h" +#include "orte/runtime/runtime_internals.h" #include "orte/mca/ess/ess.h" #include "orte/mca/ess/base/base.h" @@ -63,6 +64,8 @@ static int rte_init(char flags) { int rc; int nprocs; + + orte_dt_init(); /* Get our process information */ diff --git a/orte/runtime/Makefile.am b/orte/runtime/Makefile.am index 373e1cb4b2..b0cadca396 100644 --- a/orte/runtime/Makefile.am +++ b/orte/runtime/Makefile.am @@ -23,12 +23,22 @@ dist_pkgdata_DATA += runtime/help-orte-runtime.txt headers += \ runtime/runtime.h \ - runtime/orte_locks.h + runtime/orte_locks.h \ + runtime/runtime_internals.h \ + runtime/data_type_support/orte_dt_support.h libopen_rte_la_SOURCES += \ runtime/orte_finalize.c \ runtime/orte_init.c \ runtime/orte_locks.c \ + runtime/orte_globals.c \ + runtime/data_type_support/orte_dt_compare_fns.c \ + runtime/data_type_support/orte_dt_copy_fns.c \ + runtime/data_type_support/orte_dt_print_fns.c \ + runtime/data_type_support/orte_dt_release_fns.c \ + runtime/data_type_support/orte_dt_size_fns.c \ + runtime/data_type_support/orte_dt_packing_fns.c \ + runtime/data_type_support/orte_dt_unpacking_fns.c \ runtime/orte_mca_params.c if !ORTE_DISABLE_FULL_SUPPORT @@ -39,18 +49,9 @@ headers += \ runtime/orte_globals.h \ runtime/orte_globals_class_instances.h \ runtime/orte_cr.h \ - runtime/orte_data_server.h \ - runtime/data_type_support/orte_dt_support.h + runtime/orte_data_server.h libopen_rte_la_SOURCES += \ - runtime/orte_globals.c \ - runtime/data_type_support/orte_dt_compare_fns.c \ - runtime/data_type_support/orte_dt_copy_fns.c \ - runtime/data_type_support/orte_dt_print_fns.c \ - runtime/data_type_support/orte_dt_release_fns.c \ - runtime/data_type_support/orte_dt_size_fns.c \ - runtime/data_type_support/orte_dt_packing_fns.c \ - runtime/data_type_support/orte_dt_unpacking_fns.c \ runtime/orte_wait.c \ runtime/orte_cr.c \ runtime/orte_data_server.c diff --git a/orte/runtime/data_type_support/orte_dt_print_fns.c b/orte/runtime/data_type_support/orte_dt_print_fns.c index 65fa0a340f..92524d1af1 100644 --- a/orte/runtime/data_type_support/orte_dt_print_fns.c +++ b/orte/runtime/data_type_support/orte_dt_print_fns.c @@ -283,6 +283,8 @@ int orte_dt_print_node(char **output, char *prefix, orte_node_t *src, opal_data_ } else { asprintf(&pfx2, "%s", prefix); } + +#if !ORTE_DISABLE_FULL_SUPPORT if (orte_xml_output) { /* need to create the output in XML format */ asprintf(output, "%s\n", pfx2, @@ -291,6 +293,7 @@ int orte_dt_print_node(char **output, char *prefix, orte_node_t *src, opal_data_ free(pfx2); return ORTE_SUCCESS; } +#endif asprintf(&tmp, "\n%sData for node: Name: %s\t%s\tLaunch id: %ld\tArch: %0x\tState: %0x", pfx2, src->name, @@ -391,6 +394,7 @@ int orte_dt_print_proc(char **output, char *prefix, orte_proc_t *src, opal_data_ asprintf(&pfx2, "%s", prefix); } +#if !ORTE_DISABLE_FULL_SUPPORT if (orte_xml_output) { /* need to create the output in XML format */ tmp = orte_dt_print_proc_state(src->state); @@ -413,6 +417,7 @@ int orte_dt_print_proc(char **output, char *prefix, orte_proc_t *src, opal_data_ free(pfx2); return ORTE_SUCCESS; } +#endif asprintf(&tmp, "\n%sData for proc: %s", pfx2, ORTE_NAME_PRINT(&src->name)); @@ -510,6 +515,7 @@ int orte_dt_print_map(char **output, char *prefix, orte_job_map_t *src, opal_dat asprintf(&pfx2, "%s", prefix); } +#if !ORTE_DISABLE_FULL_SUPPORT if (orte_xml_output) { /* need to create the output in XML format */ asprintf(&tmp, "\n"); @@ -547,6 +553,8 @@ int orte_dt_print_map(char **output, char *prefix, orte_job_map_t *src, opal_dat return ORTE_SUCCESS; } +#endif + asprintf(&pfx, "%s\t", pfx2); asprintf(&tmp, "\n%sMap generated by mapping policy: %x\n%s\tPernode: %s\tNpernode: %ld\tOversubscribe allowed: %s\tCPU Lists: %s", pfx2, src->policy, pfx2, diff --git a/orte/runtime/orte_globals.c b/orte/runtime/orte_globals.c index b5070e1605..38ebb5f7ce 100644 --- a/orte/runtime/orte_globals.c +++ b/orte/runtime/orte_globals.c @@ -102,6 +102,7 @@ int orte_dt_init(void) int rc; opal_data_type_t tmp; +#if !ORTE_DISABLE_FULL_SUPPORT /* set default output */ orte_debug_output = opal_output_open(NULL); /* open up the verbose output for ORTE debugging */ @@ -113,6 +114,7 @@ int orte_dt_init(void) opal_output_set_verbosity(orte_debug_output, 1); } } +#endif /** register the base system types with the DSS */ tmp = ORTE_STD_CNTR; @@ -340,6 +342,7 @@ int orte_dt_init(void) return ORTE_SUCCESS; } +#if !ORTE_DISABLE_FULL_SUPPORT int orte_hnp_globals_init(void) { int rc; @@ -364,6 +367,7 @@ int orte_hnp_globals_init(void) return ORTE_SUCCESS; } +#endif orte_job_t* orte_get_job_data_object(orte_jobid_t job) {