1
1

* results from initial merge of the tim branch into the trunk. Compiles and

ompi_info works, but that's all that has been tested.

This commit was SVN r4827.
This commit is contained in:
Brian Barrett 2005-03-14 20:57:21 +00:00
parent 97cb8ac2fe
commit 6822a519bb
653 changed files with 46058 additions and 31365 deletions

864
RTE_MERGE_README Normal file
View File

@ -0,0 +1,864 @@
This file contains information on merging the branches/tim tree into the
trunk.
INITIAL MERGE:
svn merge -r3853:4821 svn+ssh://svn.open-mpi.org/l/svn/ompi/branches/tim .
CONFLICTS FROM INITIAL MERGE:
C src/event/event.c RESOLVED, BWB
C src/dynamic-mca/Makefile.am RESOLVED, BWB
C src/include/Makefile.am RESOLVED, BWB
C src/runtime/ompi_progress.c RESOLVED, BWB
C src/mpi/runtime/ompi_mpi_init.c RESOLVED, BWB
C src/threads/condition.h RESOLVED, BWB
C src/tools/console/Makefile.am RESOLVED, BWB
C src/tools/wrappers/Makefile.am RESOLVED, BWB
C src/tools/Makefile.am RESOLVED, BWB
C src/mca/oob/oob.h RESOLVED, BWB
C src/mca/oob/tcp/oob_tcp.c RESOLVED, BWB
C src/mca/oob/tcp/oob_tcp_msg.c RESOLVED, BWB
C src/mca/oob/base/base.h RESOLVED, BWB
C src/mca/ns/replica/src/ns_replica.c RESOLVED, BWB
C src/mca/ns/replica/src/ns_replica_component.c RESOLVED, BWB
C src/mca/ns/replica/src/ns_replica.h RESOLVED, BWB
C src/mca/ns/proxy/src/ns_proxy.c RESOLVED, BWB
C src/mca/ns/proxy/src/ns_proxy_component.c RESOLVED, BWB
C src/mca/ns/proxy/src/ns_proxy.h RESOLVED, BWB
C src/mca/ns/ns.h RESOLVED, BWB
C src/mca/ns/base/base.h RESOLVED, BWB
C src/mca/ns/base/ns_base_local_fns.c RESOLVED, BWB
C src/mca/ns/base/ns_base_open.c RESOLVED, BWB
C src/mca/gpr/replica/gpr_replica.h RESOLVED, BWB
C src/mca/gpr/proxy/gpr_proxy.h RESOLVED, BWB
C src/mca/gpr/proxy/gpr_proxy_compound_cmd.c RESOLVED, BWB
C src/mca/gpr/base/base.h RESOLVED, BWB
C src/mca/ptl/gm/src/ptl_gm.h RESOLVED, BWB
C src/mca/io/base/io_base_component_list.c RESOLVED, BWB
C src/mca/Makefile.am RESOLVED, BWB
C src/mca/base/mca_base_param.c RESOLVED, BWB
C src/mca/base/mca_base_param.h RESOLVED, BWB
C src/communicator/comm_publish.c RESOLVED, BWB
C src/communicator/comm_dyn.c RESOLVED, BWB
C src/communicator/communicator.h RESOLVED, BWB
C src/Makefile.am RESOLVED, BWB
C configure.ac RESOLVED, BWB
C config/ompi_mca.m4 RESOLVED, BWB
CHANGES AFTER RESOLUTION FROM INITIAL MERGE:
M .
M test/mca/ns/test_ns_replica.c
M test/mca/gpr
A + test/mca/gpr/gpr_test_trigs.c
A + test/mca/gpr/gpr_test.c
M test/mca/gpr/Makefile.am
A + test/mca/gpr/gpr_test_proxy.c
A + test/mca/rds
A + test/mca/rds/test_rds_resfile.c
A + test/mca/rds/Makefile.am
A + test/runtime
A + test/runtime/parse_context.c
A + test/runtime/Makefile.am
A + test/plsnds
A + test/plsnds/plsnds_test.c
A + test/plsnds/Makefile.am
A + test/dps
A + test/dps/dps_test.c
A + test/dps/Makefile.am
A + include/orte_config.h
A RTE_MERGE_README
M src/event/signal.c
M src/event/event.c
M src/event/event.h
D src/dynamic-mca/pcm
D src/dynamic-mca/pcm/Makefile.am
D src/dynamic-mca/one
D src/dynamic-mca/one/Makefile.am
A + src/dynamic-mca/rmaps
A + src/dynamic-mca/rmaps/Makefile.am
D src/dynamic-mca/llm
D src/dynamic-mca/llm/Makefile.am
A + src/dynamic-mca/ras
A + src/dynamic-mca/ras/Makefile.am
A + src/dynamic-mca/rds
A + src/dynamic-mca/rds/Makefile.am
A + src/dynamic-mca/rml
A + src/dynamic-mca/rml/Makefile.am
D src/dynamic-mca/svc
D src/dynamic-mca/svc/Makefile.am
A + src/dynamic-mca/pls
A + src/dynamic-mca/pls/Makefile.am
A + src/dynamic-mca/rmgr
A + src/dynamic-mca/rmgr/Makefile.am
M src/dynamic-mca/Makefile.am
D src/dynamic-mca/pcmclient
D src/dynamic-mca/pcmclient/Makefile.am
D src/runtime/ompi_rte_finalize.c
A + src/runtime/orte_abort.c
A + src/runtime/orte_wait.h
D src/runtime/ompi_rte_parse_environ.c
D src/runtime/ompi_rte_init_cleanup.c
M src/runtime/runtime_types.h
D src/runtime/ompi_rte_pcm.c
A + src/runtime/orte_restart.c
A + src/runtime/orte_monitor.c
D src/runtime/ompi_rte_vm_status.c
M src/runtime/runtime_internal.h
D src/runtime/ompi_rte_wait_startup_shutdown_msg.c
D src/runtime/ompi_rte_monitor.c
D src/runtime/ompi_init.c
M src/runtime/runtime.h
M src/runtime/ompi_progress.c
A + src/runtime/orte_finalize.c
M src/runtime/ompi_progress.h
D src/runtime/universe_exists.c
D src/runtime/ompi_rte_init.c
D src/runtime/ompi_rte_wait.c
D src/runtime/ompi_rte_parse_cmd_line.c
D src/runtime/ompi_rte_job_shutdown.c
D src/runtime/ompi_rte_wait.h
D src/runtime/ompi_rte_process_status.c
D src/runtime/ompi_rte_llm.c
D src/runtime/ompi_rte_parse_daemon_cmd_line.c
D src/runtime/ompi_finalize.c
A + src/runtime/orte_universe_exists.c
M src/runtime/Makefile.am
D src/runtime/ompi_rte_cmd_line_setup.c
A + src/runtime/orte_schema.c
D src/runtime/ompi_rte_job_startup.c
D src/runtime/ompi_abort.c
A + src/runtime/orte_init.c
A + src/runtime/orte_wait.c
A + src/include/orte_schema.h
M src/include/constants.h
A + src/include/orte_types.h
M src/include/Makefile.am
A + src/include/orte_constants.h
M src/mpi/c/comm_accept.c
M src/mpi/c/comm_spawn_multiple.c
M src/mpi/c/comm_join.c
M src/mpi/c/comm_spawn.c
M src/mpi/c/comm_connect.c
M src/mpi/runtime/ompi_mpi_abort.c
M src/mpi/runtime/Makefile.am
M src/mpi/runtime/ompi_mpi_finalize.c
M src/mpi/runtime/ompi_mpi_init.c
M src/mpi/runtime/ompi_mpi_params.c
A + src/dps
A + src/dps/dps_types.h
A + src/dps/dps_pack.c
A + src/dps/orte_dps_open_close.c
A + src/dps/dps_load_unload.c
A + src/dps/dps_internal.h
A + src/dps/dps_unpack.c
A + src/dps/Makefile.am
A + src/dps/dps_internal_functions.c
A + src/dps/dps_peek.c
A + src/dps/dps.h
A + src/threads/condition.c
M src/threads/Makefile.am
M src/threads/condition.h
M src/threads/condition_spinlock.h
D src/mca/pcm
D src/mca/pcm/rms
D src/mca/pcm/rms/configure.params
D src/mca/pcm/rms/.ompi_ignore
D src/mca/pcm/rms/src
D src/mca/pcm/rms/src/help-mca-pcm-rms.txt
D src/mca/pcm/rms/src/pcm_rms.c
D src/mca/pcm/rms/src/pcm_rms_component.c
D src/mca/pcm/rms/src/pcm_rms.h
D src/mca/pcm/rms/src/Makefile.am
D src/mca/pcm/rms/Makefile.am
D src/mca/pcm/rms/configure.stub
D src/mca/pcm/slurm
D src/mca/pcm/slurm/configure.params
D src/mca/pcm/slurm/.ompi_ignore
D src/mca/pcm/slurm/src
D src/mca/pcm/slurm/src/pcm_slurm.c
D src/mca/pcm/slurm/src/pcm_slurm_component.c
D src/mca/pcm/slurm/src/pcm_slurm.h
D src/mca/pcm/slurm/src/Makefile.am
D src/mca/pcm/slurm/Makefile.am
D src/mca/pcm/slurm/configure.stub
D src/mca/pcm/bproc
D src/mca/pcm/bproc/configure.params
D src/mca/pcm/bproc/.ompi_ignore
D src/mca/pcm/bproc/src
D src/mca/pcm/bproc/src/pcm_bproc_control.c
D src/mca/pcm/bproc/src/pcm_bproc_component.c
D src/mca/pcm/bproc/src/pcm_bproc_allocate.c
D src/mca/pcm/bproc/src/Makefile.am
D src/mca/pcm/bproc/src/pcm_bproc.h
D src/mca/pcm/bproc/src/pcm_bproc_monitor.c
D src/mca/pcm/bproc/src/pcm_bproc_spawn.c
D src/mca/pcm/bproc/Makefile.am
D src/mca/pcm/bproc/configure.stub
D src/mca/pcm/pcm.h
D src/mca/pcm/ompid
D src/mca/pcm/ompid/configure.params
D src/mca/pcm/ompid/pcm_ompid.c
D src/mca/pcm/ompid/Makefile.am
D src/mca/pcm/ompid/pcm_ompid_component.c
D src/mca/pcm/ompid/pcm_ompid.h
D src/mca/pcm/Makefile.am
D src/mca/pcm/base
D src/mca/pcm/base/pcm_base_close.c
D src/mca/pcm/base/base_kill_track.h
D src/mca/pcm/base/pcm_base_data_store.c
D src/mca/pcm/base/base.h
D src/mca/pcm/base/pcm_base_comm.c
D src/mca/pcm/base/base_data_store.h
D src/mca/pcm/base/pcm_base_util.c
D src/mca/pcm/base/pcm_base_kill_track.c
D src/mca/pcm/base/pcm_base_select.c
D src/mca/pcm/base/Makefile.am
D src/mca/pcm/base/pcm_base_open.c
D src/mca/pcm/rsh
D src/mca/pcm/rsh/pcm_rsh_allocate.c
D src/mca/pcm/rsh/pcm_rsh.h
D src/mca/pcm/rsh/configure.params
D src/mca/pcm/rsh/pcm_rsh_spawn.c
D src/mca/pcm/rsh/pcm_rsh_kill.c
D src/mca/pcm/rsh/Makefile.am
D src/mca/pcm/rsh/help-mca-pcm-rsh.txt
D src/mca/pcm/rsh/pcm_rsh_component.c
D src/mca/pcm/rsh/pcm_rsh_ioexecvp.c
D src/mca/pcm/wmi
D src/mca/pcm/wmi/configure.params
D src/mca/pcm/wmi/.ompi_ignore
D src/mca/pcm/wmi/src
D src/mca/pcm/wmi/src/pcm_wmi.h
D src/mca/pcm/wmi/src/Makefile.am
D src/mca/pcm/wmi/src/pcm_wmi.c
D src/mca/pcm/wmi/src/pcm_wmi_component.c
D src/mca/pcm/wmi/Makefile.am
D src/mca/pcm/wmi/configure.stub
M src/mca/oob/oob.h
M src/mca/oob/tcp/oob_tcp_send.c
M src/mca/oob/tcp/oob_tcp_addr.c
M src/mca/oob/tcp/oob_tcp_peer.c
M src/mca/oob/tcp/oob_tcp_msg.h
M src/mca/oob/tcp/oob_tcp_ping.c
M src/mca/oob/tcp/oob_tcp_addr.h
M src/mca/oob/tcp/oob_tcp_recv.c
M src/mca/oob/tcp/oob_tcp.c
M src/mca/oob/tcp/oob_tcp_peer.h
M src/mca/oob/tcp/oob_tcp_hdr.h
M src/mca/oob/tcp/oob_tcp.h
M src/mca/oob/tcp/oob_tcp_msg.c
A + src/mca/oob/oob_types.h
M src/mca/oob/base/base.h
M src/mca/oob/base/oob_base_barrier.c
M src/mca/oob/base/oob_base_send_nb.c
M src/mca/oob/base/oob_base_send.c
M src/mca/oob/base/oob_base_ping.c
M src/mca/oob/base/oob_base_recv_nb.c
M src/mca/oob/base/oob_base_recv.c
M src/mca/oob/base/oob_base_xcast.c
M src/mca/oob/base/oob_base_init.c
M src/mca/ns/replica/src/ns_replica.c
M src/mca/ns/replica/src/ns_replica_component.c
M src/mca/ns/replica/src/ns_replica.h
M src/mca/ns/proxy/src/ns_proxy.c
M src/mca/ns/proxy/src/ns_proxy_component.c
M src/mca/ns/proxy/src/ns_proxy.h
M src/mca/ns/ns.h
M src/mca/ns/Makefile.am
A + src/mca/ns/base/ns_base_nds.c
M src/mca/ns/base/base.h
M src/mca/ns/base/ns_base_close.c
A + src/mca/ns/base/ns_base_nds.h
A + src/mca/ns/base/ns_base_nds_env.c
M src/mca/ns/base/Makefile.am
M src/mca/ns/base/ns_base_select.c
M src/mca/ns/base/ns_base_local_fns.c
M src/mca/ns/base/ns_base_open.c
A + src/mca/ns/base/ns_base_nds_pipe.c
A + src/mca/ns/ns_types.h
D src/mca/one
D src/mca/one/one.h
D src/mca/one/Makefile.am
D src/mca/one/base
D src/mca/one/base/Makefile.am
A + src/mca/rmaps
A + src/mca/rmaps/round_robin
A + src/mca/rmaps/round_robin/configure.params
A + src/mca/rmaps/round_robin/rmaps_rr.c
A + src/mca/rmaps/round_robin/rmaps_rr_component.c
A + src/mca/rmaps/round_robin/Makefile.am
A + src/mca/rmaps/round_robin/rmaps_rr.h
A + src/mca/rmaps/rmaps.h
A + src/mca/rmaps/Makefile.am
A + src/mca/rmaps/base
A + src/mca/rmaps/base/rmaps_base_map.h
A + src/mca/rmaps/base/base.h
A + src/mca/rmaps/base/rmaps_base_close.c
A + src/mca/rmaps/base/Makefile.am
A + src/mca/rmaps/base/rmaps_base_map.c
A + src/mca/rmaps/base/rmaps_base_select.c
A + src/mca/rmaps/base/rmaps_base_open.c
A + src/mca/rmaps/rmaps_types.h
D src/mca/llm
D src/mca/llm/Makefile.am
D src/mca/llm/base
D src/mca/llm/base/base.h
D src/mca/llm/base/llm_base_open.c
D src/mca/llm/base/help-llm-base.txt
D src/mca/llm/base/llm_base_collapse.c
D src/mca/llm/base/llm_base_parse_hostfile_lex.h
D src/mca/llm/base/llm_base_close.c
D src/mca/llm/base/llm_base_parse_hostfile.c
D src/mca/llm/base/llm_base_parse_hostfile_lex.l
D src/mca/llm/base/Makefile.am
D src/mca/llm/base/llm_base_util.c
D src/mca/llm/base/base_internal.h
D src/mca/llm/base/llm_base_map.c
D src/mca/llm/base/llm_base_select.c
D src/mca/llm/llm.h
D src/mca/llm/hostfile
D src/mca/llm/hostfile/configure.params
D src/mca/llm/hostfile/VERSION
D src/mca/llm/hostfile/src
D src/mca/llm/hostfile/src/llm_hostfile_deallocate.c
D src/mca/llm/hostfile/src/llm_hostfile_component.c
D src/mca/llm/hostfile/src/llm_hostfile_allocate.c
D src/mca/llm/hostfile/src/llm_hostfile.h
D src/mca/llm/hostfile/src/Makefile.am
D src/mca/llm/hostfile/Makefile.am
D src/mca/llm/bjs
D src/mca/llm/bjs/configure.params
D src/mca/llm/bjs/llm_bjs.c
D src/mca/llm/bjs/VERSION
D src/mca/llm/bjs/llm_bjs_component.c
D src/mca/llm/bjs/llm_bjs.h
D src/mca/llm/bjs/Makefile.am
A + src/mca/ras
A + src/mca/ras/ras_types.h
A + src/mca/ras/tm
A + src/mca/ras/tm/configure.params
A + src/mca/ras/tm/VERSION
A + src/mca/ras/tm/src
A + src/mca/ras/tm/src/ras_tm_component.c
A + src/mca/ras/tm/src/Makefile.am
A + src/mca/ras/tm/src/ras_tm_module.c
A + src/mca/ras/tm/src/ras_tm.h
A + src/mca/ras/tm/Makefile.am
A + src/mca/ras/tm/configure.stub
A + src/mca/ras/Makefile.am
A + src/mca/ras/lsf_bproc
A + src/mca/ras/lsf_bproc/ras_lsf_bproc.c
A + src/mca/ras/lsf_bproc/ras_lsf_bproc_component.c
A + src/mca/ras/lsf_bproc/configure.params
A + src/mca/ras/lsf_bproc/ras_lsf_bproc.h
A + src/mca/ras/lsf_bproc/Makefile.am
A + src/mca/ras/lsf_bproc/configure.stub
A + src/mca/ras/base
A + src/mca/ras/base/ras_base_select.c
A + src/mca/ras/base/base.h
A + src/mca/ras/base/ras_base_open.c
A + src/mca/ras/base/ras_base_close.c
A + src/mca/ras/base/ras_base_node.c
A + src/mca/ras/base/Makefile.am
A + src/mca/ras/base/ras_base_node.h
A + src/mca/ras/base/ras_base_alloc.c
A + src/mca/ras/ras.h
A + src/mca/ras/host
A + src/mca/ras/host/ras_host.c
A + src/mca/ras/host/configure.params
A + src/mca/ras/host/ras_host_component.c
A + src/mca/ras/host/ras_host.h
A + src/mca/ras/host/Makefile.am
A + src/mca/ras/bjs
A + src/mca/ras/bjs/configure.params
A + src/mca/ras/bjs/ras_bjs.c
A + src/mca/ras/bjs/ras_bjs_component.c
A + src/mca/ras/bjs/ras_bjs.h
A + src/mca/ras/bjs/Makefile.am
A + src/mca/ras/bjs/configure.stub
M src/mca/mca.h
M src/mca/mpool/sm/mpool_sm_component.c
M src/mca/common/sm/common_sm_mmap.c
M src/mca/pml/base/pml_base_select.c
D src/mca/gpr/replica/gpr_replica_cleanup.c
D src/mca/gpr/replica/gpr_replica_recv_proxy_msgs.c
D src/mca/gpr/replica/gpr_replica_del_index.c
D src/mca/gpr/replica/gpr_replica_xmit_alerts.c
D src/mca/gpr/replica/gpr_replica_test_internals.c
A + src/mca/gpr/replica/transition_layer
A + src/mca/gpr/replica/transition_layer/gpr_replica_segment_tl.c
A + src/mca/gpr/replica/transition_layer/Makefile.am
A + src/mca/gpr/replica/transition_layer/gpr_replica_dict_tl.c
A + src/mca/gpr/replica/transition_layer/gpr_replica_tl.h
A + src/mca/gpr/replica/communications
A + src/mca/gpr/replica/communications/gpr_replica_recv_proxy_msgs.c
A + src/mca/gpr/replica/communications/gpr_replica_arithmetic_ops_cm.c
A + src/mca/gpr/replica/communications/gpr_replica_del_index_cm.c
A + src/mca/gpr/replica/communications/gpr_replica_subscribe_cm.c
A + src/mca/gpr/replica/communications/gpr_replica_comm.h
A + src/mca/gpr/replica/communications/Makefile.am
A + src/mca/gpr/replica/communications/gpr_replica_remote_msg.c
A + src/mca/gpr/replica/communications/gpr_replica_cmd_processor.c
A + src/mca/gpr/replica/communications/gpr_replica_dump_cm.c
A + src/mca/gpr/replica/communications/gpr_replica_cleanup_cm.c
A + src/mca/gpr/replica/communications/gpr_replica_put_get_cm.c
D src/mca/gpr/replica/gpr_replica_internals_segment_ops.c
R + src/mca/gpr/replica/gpr_replica_component.c
D src/mca/gpr/replica/gpr_replica_internals_trigger_ops.c
D src/mca/gpr/replica/gpr_replica_internals.h
D src/mca/gpr/replica/gpr_replica_dump.c
D src/mca/gpr/replica/gpr_replica_mode_ops.c
A + src/mca/gpr/replica/functional_layer
A + src/mca/gpr/replica/functional_layer/gpr_replica_dump_fn.c
A + src/mca/gpr/replica/functional_layer/gpr_replica_fn.h
A + src/mca/gpr/replica/functional_layer/gpr_replica_trig_ops_fn.c
A + src/mca/gpr/replica/functional_layer/gpr_replica_put_get_fn.c
A + src/mca/gpr/replica/functional_layer/gpr_replica_cleanup_fn.c
A + src/mca/gpr/replica/functional_layer/gpr_replica_arithmetic_ops_fn.c
A + src/mca/gpr/replica/functional_layer/gpr_replica_del_index_fn.c
A + src/mca/gpr/replica/functional_layer/gpr_replica_messaging_fn.c
A + src/mca/gpr/replica/functional_layer/Makefile.am
A + src/mca/gpr/replica/functional_layer/gpr_replica_subscribe_fn.c
A + src/mca/gpr/replica/functional_layer/gpr_replica_segment_fn.c
A + src/mca/gpr/replica/functional_layer/gpr_replica_dict_fn.c
D src/mca/gpr/replica/gpr_replica_put_get.c
D src/mca/gpr/replica/gpr_replica_compound_cmd.c
M src/mca/gpr/replica/configure.params
D src/mca/gpr/replica/gpr_replica_messaging.c
A + src/mca/gpr/replica/api_layer
A + src/mca/gpr/replica/api_layer/gpr_replica_subscribe_api.c
A + src/mca/gpr/replica/api_layer/gpr_replica_segment_ops_api.c
A + src/mca/gpr/replica/api_layer/gpr_replica_dump_api.c
A + src/mca/gpr/replica/api_layer/gpr_replica_api.h
A + src/mca/gpr/replica/api_layer/gpr_replica_compound_cmd_api.c
A + src/mca/gpr/replica/api_layer/gpr_replica_cleanup_api.c
A + src/mca/gpr/replica/api_layer/gpr_replica_put_get_api.c
A + src/mca/gpr/replica/api_layer/Makefile.am
A + src/mca/gpr/replica/api_layer/gpr_replica_arithmetic_ops_api.c
A + src/mca/gpr/replica/api_layer/gpr_replica_del_index_api.c
A + src/mca/gpr/replica/api_layer/gpr_replica_messaging_api.c
M src/mca/gpr/replica/Makefile.am
D src/mca/gpr/replica/gpr_replica_subscribe.c
D src/mca/gpr/replica/gpr_replica_internals_dict_ops.c
M src/mca/gpr/replica/gpr_replica.h
D src/mca/gpr/replica/gpr_replica_synchro.c
D src/mca/gpr/proxy/gpr_proxy_synchro.c
M src/mca/gpr/proxy/gpr_proxy.h
M src/mca/gpr/proxy/gpr_proxy_cleanup.c
M src/mca/gpr/proxy/gpr_proxy_del_index.c
D src/mca/gpr/proxy/gpr_proxy_xmit_alerts.c
M src/mca/gpr/proxy/gpr_proxy_internals.c
M src/mca/gpr/proxy/gpr_proxy_component.c
M src/mca/gpr/proxy/gpr_proxy_dump.c
D src/mca/gpr/proxy/gpr_proxy_mode_ops.c
M src/mca/gpr/proxy/gpr_proxy_put_get.c
M src/mca/gpr/proxy/gpr_proxy_compound_cmd.c
A + src/mca/gpr/proxy/gpr_proxy_arithmetic_ops.c
M src/mca/gpr/proxy/gpr_proxy_messaging.c
M src/mca/gpr/proxy/Makefile.am
A + src/mca/gpr/proxy/gpr_proxy_general_operations.c
M src/mca/gpr/proxy/gpr_proxy_subscribe.c
A + src/mca/gpr/gpr_types.h
D src/mca/gpr/base/gpr_base_pack_test_internals.c
D src/mca/gpr/base/gpr_base_unpack_del_index.c
D src/mca/gpr/base/gpr_base_unpack_test_internals.c
M src/mca/gpr/base/gpr_base_open.c
D src/mca/gpr/base/gpr_base_pack_mode_ops.c
D src/mca/gpr/base/gpr_base_pack_dump.c
D src/mca/gpr/base/gpr_base_pack_put_get.c
M src/mca/gpr/base/gpr_base_close.c
A + src/mca/gpr/base/unpack_api_response
A + src/mca/gpr/base/unpack_api_response/gpr_base_unpack_del_index.c
A + src/mca/gpr/base/unpack_api_response/gpr_base_dump_notify.c
A + src/mca/gpr/base/unpack_api_response/gpr_base_print_dump.c
A + src/mca/gpr/base/unpack_api_response/gpr_base_unpack_subscribe.c
A + src/mca/gpr/base/unpack_api_response/Makefile.am
A + src/mca/gpr/base/unpack_api_response/gpr_base_unpack_cleanup.c
A + src/mca/gpr/base/unpack_api_response/gpr_base_unpack_put_get.c
A + src/mca/gpr/base/unpack_api_response/gpr_base_unpack_arithmetic_ops.c
A + src/mca/gpr/base/unpack_api_response/gpr_base_decode_startup_msg.c
D src/mca/gpr/base/gpr_base_pack_startup_msg.c
D src/mca/gpr/base/gpr_base_unpack_mode_ops.c
A + src/mca/gpr/base/pack_api_cmd
A + src/mca/gpr/base/pack_api_cmd/gpr_base_pack_subscribe.c
A + src/mca/gpr/base/pack_api_cmd/gpr_base_pack_dump.c
A + src/mca/gpr/base/pack_api_cmd/gpr_base_pack_cleanup.c
A + src/mca/gpr/base/pack_api_cmd/gpr_base_pack_put_get.c
A + src/mca/gpr/base/pack_api_cmd/Makefile.am
A + src/mca/gpr/base/pack_api_cmd/gpr_base_pack_arithmetic_ops.c
A + src/mca/gpr/base/pack_api_cmd/gpr_base_pack_del_index.c
D src/mca/gpr/base/gpr_base_unpack_put_get.c
D src/mca/gpr/base/gpr_base_unpack_startup_msg.c
M src/mca/gpr/base/base.h
M src/mca/gpr/base/gpr_base_select.c
D src/mca/gpr/base/gpr_base_pack_subscribe.c
D src/mca/gpr/base/gpr_base_print_dump.c
D src/mca/gpr/base/gpr_base_unpack_subscribe.c
D src/mca/gpr/base/gpr_base_pack_synchro.c
D src/mca/gpr/base/gpr_base_pack_cleanup.c
M src/mca/gpr/base/Makefile.am
D src/mca/gpr/base/gpr_base_unpack_synchro.c
D src/mca/gpr/base/gpr_base_pack_del_index.c
M src/mca/gpr/gpr.h
A + src/mca/rds
A + src/mca/rds/rds_types.h
A + src/mca/rds/resfile
A + src/mca/rds/resfile/rds_resfile.c
A + src/mca/rds/resfile/configure.params
A + src/mca/rds/resfile/rds_resfile_component.c
A + src/mca/rds/resfile/rds_resfile.h
A + src/mca/rds/resfile/Makefile.am
A + src/mca/rds/resfile/configure.stub
A + src/mca/rds/Makefile.am
A + src/mca/rds/base
A + src/mca/rds/base/base.h
A + src/mca/rds/base/rds_base_select.c
A + src/mca/rds/base/rds_base_open.c
A + src/mca/rds/base/rds_base_close.c
A + src/mca/rds/base/rds_base_query.c
A + src/mca/rds/base/Makefile.am
A + src/mca/rds/hostfile
A + src/mca/rds/hostfile/rds_hostfile_lex.h
A + src/mca/rds/hostfile/configure.params
A + src/mca/rds/hostfile/rds_hostfile.c
A + src/mca/rds/hostfile/rds_hostfile_lex.l
A + src/mca/rds/hostfile/rds_hostfile_component.c
A + src/mca/rds/hostfile/Makefile.am
A + src/mca/rds/hostfile/rds_hostfile.h
A + src/mca/rds/rds.h
M src/mca/soh/soh.h
A + src/mca/soh/soh_types.h
M src/mca/soh/bproc
A + src/mca/soh/bproc/soh_bproc_control.c
A + src/mca/soh/bproc/soh_bproc_monitor.c
A + src/mca/soh/base/soh_base_get_proc_soh.c
M src/mca/soh/base/base.h
M src/mca/soh/base/soh_base_select.c
M src/mca/soh/base/soh_base_open.c
M src/mca/soh/base/soh_base_local_functions.c
M src/mca/soh/base/Makefile.am
M src/mca/soh/base/soh_base_close.c
A + src/mca/soh/base/soh_base_set_proc_soh.c
A + src/mca/rml
A + src/mca/rml/oob
A + src/mca/rml/oob/rml_oob.h
A + src/mca/rml/oob/configure.params
A + src/mca/rml/oob/Makefile.am
A + src/mca/rml/oob/rml_oob.c
A + src/mca/rml/oob/rml_oob_component.c
A + src/mca/rml/rml.h
A + src/mca/rml/rml_types.h
A + src/mca/rml/Makefile.am
A + src/mca/rml/base
A + src/mca/rml/base/base.h
A + src/mca/rml/base/rml_base_select.c
A + src/mca/rml/base/rml_base_open.c
A + src/mca/rml/base/Makefile.am
A + src/mca/rml/base/rml_base_close.c
D src/mca/svc
D src/mca/svc/svc.h
D src/mca/svc/Makefile.am
D src/mca/svc/base
D src/mca/svc/base/base.h
D src/mca/svc/base/svc_base_open.c
D src/mca/svc/base/svc_base_init.c
D src/mca/svc/base/Makefile.am
D src/mca/svc/base/svc_base_close.c
M src/mca/errmgr/errmgr.h
A + src/mca/errmgr/base/errmgr_base_fns.c
M src/mca/errmgr/base/base.h
M src/mca/errmgr/base/errmgr_base_select.c
M src/mca/errmgr/base/Makefile.am
M src/mca/errmgr/base/errmgr_base_open.c
M src/mca/errmgr/base/errmgr_base_close.c
A + src/mca/pls
A + src/mca/pls/tm
A + src/mca/pls/tm/configure.params
A + src/mca/pls/tm/VERSION
A + src/mca/pls/tm/src
A + src/mca/pls/tm/src/pls_tm_component.c
A + src/mca/pls/tm/src/pls_tm_module.c
A + src/mca/pls/tm/src/pls_tm.h
A + src/mca/pls/tm/src/pls_tm_registry.c
A + src/mca/pls/tm/src/Makefile.am
A + src/mca/pls/tm/Makefile.am
A + src/mca/pls/tm/configure.stub
A + src/mca/pls/fork
A + src/mca/pls/fork/pls_fork_component.c
A + src/mca/pls/fork/configure.params
A + src/mca/pls/fork/VERSION
A + src/mca/pls/fork/pls_fork.h
A + src/mca/pls/fork/pls_fork_module.c
A + src/mca/pls/fork/Makefile.am
A + src/mca/pls/proxy
A + src/mca/pls/proxy/pls_proxy.c
A + src/mca/pls/proxy/pls_proxy_component.c
A + src/mca/pls/proxy/configure.params
A + src/mca/pls/proxy/pls_proxy.h
A + src/mca/pls/proxy/VERSION
A + src/mca/pls/proxy/Makefile.am
A + src/mca/pls/slurm
A + src/mca/pls/slurm/pls_slurm_component.c
A + src/mca/pls/slurm/configure.params
A + src/mca/pls/slurm/.ompi_ignore
A + src/mca/pls/slurm/VERSION
A + src/mca/pls/slurm/pls_slurm.h
A + src/mca/pls/slurm/pls_slurm_module.c
A + src/mca/pls/slurm/.ompi_unignore
A + src/mca/pls/slurm/Makefile.am
A + src/mca/pls/poe
A + src/mca/pls/poe/configure.params
A + src/mca/pls/poe/pls_poe_component.c
A + src/mca/pls/poe/VERSION
A + src/mca/pls/poe/.ompi_ignore
A + src/mca/pls/poe/pls_poe_module.c
A + src/mca/pls/poe/pls_poe.h
A + src/mca/pls/poe/.ompi_unignore
A + src/mca/pls/poe/Makefile.am
A + src/mca/pls/daemon
A + src/mca/pls/daemon/configure.params
A + src/mca/pls/daemon/pls_daemon_component.c
A + src/mca/pls/daemon/.ompi_ignore
A + src/mca/pls/daemon/VERSION
A + src/mca/pls/daemon/pls_daemon.h
A + src/mca/pls/daemon/pls_daemon_module.c
A + src/mca/pls/daemon/.ompi_unignore
A + src/mca/pls/daemon/Makefile.am
A + src/mca/pls/pls.h
A + src/mca/pls/bproc_seed
A + src/mca/pls/bproc_seed/configure.params
A + src/mca/pls/bproc_seed/pls_bproc_seed.c
A + src/mca/pls/bproc_seed/pls_bproc_seed_component.c
A + src/mca/pls/bproc_seed/pls_bproc_seed.h
A + src/mca/pls/bproc_seed/Makefile.am
A + src/mca/pls/bproc_seed/configure.stub
A + src/mca/pls/bproc_seed/pls_bproc_seed_config.h
A + src/mca/pls/bproc_proxy
A + src/mca/pls/bproc_proxy/pls_bproc_proxy_config.h
A + src/mca/pls/bproc_proxy/configure.params
A + src/mca/pls/bproc_proxy/pls_bproc_proxy.c
A + src/mca/pls/bproc_proxy/pls_bproc_proxy_component.c
A + src/mca/pls/bproc_proxy/Makefile.am
A + src/mca/pls/bproc_proxy/pls_bproc_proxy.h
A + src/mca/pls/bproc_proxy/configure.stub
A + src/mca/pls/Makefile.am
A + src/mca/pls/base
A + src/mca/pls/base/base.h
A + src/mca/pls/base/pls_base_select.c
A + src/mca/pls/base/Makefile.am
A + src/mca/pls/base/pls_base_state.c
A + src/mca/pls/base/pls_base_open.c
A + src/mca/pls/base/pls_base_close.c
A + src/mca/pls/rsh
A + src/mca/pls/rsh/pls_rsh_module.c
A + src/mca/pls/rsh/pls_rsh.h
A + src/mca/pls/rsh/configure.params
A + src/mca/pls/rsh/VERSION
A + src/mca/pls/rsh/Makefile.am
A + src/mca/pls/rsh/pls_rsh_component.c
M src/mca/ptl/sm/src/ptl_sm.c
M src/mca/ptl/sm/src/ptl_sm_component.c
M src/mca/ptl/gm/src/ptl_gm.c
M src/mca/ptl/gm/src/ptl_gm_proc.h
M src/mca/ptl/tcp/src/ptl_tcp_peer.c
M src/mca/ptl/tcp/src/ptl_tcp_component.c
M src/mca/ptl/tcp/src/ptl_tcp_proc.c
M src/mca/ptl/tcp/src/ptl_tcp_proc.h
M src/mca/ptl/base/ptl_base_select.c
M src/mca/io/base/io_base_component_list.c
A + src/mca/rmgr
A + src/mca/rmgr/rmgr_types.h
A + src/mca/rmgr/urm
A + src/mca/rmgr/urm/rmgr_urm.h
A + src/mca/rmgr/urm/configure.params
A + src/mca/rmgr/urm/Makefile.am
A + src/mca/rmgr/urm/rmgr_urm.c
A + src/mca/rmgr/urm/rmgr_urm_component.c
A + src/mca/rmgr/Makefile.am
A + src/mca/rmgr/base
A + src/mca/rmgr/base/base.h
A + src/mca/rmgr/base/rmgr_base_select.c
A + src/mca/rmgr/base/rmgr_base_stubs.c
A + src/mca/rmgr/base/rmgr_base_open.c
A + src/mca/rmgr/base/rmgr_base_stage_gate.c
A + src/mca/rmgr/base/rmgr_base_context.c
A + src/mca/rmgr/base/rmgr_base_close.c
A + src/mca/rmgr/base/Makefile.am
A + src/mca/rmgr/rmgr.h
M src/mca/Makefile.am
M src/mca/base/mca_base_module_exchange.c
M src/mca/base/mca_base_param.c
M src/mca/base/mca_base_param_internal.h
M src/mca/base/base.h
M src/mca/base/mca_base_param.h
M src/mca/iof
M src/mca/iof/proxy
M src/mca/iof/proxy/iof_proxy.c
M src/mca/iof/proxy/iof_proxy_svc.h
M src/mca/iof/proxy/iof_proxy_component.c
M src/mca/iof/proxy/iof_proxy.h
M src/mca/iof/proxy/iof_proxy_svc.c
M src/mca/iof/iof.h
M src/mca/iof/base
M src/mca/iof/base/base.h
M src/mca/iof/base/iof_base_fragment.h
M src/mca/iof/base/iof_base_header.h
M src/mca/iof/base/iof_base_select.c
M src/mca/iof/base/iof_base_endpoint.c
M src/mca/iof/base/iof_base_open.c
M src/mca/iof/base/iof_base_flush.c
M src/mca/iof/base/iof_base_fragment.c
M src/mca/iof/base/iof_base_close.c
M src/mca/iof/base/iof_base_endpoint.h
M src/mca/iof/svc
M src/mca/iof/svc/iof_svc_proxy.h
M src/mca/iof/svc/iof_svc_publish.c
M src/mca/iof/svc/iof_svc_publish.h
M src/mca/iof/svc/iof_svc_subscript.c
M src/mca/iof/svc/iof_svc.c
M src/mca/iof/svc/iof_svc_proxy.c
M src/mca/iof/svc/iof_svc_component.c
M src/mca/iof/svc/iof_svc_subscript.h
M src/mca/iof/svc/iof_svc.h
D src/mca/op
D src/mca/op/op.h
D src/mca/op/base
D src/mca/pcmclient
D src/mca/pcmclient/seed
D src/mca/pcmclient/seed/pcmclient_seed.c
D src/mca/pcmclient/seed/pcmclient_seed_component.c
D src/mca/pcmclient/seed/configure.params
D src/mca/pcmclient/seed/pcmclient_seed.h
D src/mca/pcmclient/seed/VERSION
D src/mca/pcmclient/seed/Makefile.am
D src/mca/pcmclient/rms
D src/mca/pcmclient/rms/pcmclient_rms.c
D src/mca/pcmclient/rms/pcmclient_rms_component.c
D src/mca/pcmclient/rms/configure.params
D src/mca/pcmclient/rms/pcmclient_rms.h
D src/mca/pcmclient/rms/VERSION
D src/mca/pcmclient/rms/Makefile.am
D src/mca/pcmclient/singleton
D src/mca/pcmclient/singleton/pcmclient_singleton.c
D src/mca/pcmclient/singleton/configure.params
D src/mca/pcmclient/singleton/pcmclient_singleton_component.c
D src/mca/pcmclient/singleton/VERSION
D src/mca/pcmclient/singleton/pcmclient_singleton.h
D src/mca/pcmclient/singleton/Makefile.am
D src/mca/pcmclient/slurm
D src/mca/pcmclient/slurm/pcmclient_slurm.c
D src/mca/pcmclient/slurm/configure.params
D src/mca/pcmclient/slurm/pcmclient_slurm_component.c
D src/mca/pcmclient/slurm/VERSION
D src/mca/pcmclient/slurm/pcmclient_slurm.h
D src/mca/pcmclient/slurm/Makefile.am
D src/mca/pcmclient/pcmclient.h
D src/mca/pcmclient/bproc
D src/mca/pcmclient/bproc/configure.params
D src/mca/pcmclient/bproc/pcmclient_bproc.c
D src/mca/pcmclient/bproc/VERSION
D src/mca/pcmclient/bproc/pcmclient_bproc_component.c
D src/mca/pcmclient/bproc/Makefile.am
D src/mca/pcmclient/bproc/pcmclient_bproc.h
D src/mca/pcmclient/env
D src/mca/pcmclient/env/configure.params
D src/mca/pcmclient/env/VERSION
D src/mca/pcmclient/env/pcmclient_env.c
D src/mca/pcmclient/env/pcmclient_env_component.c
D src/mca/pcmclient/env/Makefile.am
D src/mca/pcmclient/env/pcmclient_env.h
D src/mca/pcmclient/Makefile.am
D src/mca/pcmclient/base
D src/mca/pcmclient/base/base.h
D src/mca/pcmclient/base/pcmclient_base_select.c
D src/mca/pcmclient/base/Makefile.am
D src/mca/pcmclient/base/pcmclient_base_open.c
D src/mca/pcmclient/base/pcmclient_base_close.c
M src/tools/ompi_info/ompi_info.cc
M src/tools/ompi_info/components.cc
? src/tools/console/ompiconsole
M src/tools/console
D src/tools/console/ompiconsole.c
M src/tools/console/Makefile.am
A + src/tools/console/orteconsole.c
D src/tools/bootproxy
D src/tools/bootproxy/bootproxy.c
D src/tools/bootproxy/help-bootproxy.txt
D src/tools/bootproxy/Makefile.am
M src/tools/openmpi/openmpi.c
D src/tools/ompid
D src/tools/ompid/ompid.c
D src/tools/ompid/Makefile.am
D src/tools/ompid/base
D src/tools/ompid/base/base.h
D src/tools/ompid/ompid.cc
D src/tools/ompid/ompid.h
M src/tools/Makefile.am
D src/tools/mpirun
D src/tools/mpirun/Makefile.am
D src/tools/mpirun/mpiboot
D src/tools/mpirun/mpirun.c
D src/tools/mpirun/help-mpirun.txt
A + src/tools/orted
A + src/tools/orted/orted.h
A + src/tools/orted/orted_bootproxy.c
A + src/tools/orted/Makefile.am
A + src/tools/orted/orted.c
A + src/tools/orterun
A + src/tools/orterun/orterun.c
A + src/tools/orterun/help-orterun.txt
A + src/tools/orterun/Makefile.am
M src/communicator/comm_publish.c
M src/communicator/comm_dyn.c
M src/communicator/communicator.h
M src/communicator/comm_cid.c
M src/communicator/comm.c
M src/attribute/attribute.h
M src/attribute/attribute_predefined.c
M src/proc/proc.c
M src/proc/proc.h
M src/class/ompi_proc_table.c
M src/class/ompi_list.c
A + src/class/orte_value_array.c
M src/class/ompi_proc_table.h
M src/class/ompi_list.h
A + src/class/orte_pointer_array.c
A + src/class/orte_value_array.h
A + src/class/orte_pointer_array.h
M src/class/Makefile.am
M src/Makefile.am
M src/util/argv.c
M src/util/output.c
A + src/util/univ_info.h
M src/util/proc_info.c
A + src/util/environ.c
M src/util/session_dir.c
M src/util/proc_info.h
A + src/util/environ.h
M src/util/session_dir.h
M src/util/daemon_init.c
M src/util/sys_info.c
M src/util/daemon_init.h
M src/util/os_path.c
M src/util/sys_info.h
M src/util/os_path.h
M src/util/universe_setup_file_io.c
M src/util/cmd_line.c
D src/util/bufpack.c
M src/util/universe_setup_file_io.h
M src/util/os_create_dirpath.c
M src/util/cmd_line.h
D src/util/bufpack.h
M src/util/os_create_dirpath.h
M src/util/stacktrace.c
M src/util/Makefile.am
M src/util/stacktrace.h
A + src/util/univ_info.c
M configure.ac
? config/compile
M config
M config/ompi_mca.m4
A + etc/lanl_resources.xml
M autogen.sh

