Re: [OMPI devel] [OMPI svn-full] svn:open-mpi r20557

[Jeff Squyres]

Should be fixed in r20559.  Thanks.

On Feb 14, 2009, at 9:34 AM, Tim Mattox wrote:

This commit appears to have broken the openib BTL on the trunk.
It is possible some other commit was the source of the problem, but
this is the only commit that touched the openib BTL yesterday, AFAIK.
All of IU's MTT tests that tried to use the openib BTL on the trunk
failed last night with error messages similar to this:

./c_hello: symbol lookup error:

/san/homedirs/mpiteam/mtt-runs/sif/20090213-Nightly/pb_1/installs/ FZJW/install/lib/openmpi/mca_btl_openib.so:

undefined symbol: OPAL_OUTPUT
--------------------------------------------------------------------------
mpirun has exited due to process rank 9 with PID 24480 on
node sif4 exiting without calling "finalize". This may
have caused other processes in the application to be
terminated by signals sent by mpirun (as reported here).
--------------------------------------------------------------------------


On Fri, Feb 13, 2009 at 9:26 PM,  <rusra...@osl.iu.edu> wrote:

Author: rusraink
Date: 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)
New Revision: 20557
URL: https://svn.open-mpi.org/trac/ompi/changeset/20557

Log:
- On the way to get the BTLs split out and lessen dependency on orte:
 Often, orte/util/show_help.h is included, although no functionality
 is required -- instead, most often opal_output.h, or
 orte/mca/rml/rml_types.h
 Please see orte_show_help_replacement.sh commited next.

- Local compilation (Linux/x86_64) w/ -Wimplicit-function-declaration
 actually showed two *missing* #include "orte/util/show_help.h"
 in orte/mca/odls/base/odls_base_default_fns.c and
 in orte/tools/orte-top/orte-top.c
 Manually added these.

 Let's have MTT the last word.


Text files modified:

