From b356e90fa120a3c3d89c339987e68e5f2b0d3e55 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Wed, 25 Feb 2009 03:38:00 +0000 Subject: [PATCH] - Get rid of include orte/util/proc_info.h, if not needed Only proc_info.h-internal include file is opal/dss/dss_types.h - In one case (orte/util/hnp_contact.c) had to add proc_info.h again. - Local compilation (Linux/x86_64) w/ -Wimplicit-function-declaration works fine, no errors. Again, let's have MTT the last word. This commit was SVN r20631. --- ompi/mca/btl/elan/btl_elan_proc.c | 1 - ompi/mca/btl/gm/btl_gm_component.c | 1 - ompi/mca/btl/sctp/btl_sctp_frag.c | 1 - ompi/mca/btl/self/btl_self.c | 1 - ompi/mca/btl/self/btl_self_component.c | 1 - ompi/mca/btl/tcp/btl_tcp_frag.c | 1 - ompi/mca/common/sm/common_sm_mmap.c | 1 - ompi/mca/mpool/base/mpool_base_mem_cb.c | 1 - ompi/mca/mpool/fake/mpool_fake_component.c | 1 - ompi/mca/mpool/fake/mpool_fake_module.c | 1 - ompi/mca/mpool/rdma/mpool_rdma_component.c | 1 - ompi/mca/mpool/rdma/mpool_rdma_module.c | 1 - ompi/mca/pml/ob1/pml_ob1_rdma.c | 1 - ompi/runtime/ompi_cr.c | 1 - ompi/runtime/ompi_mpi_finalize.c | 1 - ompi/tools/ompi-probe/ompi-probe.c | 1 - orte/mca/ess/slave/ess_slave_component.c | 1 - orte/mca/grpcomm/bad/grpcomm_bad_component.c | 1 - orte/mca/grpcomm/base/grpcomm_base_allgather.c | 1 - orte/mca/grpcomm/base/grpcomm_base_coll.c | 1 - orte/mca/grpcomm/basic/grpcomm_basic_component.c | 1 - orte/mca/grpcomm/hier/grpcomm_hier_component.c | 1 - orte/mca/odls/bproc/odls_bproc_component.c | 1 - orte/mca/odls/process/odls_process_component.c | 1 - orte/mca/oob/tcp/oob_tcp_addr.c | 1 - orte/mca/oob/tcp/oob_tcp_ping.c | 1 - orte/mca/oob/tcp/oob_tcp_recv.c | 1 - orte/mca/oob/tcp/oob_tcp_send.c | 1 - orte/mca/plm/bproc/smr_bproc.c | 1 - orte/mca/plm/lsf/plm_lsf_component.c | 1 - orte/mca/plm/plm_types.h | 1 - orte/mca/plm/tm/plm_tm_component.c | 1 - orte/mca/plm/tmd/plm_tmd_component.c | 1 - orte/mca/ras/base/ras_base_select.c | 1 - orte/mca/ras/gridengine/ras_gridengine_component.c | 1 - orte/mca/ras/loadleveler/ras_loadleveler_component.c | 1 - orte/mca/ras/lsf/ras_lsf_component.c | 1 - orte/mca/ras/slurm/ras_slurm_component.c | 1 - orte/mca/rmaps/base/rmaps_base_support_fns.c | 1 - orte/mca/snapc/full/snapc_full_local.c | 1 - orte/test/system/iof_delay.c | 1 - orte/test/system/iof_stress.c | 1 - orte/test/system/orte_loop_spawn.c | 1 - orte/test/system/spawn_child.c | 1 - orte/test/system/spin.c | 1 - orte/tools/orte-iof/orte-iof.c | 1 - orte/tools/orte-ps/orte-ps.c | 1 - orte/tools/orte-top/orte-top.c | 1 - orte/util/hnp_contact.c | 1 + 49 files changed, 1 insertion(+), 48 deletions(-) diff --git a/ompi/mca/btl/elan/btl_elan_proc.c b/ompi/mca/btl/elan/btl_elan_proc.c index 5dd56b8779..bc7769440c 100644 --- a/ompi/mca/btl/elan/btl_elan_proc.c +++ b/ompi/mca/btl/elan/btl_elan_proc.c @@ -14,7 +14,6 @@ #include "ompi/runtime/ompi_module_exchange.h" #include "btl_elan.h" #include "btl_elan_proc.h" -#include "orte/util/proc_info.h" #include "ompi/communicator/communicator.h" static void mca_btl_elan_proc_construct(mca_btl_elan_proc_t* proc); diff --git a/ompi/mca/btl/gm/btl_gm_component.c b/ompi/mca/btl/gm/btl_gm_component.c index 736030fcda..03f4921cac 100644 --- a/ompi/mca/btl/gm/btl_gm_component.c +++ b/ompi/mca/btl/gm/btl_gm_component.c @@ -43,7 +43,6 @@ #include "ompi/mca/btl/base/btl_base_error.h" #include "ompi/datatype/convertor.h" #include "btl_gm_endpoint.h" -#include "orte/util/proc_info.h" #include "orte/runtime/orte_globals.h" #include "orte/util/name_fns.h" #include "ompi/runtime/ompi_module_exchange.h" diff --git a/ompi/mca/btl/sctp/btl_sctp_frag.c b/ompi/mca/btl/sctp/btl_sctp_frag.c index 46e17d65f4..b4c2bc209a 100644 --- a/ompi/mca/btl/sctp/btl_sctp_frag.c +++ b/ompi/mca/btl/sctp/btl_sctp_frag.c @@ -37,7 +37,6 @@ #include "ompi/mca/btl/base/btl_base_error.h" #include "btl_sctp_frag.h" #include "btl_sctp_endpoint.h" -#include "orte/util/proc_info.h" #include "btl_sctp.h" #include "btl_sctp_addr.h" diff --git a/ompi/mca/btl/self/btl_self.c b/ompi/mca/btl/self/btl_self.c index 211e91d319..7fef17c877 100644 --- a/ompi/mca/btl/self/btl_self.c +++ b/ompi/mca/btl/self/btl_self.c @@ -30,7 +30,6 @@ #include "ompi/datatype/datatype.h" #include "opal/sys/atomic.h" #include "opal/util/if.h" -#include "orte/util/proc_info.h" #include "opal/util/printf.h" #include "ompi/class/ompi_free_list.h" #include "ompi/mca/pml/pml.h" diff --git a/ompi/mca/btl/self/btl_self_component.c b/ompi/mca/btl/self/btl_self_component.c index c8e7a20fda..698be44ed6 100644 --- a/ompi/mca/btl/self/btl_self_component.c +++ b/ompi/mca/btl/self/btl_self_component.c @@ -31,7 +31,6 @@ #include "opal/event/event.h" #include "opal/util/if.h" #include "opal/util/argv.h" -#include "orte/util/proc_info.h" #include "ompi/mca/pml/pml.h" #include "opal/mca/base/mca_base_param.h" #include "btl_self.h" diff --git a/ompi/mca/btl/tcp/btl_tcp_frag.c b/ompi/mca/btl/tcp/btl_tcp_frag.c index c0ede87473..80a50175e2 100644 --- a/ompi/mca/btl/tcp/btl_tcp_frag.c +++ b/ompi/mca/btl/tcp/btl_tcp_frag.c @@ -41,7 +41,6 @@ #include "ompi/mca/btl/base/btl_base_error.h" #include "btl_tcp_frag.h" #include "btl_tcp_endpoint.h" -#include "orte/util/proc_info.h" static void mca_btl_tcp_frag_common_constructor(mca_btl_tcp_frag_t* frag) { diff --git a/ompi/mca/common/sm/common_sm_mmap.c b/ompi/mca/common/sm/common_sm_mmap.c index 4d6bc3f9cc..a6ff88acc9 100644 --- a/ompi/mca/common/sm/common_sm_mmap.c +++ b/ompi/mca/common/sm/common_sm_mmap.c @@ -48,7 +48,6 @@ #include "opal/util/basename.h" #include "opal/util/output.h" #include "opal/align.h" -#include "orte/util/proc_info.h" #include "orte/mca/rml/rml_types.h" #include "orte/mca/rml/base/base.h" diff --git a/ompi/mca/mpool/base/mpool_base_mem_cb.c b/ompi/mca/mpool/base/mpool_base_mem_cb.c index 04bc98f2d0..2b6c4dde3c 100644 --- a/ompi/mca/mpool/base/mpool_base_mem_cb.c +++ b/ompi/mca/mpool/base/mpool_base_mem_cb.c @@ -23,7 +23,6 @@ #include "mpool_base_mem_cb.h" #include "base.h" #include "orte/types.h" -#include "orte/util/proc_info.h" opal_pointer_array_t mca_mpool_base_mem_cb_array; diff --git a/ompi/mca/mpool/fake/mpool_fake_component.c b/ompi/mca/mpool/fake/mpool_fake_component.c index 58ef8daa3a..eca31a9300 100644 --- a/ompi/mca/mpool/fake/mpool_fake_component.c +++ b/ompi/mca/mpool/fake/mpool_fake_component.c @@ -23,7 +23,6 @@ #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" #include "mpool_fake.h" -#include "orte/util/proc_info.h" #ifdef HAVE_UNISTD_H #include #endif diff --git a/ompi/mca/mpool/fake/mpool_fake_module.c b/ompi/mca/mpool/fake/mpool_fake_module.c index d0c0300e4a..e3cf6e99cc 100644 --- a/ompi/mca/mpool/fake/mpool_fake_module.c +++ b/ompi/mca/mpool/fake/mpool_fake_module.c @@ -22,7 +22,6 @@ #define OMPI_DISABLE_ENABLE_MEM_DEBUG 1 #include "ompi_config.h" #include "opal/include/opal/align.h" -#include "orte/util/proc_info.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" #include "mpool_fake.h" diff --git a/ompi/mca/mpool/rdma/mpool_rdma_component.c b/ompi/mca/mpool/rdma/mpool_rdma_component.c index 73bd96968a..a6b6be45a0 100644 --- a/ompi/mca/mpool/rdma/mpool_rdma_component.c +++ b/ompi/mca/mpool/rdma/mpool_rdma_component.c @@ -24,7 +24,6 @@ #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" #include "mpool_rdma.h" -#include "orte/util/proc_info.h" #ifdef HAVE_UNISTD_H #include #endif diff --git a/ompi/mca/mpool/rdma/mpool_rdma_module.c b/ompi/mca/mpool/rdma/mpool_rdma_module.c index a51ee90cc6..3e15ea4016 100644 --- a/ompi/mca/mpool/rdma/mpool_rdma_module.c +++ b/ompi/mca/mpool/rdma/mpool_rdma_module.c @@ -24,7 +24,6 @@ #define OMPI_DISABLE_ENABLE_MEM_DEBUG 1 #include "ompi_config.h" #include "opal/include/opal/align.h" -#include "orte/util/proc_info.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" #include "ompi/mca/mpool/rdma/mpool_rdma.h" diff --git a/ompi/mca/pml/ob1/pml_ob1_rdma.c b/ompi/mca/pml/ob1/pml_ob1_rdma.c index baf135b33e..9953b4bae8 100644 --- a/ompi/mca/pml/ob1/pml_ob1_rdma.c +++ b/ompi/mca/pml/ob1/pml_ob1_rdma.c @@ -21,7 +21,6 @@ #include "ompi_config.h" #include "ompi/constants.h" -#include "orte/util/proc_info.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" #include "ompi/mca/bml/bml.h" diff --git a/ompi/runtime/ompi_cr.c b/ompi/runtime/ompi_cr.c index d25a884600..a5362b9784 100644 --- a/ompi/runtime/ompi_cr.c +++ b/ompi/runtime/ompi_cr.c @@ -45,7 +45,6 @@ #include "opal/mca/crs/base/base.h" #include "opal/runtime/opal_cr.h" -#include "orte/util/proc_info.h" #include "orte/mca/snapc/snapc.h" #include "orte/mca/snapc/base/base.h" #include "orte/runtime/runtime.h" diff --git a/ompi/runtime/ompi_mpi_finalize.c b/ompi/runtime/ompi_mpi_finalize.c index 76f81f21d0..5c7d5cb454 100644 --- a/ompi/runtime/ompi_mpi_finalize.c +++ b/ompi/runtime/ompi_mpi_finalize.c @@ -47,7 +47,6 @@ #include "opal/sys/atomic.h" #include "opal/runtime/opal.h" -#include "orte/util/proc_info.h" #include "orte/mca/oob/base/base.h" #include "orte/mca/rml/rml.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/ompi/tools/ompi-probe/ompi-probe.c b/ompi/tools/ompi-probe/ompi-probe.c index 55ef48079b..8f95af4606 100644 --- a/ompi/tools/ompi-probe/ompi-probe.c +++ b/ompi/tools/ompi-probe/ompi-probe.c @@ -45,7 +45,6 @@ #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/rml/rml.h" -#include "orte/util/proc_info.h" #include "orte/runtime/orte_globals.h" /* diff --git a/orte/mca/ess/slave/ess_slave_component.c b/orte/mca/ess/slave/ess_slave_component.c index 83d4064ed9..0ba91570e8 100644 --- a/orte/mca/ess/slave/ess_slave_component.c +++ b/orte/mca/ess/slave/ess_slave_component.c @@ -27,7 +27,6 @@ #include "opal/mca/base/mca_base_param.h" -#include "orte/util/proc_info.h" #include "orte/mca/ess/ess.h" #include "orte/mca/ess/slave/ess_slave.h" diff --git a/orte/mca/grpcomm/bad/grpcomm_bad_component.c b/orte/mca/grpcomm/bad/grpcomm_bad_component.c index 8ac1eacef4..bedd0f24c0 100644 --- a/orte/mca/grpcomm/bad/grpcomm_bad_component.c +++ b/orte/mca/grpcomm/bad/grpcomm_bad_component.c @@ -38,7 +38,6 @@ #include "opal/mca/mca.h" #include "opal/mca/base/mca_base_param.h" -#include "orte/util/proc_info.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/rml/rml.h" diff --git a/orte/mca/grpcomm/base/grpcomm_base_allgather.c b/orte/mca/grpcomm/base/grpcomm_base_allgather.c index 7de4749829..7aea3aa7d5 100644 --- a/orte/mca/grpcomm/base/grpcomm_base_allgather.c +++ b/orte/mca/grpcomm/base/grpcomm_base_allgather.c @@ -28,7 +28,6 @@ #include "opal/threads/condition.h" -#include "orte/util/proc_info.h" #include "opal/dss/dss.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/odls/odls_types.h" diff --git a/orte/mca/grpcomm/base/grpcomm_base_coll.c b/orte/mca/grpcomm/base/grpcomm_base_coll.c index cfde6501b4..be966da615 100644 --- a/orte/mca/grpcomm/base/grpcomm_base_coll.c +++ b/orte/mca/grpcomm/base/grpcomm_base_coll.c @@ -36,7 +36,6 @@ #include "opal/util/bit_ops.h" #include "opal/class/opal_hash_table.h" -#include "orte/util/proc_info.h" #include "opal/dss/dss.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/odls/odls_types.h" diff --git a/orte/mca/grpcomm/basic/grpcomm_basic_component.c b/orte/mca/grpcomm/basic/grpcomm_basic_component.c index 7d7a86a66a..f695c72345 100644 --- a/orte/mca/grpcomm/basic/grpcomm_basic_component.c +++ b/orte/mca/grpcomm/basic/grpcomm_basic_component.c @@ -38,7 +38,6 @@ #include "opal/mca/mca.h" #include "opal/mca/base/mca_base_param.h" -#include "orte/util/proc_info.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/rml/rml.h" diff --git a/orte/mca/grpcomm/hier/grpcomm_hier_component.c b/orte/mca/grpcomm/hier/grpcomm_hier_component.c index 0b18406ef2..75a20b0363 100644 --- a/orte/mca/grpcomm/hier/grpcomm_hier_component.c +++ b/orte/mca/grpcomm/hier/grpcomm_hier_component.c @@ -32,7 +32,6 @@ #include "opal/mca/mca.h" #include "opal/mca/base/mca_base_param.h" -#include "orte/util/proc_info.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/rml/rml.h" diff --git a/orte/mca/odls/bproc/odls_bproc_component.c b/orte/mca/odls/bproc/odls_bproc_component.c index 84f17b5b6b..ce337156ba 100644 --- a/orte/mca/odls/bproc/odls_bproc_component.c +++ b/orte/mca/odls/bproc/odls_bproc_component.c @@ -25,7 +25,6 @@ #include "opal/mca/base/mca_base_param.h" -#include "orte/util/proc_info.h" #include "orte/mca/odls/odls.h" #include "orte/mca/odls/base/odls_private.h" diff --git a/orte/mca/odls/process/odls_process_component.c b/orte/mca/odls/process/odls_process_component.c index 2d7ffe04f7..c7bbd13ce4 100755 --- a/orte/mca/odls/process/odls_process_component.c +++ b/orte/mca/odls/process/odls_process_component.c @@ -25,7 +25,6 @@ #include "opal/util/path.h" #include "opal/mca/base/mca_base_param.h" -#include "orte/util/proc_info.h" #include "orte/mca/odls/odls.h" #include "orte/mca/odls/base/odls_private.h" diff --git a/orte/mca/oob/tcp/oob_tcp_addr.c b/orte/mca/oob/tcp/oob_tcp_addr.c index 77b592d648..4d7f38f871 100644 --- a/orte/mca/oob/tcp/oob_tcp_addr.c +++ b/orte/mca/oob/tcp/oob_tcp_addr.c @@ -37,7 +37,6 @@ #include "opal/util/if.h" #include "opal/util/net.h" -#include "orte/util/proc_info.h" #include "oob_tcp.h" #include "oob_tcp_addr.h" diff --git a/orte/mca/oob/tcp/oob_tcp_ping.c b/orte/mca/oob/tcp/oob_tcp_ping.c index ec71f014ee..90c571698e 100644 --- a/orte/mca/oob/tcp/oob_tcp_ping.c +++ b/orte/mca/oob/tcp/oob_tcp_ping.c @@ -53,7 +53,6 @@ #endif #include "opal/event/event.h" -#include "orte/util/proc_info.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/mca/oob/tcp/oob_tcp_recv.c b/orte/mca/oob/tcp/oob_tcp_recv.c index 4e66a8b541..3ac5cc82a9 100644 --- a/orte/mca/oob/tcp/oob_tcp_recv.c +++ b/orte/mca/oob/tcp/oob_tcp_recv.c @@ -20,7 +20,6 @@ #include "orte_config.h" #include "orte/types.h" -#include "orte/util/proc_info.h" #include "orte/runtime/orte_globals.h" #include "orte/mca/oob/tcp/oob_tcp.h" diff --git a/orte/mca/oob/tcp/oob_tcp_send.c b/orte/mca/oob/tcp/oob_tcp_send.c index cfb6be158c..187ae6d06e 100644 --- a/orte/mca/oob/tcp/oob_tcp_send.c +++ b/orte/mca/oob/tcp/oob_tcp_send.c @@ -20,7 +20,6 @@ #include "orte_config.h" #include "orte/types.h" -#include "orte/util/proc_info.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/mca/plm/bproc/smr_bproc.c b/orte/mca/plm/bproc/smr_bproc.c index 58e1548598..7f7327cfb4 100644 --- a/orte/mca/plm/bproc/smr_bproc.c +++ b/orte/mca/plm/bproc/smr_bproc.c @@ -31,7 +31,6 @@ #include "opal/util/output.h" #include "opal/class/opal_list.h" -#include "orte/util/proc_info.h" #include "orte/runtime/orte_globals.h" #include "orte/mca/ns/ns.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/mca/plm/lsf/plm_lsf_component.c b/orte/mca/plm/lsf/plm_lsf_component.c index c020a61b64..c2e57b19cd 100644 --- a/orte/mca/plm/lsf/plm_lsf_component.c +++ b/orte/mca/plm/lsf/plm_lsf_component.c @@ -34,7 +34,6 @@ #include "opal/util/argv.h" #include "opal/util/output.h" -#include "orte/util/proc_info.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/plm/plm.h" diff --git a/orte/mca/plm/plm_types.h b/orte/mca/plm/plm_types.h index 8ff919391e..2f6aaddbdc 100644 --- a/orte/mca/plm/plm_types.h +++ b/orte/mca/plm/plm_types.h @@ -26,7 +26,6 @@ #include "opal/class/opal_list.h" #include "opal/class/opal_pointer_array.h" -#include "orte/util/proc_info.h" BEGIN_C_DECLS diff --git a/orte/mca/plm/tm/plm_tm_component.c b/orte/mca/plm/tm/plm_tm_component.c index 67494510d5..3d23bea663 100644 --- a/orte/mca/plm/tm/plm_tm_component.c +++ b/orte/mca/plm/tm/plm_tm_component.c @@ -29,7 +29,6 @@ #include "opal/mca/base/mca_base_param.h" #include "opal/util/argv.h" -#include "orte/util/proc_info.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/plm/plm.h" diff --git a/orte/mca/plm/tmd/plm_tmd_component.c b/orte/mca/plm/tmd/plm_tmd_component.c index 51d6d2eb89..8cc1bb7d6d 100644 --- a/orte/mca/plm/tmd/plm_tmd_component.c +++ b/orte/mca/plm/tmd/plm_tmd_component.c @@ -29,7 +29,6 @@ #include "opal/mca/base/mca_base_param.h" #include "opal/util/argv.h" -#include "orte/util/proc_info.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/plm/plm.h" diff --git a/orte/mca/ras/base/ras_base_select.c b/orte/mca/ras/base/ras_base_select.c index 9c7b2bb041..2185f0b351 100644 --- a/orte/mca/ras/base/ras_base_select.c +++ b/orte/mca/ras/base/ras_base_select.c @@ -24,7 +24,6 @@ #include "orte/mca/errmgr/errmgr.h" #include "orte/util/name_fns.h" -#include "orte/util/proc_info.h" #include "orte/runtime/orte_globals.h" #include "orte/mca/ras/base/ras_private.h" diff --git a/orte/mca/ras/gridengine/ras_gridengine_component.c b/orte/mca/ras/gridengine/ras_gridengine_component.c index 587e5f07c8..192081a99b 100644 --- a/orte/mca/ras/gridengine/ras_gridengine_component.c +++ b/orte/mca/ras/gridengine/ras_gridengine_component.c @@ -29,7 +29,6 @@ #include "opal/util/output.h" #include "opal/mca/base/mca_base_param.h" -#include "orte/util/proc_info.h" #include "orte/runtime/orte_globals.h" #include "orte/util/name_fns.h" diff --git a/orte/mca/ras/loadleveler/ras_loadleveler_component.c b/orte/mca/ras/loadleveler/ras_loadleveler_component.c index 06e8f61ad4..0d416683a8 100644 --- a/orte/mca/ras/loadleveler/ras_loadleveler_component.c +++ b/orte/mca/ras/loadleveler/ras_loadleveler_component.c @@ -20,7 +20,6 @@ #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "orte/util/proc_info.h" #include "orte/runtime/orte_globals.h" #include "orte/util/name_fns.h" diff --git a/orte/mca/ras/lsf/ras_lsf_component.c b/orte/mca/ras/lsf/ras_lsf_component.c index 7a6b7db824..691b8513c8 100644 --- a/orte/mca/ras/lsf/ras_lsf_component.c +++ b/orte/mca/ras/lsf/ras_lsf_component.c @@ -24,7 +24,6 @@ #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "orte/util/proc_info.h" #include "ras_lsf.h" diff --git a/orte/mca/ras/slurm/ras_slurm_component.c b/orte/mca/ras/slurm/ras_slurm_component.c index b2f0419579..4e0f0e24b9 100644 --- a/orte/mca/ras/slurm/ras_slurm_component.c +++ b/orte/mca/ras/slurm/ras_slurm_component.c @@ -22,7 +22,6 @@ #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "orte/util/proc_info.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/mca/rmaps/base/rmaps_base_support_fns.c b/orte/mca/rmaps/base/rmaps_base_support_fns.c index 231067c065..a86c7d94c7 100644 --- a/orte/mca/rmaps/base/rmaps_base_support_fns.c +++ b/orte/mca/rmaps/base/rmaps_base_support_fns.c @@ -30,7 +30,6 @@ #include "orte/util/show_help.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" -#include "orte/util/proc_info.h" #include "orte/util/hostfile/hostfile.h" #include "orte/util/dash_host/dash_host.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/mca/snapc/full/snapc_full_local.c b/orte/mca/snapc/full/snapc_full_local.c index 08cdf279d9..d9d538fd03 100644 --- a/orte/mca/snapc/full/snapc_full_local.c +++ b/orte/mca/snapc/full/snapc_full_local.c @@ -55,7 +55,6 @@ #include "orte/util/name_fns.h" #include "orte/runtime/orte_wait.h" #include "orte/runtime/orte_globals.h" -#include "orte/util/proc_info.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" #include "orte/mca/plm/plm.h" diff --git a/orte/test/system/iof_delay.c b/orte/test/system/iof_delay.c index 53af7e4dec..5c958cf803 100644 --- a/orte/test/system/iof_delay.c +++ b/orte/test/system/iof_delay.c @@ -2,7 +2,6 @@ #include #include -#include "orte/util/proc_info.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/test/system/iof_stress.c b/orte/test/system/iof_stress.c index 12dacff6ee..6dc7f4c6bb 100644 --- a/orte/test/system/iof_stress.c +++ b/orte/test/system/iof_stress.c @@ -2,7 +2,6 @@ #include #include -#include "orte/util/proc_info.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/test/system/orte_loop_spawn.c b/orte/test/system/orte_loop_spawn.c index 064090bc3e..87ea462e66 100644 --- a/orte/test/system/orte_loop_spawn.c +++ b/orte/test/system/orte_loop_spawn.c @@ -4,7 +4,6 @@ #include "opal/util/argv.h" -#include "orte/util/proc_info.h" #include "orte/mca/plm/plm.h" #include "orte/mca/rml/rml.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/test/system/spawn_child.c b/orte/test/system/spawn_child.c index c7b3efbcaf..cf93d3e842 100644 --- a/orte/test/system/spawn_child.c +++ b/orte/test/system/spawn_child.c @@ -7,7 +7,6 @@ #include -#include "orte/util/proc_info.h" #include "orte/runtime/runtime.h" #include "orte/mca/rml/rml.h" #include "orte/mca/oob/base/base.h" diff --git a/orte/test/system/spin.c b/orte/test/system/spin.c index f3be62eaca..a9b19f091e 100644 --- a/orte/test/system/spin.c +++ b/orte/test/system/spin.c @@ -9,7 +9,6 @@ #include #include -#include "orte/util/proc_info.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" #include "orte/runtime/runtime.h" diff --git a/orte/tools/orte-iof/orte-iof.c b/orte/tools/orte-iof/orte-iof.c index 3bf0f7d8c2..6349478079 100644 --- a/orte/tools/orte-iof/orte-iof.c +++ b/orte/tools/orte-iof/orte-iof.c @@ -69,7 +69,6 @@ #include "opal/dss/dss.h" #include "orte/runtime/runtime.h" -#include "orte/util/proc_info.h" #include "opal/util/os_path.h" #include "orte/util/session_dir.h" #include "orte/util/hnp_contact.h" diff --git a/orte/tools/orte-ps/orte-ps.c b/orte/tools/orte-ps/orte-ps.c index b1367a765d..d69f93e070 100644 --- a/orte/tools/orte-ps/orte-ps.c +++ b/orte/tools/orte-ps/orte-ps.c @@ -67,7 +67,6 @@ #include "opal/dss/dss.h" #include "orte/runtime/runtime.h" -#include "orte/util/proc_info.h" #include "opal/util/os_path.h" #include "orte/util/session_dir.h" #include "orte/util/hnp_contact.h" diff --git a/orte/tools/orte-top/orte-top.c b/orte/tools/orte-top/orte-top.c index 47098f015c..c954a453c5 100644 --- a/orte/tools/orte-top/orte-top.c +++ b/orte/tools/orte-top/orte-top.c @@ -48,7 +48,6 @@ #include "orte/mca/rml/rml.h" #include "orte/mca/odls/odls_types.h" #include "orte/mca/routed/routed.h" -#include "orte/util/proc_info.h" #include "orte/runtime/orte_globals.h" #include "orte/util/hnp_contact.h" #include "orte/util/name_fns.h" diff --git a/orte/util/hnp_contact.c b/orte/util/hnp_contact.c index 4208aec1b4..5a021b76b6 100644 --- a/orte/util/hnp_contact.c +++ b/orte/util/hnp_contact.c @@ -45,6 +45,7 @@ #include "orte/mca/rml/base/rml_contact.h" #include "orte/mca/routed/routed.h" +#include "orte/util/proc_info.h" #include "orte/util/hnp_contact.h" #define ORTE_HNP_CONTACT_FILE_MAX_LINE_LENGTH 1024