View File

@ -860,7 +860,6 @@ MCA_soh_NO_CONFIGURE_SUBDIRS=""
MCA_allocator_NO_CONFIGURE_SUBDIRS=""
MCA_coll_NO_CONFIGURE_SUBDIRS=""
MCA_io_NO_CONFIGURE_SUBDIRS=""
MCA_one_NO_CONFIGURE_SUBDIRS=""
MCA_pml_NO_CONFIGURE_SUBDIRS=""
MCA_ptl_NO_CONFIGURE_SUBDIRS=""
MCA_topo_NO_CONFIGURE_SUBDIRS=""

View File

@ -65,7 +65,7 @@ fi
# The list of MCA types (it's fixed)
AC_MSG_CHECKING([for MCA types])
found_types="common allocator coll errmgr gpr io iof llm mpool ns one oob op pcm pcmclient pml ptl soh svc topo"
found_types="common allocator coll errmgr gpr io iof mpool ns oob pls pml ptl ras rds rmaps rmgr rml soh topo"
AC_MSG_RESULT([$found_types])
# Get the list of all the non-configure MCA components that were found by
@ -322,22 +322,17 @@ AC_SUBST(MCA_common_STATIC_SUBDIRS)
AC_SUBST(MCA_common_DSO_SUBDIRS)
AC_SUBST(MCA_common_STATIC_LTLIBS)
# OMPI types
# ORTE types
AC_SUBST(MCA_oob_ALL_SUBDIRS)
AC_SUBST(MCA_oob_STATIC_SUBDIRS)
AC_SUBST(MCA_oob_DSO_SUBDIRS)
AC_SUBST(MCA_oob_STATIC_LTLIBS)
AC_SUBST(MCA_pcm_ALL_SUBDIRS)
AC_SUBST(MCA_pcm_STATIC_SUBDIRS)
AC_SUBST(MCA_pcm_DSO_SUBDIRS)
AC_SUBST(MCA_pcm_STATIC_LTLIBS)
AC_SUBST(MCA_pcmclient_ALL_SUBDIRS)
AC_SUBST(MCA_pcmclient_STATIC_SUBDIRS)
AC_SUBST(MCA_pcmclient_DSO_SUBDIRS)
AC_SUBST(MCA_pcmclient_STATIC_LTLIBS)
AC_SUBST(MCA_errmgr_ALL_SUBDIRS)
AC_SUBST(MCA_errmgr_STATIC_SUBDIRS)
AC_SUBST(MCA_errmgr_DSO_SUBDIRS)
AC_SUBST(MCA_errmgr_STATIC_LTLIBS)
AC_SUBST(MCA_errmgr_ALL_SUBDIRS)
AC_SUBST(MCA_errmgr_STATIC_SUBDIRS)
@ -349,16 +344,36 @@ AC_SUBST(MCA_gpr_STATIC_SUBDIRS)
AC_SUBST(MCA_gpr_DSO_SUBDIRS)
AC_SUBST(MCA_gpr_STATIC_LTLIBS)
AC_SUBST(MCA_llm_ALL_SUBDIRS)
AC_SUBST(MCA_llm_STATIC_SUBDIRS)
AC_SUBST(MCA_llm_DSO_SUBDIRS)
AC_SUBST(MCA_llm_STATIC_LTLIBS)
AC_SUBST(MCA_ns_ALL_SUBDIRS)
AC_SUBST(MCA_ns_STATIC_SUBDIRS)
AC_SUBST(MCA_ns_DSO_SUBDIRS)
AC_SUBST(MCA_ns_STATIC_LTLIBS)
AC_SUBST(MCA_ras_ALL_SUBDIRS)
AC_SUBST(MCA_ras_STATIC_SUBDIRS)
AC_SUBST(MCA_ras_DSO_SUBDIRS)
AC_SUBST(MCA_ras_STATIC_LTLIBS)
AC_SUBST(MCA_rds_ALL_SUBDIRS)
AC_SUBST(MCA_rds_STATIC_SUBDIRS)
AC_SUBST(MCA_rds_DSO_SUBDIRS)
AC_SUBST(MCA_rds_STATIC_LTLIBS)
AC_SUBST(MCA_rmaps_ALL_SUBDIRS)
AC_SUBST(MCA_rmaps_STATIC_SUBDIRS)
AC_SUBST(MCA_rmaps_DSO_SUBDIRS)
AC_SUBST(MCA_rmaps_STATIC_LTLIBS)
AC_SUBST(MCA_rmgr_ALL_SUBDIRS)
AC_SUBST(MCA_rmgr_STATIC_SUBDIRS)
AC_SUBST(MCA_rmgr_DSO_SUBDIRS)
AC_SUBST(MCA_rmgr_STATIC_LTLIBS)
AC_SUBST(MCA_pls_ALL_SUBDIRS)
AC_SUBST(MCA_pls_STATIC_SUBDIRS)
AC_SUBST(MCA_pls_DSO_SUBDIRS)
AC_SUBST(MCA_pls_STATIC_LTLIBS)
# MPI types
AC_SUBST(MCA_allocator_ALL_SUBDIRS)
@ -386,11 +401,6 @@ AC_SUBST(MCA_mpool_STATIC_SUBDIRS)
AC_SUBST(MCA_mpool_DSO_SUBDIRS)
AC_SUBST(MCA_mpool_STATIC_LTLIBS)
AC_SUBST(MCA_one_ALL_SUBDIRS)
AC_SUBST(MCA_one_STATIC_SUBDIRS)
AC_SUBST(MCA_one_DSO_SUBDIRS)
AC_SUBST(MCA_one_STATIC_LTLIBS)
AC_SUBST(MCA_pml_ALL_SUBDIRS)
AC_SUBST(MCA_pml_STATIC_SUBDIRS)
AC_SUBST(MCA_pml_DSO_SUBDIRS)
@ -401,6 +411,11 @@ AC_SUBST(MCA_ptl_STATIC_SUBDIRS)
AC_SUBST(MCA_ptl_DSO_SUBDIRS)
AC_SUBST(MCA_ptl_STATIC_LTLIBS)
AC_SUBST(MCA_rml_ALL_SUBDIRS)
AC_SUBST(MCA_rml_STATIC_SUBDIRS)
AC_SUBST(MCA_rml_DSO_SUBDIRS)
AC_SUBST(MCA_rml_STATIC_LTLIBS)
AC_SUBST(MCA_soh_ALL_SUBDIRS)
AC_SUBST(MCA_soh_STATIC_SUBDIRS)
AC_SUBST(MCA_soh_DSO_SUBDIRS)