trunk/ompi/class/ompi_free_list.c | 2 +- trunk/ompi/class/ompi_seq_tracker.c | 1 - trunk/ompi/communicator/comm.c | 3 ++- trunk/ompi/datatype/copy_functions_heterogeneous.c | 1 - trunk/ompi/datatype/datatype_internal.h | 2 +- trunk/ompi/errhandler/errhandler_predefined.c | 1 + trunk/ompi/file/file.c | 2 +- trunk/ompi/group/group.h | 2 +- trunk/ompi/info/info.c | 2 +- trunk/ompi/mca/bml/base/bml_base_btl.h | 1 - trunk/ompi/mca/bml/r2/bml_r2.c | 1 + trunk/ompi/mca/bml/r2/bml_r2_ft.c | 2 +- trunk/ompi/mca/bml/r2/bml_r2_ft.h | 1 - trunk/ompi/mca/btl/base/btl_base_error.h | 1 - trunk/ompi/mca/btl/base/btl_base_mca.c | 2 +- trunk/ompi/mca/btl/base/btl_base_open.c | 3 +-- trunk/ompi/mca/btl/base/btl_base_select.c | 1 + trunk/ompi/mca/btl/elan/btl_elan.c | 2 +- trunk/ompi/mca/btl/elan/btl_elan.h | 1 - trunk/ompi/mca/btl/elan/btl_elan_component.c | 2 +- trunk/ompi/mca/btl/gm/btl_gm.c | 2 +- trunk/ompi/mca/btl/gm/btl_gm.h | 1 - trunk/ompi/mca/btl/gm/btl_gm_component.c | 2 +- trunk/ompi/mca/btl/mx/btl_mx.h | 1 - trunk/ompi/mca/btl/ofud/btl_ofud.c | 2 +- trunk/ompi/mca/btl/ofud/btl_ofud.h | 1 - trunk/ompi/mca/btl/openib/btl_openib.c | 1 + trunk/ompi/mca/btl/openib/btl_openib.h | 2 +- trunk/ompi/mca/btl/openib/btl_openib_component.c | 1 + trunk/ompi/mca/btl/openib/btl_openib_fd.c | 1 - trunk/ompi/mca/btl/openib/btl_openib_mca.c | 1 + trunk/ompi/mca/btl/openib/btl_openib_xrc.c | 1 - trunk/ompi/mca/btl/openib/connect/btl_openib_connect_base.c | 1 + trunk/ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c | 1 + trunk/ompi/mca/btl/openib/connect/btl_openib_connect_oob.c | 2 ++ trunk/ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c | 1 + trunk/ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c | 2 ++ trunk/ompi/mca/btl/sctp/btl_sctp.c | 1 - trunk/ompi/mca/btl/sctp/btl_sctp.h | 1 - trunk/ompi/mca/btl/sctp/btl_sctp_component.c | 1 - trunk/ompi/mca/btl/sctp/btl_sctp_recv_handler.c | 1 - trunk/ompi/mca/btl/self/btl_self.c | 1 - trunk/ompi/mca/btl/self/btl_self_component.c | 1 - trunk/ompi/mca/btl/sm/btl_sm.c | 2 +- trunk/ompi/mca/btl/sm/btl_sm_component.c | 2 +- trunk/ompi/mca/btl/tcp/btl_tcp.c | 1 - trunk/ompi/mca/btl/tcp/btl_tcp.h | 1 - trunk/ompi/mca/btl/tcp/btl_tcp_component.c | 2 +- trunk/ompi/mca/btl/tcp/btl_tcp_ft.h | 1 - trunk/ompi/mca/btl/template/btl_template.c | 1 - trunk/ompi/mca/btl/template/btl_template.h | 1 - trunk/ompi/mca/btl/template/btl_template_component.c | 1 - trunk/ompi/mca/btl/udapl/btl_udapl.c | 1 - trunk/ompi/mca/btl/udapl/btl_udapl_component.c | 1 - trunk/ompi/mca/btl/udapl/btl_udapl_mca.c | 1 - trunk/ompi/mca/coll/base/coll_base_comm_select.c | 1 + trunk/ompi/mca/coll/base/coll_base_comm_unselect.c | 1 - trunk/ompi/mca/coll/base/coll_base_find_available.c | 1 + trunk/ompi/mca/coll/base/coll_base_open.c | 3 +-- trunk/ompi/mca/coll/demo/coll_demo_allgather.c | 2 +- trunk/ompi/mca/coll/demo/coll_demo_allgatherv.c | 2 +- trunk/ompi/mca/coll/demo/coll_demo_allreduce.c | 2 +- trunk/ompi/mca/coll/demo/coll_demo_alltoall.c | 2 +- trunk/ompi/mca/coll/demo/coll_demo_alltoallv.c | 2 +- trunk/ompi/mca/coll/demo/coll_demo_alltoallw.c | 2 +- trunk/ompi/mca/coll/demo/coll_demo_barrier.c | 2 +- trunk/ompi/mca/coll/demo/coll_demo_bcast.c | 2 +- trunk/ompi/mca/coll/demo/coll_demo_exscan.c | 2 +- trunk/ompi/mca/coll/demo/coll_demo_gather.c | 2 +- trunk/ompi/mca/coll/demo/coll_demo_gatherv.c | 2 +- trunk/ompi/mca/coll/demo/coll_demo_reduce.c | 2 +- trunk/ompi/mca/coll/demo/coll_demo_reduce_scatter.c | 2 +- trunk/ompi/mca/coll/demo/coll_demo_scan.c | 2 +- trunk/ompi/mca/coll/demo/coll_demo_scatter.c | 2 +- trunk/ompi/mca/coll/demo/coll_demo_scatterv.c | 2 +- trunk/ompi/mca/coll/hierarch/coll_hierarch_allreduce.c | 1 - trunk/ompi/mca/coll/hierarch/coll_hierarch_barrier.c | 1 - trunk/ompi/mca/coll/hierarch/coll_hierarch_bcast.c | 1 - trunk/ompi/mca/coll/hierarch/coll_hierarch_reduce.c | 1 - trunk/ompi/mca/coll/inter/coll_inter_bcast.c | 1 - trunk/ompi/mca/coll/sm2/coll_sm2_module.c | 1 + trunk/ompi/mca/coll/tuned/coll_tuned_component.c | 3 +-- trunk/ompi/mca/coll/tuned/coll_tuned_dynamic_file.c | 1 - trunk/ompi/mca/common/mx/common_mx.c | 2 +- trunk/ompi/mca/common/portals/common_portals_cray_xt_modex.c | 2 +- trunk/ompi/mca/common/portals/common_portals_crayxt3.c | 2 +- trunk/ompi/mca/common/portals/common_portals_utcp.c | 2 +- trunk/ompi/mca/common/sm/common_sm_mmap.c | 2 +- trunk/ompi/mca/crcp/base/crcp_base_close.c | 1 - trunk/ompi/mca/crcp/base/crcp_base_fns.c | 1 - trunk/ompi/mca/crcp/base/crcp_base_open.c | 3 +-- trunk/ompi/mca/crcp/base/crcp_base_select.c | 2 +- trunk/ompi/mca/dpm/base/dpm_base_close.c | 1 - trunk/ompi/mca/dpm/base/dpm_base_open.c | 3 +-- trunk/ompi/mca/dpm/base/dpm_base_select.c | 1 - trunk/ompi/mca/dpm/orte/dpm_orte.c | 2 +- trunk/ompi/mca/io/base/io_base_delete.c | 2 +- trunk/ompi/mca/io/base/io_base_file_select.c | 2 +- trunk/ompi/mca/io/base/io_base_find_available.c | 2 +- trunk/ompi/mca/io/base/io_base_open.c | 3 +-- trunk/ompi/mca/mtl/base/mtl_base_component.c | 3 +-- trunk/ompi/mca/mtl/mx/mtl_mx_component.c | 1 - trunk/ompi/mca/mtl/mx/mtl_mx_endpoint.c | 2 +- trunk/ompi/mca/mtl/portals/mtl_portals_component.c | 2 +- trunk/ompi/mca/mtl/portals/mtl_portals_recv_short.c | 1 - trunk/ompi/mca/mtl/portals/mtl_portals_send_short.c | 2 +- trunk/ompi/mca/mtl/psm/mtl_psm_component.c | 2 +- trunk/ompi/mca/mtl/psm/mtl_psm_endpoint.c | 1 - trunk/ompi/mca/op/base/op_base_find_available.c | 2 +- trunk/ompi/mca/op/base/op_base_op_select.c | 2 +- trunk/ompi/mca/osc/base/osc_base_open.c | 2 +- trunk/ompi/mca/osc/pt2pt/osc_pt2pt_data_move.c | 2 +- trunk/ompi/mca/osc/rdma/osc_rdma_data_move.c | 2 +- trunk/ompi/mca/pml/base/pml_base_open.c | 3 +-- trunk/ompi/mca/pml/base/pml_base_select.c | 1 + trunk/ompi/mca/pml/crcpw/pml_crcpw_component.c | 2 +- trunk/ompi/mca/pml/ob1/pml_ob1_endpoint.h | 1 - trunk/ompi/mca/pml/v/pml_v_output.c | 2 +- trunk/ompi/mca/pml/v/pml_v_output.h | 2 +- trunk/ompi/mca/pubsub/base/pubsub_base_close.c | 1 - trunk/ompi/mca/pubsub/base/pubsub_base_open.c | 3 +-- trunk/ompi/mca/pubsub/base/pubsub_base_select.c | 1 - trunk/ompi/mca/pubsub/orte/pubsub_orte.c | 1 + trunk/ompi/mca/topo/base/topo_base_close.c | 2 +- trunk/ompi/mca/topo/base/topo_base_comm_select.c | 2 +- trunk/ompi/mca/topo/base/topo_base_find_available.c | 2 +- trunk/ompi/mca/topo/base/topo_base_open.c | 3 +-- trunk/ompi/mpi/c/comm_spawn.c | 1 - trunk/ompi/mpi/c/comm_spawn_multiple.c | 1 - trunk/ompi/runtime/ompi_cr.c | 3 +-- trunk/ompi/runtime/ompi_mpi_finalize.c | 1 + trunk/ompi/runtime/ompi_mpi_init.c | 1 + trunk/ompi/runtime/ompi_mpi_params.c | 1 + trunk/ompi/tools/ompi-server/ompi-server.c | 1 + trunk/ompi/tools/ompi_info/components.cc | 1 + trunk/orte/mca/errmgr/base/errmgr_base_fns.c | 2 +- trunk/orte/mca/errmgr/base/errmgr_base_open.c | 3 +-- trunk/orte/mca/errmgr/default/errmgr_default.c | 1 - trunk/orte/mca/errmgr/default/errmgr_default_component.c | 1 - trunk/orte/mca/ess/base/ess_base_close.c | 2 +- trunk/orte/mca/ess/base/ess_base_get.c | 1 - trunk/orte/mca/ess/base/ess_base_open.c | 3 +-- trunk/orte/mca/ess/base/ess_base_put.c | 1 - trunk/orte/mca/ess/base/ess_base_select.c | 1 - trunk/orte/mca/ess/base/ess_base_std_app.c | 1 + trunk/orte/mca/ess/cnos/ess_cnos_module.c | 2 +- trunk/orte/mca/ess/env/ess_env_module.c | 2 ++ trunk/orte/mca/ess/hnp/ess_hnp_module.c | 2 ++ trunk/orte/mca/ess/portals_utcp/ess_portals_utcp_module.c | 1 - trunk/orte/mca/ess/slave/ess_slave_module.c | 2 ++ trunk/orte/mca/ess/slurm/ess_slurm_module.c | 1 + trunk/orte/mca/filem/base/filem_base_close.c | 1 - trunk/orte/mca/filem/base/filem_base_fns.c | 2 +- trunk/orte/mca/filem/base/filem_base_open.c | 3 +-- trunk/orte/mca/filem/base/filem_base_receive.c | 3 ++- trunk/orte/mca/filem/base/filem_base_select.c | 2 +- trunk/orte/mca/filem/rsh/filem_rsh_component.c | 3 +-- trunk/orte/mca/filem/rsh/filem_rsh_module.c | 2 ++ trunk/orte/mca/grpcomm/bad/grpcomm_bad_component.c | 1 - trunk/orte/mca/grpcomm/bad/grpcomm_bad_module.c | 2 +- trunk/orte/mca/grpcomm/base/grpcomm_base_allgather.c | 2 +- trunk/orte/mca/grpcomm/base/grpcomm_base_coll.c | 2 +- trunk/orte/mca/grpcomm/base/grpcomm_base_modex.c | 2 +- trunk/orte/mca/grpcomm/base/grpcomm_base_open.c | 3 +-- trunk/orte/mca/grpcomm/basic/grpcomm_basic_component.c | 1 - trunk/orte/mca/grpcomm/basic/grpcomm_basic_module.c | 1 + trunk/orte/mca/grpcomm/hier/grpcomm_hier_component.c | 1 - trunk/orte/mca/grpcomm/hier/grpcomm_hier_module.c | 1 + trunk/orte/mca/iof/base/iof_base_open.c | 2 +- trunk/orte/mca/iof/base/iof_base_select.c | 1 - trunk/orte/mca/iof/base/iof_base_setup.c | 1 - trunk/orte/mca/iof/hnp/iof_hnp.c | 2 +- trunk/orte/mca/iof/hnp/iof_hnp_component.c | 3 ++- trunk/orte/mca/iof/hnp/iof_hnp_read.c | 2 +- trunk/orte/mca/iof/hnp/iof_hnp_receive.c | 2 +- trunk/orte/mca/iof/hnp/iof_hnp_send.c | 2 +- trunk/orte/mca/iof/orted/iof_orted.c | 2 +- trunk/orte/mca/iof/orted/iof_orted_component.c | 2 +- trunk/orte/mca/iof/orted/iof_orted_read.c | 2 +- trunk/orte/mca/iof/orted/iof_orted_receive.c | 2 +- trunk/orte/mca/iof/tool/iof_tool.c | 2 +- trunk/orte/mca/iof/tool/iof_tool_component.c | 2 +- trunk/orte/mca/iof/tool/iof_tool_receive.c | 2 +- trunk/orte/mca/notifier/base/notifier_base_open.c | 2 +- trunk/orte/mca/odls/base/odls_base_default_fns.c | 1 + trunk/orte/mca/odls/base/odls_base_open.c | 1 + trunk/orte/mca/oob/base/oob_base_init.c | 2 +- trunk/orte/mca/oob/base/oob_base_open.c | 2 +- trunk/orte/mca/oob/tcp/oob_tcp.c | 3 +-- trunk/orte/mca/oob/tcp/oob_tcp_msg.h | 1 - trunk/orte/mca/oob/tcp/oob_tcp_peer.c | 2 +- trunk/orte/mca/plm/alps/plm_alps_component.c | 1 - trunk/orte/mca/plm/alps/plm_alps_module.c | 1 + trunk/orte/mca/plm/base/plm_base_heartbeat.c | 2 +- trunk/orte/mca/plm/base/plm_base_jobid.c | 1 - trunk/orte/mca/plm/base/plm_base_launch_support.c | 1 + trunk/orte/mca/plm/base/plm_base_open.c | 2 +- trunk/orte/mca/plm/base/plm_base_orted_cmds.c | 2 +- trunk/orte/mca/plm/base/plm_base_proxy.c | 2 +- trunk/orte/mca/plm/base/plm_base_receive.c | 2 +- trunk/orte/mca/plm/base/plm_base_rsh_support.c | 2 ++ trunk/orte/mca/plm/base/plm_base_select.c | 1 - trunk/orte/mca/plm/bproc/plm_bproc.c | 1 + trunk/orte/mca/plm/ccp/plm_ccp_component.c | 1 - trunk/orte/mca/plm/ccp/plm_ccp_module.c | 2 +- trunk/orte/mca/plm/lsf/plm_lsf_component.c | 2 +- trunk/orte/mca/plm/lsf/plm_lsf_module.c | 1 + trunk/orte/mca/plm/process/plm_process_module.c | 1 + trunk/orte/mca/plm/rsh/plm_rsh_component.c | 1 + trunk/orte/mca/plm/rsh/plm_rsh_module.c | 2 ++ trunk/orte/mca/plm/slurm/plm_slurm_component.c | 1 - trunk/orte/mca/plm/slurm/plm_slurm_module.c | 1 + trunk/orte/mca/plm/slurmd/plm_slurmd_component.c | 1 - trunk/orte/mca/plm/slurmd/plm_slurmd_module.c | 1 + trunk/orte/mca/plm/submit/pls_submit_module.c | 1 + trunk/orte/mca/plm/tm/plm_tm_component.c | 1 - trunk/orte/mca/plm/tm/plm_tm_module.c | 1 + trunk/orte/mca/plm/tmd/plm_tmd_component.c | 1 - trunk/orte/mca/plm/tmd/plm_tmd_module.c | 1 + trunk/orte/mca/ras/alps/ras_alps_component.c | 2 +- trunk/orte/mca/ras/alps/ras_alps_module.c | 1 + trunk/orte/mca/ras/base/ras_base_allocate.c | 1 + trunk/orte/mca/ras/base/ras_base_node.c | 1 - trunk/orte/mca/ras/base/ras_base_select.c | 1 - trunk/orte/mca/ras/ccp/ras_ccp_component.c | 1 - trunk/orte/mca/ras/ccp/ras_ccp_module.c | 1 + trunk/orte/mca/ras/gridengine/ras_gridengine_component.c | 3 +-- trunk/orte/mca/ras/gridengine/ras_gridengine_module.c | 1 + trunk/orte/mca/ras/loadleveler/ras_loadleveler_component.c | 1 - trunk/orte/mca/ras/loadleveler/ras_loadleveler_module.c | 2 +- trunk/orte/mca/ras/lsf/ras_lsf_component.c | 1 - trunk/orte/mca/ras/slurm/ras_slurm_component.c | 1 - trunk/orte/mca/ras/slurm/ras_slurm_module.c | 1 + trunk/orte/mca/ras/tm/ras_tm_component.c | 1 - trunk/orte/mca/rmaps/base/rmaps_base_map_job.c | 3 +-- trunk/orte/mca/rmaps/base/rmaps_base_open.c | 2 +- trunk/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c | 1 - trunk/orte/mca/rmaps/round_robin/rmaps_rr_component.c | 1 - trunk/orte/mca/rmaps/seq/rmaps_seq_component.c | 1 - trunk/orte/mca/rmaps/topo/rmaps_topo_component.c | 1 - trunk/orte/mca/rml/base/rml_base_components.c | 1 - trunk/orte/mca/rml/base/rml_base_contact.c | 1 - trunk/orte/mca/rml/ftrm/rml_ftrm_component.c | 4 ++-- trunk/orte/mca/rml/ftrm/rml_ftrm_module.c | 3 ++- trunk/orte/mca/rml/oob/rml_oob_component.c | 3 ++- trunk/orte/mca/rml/oob/rml_oob_recv.c | 2 +- trunk/orte/mca/rml/oob/rml_oob_send.c | 3 ++- trunk/orte/mca/routed/base/routed_base_components.c | 2 +- trunk/orte/mca/routed/base/routed_base_receive.c | 2 +- trunk/orte/mca/routed/binomial/routed_binomial.c | 3 ++- trunk/orte/mca/routed/binomial/routed_binomial_component.c | 1 - trunk/orte/mca/routed/linear/routed_linear.c | 3 ++- trunk/orte/mca/routed/linear/routed_linear_component.c | 1 - trunk/orte/mca/routed/radix/routed_radix.c | 3 ++- trunk/orte/mca/routed/radix/routed_radix_component.c | 1 - trunk/orte/mca/routed/slave/routed_slave.c | 3 ++- trunk/orte/mca/routed/slave/routed_slave_component.c | 1 - trunk/orte/mca/snapc/base/snapc_base_close.c | 1 - trunk/orte/mca/snapc/base/snapc_base_fns.c | 3 ++- trunk/orte/mca/snapc/base/snapc_base_open.c | 2 +- trunk/orte/mca/snapc/base/snapc_base_select.c | 2 +- trunk/orte/mca/snapc/full/snapc_full_app.c | 2 +- trunk/orte/mca/snapc/full/snapc_full_component.c | 2 +- trunk/orte/mca/snapc/full/snapc_full_global.c | 3 ++- trunk/orte/mca/snapc/full/snapc_full_local.c | 2 ++ trunk/orte/mca/snapc/full/snapc_full_module.c | 2 +- trunk/orte/mca/snapc/snapc.h | 2 +- trunk/orte/orted/orted_comm.c | 3 ++- trunk/orte/orted/orted_main.c | 2 ++ trunk/orte/runtime/orte_cr.c | 3 +-- trunk/orte/runtime/orte_finalize.c | 1 + trunk/orte/runtime/orte_globals.c | 3 ++- trunk/orte/runtime/orte_init.c | 1 + trunk/orte/runtime/orte_mca_params.c | 1 - trunk/orte/runtime/orte_wait.c | 2 +- trunk/orte/runtime/orte_wait.h | 1 - trunk/orte/test/mpi/hello_output.c | 2 +- trunk/orte/test/mpi/hello_show_help.c | 1 + trunk/orte/tools/orte-checkpoint/orte-checkpoint.c | 2 ++ trunk/orte/tools/orte-ps/orte-ps.c | 1 + trunk/orte/tools/orte-restart/orte-restart.c | 1 + trunk/orte/tools/orte-top/orte-top.c | 1 + trunk/orte/tools/orterun/debuggers.c | 2 ++ trunk/orte/tools/orterun/orterun.c | 2 ++ trunk/orte/util/comm/comm.c | 2 +- trunk/orte/util/hnp_contact.c | 2 +- trunk/orte/util/hostfile/hostfile.c | 1 + trunk/orte/util/name_fns.c | 1 - trunk/orte/util/nidmap.c | 1 + trunk/orte/util/pre_condition_transports.c | 1 - trunk/orte/util/session_dir.c | 1 + trunk/orte/util/show_help.c | 1 +

 292 files changed, 232 insertions(+), 249 deletions(-)