View File

@ -937,8 +937,8 @@ AC_DEFINE_UNQUOTED(OMPI_RANGE_F90_COMPLEX32, $OMPI_RANGE_F90_COMPLEX32,
ompi_show_title "Header file tests"
AC_CHECK_HEADERS([alloca.h aio.h arpa/inet.h dirent.h dlfcn.h execinfo.h \
fcntl.h inttypes.h libgen.h net/if.h netdb.h netinet/in.h netinet/tcp.h \
sys/stat.h poll.h pthread.h pwd.h sched.h stdint.h string.h strings.h stropts.h \
fcntl.h sys/fcntl.h inttypes.h libgen.h net/if.h netdb.h netinet/in.h netinet/tcp.h \
sys/stat.h poll.h pthread.h pwd.h sched.h stdint.h string.hstrings.h stropts.h \
sys/types.h sys/ipc.h sys/mman.h sys/resource.h sys/select.h sys/socket.h \
sys/ioctl.h err.h sys/statvfs.h sys/time.h sys/uio.h sys/utsname.h sys/wait.h \
syslog.h termios.h ulimit.h unistd.h sys/param.h sys/tree.h sys/queue.h])
@ -1038,6 +1038,8 @@ AC_DEFINE_UNQUOTED(OMPI_HAVE_UNDERSCORE_VA_COPY, $OMPI_HAVE_UNDERSCORE_VA_COPY,
AC_CHECK_DECLS(__func__)
AC_CHECK_LIB([m], [ceil])
##################################
# System-specific tests
@ -1498,6 +1500,7 @@ AC_CONFIG_FILES([
src/include/sys/win32/Makefile
src/class/Makefile
src/dps/Makefile
src/runtime/Makefile
src/threads/Makefile
src/util/Makefile
@ -1523,65 +1526,70 @@ AC_CONFIG_FILES([
src/mca/base/Makefile
src/mca/common/Makefile
src/mca/errmgr/Makefile
src/mca/errmgr/base/Makefile
src/mca/iof/Makefile
src/mca/iof/base/Makefile
src/mca/gpr/Makefile
src/mca/gpr/base/Makefile
src/mca/gpr/base/pack_api_cmd/Makefile
src/mca/gpr/base/unpack_api_response/Makefile
src/mca/ns/Makefile
src/mca/ns/base/Makefile
src/mca/oob/Makefile
src/mca/oob/base/Makefile
src/mca/pcm/Makefile
src/mca/pcm/base/Makefile
src/mca/pcmclient/Makefile
src/mca/pcmclient/base/Makefile
src/mca/llm/Makefile
src/mca/llm/base/Makefile
src/mca/pls/Makefile
src/mca/pls/base/Makefile
src/mca/ras/Makefile
src/mca/ras/base/Makefile
src/mca/rds/Makefile
src/mca/rds/base/Makefile
src/mca/rmaps/Makefile
src/mca/rmaps/base/Makefile
src/mca/rmgr/Makefile
src/mca/rmgr/base/Makefile
src/mca/soh/Makefile
src/mca/soh/base/Makefile
src/mca/svc/Makefile
src/mca/svc/base/Makefile
src/mca/allocator/Makefile
src/mca/allocator/base/Makefile
src/mca/coll/Makefile
src/mca/coll/base/Makefile
src/mca/errmgr/Makefile
src/mca/errmgr/base/Makefile
src/mca/gpr/Makefile
src/mca/gpr/base/Makefile
src/mca/io/Makefile
src/mca/io/base/Makefile
src/mca/iof/Makefile
src/mca/iof/base/Makefile
src/mca/mpool/Makefile
src/mca/mpool/base/Makefile
src/mca/one/Makefile
src/mca/one/base/Makefile
src/mca/pml/Makefile
src/mca/pml/base/Makefile
src/mca/ptl/Makefile
src/mca/ptl/base/Makefile
src/mca/rml/Makefile
src/mca/rml/base/Makefile
src/mca/topo/Makefile
src/mca/topo/base/Makefile
src/mca/ns/Makefile
src/mca/ns/base/Makefile
src/dynamic-mca/common/Makefile
src/dynamic-mca/errmgr/Makefile
src/dynamic-mca/iof/Makefile
src/dynamic-mca/gpr/Makefile
src/dynamic-mca/ns/Makefile
src/dynamic-mca/oob/Makefile
src/dynamic-mca/pcm/Makefile
src/dynamic-mca/pcmclient/Makefile
src/dynamic-mca/llm/Makefile
src/dynamic-mca/pls/Makefile
src/dynamic-mca/ras/Makefile
src/dynamic-mca/rds/Makefile
src/dynamic-mca/rmaps/Makefile
src/dynamic-mca/rmgr/Makefile
src/dynamic-mca/soh/Makefile
src/dynamic-mca/svc/Makefile
src/dynamic-mca/Makefile
src/dynamic-mca/allocator/Makefile
src/dynamic-mca/coll/Makefile
src/dynamic-mca/errmgr/Makefile
src/dynamic-mca/gpr/Makefile
src/dynamic-mca/io/Makefile
src/dynamic-mca/iof/Makefile
src/dynamic-mca/mpool/Makefile
src/dynamic-mca/one/Makefile
src/dynamic-mca/ns/Makefile
src/dynamic-mca/pml/Makefile
src/dynamic-mca/ptl/Makefile
src/dynamic-mca/rml/Makefile
src/dynamic-mca/topo/Makefile
src/mpi/Makefile
@ -1597,14 +1605,24 @@ AC_CONFIG_FILES([
src/mpi/runtime/Makefile
src/tools/Makefile
src/tools/bootproxy/Makefile
src/tools/console/Makefile
src/tools/mpirun/Makefile
src/tools/ompi_info/Makefile
src/tools/ompid/Makefile
src/tools/orted/Makefile
src/tools/orterun/Makefile
src/tools/openmpi/Makefile
src/tools/wrappers/Makefile
src/asm/test/Makefile
test/support/Makefile
test/util/Makefile
test/class/Makefile
test/include/Makefile
test/rte/Makefile
test/dps/Makefile
test/mca/gpr/Makefile
test/mca/ns/Makefile
test/mca/rds/Makefile
test/runtime/Makefile
])
AC_OUTPUT

496
etc/lanl_resources.xml Normal file
View File

@ -0,0 +1,496 @@
<?xml version="1.0" encoding="UTF-8"?>
<site-resources>
<site-name>lanl</site-name>
<resource>
<name>pink</name>
<type>cluster</type>
<front-end>
<name>pfe1.lanl.gov</name>
<tmp-dir>/net/scratch1</tmp-dir>
</front-end>
<front-end>pfe2.lanl.gov</front-end>
<compute-domains>
<num-domains>1</num-domains>
<nodes-per-domain>1024</nodes-per-domain>
</compute-domains>
<os>
<type>linux</type>
<vendor>Red Hat</vendor>
<version>9.0</version>
</os>
<filesystem>
<type>panasys</type>
<home-root>/users</home-root>
<scratch>
<root>/net/scratch1</root>
<filesystem-size>15.0</filesystem-size> <!--given in terabytes-->
</scratch>
<scratch>
<root>/net/scratch2</root>
<filesystem-size>15.0</filesystem-size>
</scratch>
<give-root>/net/scratch1/givedir</give-root>
</filesystem>
<allocator>lsf</allocator>
<launcher>bproc</launcher>
<node-arch>
<cpus-per-node>2</cpus-per-node>
<cpu-type>xeon</cpu-type>
<cpu-vendor>intel</cpu-vendor>
<cpu-speed>2400</cpu-speed> <!--given in MHz-->
<interconnect>
<type>myrinet</type>
</interconnect>
<memory-per-node>1.0</memory-per-node> <!--given in gigabytes-->
</node-arch>
</resource>
<resource>
<name>lightning</name>
<type>cluster</type>
<front-end>
<name>ll-1.lanl.gov</name>
<tmp-dir>/net/scratch1</tmp-dir>
</front-end>
<front-end>
<name>ll-2.lanl.gov</name>
<tmp-dir>/net/scratch1</tmp-dir>
</front-end>
<front-end>
<name>ll-3.lanl.gov</name>
<tmp-dir>/net/scratch1</tmp-dir>
</front-end>
<front-end>
<name>ll-4.lanl.gov</name>
<tmp-dir>/net/scratch1</tmp-dir>
</front-end>
<front-end>
<name>ll-5.lanl.gov</name>
<tmp-dir>/net/scratch1</tmp-dir>
</front-end>
<front-end>
<name>ll-6.lanl.gov</name>
<tmp-dir>/net/scratch1</tmp-dir>
</front-end>
<os>
<type>linux</type>
<vendor>Red Hat</vendor>
<version>9.0</version>
</os>
<compute-domains>
<num-domains>6</num-domains>
<nodes-per-domain>256</nodes-per-domain>
</compute-domains>
<filesystem>
<type>panasys</type>
<home-root>/users</home-root>
<scratch>
<root>/net/scratch1</root>
<filesystem-size>15.0</filesystem-size> <!--given in terabytes-->
</scratch>
<scratch>
<root>/net/scratch2</root>
<filesystem-size>15.0</filesystem-size>
</scratch>
<give-root>/net/scratch1/givedir</give-root>
</filesystem>
<allocator>lsf</allocator>
<launcher>bproc</launcher>
<node-arch>
<cpus-per-node>2</cpus-per-node>>
<cpu-type>opteron</cpu-type>
<cpu-vendor>amd</cpu-vendor>
<cpu-speed>2000</cpu-speed>
<interconnect>
<type>myrinet</type>
</interconnect>
<memory-per-node>2.0</memory-per-node> <!--given in gigabytes-->
</node-arch>
</resource>
<resource>
<name>flash</name>
<type>cluster</type>
<front-end>
<name>ffe1.lanl.gov</name>
<tmp-dir>/net/scratch1</tmp-dir>
</front-end>
<front-end><name>ffe2.lanl.gov</name>
<tmp-dir>/net/scratch1</tmp-dir>
</front-end>
<os>
<type>linux</type>
<vendor>Red Hat</vendor>
<version>9.0</version>
</os>
<filesystem>
<type>panasys</type>
<home-root>/users</home-root>
<scratch>
<root>/net/scratch1</root>
<filesystem-size>15.0</filesystem-size> <!--given in terabytes-->
</scratch>
<scratch>
<root>/net/scratch2</root>
<filesystem-size>15.0</filesystem-size>
</scratch>
</filesystem>
<allocator>lsf</allocator>
<launcher>bproc</launcher>
<arch>
<num-nodes>510</num-nodes>
<cpus-per-node>2</cpus-per-node>
<memory-per-node>4.0</memory-per-node>
<interconnect>
<type>myrinet</type>
</interconnect>
<cpu-speed>2000</cpu-speed>
<cpu-type>opteron</cpu-type>
<cpu-vendor>amd</cpu-vendor>
</arch>
<compute-domains>
<num-domains>1</num-domains>
<nodes-per-domain>510</nodes-per-domain>
</compute-domains>
</resource>
<resource>
<name>QA</name>
<type>cluster</type>
<front-end>
<name>qafe.lanl.gov</name>
</front-end>
<allocator>lsf</allocator>
<launcher>rms</launcher>
<arch>
<num-nodes>1024</num-nodes>
<cpus-per-node>4</cpus-per-node>
<memory-per-node>8.0</memory-per-node>
<cache>16.0</cache> <!--given in megabytes-->
<interconnect>
<type>quadrics</type>
<num-rails>2</num-rails>
<sw>qsnet</sw>
</interconnect>
<cpu-speed>1250</cpu-speed>
<cpu-type>alpha-ev68</cpu-type>
<cpu-vendor>compaq</cpu-vendor>
</arch>
<filesystem>
<type>trucluster</type>
<fs-domains>32</fs-domains>
<nodes-per-domain>32</nodes-per-domain>
<home-root>/users</home-root>
<scratch>
<root>/scratch1</root>
</scratch>
<scratch>
<root>/scratch2</root>
</scratch>
<give-root>/givedir</give-root>
</filesystem>
<os>
<type>tru64</type>
</os>
</resource>
<resource>
<name>QB</name>
<type>cluster</type>
<front-end>
<name>qbfe.lanl.gov</name>
</front-end>
<allocator>lsf</allocator>
<launcher>rms</launcher>
<arch>
<num-nodes>1024</num-nodes>
<cpus-per-node>4</cpus-per-node>
<memory-per-node>8.0</memory-per-node>
<cache>16.0</cache> <!--given in megabytes-->
<interconnect>
<type>quadrics</type>
<num-rails>2</num-rails>
<sw>qsnet</sw>
</interconnect>
<cpu-speed>1250</cpu-speed>
<cpu-type>alpha-ev68</cpu-type>
<cpu-vendor>compaq</cpu-vendor>
</arch>
<filesystem>
<type>trucluster</type>
<fs-domains>32</fs-domains>
<nodes-per-domain>32</nodes-per-domain>
<home-root>/users</home-root>
<scratch>
<root>/scratch1</root>
</scratch>
<scratch>
<root>/scratch2</root>
</scratch>
<give-root>/givedir</give-root>
</filesystem>
<os>
<type>tru64</type>
</os>
</resource>
<resource>
<name>CA</name>
<type>cluster</type>
<front-end>
<name>cfe1.lanl.gov</name>
<tmp-dir>/scratch1</tmp-dir>
</front-end>
<allocator>lsf</allocator>
<launcher>lsf</launcher>
<arch>
<num-nodes>120</num-nodes>
<cpus-per-node>4</cpus-per-node>
<memory-per-node>4.0</memory-per-node>
<cache>16.0</cache> <!--given in megabytes-->
<interconnect>
<type>quadrics</type>
<num-rails>1</num-rails>
<sw>qsnet</sw>
</interconnect>
<cpu-speed>1250</cpu-speed>
<cpu-type>alpha-ev68</cpu-type>
<cpu-vendor>compaq</cpu-vendor>
</arch>
<filesystem>
<type>trucluster</type>
<fs-domains>4</fs-domains>
<nodes-per-domain>30</nodes-per-domain>
<home-root>/users</home-root>
<scratch>
<root>/scratch1</root>
</scratch>
<give-root>/givedir</give-root>
</filesystem>
<os>
<type>tru64</type>
</os>
</resource>
<resource>
<name>CB</name>
<type>cluster</type>
<front-end>
<name>cfe1.lanl.gov</name>
<tmp-dir>/scratch1</tmp-dir>
</front-end>
<allocator>lsf</allocator>
<launcher>lsf</launcher>
<arch>
<num-nodes>120</num-nodes>
<cpus-per-node>4</cpus-per-node>
<memory-per-node>4.0</memory-per-node>
<cache>16.0</cache> <!--given in megabytes-->
<interconnect>
<type>quadrics</type>
<num-rails>1</num-rails>
<sw>qsnet</sw>
</interconnect>
<cpu-speed>1250</cpu-speed>
<cpu-type>alpha-ev68</cpu-type>
<cpu-vendor>compaq</cpu-vendor>
</arch>
<filesystem>
<type>trucluster</type>
<fs-domains>4</fs-domains>
<nodes-per-domain>30</nodes-per-domain>
<home-root>/users</home-root>
<scratch>
<root>/scratch1</root>
</scratch>
<give-root>/givedir</give-root>
</filesystem>
<os>
<type>tru64</type>
</os>
</resource>
<resource>
<name>CC</name>
<type>cluster</type>
<front-end>
<name>cfe1.lanl.gov</name>
<tmp-dir>/scratch1</tmp-dir>
</front-end>
<allocator>lsf</allocator>
<launcher>lsf</launcher>
<arch>
<num-nodes>120</num-nodes>
<cpus-per-node>4</cpus-per-node>
<memory-per-node>4.0</memory-per-node>
<cache>16.0</cache> <!--given in megabytes-->
<interconnect>
<type>quadrics</type>
<num-rails>1</num-rails>
<sw>qsnet</sw>
</interconnect>
<cpu-speed>1250</cpu-speed>
<cpu-type>alpha-ev68</cpu-type>
<cpu-vendor>compaq</cpu-vendor>
</arch>
<filesystem>
<type>trucluster</type>
<fs-domains>4</fs-domains>
<nodes-per-domain>30</nodes-per-domain>
<home-root>/users</home-root>
<scratch>
<root>/scratch1</root>
</scratch>
<give-root>/givedir</give-root>
</filesystem>
<os>
<type>tru64</type>
</os>
</resource>
<resource>
<name>lambda</name>
<type>cluster</type>
<front-end>
<name>lambda.lanl.gov</name>
<tmp-dir>/scratch</tmp-dir>
</front-end>
<allocator>lsf</allocator>
<launcher>bproc</launcher>
<arch>
<num-nodes>164</num-nodes>
<cpus-per-node>2</cpus-per-node>
<memory-per-node>1.0</memory-per-node>
<interconnect>
<type>gige</type>
<sw>tcp-ip</sw>
</interconnect>
<cpu-speed>1000</cpu-speed>
<cpu-type>pentium-3</cpu-type>
<cpu-vendor>intel</cpu-vendor>
</arch>
<filesystem>
<home-root>/users</home-root>
<scratch>
<root>/scratch</root>
</scratch>
<give-root>/scratch/tmp</give-root>
</filesystem>
<os>
<type>linux</type>
<vendor>Red Hat</vendor>
</os>
</resource>
<resource>
<name>QSC</name>
<type>cluster</type>
<front-end>
<name>qscfe1.lanl.gov</name>
</front-end>
<allocator>lsf</allocator>
<launcher>lsf</launcher>
<os>
<type>tru64</type>
</os>
<arch>
<num-nodes>256</num-nodes>
<cpus-per-node>4</cpus-per-node>
<memory-per-node>16.0</memory-per-node>
<interconnect>
<type>quadrics</type>
</interconnect>
<cpu-speed>1250</cpu-speed>
<cpu-type>alpha-ev6</cpu-type>
<cpu-vendor>compaq</cpu-vendor>
</arch>
<filesystem>
<home-root>/users</home-root>
<scratch>
<root>/scratch1</root>
<filesystem-size>12.0</filesystem-size>
</scratch>
<scratch>
<root>/scratch2</root>
<filesystem-size>12.0</filesystem-size>
</scratch>
<give-root>/givedir</give-root>
</filesystem>
</resource>
<resource>
<name>CX</name>
<type>cluster</type>
<front-end>
<name>cxfe.lanl.gov</name>
<tmp-dir>/scratch1</tmp-dir>
</front-end>
<allocator>lsf</allocator>
<launcher>lsf</launcher>
<arch>
<num-nodes>32</num-nodes>
<cpus-per-node>4</cpus-per-node>
<memory-per-node>4.0</memory-per-node>
<node-arch>
<name>cx0</name>
<memory-per-node>16.0</memory-per-node>
</node-arch>
<node-arch>
<name>cx1</name>
<memory-per-node>16.0</memory-per-node>
</node-arch>
<interconnect>
<type>quadrics</type>
<num-rails>1</num-rails>
<sw>qsnet</sw>
</interconnect>
<cpu-speed>1250</cpu-speed>
<cpu-type>alpha-ev68</cpu-type>
<cpu-vendor>compaq</cpu-vendor>
</arch>
<filesystem>
<type>trucluster</type>
<fs-domains>1</fs-domains>
<nodes-per-domain>32</nodes-per-domain>
<home-root>/users</home-root>
<scratch>
<root>/scratch</root>
</scratch>
<give-root>/givedir</give-root>
</filesystem>
<os>
<type>tru64</type>
</os>
</resource>
<resource>
<name>mauve</name>
<type>smp</type>
<front-end>
<name>mauve.lanl.gov</name>
<tmp-dir>/scratch</tmp-dir>
</front-end>
<allocator>lsf</allocator>
<launcher>lsf</launcher>
<arch>
<num-nodes>256</num-nodes>
<cpus-per-node>1</cpus-per-node>
<shared-memory>1000</shared-memory>
<cpu-speed>1300</cpu-speed>
<cpu-type>itanium-2</cpu-type>
<cpu-vendor>intel</cpu-vendor>
</arch>
<filesystem>
<home-root>/users</home-root>
<scratch>
<root>/scratch</root>
<filesystem-size>50.0</filesystem-size>
</scratch>
</filesystem>
<os>
<type>altix</type>
</os>
</resource>
</site-resources>

View File

@ -1,15 +1,24 @@
/*
/* -*- c -*-
*
* Copyright (c) 2004-2005 The Trustees of Indiana University.
* All rights reserved.
* Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
* All rights reserved.
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
* University of Stuttgart. All rights reserved.
* $COPYRIGHT$
*
*
* Additional copyrights may follow
*
*
* $HEADER$
*
* Function: - OS, CPU and compiler dependent configuration
*/
/* Nothing to see here; move along... */
#ifndef ORTE_CONFIG_H_
#define ORTE_CONFIG_H_
#include "ompi_config.h"
#define ORTE_DECLSPEC OMPI_DECLSPEC
#endif

View File

@ -109,6 +109,7 @@ SUBDIRS = \
attribute \
communicator \
datatype \
dps \
errhandler \
event \
file \
@ -139,6 +140,7 @@ libmpi_la_LIBADD = \
class/liblfc.la \
communicator/libcommunicator.la \
datatype/libdatatype.la \
dps/libdps.la \
errhandler/liberrhandler.la \
event/libevent.la \
file/libfile.la \
@ -148,23 +150,29 @@ libmpi_la_LIBADD = \
mca/allocator/base/libmca_allocator_base.la $(MCA_allocator_STATIC_LTLIBS) \
mca/coll/base/libmca_coll_base.la $(MCA_coll_STATIC_LTLIBS) \
$(MCA_common_STATIC_LTLIBS) \
mca/errmgr/base/libmca_errmgr_base.la \
mca/gpr/base/pack_api_cmd/libmca_gpr_base_pack.la \
mca/gpr/base/unpack_api_response/libmca_gpr_base_unpack.la \
mca/gpr/base/libmca_gpr_base.la $(MCA_gpr_STATIC_LTLIBS) \
mca/io/base/libmca_io_base.la $(MCA_io_STATIC_LTLIBS) \
mca/iof/base/libmca_iof_base.la $(MCA_iof_STATIC_LTLIBS) \
mca/llm/base/libmca_llm_base.la $(MCA_llm_STATIC_LTLIBS) \
mca/mpool/base/libmca_mpool_base.la $(MCA_mpool_STATIC_LTLIBS) \
mca/ns/base/libmca_ns_base.la $(MCA_ns_STATIC_LTLIBS) \
mca/oob/base/libmca_oob_base.la $(MCA_oob_STATIC_LTLIBS) \
mca/pcm/base/libmca_pcm_base.la $(MCA_pcm_STATIC_LTLIBS) \
mca/pcmclient/base/libmca_pcmclient_base.la $(MCA_pcmclient_STATIC_LTLIBS) \
mca/pls/base/libmca_p