Modified: trunk/ompi/class/ompi_free_list.c

= = = = = = = = = =====================================================================

--- trunk/ompi/class/ompi_free_list.c   (original)

+++ trunk/ompi/class/ompi_free_list.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -22,8 +22,8 @@

#include "ompi/class/ompi_free_list.h"
#include "opal/include/opal/align.h"
+#include "opal/util/output.h"
#include "opal/sys/cache.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/mpool/mpool.h"

static void ompi_free_list_construct(ompi_free_list_t* fl);

Modified: trunk/ompi/class/ompi_seq_tracker.c

= = = = = = = = = =====================================================================

--- trunk/ompi/class/ompi_seq_tracker.c (original)

+++ trunk/ompi/class/ompi_seq_tracker.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -20,7 +20,6 @@

#include "ompi/class/ompi_seq_tracker.h"
#include "opal/sys/cache.h"
-#include "orte/util/show_help.h"




Modified: trunk/ompi/communicator/comm.c

= = = = = = = = = =====================================================================

--- trunk/ompi/communicator/comm.c      (original)

+++ trunk/ompi/communicator/comm.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -26,11 +26,12 @@

#include "opal/dss/dss.h"
#include "orte/util/name_fns.h"
+#include "orte/mca/rml/rml_types.h"

#include "ompi/proc/proc.h"
#include "opal/threads/mutex.h"
#include "opal/util/bit_ops.h"
-#include "orte/util/show_help.h"
+#include "opal/util/output.h"
#include "opal/util/convert.h"
#include "ompi/mca/topo/topo.h"
#include "ompi/mca/topo/base/base.h"

Modified: trunk/ompi/datatype/copy_functions_heterogeneous.c

= = = = = = = = = =====================================================================

--- trunk/ompi/datatype/copy_functions_heterogeneous.c  (original)

+++ trunk/ompi/datatype/copy_functions_heterogeneous.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -12,7 +12,6 @@

#include "ompi_config.h"

-#include "orte/util/show_help.h"
#include "opal/util/arch.h"

#include "opal/types.h"

Modified: trunk/ompi/datatype/datatype_internal.h

= = = = = = = = = =====================================================================

--- trunk/ompi/datatype/datatype_internal.h     (original)

+++ trunk/ompi/datatype/datatype_internal.h 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -23,7 +23,7 @@
#ifdef HAVE_STRING_H
#include <string.h>
#endif  /* HAVE_STRING_H */
-#include "orte/util/show_help.h"
+#include "opal/util/output.h"

extern int ompi_ddt_dfd;


Modified: trunk/ompi/errhandler/errhandler_predefined.c

= = = = = = = = = =====================================================================

--- trunk/ompi/errhandler/errhandler_predefined.c       (original)

+++ trunk/ompi/errhandler/errhandler_predefined.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -38,6 +38,7 @@
#include "ompi/win/win.h"
#include "orte/runtime/runtime.h"
#include "opal/util/printf.h"
+#include "opal/util/output.h"

/*
* Local functions

Modified: trunk/ompi/file/file.c

= = = = = = = = = =====================================================================

--- trunk/ompi/file/file.c      (original)

+++ trunk/ompi/file/file.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -22,10 +22,10 @@

#include "ompi/file/file.h"
#include "opal/class/opal_list.h"
+#include "opal/util/output.h"
#include "ompi/runtime/params.h"
#include "ompi/mca/io/base/base.h"
#include "ompi/info/info.h"
-#include "orte/util/show_help.h"

/*
* Table for Fortran <-> C file handle conversion

Modified: trunk/ompi/group/group.h

= = = = = = = = = =====================================================================

--- trunk/ompi/group/group.h    (original)

+++ trunk/ompi/group/group.h 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -28,9 +28,9 @@
#ifndef OMPI_GROUP_H
#define OMPI_GROUP_H

-#include "orte/util/show_help.h"
#include "mpi.h"
#include "opal/class/opal_pointer_array.h"
+#include "opal/util/output.h"
#if defined(c_plusplus) || defined(__cplusplus)
extern "C" {
#endif

Modified: trunk/ompi/info/info.c

= = = = = = = = = =====================================================================

--- trunk/ompi/info/info.c      (original)

+++ trunk/ompi/info/info.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -19,6 +19,7 @@
*/

#include "ompi_config.h"
+#include "opal/util/output.h"

#ifdef HAVE_STRING_H
#include <string.h>
@@ -33,7 +34,6 @@
#include "ompi/constants.h"
#include "ompi/info/info.h"
#include "ompi/runtime/params.h"
-#include "orte/util/show_help.h"


/*

Modified: trunk/ompi/mca/bml/base/bml_base_btl.h

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/bml/base/bml_base_btl.h      (original)

+++ trunk/ompi/mca/bml/base/bml_base_btl.h 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -23,7 +23,6 @@

#include "opal/mca/mca.h"

-#include "orte/util/show_help.h"

/*
* Global functions for the BML

Modified: trunk/ompi/mca/bml/r2/bml_r2.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/bml/r2/bml_r2.c      (original)

+++ trunk/ompi/mca/bml/r2/bml_r2.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -26,6 +26,7 @@
#include <string.h>

#include "opal/util/argv.h"
+#include "opal/util/output.h"
#include "orte/util/show_help.h"
#include "ompi/class/ompi_bitmap.h"
#include "ompi/mca/bml/bml.h"

Modified: trunk/ompi/mca/bml/r2/bml_r2_ft.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/bml/r2/bml_r2_ft.c   (original)

+++ trunk/ompi/mca/bml/r2/bml_r2_ft.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -20,11 +20,11 @@
*/

#include "ompi_config.h"
+#include "opal/util/output.h"

#include <stdlib.h>
#include <string.h>

-#include "orte/util/show_help.h"
#include "ompi/runtime/ompi_cr.h"
#include "ompi/class/ompi_bitmap.h"
#include "ompi/mca/bml/bml.h"

Modified: trunk/ompi/mca/bml/r2/bml_r2_ft.h

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/bml/r2/bml_r2_ft.h   (original)

+++ trunk/ompi/mca/bml/r2/bml_r2_ft.h 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -21,7 +21,6 @@
#ifndef MCA_BML_R2_FT_H
#define MCA_BML_R2_FT_H

-#include "orte/util/show_help.h"
#include "ompi/mca/btl/btl.h"

#if defined(c_plusplus) || defined(__cplusplus)

Modified: trunk/ompi/mca/btl/base/btl_base_error.h

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/base/btl_base_error.h    (original)

+++ trunk/ompi/mca/btl/base/btl_base_error.h 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -28,7 +28,6 @@

#include "orte/util/proc_info.h"
#include "orte/util/name_fns.h"
-#include "orte/util/show_help.h"
#include "orte/runtime/orte_globals.h"

OMPI_DECLSPEC extern int mca_btl_base_verbose;

Modified: trunk/ompi/mca/btl/base/btl_base_mca.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/base/btl_base_mca.c      (original)

+++ trunk/ompi/mca/btl/base/btl_base_mca.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -24,8 +24,8 @@
#include <stdio.h>

#include "opal/mca/base/mca_base_param.h"
+#include "opal/util/output.h"

-#include "orte/util/show_help.h"

#include "ompi/mca/btl/btl.h"
#include "ompi/mca/btl/base/base.h"

Modified: trunk/ompi/mca/btl/base/btl_base_open.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/base/btl_base_open.c     (original)

+++ trunk/ompi/mca/btl/base/btl_base_open.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -23,10 +23,9 @@
#include <stdio.h>

#include "opal/mca/mca.h"
+#include "opal/util/output.h"
#include "opal/mca/base/base.h"
-#include "orte/util/show_help.h"

-#include "orte/util/show_help.h"

#include "opal/mca/base/mca_base_param.h"
#include "ompi/mca/pml/pml.h"

Modified: trunk/ompi/mca/btl/base/btl_base_select.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/base/btl_base_select.c   (original)

+++ trunk/ompi/mca/btl/base/btl_base_select.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -20,6 +20,7 @@
#include "ompi_config.h"

#include "opal/util/argv.h"
+#include "opal/util/output.h"
#include "orte/util/show_help.h"
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"

Modified: trunk/ompi/mca/btl/elan/btl_elan.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/elan/btl_elan.c  (original)

+++ trunk/ompi/mca/btl/elan/btl_elan.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -10,8 +10,8 @@
*/

#include "ompi_config.h"
-#include "orte/util/show_help.h"
#include "opal/util/if.h"
+#include "opal/util/output.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"
#include "ompi/communicator/communicator.h"

Modified: trunk/ompi/mca/btl/elan/btl_elan.h

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/elan/btl_elan.h  (original)

+++ trunk/ompi/mca/btl/elan/btl_elan.h 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -23,7 +23,6 @@
#include "opal/event/event.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/btl/base/btl_base_error.h"

#include "ompi/mca/btl/btl.h"

Modified: trunk/ompi/mca/btl/elan/btl_elan_component.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/elan/btl_elan_component.c        (original)

+++ trunk/ompi/mca/btl/elan/btl_elan_component.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -14,8 +14,8 @@
#include "ompi/constants.h"
#include "opal/event/event.h"
#include "opal/util/if.h"
+#include "opal/util/output.h"
#include "opal/util/argv.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"


Modified: trunk/ompi/mca/btl/gm/btl_gm.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/gm/btl_gm.c      (original)

+++ trunk/ompi/mca/btl/gm/btl_gm.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -19,8 +19,8 @@

#include "ompi_config.h"
#include <string.h>
-#include "orte/util/show_help.h"
#include "opal/util/if.h"
+#include "opal/util/output.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"


Modified: trunk/ompi/mca/btl/gm/btl_gm.h

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/gm/btl_gm.h      (original)

+++ trunk/ompi/mca/btl/gm/btl_gm.h 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -34,7 +34,6 @@
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"
#include "ompi/mca/btl/base/base.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/mpool/mpool.h"
#include "ompi/mca/btl/btl.h"
#include "btl_gm_endpoint.h"

Modified: trunk/ompi/mca/btl/gm/btl_gm_component.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/gm/btl_gm_component.c    (original)

+++ trunk/ompi/mca/btl/gm/btl_gm_component.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -22,8 +22,8 @@
#include "ompi/constants.h"
#include "opal/event/event.h"
#include "opal/util/if.h"
+#include "opal/util/output.h"
#include "opal/util/argv.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"
#include "ompi/request/request.h"

Modified: trunk/ompi/mca/btl/mx/btl_mx.h

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/mx/btl_mx.h      (original)

+++ trunk/ompi/mca/btl/mx/btl_mx.h 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -28,7 +28,6 @@
/* Open MPI includes */
#include "ompi/class/ompi_free_list.h"
#include "ompi/class/ompi_bitmap.h"
-#include "orte/util/show_help.h"
#include "opal/event/event.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"

Modified: trunk/ompi/mca/btl/ofud/btl_ofud.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/ofud/btl_ofud.c  (original)

+++ trunk/ompi/mca/btl/ofud/btl_ofud.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -23,7 +23,7 @@

#include "ompi_config.h"
#include "opal/prefetch.h"
-#include "orte/util/show_help.h"
+#include "opal/util/output.h"
#include "ompi/datatype/convertor.h"
#include "ompi/datatype/datatype.h"
#include "ompi/mca/btl/btl.h"

Modified: trunk/ompi/mca/btl/ofud/btl_ofud.h

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/ofud/btl_ofud.h  (original)

+++ trunk/ompi/mca/btl/ofud/btl_ofud.h 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -34,7 +34,6 @@

/* Open MPI includes */
#include "opal/class/opal_hash_table.h"
-#include "orte/util/show_help.h"
#include "opal/sys/timer.h"
#include "ompi/class/ompi_free_list.h"
#include "ompi/class/ompi_bitmap.h"

Modified: trunk/ompi/mca/btl/openib/btl_openib.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/openib/btl_openib.c      (original)

+++ trunk/ompi/mca/btl/openib/btl_openib.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -28,6 +28,7 @@
#include <inttypes.h>
#include "orte/util/show_help.h"
#include "opal/util/if.h"
+#include "opal/util/output.h"
#include "opal/util/arch.h"

#include "ompi/mca/pml/pml.h"

Modified: trunk/ompi/mca/btl/openib/btl_openib.h

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/openib/btl_openib.h      (original)

+++ trunk/ompi/mca/btl/openib/btl_openib.h 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -36,10 +36,10 @@
#include "ompi/class/ompi_free_list.h"
#include "ompi/class/ompi_bitmap.h"
#include "opal/class/opal_pointer_array.h"
+#include "opal/util/output.h"
#include "opal/event/event.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/mpool/mpool.h"
#include "ompi/mca/btl/base/btl_base_error.h"


Modified: trunk/ompi/mca/btl/openib/btl_openib_component.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/openib/btl_openib_component.c    (original)

+++ trunk/ompi/mca/btl/openib/btl_openib_component.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -47,6 +47,7 @@
#include "opal/event/event.h"
#include "opal/include/opal/align.h"
#include "opal/util/if.h"
+#include "opal/util/output.h"
#include "opal/util/argv.h"
#include "opal/sys/timer.h"
#include "opal/sys/atomic.h"

Modified: trunk/ompi/mca/btl/openib/btl_openib_fd.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/openib/btl_openib_fd.c   (original)

+++ trunk/ompi/mca/btl/openib/btl_openib_fd.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -34,7 +34,6 @@

#include "opal/class/opal_list.h"
#include "opal/event/event.h"
-#include "orte/util/show_help.h"

#include "ompi/constants.h"


Modified: trunk/ompi/mca/btl/openib/btl_openib_mca.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/openib/btl_openib_mca.c  (original)

+++ trunk/ompi/mca/btl/openib/btl_openib_mca.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -28,6 +28,7 @@
#include "opal/mca/installdirs/installdirs.h"
#include "orte/util/show_help.h"
#include "opal/util/argv.h"
+#include "opal/util/output.h"
#include "opal/mca/base/mca_base_param.h"
#include "btl_openib.h"
#include "btl_openib_mca.h"

Modified: trunk/ompi/mca/btl/openib/btl_openib_xrc.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/openib/btl_openib_xrc.c  (original)

+++ trunk/ompi/mca/btl/openib/btl_openib_xrc.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -16,7 +16,6 @@
#include <errno.h>
#include <unistd.h>

-#include "orte/util/show_help.h"
#include "ompi/mca/btl/btl.h"
#include "ompi/mca/btl/base/base.h"
#include "btl_openib_xrc.h"

Modified: trunk/ompi/mca/btl/openib/connect/btl_openib_connect_base.c

= = = = = = = = = ===================================================================== --- trunk/ompi/mca/btl/openib/connect/btl_openib_connect_base.c (original) +++ trunk/ompi/mca/btl/openib/connect/btl_openib_connect_base.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -27,6 +27,7 @@

#include "orte/util/show_help.h"
#include "opal/util/argv.h"
+#include "opal/util/output.h"

/*
* Array of all possible connection functions

Modified: trunk/ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c

= = = = = = = = = ===================================================================== --- trunk/ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c (original) +++ trunk/ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -259,6 +259,7 @@
#include <infiniband/cm.h>

#include "opal/util/if.h"
+#include "opal/util/output.h"
#include "opal/util/error.h"
#include "opal/event/event.h"
#include "opal/class/opal_pointer_array.h"

Modified: trunk/ompi/mca/btl/openib/connect/btl_openib_connect_oob.c

= = = = = = = = = ===================================================================== --- trunk/ompi/mca/btl/openib/connect/btl_openib_connect_oob.c (original) +++ trunk/ompi/mca/btl/openib/connect/btl_openib_connect_oob.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -26,8 +26,10 @@
#include "opal/dss/dss.h"
#include "orte/util/show_help.h"
#include "opal/util/error.h"
+#include "opal/util/output.h"
#include "orte/mca/oob/base/base.h"
#include "orte/mca/rml/rml.h"
+#include "orte/mca/rml/rml_types.h"
#include "orte/mca/errmgr/errmgr.h"
#include "orte/util/name_fns.h"
#include "orte/runtime/orte_globals.h"

Modified: trunk/ompi/mca/btl/openib/connect/ btl_openib_connect_rdmacm.c = = = = = = = = = ===================================================================== --- trunk/ompi/mca/btl/openib/connect/ btl_openib_connect_rdmacm.c (original) +++ trunk/ompi/mca/btl/openib/connect/ btl_openib_connect_rdmacm.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -29,6 +29,7 @@
#include <malloc.h>

#include "opal/util/argv.h"
+#include "opal/util/output.h"
#include "opal/util/error.h"
#include "orte/util/show_help.h"


Modified: trunk/ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c

= = = = = = = = = ===================================================================== --- trunk/ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c (original) +++ trunk/ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -13,9 +13,11 @@

#include "opal/dss/dss.h"
#include "opal/util/error.h"
+#include "opal/util/output.h"
#include "orte/util/show_help.h"
#include "orte/util/name_fns.h"
#include "orte/mca/rml/rml.h"
+#include "orte/mca/rml/rml_types.h"
#include "orte/mca/errmgr/errmgr.h"
#include "ompi/mca/dpm/dpm.h"


Modified: trunk/ompi/mca/btl/sctp/btl_sctp.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/sctp/btl_sctp.c  (original)

+++ trunk/ompi/mca/btl/sctp/btl_sctp.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -18,7 +18,6 @@

#include "ompi_config.h"
#include <string.h>
-#include "orte/util/show_help.h"
#include "opal/util/if.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"

Modified: trunk/ompi/mca/btl/sctp/btl_sctp.h

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/sctp/btl_sctp.h  (original)

+++ trunk/ompi/mca/btl/sctp/btl_sctp.h 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -35,7 +35,6 @@

/* Open MPI includes */
#include "opal/event/event.h"
-#include "orte/util/show_help.h"
#include "ompi/class/ompi_bitmap.h"
#include "ompi/class/ompi_free_list.h"
#include "ompi/mca/pml/pml.h"

Modified: trunk/ompi/mca/btl/sctp/btl_sctp_component.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/sctp/btl_sctp_component.c        (original)

+++ trunk/ompi/mca/btl/sctp/btl_sctp_component.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -48,7 +48,6 @@
#include "opal/event/event.h"
#include "opal/util/if.h"
#include "opal/util/argv.h"
-#include "orte/util/show_help.h"
#include "orte/mca/oob/base/base.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"

Modified: trunk/ompi/mca/btl/sctp/btl_sctp_recv_handler.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/sctp/btl_sctp_recv_handler.c     (original)

+++ trunk/ompi/mca/btl/sctp/btl_sctp_recv_handler.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -41,7 +41,6 @@
#include "opal/event/event.h"
#include "opal/util/if.h"
#include "opal/util/argv.h"
-#include "orte/util/show_help.h"
#include "orte/mca/oob/base/base.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"

Modified: trunk/ompi/mca/btl/self/btl_self.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/self/btl_self.c  (original)

+++ trunk/ompi/mca/btl/self/btl_self.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -29,7 +29,6 @@
#include "ompi/datatype/convertor.h"
#include "ompi/datatype/datatype.h"
#include "opal/sys/atomic.h"
-#include "orte/util/show_help.h"
#include "opal/util/if.h"
#include "orte/util/proc_info.h"
#include "opal/util/printf.h"

Modified: trunk/ompi/mca/btl/self/btl_self_component.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/self/btl_self_component.c        (original)

+++ trunk/ompi/mca/btl/self/btl_self_component.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -31,7 +31,6 @@
#include "opal/event/event.h"
#include "opal/util/if.h"
#include "opal/util/argv.h"
-#include "orte/util/show_help.h"
#include "orte/util/proc_info.h"
#include "ompi/mca/pml/pml.h"
#include "opal/mca/base/mca_base_param.h"

Modified: trunk/ompi/mca/btl/sm/btl_sm.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/sm/btl_sm.c      (original)

+++ trunk/ompi/mca/btl/sm/btl_sm.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -29,8 +29,8 @@
#include "opal/threads/mutex.h"
#include "ompi/datatype/convertor.h"
#include "opal/sys/atomic.h"
-#include "orte/util/show_help.h"
#include "opal/util/if.h"
+#include "opal/util/output.h"
#include "opal/mca/carto/carto.h"
#include "opal/mca/carto/base/base.h"
#include "opal/mca/paffinity/base/base.h"

Modified: trunk/ompi/mca/btl/sm/btl_sm_component.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/sm/btl_sm_component.c    (original)

+++ trunk/ompi/mca/btl/sm/btl_sm_component.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -42,8 +42,8 @@
#include "opal/sys/cache.h"
#include "opal/event/event.h"
#include "opal/util/if.h"
+#include "opal/util/output.h"
#include "opal/util/argv.h"
-#include "orte/util/show_help.h"
#include "orte/util/proc_info.h"
#include "orte/runtime/orte_globals.h"


Modified: trunk/ompi/mca/btl/tcp/btl_tcp.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/tcp/btl_tcp.c    (original)

+++ trunk/ompi/mca/btl/tcp/btl_tcp.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -21,7 +21,6 @@

#include "ompi_config.h"
#include <string.h>
-#include "orte/util/show_help.h"
#include "opal/util/if.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"

Modified: trunk/ompi/mca/btl/tcp/btl_tcp.h

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/tcp/btl_tcp.h    (original)

+++ trunk/ompi/mca/btl/tcp/btl_tcp.h 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -36,7 +36,6 @@

/* Open MPI includes */
#include "opal/event/event.h"
-#include "orte/util/show_help.h"
#include "ompi/class/ompi_bitmap.h"
#include "ompi/class/ompi_free_list.h"
#include "ompi/mca/pml/pml.h"

Modified: trunk/ompi/mca/btl/tcp/btl_tcp_component.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/tcp/btl_tcp_component.c  (original)

+++ trunk/ompi/mca/btl/tcp/btl_tcp_component.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -48,8 +48,8 @@
#include "ompi/constants.h"
#include "opal/event/event.h"
#include "opal/util/if.h"
+#include "opal/util/output.h"
#include "opal/util/argv.h"
-#include "orte/util/show_help.h"
#include "orte/mca/oob/base/base.h"
#include "orte/types.h"
#include "ompi/mca/pml/pml.h"

Modified: trunk/ompi/mca/btl/tcp/btl_tcp_ft.h

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/tcp/btl_tcp_ft.h (original)

+++ trunk/ompi/mca/btl/tcp/btl_tcp_ft.h 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -24,7 +24,6 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-#include "orte/util/show_help.h"

#if defined(c_plusplus) || defined(__cplusplus)
extern "C" {

Modified: trunk/ompi/mca/btl/template/btl_template.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/template/btl_template.c  (original)

+++ trunk/ompi/mca/btl/template/btl_template.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -18,7 +18,6 @@

#include "ompi_config.h"
#include <string.h>
-#include "orte/util/show_help.h"
#include "opal/util/if.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"

Modified: trunk/ompi/mca/btl/template/btl_template.h

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/template/btl_template.h  (original)

+++ trunk/ompi/mca/btl/template/btl_template.h 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -32,7 +32,6 @@
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"
#include "ompi/mca/btl/base/base.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/mpool/mpool.h"
#include "ompi/mca/btl/btl.h"


Modified: trunk/ompi/mca/btl/template/btl_template_component.c

= = = = = = = = = ===================================================================== --- trunk/ompi/mca/btl/template/btl_template_component.c (original) +++ trunk/ompi/mca/btl/template/btl_template_component.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -22,7 +22,6 @@
#include "opal/event/event.h"
#include "opal/util/if.h"
#include "opal/util/argv.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"


Modified: trunk/ompi/mca/btl/udapl/btl_udapl.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/udapl/btl_udapl.c        (original)

+++ trunk/ompi/mca/btl/udapl/btl_udapl.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -24,7 +24,6 @@
#include "ompi_config.h"
#include <errno.h>
#include <string.h>
-#include "orte/util/show_help.h"
#include "opal/util/if.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"

Modified: trunk/ompi/mca/btl/udapl/btl_udapl_component.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/udapl/btl_udapl_component.c      (original)

+++ trunk/ompi/mca/btl/udapl/btl_udapl_component.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -28,7 +28,6 @@
#include "opal/event/event.h"
#include "opal/util/if.h"
#include "opal/util/argv.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"
#include "ompi/runtime/params.h"

Modified: trunk/ompi/mca/btl/udapl/btl_udapl_mca.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/btl/udapl/btl_udapl_mca.c    (original)

+++ trunk/ompi/mca/btl/udapl/btl_udapl_mca.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -19,7 +19,6 @@
*/

#include "ompi_config.h"
-#include "orte/util/show_help.h"
#include "opal/mca/base/mca_base_param.h"
#include "btl_udapl.h"
#include "btl_udapl_mca.h"

Modified: trunk/ompi/mca/coll/base/coll_base_comm_select.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/base/coll_base_comm_select.c    (original)

+++ trunk/ompi/mca/coll/base/coll_base_comm_select.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -29,6 +29,7 @@
#include "mpi.h"
#include "ompi/communicator/communicator.h"
#include "opal/util/argv.h"
+#include "opal/util/output.h"
#include "orte/util/show_help.h"
#include "opal/class/opal_list.h"
#include "opal/class/opal_object.h"

Modified: trunk/ompi/mca/coll/base/coll_base_comm_unselect.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/base/coll_base_comm_unselect.c  (original)

+++ trunk/ompi/mca/coll/base/coll_base_comm_unselect.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -24,7 +24,6 @@

#include "mpi.h"
#include "ompi/communicator/communicator.h"
-#include "orte/util/show_help.h"
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"
#include "ompi/mca/coll/coll.h"

Modified: trunk/ompi/mca/coll/base/coll_base_find_available.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/base/coll_base_find_available.c (original)

+++ trunk/ompi/mca/coll/base/coll_base_find_available.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -26,6 +26,7 @@
#include "mpi.h"
#include "ompi/constants.h"
#include "opal/class/opal_list.h"
+#include "opal/util/output.h"
#include "orte/util/show_help.h"
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"

Modified: trunk/ompi/mca/coll/base/coll_base_open.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/base/coll_base_open.c   (original)

+++ trunk/ompi/mca/coll/base/coll_base_open.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -21,12 +21,11 @@
#include <stdio.h>

#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "opal/mca/mca.h"
+#include "opal/util/output.h"
#include "opal/mca/base/base.h"
#include "opal/mca/base/mca_base_param.h"

-#include "orte/util/show_help.h"

#include "ompi/mca/coll/coll.h"
#include "ompi/mca/coll/base/base.h"

Modified: trunk/ompi/mca/coll/demo/coll_demo_allgather.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/demo/coll_demo_allgather.c      (original)

+++ trunk/ompi/mca/coll/demo/coll_demo_allgather.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -17,10 +17,10 @@
*/

#include "ompi_config.h"
+#include "opal/util/output.h"

#include "mpi.h"
#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/coll/coll.h"
#include "ompi/mca/coll/base/base.h"
#include "coll_demo.h"

Modified: trunk/ompi/mca/coll/demo/coll_demo_allgatherv.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/demo/coll_demo_allgatherv.c     (original)

+++ trunk/ompi/mca/coll/demo/coll_demo_allgatherv.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -17,10 +17,10 @@
*/

#include "ompi_config.h"
+#include "opal/util/output.h"

#include "mpi.h"
#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/coll/coll.h"
#include "ompi/mca/coll/base/base.h"
#include "coll_demo.h"

Modified: trunk/ompi/mca/coll/demo/coll_demo_allreduce.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/demo/coll_demo_allreduce.c      (original)

+++ trunk/ompi/mca/coll/demo/coll_demo_allreduce.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -17,10 +17,10 @@
*/

#include "ompi_config.h"
+#include "opal/util/output.h"

#include "mpi.h"
#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/coll/coll.h"
#include "ompi/mca/coll/base/base.h"
#include "coll_demo.h"

Modified: trunk/ompi/mca/coll/demo/coll_demo_alltoall.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/demo/coll_demo_alltoall.c       (original)

+++ trunk/ompi/mca/coll/demo/coll_demo_alltoall.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -17,10 +17,10 @@
*/

#include "ompi_config.h"
+#include "opal/util/output.h"

#include "mpi.h"
#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/coll/coll.h"
#include "ompi/mca/coll/base/base.h"
#include "coll_demo.h"

Modified: trunk/ompi/mca/coll/demo/coll_demo_alltoallv.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/demo/coll_demo_alltoallv.c      (original)

+++ trunk/ompi/mca/coll/demo/coll_demo_alltoallv.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -17,10 +17,10 @@
*/

#include "ompi_config.h"
+#include "opal/util/output.h"

#include "mpi.h"
#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/coll/coll.h"
#include "ompi/mca/coll/base/base.h"
#include "coll_demo.h"

Modified: trunk/ompi/mca/coll/demo/coll_demo_alltoallw.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/demo/coll_demo_alltoallw.c      (original)

+++ trunk/ompi/mca/coll/demo/coll_demo_alltoallw.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -17,10 +17,10 @@
*/

#include "ompi_config.h"
+#include "opal/util/output.h"

#include "mpi.h"
#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/coll/coll.h"
#include "ompi/mca/coll/base/base.h"
#include "coll_demo.h"

Modified: trunk/ompi/mca/coll/demo/coll_demo_barrier.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/demo/coll_demo_barrier.c        (original)

+++ trunk/ompi/mca/coll/demo/coll_demo_barrier.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -17,10 +17,10 @@
*/

#include "ompi_config.h"
+#include "opal/util/output.h"

#include "mpi.h"
#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/coll/coll.h"
#include "ompi/mca/coll/base/base.h"
#include "coll_demo.h"

Modified: trunk/ompi/mca/coll/demo/coll_demo_bcast.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/demo/coll_demo_bcast.c  (original)

+++ trunk/ompi/mca/coll/demo/coll_demo_bcast.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -17,10 +17,10 @@
*/

#include "ompi_config.h"
+#include "opal/util/output.h"

#include "mpi.h"
#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/coll/coll.h"
#include "ompi/mca/coll/base/base.h"
#include "coll_demo.h"

Modified: trunk/ompi/mca/coll/demo/coll_demo_exscan.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/demo/coll_demo_exscan.c (original)

+++ trunk/ompi/mca/coll/demo/coll_demo_exscan.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -17,10 +17,10 @@
*/

#include "ompi_config.h"
+#include "opal/util/output.h"

#include "mpi.h"
#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/coll/coll.h"
#include "ompi/mca/coll/base/base.h"
#include "coll_demo.h"

Modified: trunk/ompi/mca/coll/demo/coll_demo_gather.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/demo/coll_demo_gather.c (original)

+++ trunk/ompi/mca/coll/demo/coll_demo_gather.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -17,10 +17,10 @@
*/

#include "ompi_config.h"
+#include "opal/util/output.h"

#include "mpi.h"
#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/coll/coll.h"
#include "ompi/mca/coll/base/base.h"
#include "coll_demo.h"

Modified: trunk/ompi/mca/coll/demo/coll_demo_gatherv.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/demo/coll_demo_gatherv.c        (original)

+++ trunk/ompi/mca/coll/demo/coll_demo_gatherv.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -17,10 +17,10 @@
*/

#include "ompi_config.h"
+#include "opal/util/output.h"

#include "mpi.h"
#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/coll/coll.h"
#include "ompi/mca/coll/base/base.h"
#include "coll_demo.h"

Modified: trunk/ompi/mca/coll/demo/coll_demo_reduce.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/demo/coll_demo_reduce.c (original)

+++ trunk/ompi/mca/coll/demo/coll_demo_reduce.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -17,10 +17,10 @@
*/

#include "ompi_config.h"
+#include "opal/util/output.h"

#include "mpi.h"
#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/coll/coll.h"
#include "ompi/mca/coll/base/base.h"
#include "coll_demo.h"

Modified: trunk/ompi/mca/coll/demo/coll_demo_reduce_scatter.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/demo/coll_demo_reduce_scatter.c (original)

+++ trunk/ompi/mca/coll/demo/coll_demo_reduce_scatter.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -17,10 +17,10 @@
*/

#include "ompi_config.h"
+#include "opal/util/output.h"

#include "mpi.h"
#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/coll/coll.h"
#include "ompi/mca/coll/base/base.h"
#include "coll_demo.h"

Modified: trunk/ompi/mca/coll/demo/coll_demo_scan.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/demo/coll_demo_scan.c   (original)

+++ trunk/ompi/mca/coll/demo/coll_demo_scan.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -17,10 +17,10 @@
*/

#include "ompi_config.h"
+#include "opal/util/output.h"

#include "mpi.h"
#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/coll/coll.h"
#include "ompi/mca/coll/base/base.h"
#include "coll_demo.h"

Modified: trunk/ompi/mca/coll/demo/coll_demo_scatter.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/demo/coll_demo_scatter.c        (original)

+++ trunk/ompi/mca/coll/demo/coll_demo_scatter.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -17,10 +17,10 @@
*/

#include "ompi_config.h"
+#include "opal/util/output.h"

#include "mpi.h"
#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/coll/coll.h"
#include "ompi/mca/coll/base/base.h"
#include "coll_demo.h"

Modified: trunk/ompi/mca/coll/demo/coll_demo_scatterv.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/demo/coll_demo_scatterv.c       (original)

+++ trunk/ompi/mca/coll/demo/coll_demo_scatterv.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -17,10 +17,10 @@
*/

#include "ompi_config.h"
+#include "opal/util/output.h"

#include "mpi.h"
#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "ompi/mca/coll/coll.h"
#include "ompi/mca/coll/base/base.h"
#include "coll_demo.h"

Modified: trunk/ompi/mca/coll/hierarch/coll_hierarch_allreduce.c

= = = = = = = = = ===================================================================== --- trunk/ompi/mca/coll/hierarch/coll_hierarch_allreduce.c (original) +++ trunk/ompi/mca/coll/hierarch/coll_hierarch_allreduce.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -24,7 +24,6 @@

#include "mpi.h"
#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "ompi/communicator/communicator.h"
#include "ompi/datatype/datatype.h"
#include "ompi/mca/coll/coll.h"

Modified: trunk/ompi/mca/coll/hierarch/coll_hierarch_barrier.c

= = = = = = = = = ===================================================================== --- trunk/ompi/mca/coll/hierarch/coll_hierarch_barrier.c (original) +++ trunk/ompi/mca/coll/hierarch/coll_hierarch_barrier.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -23,7 +23,6 @@

#include "mpi.h"
#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "ompi/communicator/communicator.h"
#include "ompi/mca/coll/coll.h"


Modified: trunk/ompi/mca/coll/hierarch/coll_hierarch_bcast.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/hierarch/coll_hierarch_bcast.c  (original)

+++ trunk/ompi/mca/coll/hierarch/coll_hierarch_bcast.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -22,7 +22,6 @@

#include "mpi.h"
#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "ompi/communicator/communicator.h"
#include "ompi/mca/coll/coll.h"
#include "ompi/mca/coll/base/coll_tags.h"

Modified: trunk/ompi/mca/coll/hierarch/coll_hierarch_reduce.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/hierarch/coll_hierarch_reduce.c (original)

+++ trunk/ompi/mca/coll/hierarch/coll_hierarch_reduce.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -24,7 +24,6 @@

#include "mpi.h"
#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "ompi/communicator/communicator.h"
#include "ompi/datatype/datatype.h"
#include "ompi/mca/coll/coll.h"

Modified: trunk/ompi/mca/coll/inter/coll_inter_bcast.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/inter/coll_inter_bcast.c        (original)

+++ trunk/ompi/mca/coll/inter/coll_inter_bcast.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -22,7 +22,6 @@

#include "mpi.h"
#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "ompi/communicator/communicator.h"
#include "ompi/mca/coll/coll.h"
#include "ompi/mca/coll/base/coll_tags.h"

Modified: trunk/ompi/mca/coll/sm2/coll_sm2_module.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/sm2/coll_sm2_module.c   (original)

+++ trunk/ompi/mca/coll/sm2/coll_sm2_module.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -33,6 +33,7 @@
#include "ompi/communicator/communicator.h"
#include "ompi/mca/coll/coll.h"
#include "opal/util/show_help.h"
+#include "opal/util/output.h"
#include "coll_sm2.h"
#include "ompi/mca/coll/base/base.h"
#include "ompi/mca/dpm/dpm.h"

Modified: trunk/ompi/mca/coll/tuned/coll_tuned_component.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/tuned/coll_tuned_component.c    (original)

+++ trunk/ompi/mca/coll/tuned/coll_tuned_component.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -25,15 +25,14 @@
*/

#include "ompi_config.h"
+#include "opal/util/output.h"
#include "coll_tuned.h"

#include "mpi.h"
#include "ompi/mca/coll/coll.h"
#include "coll_tuned.h"

-#include "orte/util/show_help.h"

-#include "orte/util/show_help.h"

/*
* Public string showing the coll ompi_tuned component version number

Modified: trunk/ompi/mca/coll/tuned/coll_tuned_dynamic_file.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/coll/tuned/coll_tuned_dynamic_file.c (original)

+++ trunk/ompi/mca/coll/tuned/coll_tuned_dynamic_file.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -26,7 +26,6 @@
#include "ompi/mca/coll/coll.h"
#include "ompi/request/request.h"
#include "ompi/mca/pml/pml.h"
-#include "orte/util/show_help.h"
#include "coll_tuned.h"

/* need to include our own topo prototypes so we can malloc data on the comm correctly */

Modified: trunk/ompi/mca/common/mx/common_mx.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/common/mx/common_mx.c        (original)

+++ trunk/ompi/mca/common/mx/common_mx.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -20,7 +20,6 @@
*/

#include "ompi_config.h"
-#include "orte/util/show_help.h"
#include "ompi/constants.h"
#include "common_mx.h"

@@ -29,6 +28,7 @@
#include <malloc.h>
#endif
#include "opal/memoryhooks/memory.h"
+#include "opal/util/output.h"
#include "opal/mca/base/mca_base_param.h"
#include "ompi/runtime/params.h"
#include "ompi/mca/mpool/mpool.h"

Modified: trunk/ompi/mca/common/portals/ common_portals_cray_xt_modex.c = = = = = = = = = ===================================================================== --- trunk/ompi/mca/common/portals/ common_portals_cray_xt_modex.c (original) +++ trunk/ompi/mca/common/portals/ common_portals_cray_xt_modex.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -22,7 +22,7 @@
#include "common_portals.h"
#include "ompi/constants.h"
#include "opal/mca/base/base.h"
-#include "orte/util/show_help.h"
+#include "opal/util/output.h"
#include "ompi/runtime/ompi_module_exchange.h"



Modified: trunk/ompi/mca/common/portals/common_portals_crayxt3.c

= = = = = = = = = ===================================================================== --- trunk/ompi/mca/common/portals/common_portals_crayxt3.c (original) +++ trunk/ompi/mca/common/portals/common_portals_crayxt3.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -18,10 +18,10 @@

#include <catamount/cnos_mpi_os.h>

-#include "orte/util/show_help.h"
#include "ompi/constants.h"
#include "ompi/proc/proc.h"
#include "opal/mca/base/base.h"
+#include "opal/util/output.h"

static bool use_accelerated;


Modified: trunk/ompi/mca/common/portals/common_portals_utcp.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/common/portals/common_portals_utcp.c (original)

+++ trunk/ompi/mca/common/portals/common_portals_utcp.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -21,7 +21,7 @@
#include <p3api/debug.h>

#include "opal/mca/mca.h"
-#include "orte/util/show_help.h"
+#include "opal/util/output.h"
#include "opal/mca/base/mca_base_param.h"
#include "ompi/proc/proc.h"
#include "ompi/constants.h"

Modified: trunk/ompi/mca/common/sm/common_sm_mmap.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/common/sm/common_sm_mmap.c   (original)

+++ trunk/ompi/mca/common/sm/common_sm_mmap.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -46,7 +46,7 @@
#include "ompi/proc/proc.h"
#include "common_sm_mmap.h"
#include "opal/util/basename.h"
-#include "orte/util/show_help.h"
+#include "opal/util/output.h"
#include "opal/align.h"
#include "orte/util/proc_info.h"
#include "orte/mca/rml/rml_types.h"

Modified: trunk/ompi/mca/crcp/base/crcp_base_close.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/crcp/base/crcp_base_close.c  (original)

+++ trunk/ompi/mca/crcp/base/crcp_base_close.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -19,7 +19,6 @@
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"

-#include "orte/util/show_help.h"
#include "opal/mca/base/mca_base_param.h"

#include "ompi/mca/crcp/crcp.h"

Modified: trunk/ompi/mca/crcp/base/crcp_base_fns.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/crcp/base/crcp_base_fns.c    (original)

+++ trunk/ompi/mca/crcp/base/crcp_base_fns.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -28,7 +28,6 @@
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"

-#include "orte/util/show_help.h"
#include "opal/util/os_dirpath.h"

#include "ompi/communicator/communicator.h"

Modified: trunk/ompi/mca/crcp/base/crcp_base_open.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/crcp/base/crcp_base_open.c   (original)

+++ trunk/ompi/mca/crcp/base/crcp_base_open.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -17,12 +17,11 @@
#include "ompi_config.h"

#include "opal/mca/mca.h"
+#include "opal/util/output.h"
#include "opal/mca/base/base.h"

-#include "orte/util/show_help.h"
#include "opal/mca/base/mca_base_param.h"

-#include "orte/util/show_help.h"

#include "ompi/mca/crcp/crcp.h"
#include "ompi/mca/crcp/base/base.h"

Modified: trunk/ompi/mca/crcp/base/crcp_base_select.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/crcp/base/crcp_base_select.c (original)

+++ trunk/ompi/mca/crcp/base/crcp_base_select.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -17,9 +17,9 @@
#include "ompi_config.h"

#include "opal/mca/mca.h"
+#include "opal/util/output.h"
#include "opal/mca/base/base.h"

-#include "orte/util/show_help.h"
#include "opal/mca/base/mca_base_param.h"

#include "ompi/mca/crcp/crcp.h"

Modified: trunk/ompi/mca/dpm/base/dpm_base_close.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/dpm/base/dpm_base_close.c    (original)

+++ trunk/ompi/mca/dpm/base/dpm_base_close.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -19,7 +19,6 @@
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"

-#include "orte/util/show_help.h"
#include "opal/mca/base/mca_base_param.h"

#include "ompi/mca/dpm/dpm.h"

Modified: trunk/ompi/mca/dpm/base/dpm_base_open.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/dpm/base/dpm_base_open.c     (original)

+++ trunk/ompi/mca/dpm/base/dpm_base_open.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -17,12 +17,11 @@
#include "ompi_config.h"

#include "opal/mca/mca.h"
+#include "opal/util/output.h"
#include "opal/mca/base/base.h"

-#include "orte/util/show_help.h"
#include "opal/mca/base/mca_base_param.h"

-#include "orte/util/show_help.h"

#include "ompi/mca/dpm/dpm.h"
#include "ompi/mca/dpm/base/base.h"

Modified: trunk/ompi/mca/dpm/base/dpm_base_select.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/dpm/base/dpm_base_select.c   (original)

+++ trunk/ompi/mca/dpm/base/dpm_base_select.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -19,7 +19,6 @@
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"

-#include "orte/util/show_help.h"
#include "opal/mca/base/mca_base_param.h"
#include "opal/mca/base/mca_base_component_repository.h"


Modified: trunk/ompi/mca/dpm/orte/dpm_orte.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/dpm/orte/dpm_orte.c  (original)

+++ trunk/ompi/mca/dpm/orte/dpm_orte.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -25,7 +25,6 @@
#include <stdio.h>
#include <ctype.h>

-#include "orte/util/show_help.h"
#include "opal/util/argv.h"
#include "opal/util/opal_getcwd.h"

@@ -34,6 +33,7 @@
#include "orte/mca/grpcomm/grpcomm.h"
#include "orte/mca/plm/plm.h"
#include "orte/mca/rml/rml.h"
+#include "orte/mca/rml/rml_types.h"
#include "orte/mca/rml/base/rml_contact.h"
#include "orte/mca/routed/routed.h"
#include "orte/util/name_fns.h"

Modified: trunk/ompi/mca/io/base/io_base_delete.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/io/base/io_base_delete.c     (original)

+++ trunk/ompi/mca/io/base/io_base_delete.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -27,7 +27,7 @@
#include "ompi/file/file.h"
#include "opal/class/opal_list.h"
#include "opal/util/argv.h"
-#include "orte/util/show_help.h"
+#include "opal/util/output.h"
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"
#include "ompi/mca/io/io.h"

Modified: trunk/ompi/mca/io/base/io_base_file_select.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/io/base/io_base_file_select.c        (original)

+++ trunk/ompi/mca/io/base/io_base_file_select.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -26,7 +26,7 @@
#include "mpi.h"
#include "ompi/file/file.h"
#include "opal/util/argv.h"
-#include "orte/util/show_help.h"
+#include "opal/util/output.h"
#include "opal/class/opal_list.h"
#include "opal/class/opal_object.h"
#include "opal/mca/mca.h"

Modified: trunk/ompi/mca/io/base/io_base_find_available.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/io/base/io_base_find_available.c     (original)

+++ trunk/ompi/mca/io/base/io_base_find_available.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -25,7 +25,7 @@
#include "mpi.h"
#include "ompi/constants.h"
#include "opal/class/opal_list.h"
-#include "orte/util/show_help.h"
+#include "opal/util/output.h"
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"
#include "opal/mca/base/mca_base_component_repository.h"

Modified: trunk/ompi/mca/io/base/io_base_open.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/io/base/io_base_open.c       (original)

+++ trunk/ompi/mca/io/base/io_base_open.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -21,12 +21,11 @@
#include <stdio.h>

#include "ompi/class/ompi_free_list.h"
-#include "orte/util/show_help.h"
#include "opal/mca/mca.h"
+#include "opal/util/output.h"
#include "opal/mca/base/base.h"
#include "opal/mca/base/mca_base_param.h"

-#include "orte/util/show_help.h"

#include "ompi/mca/io/io.h"
#include "ompi/mca/io/base/base.h"

Modified: trunk/ompi/mca/mtl/base/mtl_base_component.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/mtl/base/mtl_base_component.c        (original)

+++ trunk/ompi/mca/mtl/base/mtl_base_component.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -19,10 +19,9 @@
#include "ompi_config.h"

#include "opal/mca/mca.h"
+#include "opal/util/output.h"
#include "opal/mca/base/base.h"
-#include "orte/util/show_help.h"

-#include "orte/util/show_help.h"

#include "ompi/constants.h"
#include "ompi/mca/mtl/mtl.h"

Modified: trunk/ompi/mca/mtl/mx/mtl_mx_component.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/mtl/mx/mtl_mx_component.c    (original)

+++ trunk/ompi/mca/mtl/mx/mtl_mx_component.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -20,7 +20,6 @@

#include "opal/event/event.h"
#include "opal/mca/base/mca_base_param.h"
-#include "orte/util/show_help.h"
#include "ompi/datatype/convertor.h"
#include "ompi/mca/mtl/base/base.h"
#include "ompi/mca/common/mx/common_mx.h"

Modified: trunk/ompi/mca/mtl/mx/mtl_mx_endpoint.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/mtl/mx/mtl_mx_endpoint.c     (original)

+++ trunk/ompi/mca/mtl/mx/mtl_mx_endpoint.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -18,10 +18,10 @@


#include "ompi_config.h"
+#include "opal/util/output.h"
#include <sys/time.h>
#include <time.h>
#include "ompi/types.h"
-#include "orte/util/show_help.h"
#include "mtl_mx.h"
#include "mtl_mx_types.h"
#include "mtl_mx_endpoint.h"

Modified: trunk/ompi/mca/mtl/portals/mtl_portals_component.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/mtl/portals/mtl_portals_component.c  (original)

+++ trunk/ompi/mca/mtl/portals/mtl_portals_component.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -19,8 +19,8 @@
#include "ompi_config.h"

#include "opal/event/event.h"
+#include "opal/util/output.h"
#include "opal/mca/base/mca_base_param.h"
-#include "orte/util/show_help.h"
#include "ompi/datatype/convertor.h"
#include "ompi/mca/common/portals/common_portals.h"


Modified: trunk/ompi/mca/mtl/portals/mtl_portals_recv_short.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/mtl/portals/mtl_portals_recv_short.c (original)

+++ trunk/ompi/mca/mtl/portals/mtl_portals_recv_short.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -20,7 +20,6 @@
#include "ompi_config.h"

#include "ompi/constants.h"
-#include "orte/util/show_help.h"

#include "mtl_portals.h"
#include "mtl_portals_recv_short.h"

Modified: trunk/ompi/mca/mtl/portals/mtl_portals_send_short.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/mtl/portals/mtl_portals_send_short.c (original)

+++ trunk/ompi/mca/mtl/portals/mtl_portals_send_short.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -17,8 +17,8 @@
*/

#include "ompi_config.h"
+#include "opal/util/output.h"

-#include "orte/util/show_help.h"

#include "mtl_portals.h"
#include "mtl_portals_request.h"

Modified: trunk/ompi/mca/mtl/psm/mtl_psm_component.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/mtl/psm/mtl_psm_component.c  (original)

+++ trunk/ompi/mca/mtl/psm/mtl_psm_component.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -20,8 +20,8 @@
#include "ompi_config.h"

#include "opal/event/event.h"
+#include "opal/util/output.h"
#include "opal/mca/base/mca_base_param.h"
-#include "orte/util/show_help.h"
#include "ompi/datatype/convertor.h"

#include "mtl_psm.h"

Modified: trunk/ompi/mca/mtl/psm/mtl_psm_endpoint.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/mtl/psm/mtl_psm_endpoint.c   (original)

+++ trunk/ompi/mca/mtl/psm/mtl_psm_endpoint.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -25,7 +25,6 @@
#include "orte/mca/oob/base/base.h"
#include "orte/mca/rml/rml.h"
#include "orte/mca/errmgr/errmgr.h"
-#include "orte/util/show_help.h"
#include "mtl_psm.h"
#include "mtl_psm_types.h"
#include "mtl_psm_endpoint.h"

Modified: trunk/ompi/mca/op/base/op_base_find_available.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/op/base/op_base_find_available.c     (original)

+++ trunk/ompi/mca/op/base/op_base_find_available.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -26,11 +26,11 @@
#include "mpi.h"

#include "opal/class/opal_list.h"
+#include "opal/util/output.h"
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"
#include "opal/mca/base/mca_base_component_repository.h"

-#include "orte/util/show_help.h"

#include "ompi/constants.h"
#include "ompi/op/op.h"

Modified: trunk/ompi/mca/op/base/op_base_op_select.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/op/base/op_base_op_select.c  (original)

+++ trunk/ompi/mca/op/base/op_base_op_select.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -31,12 +31,12 @@
#include "ompi/constants.h"

#include "opal/util/argv.h"
+#include "opal/util/output.h"
#include "opal/class/opal_list.h"
#include "opal/class/opal_object.h"
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"

-#include "orte/util/show_help.h"

#include "ompi/op/op.h"
#include "ompi/mca/op/op.h"

Modified: trunk/ompi/mca/osc/base/osc_base_open.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/osc/base/osc_base_open.c     (original)

+++ trunk/ompi/mca/osc/base/osc_base_open.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -18,10 +18,10 @@
#include "ompi/constants.h"

#include "opal/mca/mca.h"
+#include "opal/util/output.h"
#include "opal/mca/base/base.h"
#include "opal/mca/base/mca_base_param.h"

-#include "orte/util/show_help.h"

#include "ompi/mca/osc/osc.h"
#include "ompi/mca/osc/base/base.h"

Modified: trunk/ompi/mca/osc/pt2pt/osc_pt2pt_data_move.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/osc/pt2pt/osc_pt2pt_data_move.c      (original)

+++ trunk/ompi/mca/osc/pt2pt/osc_pt2pt_data_move.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -23,8 +23,8 @@
#include "osc_pt2pt_data_move.h"
#include "osc_pt2pt_buffer.h"

-#include "orte/util/show_help.h"
#include "opal/util/arch.h"
+#include "opal/util/output.h"
#include "opal/sys/atomic.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/datatype/datatype.h"

Modified: trunk/ompi/mca/osc/rdma/osc_rdma_data_move.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/osc/rdma/osc_rdma_data_move.c        (original)

+++ trunk/ompi/mca/osc/rdma/osc_rdma_data_move.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -24,8 +24,8 @@
#include "osc_rdma_data_move.h"
#include "osc_rdma_obj_convert.h"

-#include "orte/util/show_help.h"
#include "opal/util/arch.h"
+#include "opal/util/output.h"
#include "opal/sys/atomic.h"
#include "ompi/mca/bml/bml.h"
#include "ompi/mca/bml/base/base.h"

Modified: trunk/ompi/mca/pml/base/pml_base_open.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/pml/base/pml_base_open.c     (original)

+++ trunk/ompi/mca/pml/base/pml_base_open.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -26,10 +26,9 @@
#include <unistd.h>
#endif  /* HAVE_UNIST_H */
#include "opal/mca/mca.h"
+#include "opal/util/output.h"
#include "opal/mca/base/base.h"
-#include "orte/util/show_help.h"

-#include "orte/util/show_help.h"

#include "ompi/constants.h"
#include "ompi/mca/pml/pml.h"

Modified: trunk/ompi/mca/pml/base/pml_base_select.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/pml/base/pml_base_select.c   (original)

+++ trunk/ompi/mca/pml/base/pml_base_select.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -20,6 +20,7 @@
#include "ompi_config.h"

#include "opal/class/opal_list.h"
+#include "opal/util/output.h"
#include "orte/util/show_help.h"
#include "opal/runtime/opal_progress.h"
#include "opal/mca/mca.h"

Modified: trunk/ompi/mca/pml/crcpw/pml_crcpw_component.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/pml/crcpw/pml_crcpw_component.c      (original)

+++ trunk/ompi/mca/pml/crcpw/pml_crcpw_component.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -18,9 +18,9 @@

#include "ompi_config.h"
#include "opal/sys/cache.h"
+#include "opal/util/output.h"
#include "opal/event/event.h"

-#include "orte/util/show_help.h"

#include "mpi.h"
#include "ompi/mca/pml/pml.h"

Modified: trunk/ompi/mca/pml/ob1/pml_ob1_endpoint.h

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/pml/ob1/pml_ob1_endpoint.h   (original)

+++ trunk/ompi/mca/pml/ob1/pml_ob1_endpoint.h 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -21,7 +21,6 @@
#ifndef MCA_PML_OB1_ENDPOINT_H
#define MCA_PML_OB1_ENDPOINT_H

-#include "orte/util/show_help.h"
#include "ompi/mca/btl/btl.h"
#if defined(c_plusplus) || defined(__cplusplus)
extern "C" {

Modified: trunk/ompi/mca/pml/v/pml_v_output.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/pml/v/pml_v_output.c (original)

+++ trunk/ompi/mca/pml/v/pml_v_output.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -9,8 +9,8 @@
*/

#include "ompi_config.h"
+#include "opal/util/output.h"

-#include "orte/util/show_help.h"

#include "pml_v_output.h"


Modified: trunk/ompi/mca/pml/v/pml_v_output.h

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/pml/v/pml_v_output.h (original)

+++ trunk/ompi/mca/pml/v/pml_v_output.h 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -11,7 +11,7 @@
#ifndef PML_V_OUTPUT_H_HAS_BEEN_INCLUDED
#define PML_V_OUTPUT_H_HAS_BEEN_INCLUDED

-#include "orte/util/show_help.h"
+#include "opal/util/output.h"
#include "opal_stdint.h"
#include <stdio.h>
#include "pml_v.h"

Modified: trunk/ompi/mca/pubsub/base/pubsub_base_close.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/pubsub/base/pubsub_base_close.c      (original)

+++ trunk/ompi/mca/pubsub/base/pubsub_base_close.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -19,7 +19,6 @@
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"

-#include "orte/util/show_help.h"
#include "opal/mca/base/mca_base_param.h"

#include "ompi/mca/pubsub/pubsub.h"

Modified: trunk/ompi/mca/pubsub/base/pubsub_base_open.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/pubsub/base/pubsub_base_open.c       (original)

+++ trunk/ompi/mca/pubsub/base/pubsub_base_open.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -17,12 +17,11 @@
#include "ompi_config.h"

#include "opal/mca/mca.h"
+#include "opal/util/output.h"
#include "opal/mca/base/base.h"

-#include "orte/util/show_help.h"
#include "opal/mca/base/mca_base_param.h"

-#include "orte/util/show_help.h"

#include "ompi/mca/pubsub/pubsub.h"
#include "ompi/mca/pubsub/base/base.h"

Modified: trunk/ompi/mca/pubsub/base/pubsub_base_select.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/pubsub/base/pubsub_base_select.c     (original)

+++ trunk/ompi/mca/pubsub/base/pubsub_base_select.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -19,7 +19,6 @@
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"

-#include "orte/util/show_help.h"
#include "opal/mca/base/mca_base_param.h"
#include "opal/mca/base/mca_base_component_repository.h"


Modified: trunk/ompi/mca/pubsub/orte/pubsub_orte.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/pubsub/orte/pubsub_orte.c    (original)

+++ trunk/ompi/mca/pubsub/orte/pubsub_orte.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -33,6 +33,7 @@
#include "orte/mca/grpcomm/grpcomm.h"
#include "orte/mca/plm/plm.h"
#include "orte/mca/rml/rml.h"
+#include "orte/mca/rml/rml_types.h"
#include "orte/mca/rml/base/rml_contact.h"
#include "orte/mca/routed/routed.h"
#include "orte/util/name_fns.h"

Modified: trunk/ompi/mca/topo/base/topo_base_close.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/topo/base/topo_base_close.c  (original)

+++ trunk/ompi/mca/topo/base/topo_base_close.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -19,9 +19,9 @@

#include <stdio.h>

-#include "orte/util/show_help.h"
#include "ompi/constants.h"
#include "opal/mca/mca.h"
+#include "opal/util/output.h"
#include "opal/mca/base/base.h"
#include "ompi/mca/topo/topo.h"
#include "ompi/mca/topo/base/base.h"

Modified: trunk/ompi/mca/topo/base/topo_base_comm_select.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/topo/base/topo_base_comm_select.c    (original)

+++ trunk/ompi/mca/topo/base/topo_base_comm_select.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -23,11 +23,11 @@

#include "opal/class/opal_list.h"
#include "opal/util/argv.h"
+#include "opal/util/output.h"
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"
#include "ompi/mca/topo/topo.h"
#include "ompi/mca/topo/base/base.h"
-#include "orte/util/show_help.h"
#include "ompi/communicator/communicator.h"



Modified: trunk/ompi/mca/topo/base/topo_base_find_available.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/topo/base/topo_base_find_available.c (original)

+++ trunk/ompi/mca/topo/base/topo_base_find_available.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -23,7 +23,7 @@

#include "mpi.h"
#include "opal/class/opal_list.h"
-#include "orte/util/show_help.h"
+#include "opal/util/output.h"
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"
#include "opal/mca/base/mca_base_component_repository.h"

Modified: trunk/ompi/mca/topo/base/topo_base_open.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mca/topo/base/topo_base_open.c   (original)

+++ trunk/ompi/mca/topo/base/topo_base_open.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -21,12 +21,11 @@
#include <stdio.h>

#include "ompi/constants.h"
-#include "orte/util/show_help.h"
#include "opal/class/opal_list.h"
+#include "opal/util/output.h"
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"

-#include "orte/util/show_help.h"

#include "ompi/mca/topo/base/base.h"


Modified: trunk/ompi/mpi/c/comm_spawn.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mpi/c/comm_spawn.c       (original)

+++ trunk/ompi/mpi/c/comm_spawn.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -19,7 +19,6 @@
#include "ompi_config.h"
#include <stdio.h>

-#include "orte/util/show_help.h"
#include "ompi/info/info.h"
#include "ompi/mpi/c/bindings.h"
#include "ompi/mca/dpm/dpm.h"

Modified: trunk/ompi/mpi/c/comm_spawn_multiple.c

= = = = = = = = = =====================================================================

--- trunk/ompi/mpi/c/comm_spawn_multiple.c      (original)

+++ trunk/ompi/mpi/c/comm_spawn_multiple.c 2009-02-13 21:26:12 EST (Fri, 13 Feb 2009)

@@ -19,7 +19,6 @@
#include "ompi_config.h"
#include <stdio.h>

-#include "orte/util/show_help.h"
#include "ompi/mpi/c/bindings.h"
#include "ompi/info/info.h"
#include "ompi/mca/dpm/dpm.h"

Modified: trunk/ompi/runtime/ompi_cr.c
======...

[Message clipped]

--
Tim Mattox, Ph.D. - http://homepage.mac.com/tmattox/
tmat...@gmail.com || timat...@open-mpi.org
   I'm a bright... http://www.the-brights.net/
_______________________________________________
devel mailing list
de...@open-mpi.org
http://www.open-mpi.org/mailman/listinfo.cgi/devel

--
Jeff Squyres
Cisco Systems