From 0af7ac53f2a04068b2d6caa48ca6de5981808f57 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Mon, 28 Jul 2008 22:40:57 +0000 Subject: [PATCH] Fixes trac:1392, #1400 * add "register" function to mca_base_component_t * converted coll:basic and paffinity:linux and paffinity:solaris to use this function * we'll convert the rest over time (I'll file a ticket once all this is committed) * add 32 bytes of "reserved" space to the end of mca_base_component_t and mca_base_component_data_2_0_0_t to make future upgrades [slightly] easier * new mca_base_component_t size: 196 bytes * new mca_base_component_data_2_0_0_t size: 36 bytes * MCA base version bumped to v2.0 * '''We now refuse to load components that are not MCA v2.0.x''' * all MCA frameworks versions bumped to v2.0 * be a little more explicit about version numbers in the MCA base * add big comment in mca.h about versioning philosophy This commit was SVN r19073. The following Trac tickets were found above: Ticket 1392 --> https://svn.open-mpi.org/trac/ompi/ticket/1392 --- ompi/communicator/comm.c | 6 +- ompi/include/ompi/memchecker.h | 2 +- ompi/mca/allocator/allocator.h | 16 +- ompi/mca/allocator/basic/allocator_basic.c | 8 +- ompi/mca/allocator/bucket/allocator_bucket.c | 8 +- ompi/mca/bml/bml.h | 18 +- ompi/mca/bml/r2/bml_r2.h | 2 +- ompi/mca/bml/r2/bml_r2_component.c | 9 +- ompi/mca/btl/btl.h | 27 +-- ompi/mca/btl/elan/btl_elan.h | 2 +- ompi/mca/btl/elan/btl_elan_component.c | 8 +- ompi/mca/btl/gm/btl_gm.h | 2 +- ompi/mca/btl/gm/btl_gm_component.c | 8 +- ompi/mca/btl/mx/btl_mx.h | 2 +- ompi/mca/btl/mx/btl_mx_component.c | 8 +- ompi/mca/btl/ofud/btl_ofud.h | 2 +- ompi/mca/btl/ofud/btl_ofud_component.c | 6 +- ompi/mca/btl/openib/btl_openib.h | 2 +- ompi/mca/btl/openib/btl_openib_component.c | 8 +- ompi/mca/btl/portals/btl_portals.h | 2 +- ompi/mca/btl/portals/btl_portals_component.c | 8 +- ompi/mca/btl/sctp/btl_sctp.h | 2 +- ompi/mca/btl/sctp/btl_sctp_component.c | 9 +- ompi/mca/btl/self/btl_self.h | 2 +- ompi/mca/btl/self/btl_self_component.c | 7 +- ompi/mca/btl/sm/btl_sm.h | 2 +- ompi/mca/btl/sm/btl_sm_component.c | 7 +- ompi/mca/btl/tcp/btl_tcp.h | 2 +- ompi/mca/btl/tcp/btl_tcp_component.c | 8 +- ompi/mca/btl/template/btl_template.h | 3 +- .../mca/btl/template/btl_template_component.c | 8 +- ompi/mca/btl/udapl/btl_udapl.h | 2 +- ompi/mca/btl/udapl/btl_udapl_component.c | 7 +- ompi/mca/coll/base/coll_base_comm_select.c | 35 ++-- ompi/mca/coll/base/coll_base_find_available.c | 15 +- ompi/mca/coll/base/coll_base_open.c | 2 +- ompi/mca/coll/basic/coll_basic.h | 83 ++++---- ompi/mca/coll/basic/coll_basic_allgather.c | 4 +- ompi/mca/coll/basic/coll_basic_allgatherv.c | 4 +- ompi/mca/coll/basic/coll_basic_allreduce.c | 4 +- ompi/mca/coll/basic/coll_basic_alltoall.c | 4 +- ompi/mca/coll/basic/coll_basic_alltoallv.c | 4 +- ompi/mca/coll/basic/coll_basic_alltoallw.c | 4 +- ompi/mca/coll/basic/coll_basic_barrier.c | 6 +- ompi/mca/coll/basic/coll_basic_bcast.c | 8 +- ompi/mca/coll/basic/coll_basic_component.c | 25 +-- ompi/mca/coll/basic/coll_basic_exscan.c | 4 +- ompi/mca/coll/basic/coll_basic_gather.c | 4 +- ompi/mca/coll/basic/coll_basic_gatherv.c | 4 +- ompi/mca/coll/basic/coll_basic_module.c | 4 +- ompi/mca/coll/basic/coll_basic_reduce.c | 8 +- .../coll/basic/coll_basic_reduce_scatter.c | 4 +- ompi/mca/coll/basic/coll_basic_scan.c | 2 +- ompi/mca/coll/basic/coll_basic_scatter.c | 4 +- ompi/mca/coll/basic/coll_basic_scatterv.c | 4 +- ompi/mca/coll/coll.h | 105 +++++----- ompi/mca/coll/demo/coll_demo.h | 73 +++---- ompi/mca/coll/demo/coll_demo_allgather.c | 4 +- ompi/mca/coll/demo/coll_demo_allgatherv.c | 4 +- ompi/mca/coll/demo/coll_demo_allreduce.c | 4 +- ompi/mca/coll/demo/coll_demo_alltoall.c | 4 +- ompi/mca/coll/demo/coll_demo_alltoallv.c | 4 +- ompi/mca/coll/demo/coll_demo_alltoallw.c | 4 +- ompi/mca/coll/demo/coll_demo_barrier.c | 4 +- ompi/mca/coll/demo/coll_demo_bcast.c | 4 +- ompi/mca/coll/demo/coll_demo_component.c | 15 +- ompi/mca/coll/demo/coll_demo_exscan.c | 2 +- ompi/mca/coll/demo/coll_demo_gather.c | 4 +- ompi/mca/coll/demo/coll_demo_gatherv.c | 4 +- ompi/mca/coll/demo/coll_demo_module.c | 4 +- ompi/mca/coll/demo/coll_demo_reduce.c | 4 +- ompi/mca/coll/demo/coll_demo_reduce_scatter.c | 4 +- ompi/mca/coll/demo/coll_demo_scan.c | 2 +- ompi/mca/coll/demo/coll_demo_scatter.c | 4 +- ompi/mca/coll/demo/coll_demo_scatterv.c | 4 +- ompi/mca/coll/hierarch/coll_hierarch.c | 4 +- ompi/mca/coll/hierarch/coll_hierarch.h | 39 ++-- .../coll/hierarch/coll_hierarch_allreduce.c | 2 +- .../mca/coll/hierarch/coll_hierarch_barrier.c | 2 +- ompi/mca/coll/hierarch/coll_hierarch_bcast.c | 2 +- .../coll/hierarch/coll_hierarch_component.c | 15 +- ompi/mca/coll/hierarch/coll_hierarch_reduce.c | 2 +- ompi/mca/coll/inter/coll_inter.c | 4 +- ompi/mca/coll/inter/coll_inter.h | 27 +-- ompi/mca/coll/inter/coll_inter_allgather.c | 2 +- ompi/mca/coll/inter/coll_inter_allgatherv.c | 2 +- ompi/mca/coll/inter/coll_inter_allreduce.c | 2 +- ompi/mca/coll/inter/coll_inter_bcast.c | 2 +- ompi/mca/coll/inter/coll_inter_component.c | 19 +- ompi/mca/coll/inter/coll_inter_gather.c | 2 +- ompi/mca/coll/inter/coll_inter_gatherv.c | 2 +- ompi/mca/coll/inter/coll_inter_reduce.c | 2 +- ompi/mca/coll/inter/coll_inter_scatter.c | 2 +- ompi/mca/coll/inter/coll_inter_scatterv.c | 2 +- ompi/mca/coll/self/coll_self.h | 41 ++-- ompi/mca/coll/self/coll_self_allgather.c | 2 +- ompi/mca/coll/self/coll_self_allgatherv.c | 2 +- ompi/mca/coll/self/coll_self_allreduce.c | 2 +- ompi/mca/coll/self/coll_self_alltoall.c | 2 +- ompi/mca/coll/self/coll_self_alltoallv.c | 2 +- ompi/mca/coll/self/coll_self_alltoallw.c | 2 +- ompi/mca/coll/self/coll_self_barrier.c | 2 +- ompi/mca/coll/self/coll_self_bcast.c | 2 +- ompi/mca/coll/self/coll_self_component.c | 15 +- ompi/mca/coll/self/coll_self_exscan.c | 2 +- ompi/mca/coll/self/coll_self_gather.c | 2 +- ompi/mca/coll/self/coll_self_gatherv.c | 2 +- ompi/mca/coll/self/coll_self_module.c | 4 +- ompi/mca/coll/self/coll_self_reduce.c | 2 +- ompi/mca/coll/self/coll_self_reduce_scatter.c | 2 +- ompi/mca/coll/self/coll_self_scan.c | 2 +- ompi/mca/coll/self/coll_self_scatter.c | 2 +- ompi/mca/coll/self/coll_self_scatterv.c | 2 +- ompi/mca/coll/sm/coll_sm.h | 45 ++--- ompi/mca/coll/sm/coll_sm_allgather.c | 2 +- ompi/mca/coll/sm/coll_sm_allgatherv.c | 2 +- ompi/mca/coll/sm/coll_sm_allreduce.c | 2 +- ompi/mca/coll/sm/coll_sm_alltoall.c | 2 +- ompi/mca/coll/sm/coll_sm_alltoallv.c | 2 +- ompi/mca/coll/sm/coll_sm_alltoallw.c | 2 +- ompi/mca/coll/sm/coll_sm_barrier.c | 2 +- ompi/mca/coll/sm/coll_sm_bcast.c | 2 +- ompi/mca/coll/sm/coll_sm_component.c | 15 +- ompi/mca/coll/sm/coll_sm_exscan.c | 2 +- ompi/mca/coll/sm/coll_sm_gather.c | 2 +- ompi/mca/coll/sm/coll_sm_gatherv.c | 2 +- ompi/mca/coll/sm/coll_sm_module.c | 6 +- ompi/mca/coll/sm/coll_sm_reduce.c | 10 +- ompi/mca/coll/sm/coll_sm_reduce_scatter.c | 2 +- ompi/mca/coll/sm/coll_sm_scan.c | 2 +- ompi/mca/coll/sm/coll_sm_scatter.c | 2 +- ompi/mca/coll/sm/coll_sm_scatterv.c | 2 +- ompi/mca/coll/sm2/coll_sm2.h | 31 +-- ompi/mca/coll/sm2/coll_sm2_allreduce.c | 12 +- ompi/mca/coll/sm2/coll_sm2_barrier.c | 10 +- ompi/mca/coll/sm2/coll_sm2_bcast.c | 4 +- ompi/mca/coll/sm2/coll_sm2_component.c | 11 +- ompi/mca/coll/sm2/coll_sm2_module.c | 12 +- ompi/mca/coll/sm2/coll_sm2_reduce.c | 6 +- ompi/mca/coll/tuned/coll_tuned.h | 39 ++-- ompi/mca/coll/tuned/coll_tuned_allgather.c | 16 +- ompi/mca/coll/tuned/coll_tuned_allgatherv.c | 14 +- ompi/mca/coll/tuned/coll_tuned_allreduce.c | 14 +- ompi/mca/coll/tuned/coll_tuned_alltoall.c | 14 +- ompi/mca/coll/tuned/coll_tuned_alltoallv.c | 8 +- ompi/mca/coll/tuned/coll_tuned_barrier.c | 16 +- ompi/mca/coll/tuned/coll_tuned_bcast.c | 18 +- ompi/mca/coll/tuned/coll_tuned_component.c | 14 +- .../coll/tuned/coll_tuned_decision_dynamic.c | 22 +-- .../coll/tuned/coll_tuned_decision_fixed.c | 22 +-- ompi/mca/coll/tuned/coll_tuned_gather.c | 10 +- ompi/mca/coll/tuned/coll_tuned_module.c | 6 +- ompi/mca/coll/tuned/coll_tuned_reduce.c | 18 +- .../coll/tuned/coll_tuned_reduce_scatter.c | 10 +- ompi/mca/coll/tuned/coll_tuned_scatter.c | 8 +- .../portals/common_portals_cray_xt_modex.c | 6 +- ompi/mca/common/portals/common_portals_utcp.c | 6 +- ompi/mca/crcp/base/crcp_base_select.c | 9 +- ompi/mca/crcp/coord/crcp_coord_component.c | 5 +- ompi/mca/crcp/crcp.h | 22 +-- ompi/mca/dpm/dpm.h | 22 +-- ompi/mca/dpm/orte/dpm_orte_component.c | 7 +- ompi/mca/io/base/base.h | 3 +- ompi/mca/io/base/io_base_delete.c | 12 +- ompi/mca/io/base/io_base_file_select.c | 10 +- ompi/mca/io/base/io_base_find_available.c | 4 +- ompi/mca/io/base/io_base_register_datarep.c | 4 +- ompi/mca/io/base/io_base_request.c | 4 +- ompi/mca/io/io.h | 18 +- ompi/mca/io/romio/src/io_romio.h | 4 +- ompi/mca/io/romio/src/io_romio_component.c | 9 +- ompi/mca/mpool/mpool.h | 18 +- ompi/mca/mpool/rdma/mpool_rdma_component.c | 8 +- ompi/mca/mpool/sm/mpool_sm_component.c | 8 +- ompi/mca/mtl/mtl.h | 18 +- ompi/mca/mtl/mx/mtl_mx_component.c | 8 +- ompi/mca/mtl/mx/mtl_mx_types.h | 2 +- ompi/mca/mtl/portals/mtl_portals.h | 2 +- ompi/mca/mtl/portals/mtl_portals_component.c | 10 +- ompi/mca/mtl/psm/mtl_psm_component.c | 8 +- ompi/mca/mtl/psm/mtl_psm_types.h | 2 +- ompi/mca/osc/osc.h | 18 +- ompi/mca/osc/pt2pt/osc_pt2pt_component.c | 2 +- ompi/mca/osc/rdma/osc_rdma_component.c | 2 +- ompi/mca/pml/base/pml_base_select.c | 6 +- ompi/mca/pml/cm/pml_cm.h | 2 +- ompi/mca/pml/cm/pml_cm_component.c | 10 +- ompi/mca/pml/cm/pml_cm_component.h | 2 +- ompi/mca/pml/crcpw/pml_crcpw_component.c | 8 +- ompi/mca/pml/dr/pml_dr_component.c | 10 +- ompi/mca/pml/dr/pml_dr_component.h | 2 +- ompi/mca/pml/example/pml_example_component.c | 10 +- ompi/mca/pml/ob1/pml_ob1_component.c | 10 +- ompi/mca/pml/ob1/pml_ob1_component.h | 2 +- ompi/mca/pml/pml.h | 18 +- ompi/mca/pml/v/mca/vprotocol/base/base.h | 14 +- .../example/vprotocol_example_component.c | 13 +- .../vprotocol/pessimist/vprotocol_pessimist.h | 2 +- .../pessimist/vprotocol_pessimist_component.c | 13 +- ompi/mca/pml/v/mca/vprotocol/vprotocol.h | 8 +- ompi/mca/pml/v/pml_v.h | 2 +- ompi/mca/pml/v/pml_v_component.c | 8 +- ompi/mca/pubsub/orte/pubsub_orte_component.c | 7 +- ompi/mca/pubsub/pubsub.h | 22 +-- ompi/mca/rcache/rb/rcache_rb_component.c | 9 +- ompi/mca/rcache/rcache.h | 18 +- ompi/mca/rcache/vma/rcache_vma_component.c | 9 +- ompi/mca/topo/base/base.h | 5 +- ompi/mca/topo/base/topo_base_comm_select.c | 3 +- ompi/mca/topo/base/topo_base_find_available.c | 2 +- ompi/mca/topo/topo.h | 20 +- ompi/mca/topo/unity/topo_unity.h | 2 +- ompi/mca/topo/unity/topo_unity_component.c | 5 +- ompi/runtime/ompi_cr.c | 6 +- ompi/runtime/ompi_module_exchange.h | 7 +- opal/mca/backtrace/backtrace.h | 19 +- .../darwin/backtrace_darwin_component.c | 8 +- .../execinfo/backtrace_execinfo_component.c | 8 +- .../backtrace/none/backtrace_none_component.c | 10 +- .../backtrace_printstack_component.c | 8 +- opal/mca/base/mca_base_component_find.c | 42 ++-- opal/mca/base/mca_base_components_open.c | 42 +++- .../mca/carto/auto_detect/carto_auto_detect.h | 2 +- .../auto_detect/carto_auto_detect_component.c | 10 +- opal/mca/carto/base/base.h | 2 +- opal/mca/carto/base/carto_base_select.c | 4 +- opal/mca/carto/carto.h | 23 +-- opal/mca/carto/file/carto_file.h | 2 +- opal/mca/carto/file/carto_file_component.c | 9 +- opal/mca/crs/blcr/crs_blcr_component.c | 5 +- opal/mca/crs/crs.h | 22 +-- opal/mca/crs/none/crs_none_component.c | 5 +- opal/mca/crs/self/crs_self_component.c | 5 +- .../config/opal_installdirs_config.c | 10 +- .../installdirs/env/opal_installdirs_env.c | 10 +- opal/mca/installdirs/installdirs.h | 19 +- .../windows/opal_installdirs_windows.c | 10 +- opal/mca/maffinity/base/base.h | 2 +- .../maffinity/base/maffinity_base_select.c | 4 +- .../maffinity/first_use/maffinity_first_use.h | 2 +- .../first_use/maffinity_first_use_component.c | 12 +- .../mca/maffinity/libnuma/maffinity_libnuma.h | 2 +- .../libnuma/maffinity_libnuma_component.c | 12 +- opal/mca/maffinity/maffinity.h | 21 +- opal/mca/mca.h | 180 +++++++++++++++--- opal/mca/memchecker/base/base.h | 2 +- .../memchecker/base/memchecker_base_select.c | 4 +- opal/mca/memchecker/memchecker.h | 23 +-- .../memchecker/valgrind/memchecker_valgrind.h | 2 +- .../valgrind/memchecker_valgrind_component.c | 10 +- opal/mca/memcpy/memcpy.h | 19 +- opal/mca/memory/base/memory_base_open.c | 4 +- .../memory/mallopt/memory_mallopt_component.c | 8 +- opal/mca/memory/memory.h | 21 +- .../ptmalloc2/opal_ptmalloc2_component.c | 8 +- opal/mca/paffinity/base/base.h | 2 +- .../paffinity/base/paffinity_base_select.c | 4 +- opal/mca/paffinity/linux/paffinity_linux.h | 2 +- .../linux/paffinity_linux_component.c | 20 +- opal/mca/paffinity/paffinity.h | 23 +-- opal/mca/paffinity/posix/paffinity_posix.h | 2 +- .../posix/paffinity_posix_component.c | 4 +- .../mca/paffinity/solaris/paffinity_solaris.h | 2 +- .../solaris/paffinity_solaris_component.c | 21 +- .../mca/paffinity/windows/paffinity_windows.h | 2 +- .../windows/paffinity_windows_component.c | 10 +- opal/mca/timer/aix/timer_aix_component.c | 8 +- opal/mca/timer/altix/timer_altix_component.c | 10 +- .../catamount/timer_catamount_component.c | 8 +- .../mca/timer/darwin/timer_darwin_component.c | 8 +- opal/mca/timer/linux/timer_linux_component.c | 8 +- .../timer/solaris/timer_solaris_component.c | 8 +- opal/mca/timer/timer.h | 19 +- .../timer/windows/timer_windows_component.c | 8 +- .../timer/windows/timer_windows_component.h | 2 +- .../errmgr/default/errmgr_default_component.c | 2 +- orte/mca/errmgr/errmgr.h | 26 ++- orte/mca/ess/alps/ess_alps_component.c | 5 +- orte/mca/ess/bproc/ess_bproc_component.c | 6 +- orte/mca/ess/cnos/ess_cnos_component.c | 5 +- orte/mca/ess/env/ess_env_component.c | 5 +- orte/mca/ess/ess.h | 18 +- orte/mca/ess/hnp/ess_hnp_component.c | 5 +- orte/mca/ess/lsf/ess_lsf_component.c | 5 +- .../portals_utcp/ess_portals_utcp_component.c | 5 +- .../ess/singleton/ess_singleton_component.c | 5 +- orte/mca/ess/slurm/ess_slurm_component.c | 5 +- orte/mca/ess/tool/ess_tool_component.c | 5 +- orte/mca/filem/base/filem_base_select.c | 8 +- orte/mca/filem/filem.h | 22 +-- orte/mca/filem/rsh/filem_rsh_component.c | 4 +- orte/mca/grpcomm/grpcomm.h | 6 +- orte/mca/iof/iof.h | 18 +- orte/mca/iof/null/iof_null_component.c | 7 +- orte/mca/iof/proxy/iof_proxy_component.c | 7 +- orte/mca/iof/svc/iof_svc_component.c | 7 +- orte/mca/odls/bproc/odls_bproc_component.c | 5 +- .../mca/odls/default/odls_default_component.c | 9 +- orte/mca/odls/odls.h | 22 +-- .../mca/odls/process/odls_process_component.c | 9 +- orte/mca/oob/oob.h | 18 +- orte/mca/oob/tcp/oob_tcp.c | 2 +- orte/mca/oob/tcp/oob_tcp.h | 2 +- orte/mca/plm/alps/plm_alps_component.c | 10 +- orte/mca/plm/bproc/plm_bproc_component.c | 2 +- orte/mca/plm/bproc/smr_bproc_component.c | 13 +- orte/mca/plm/ccp/plm_ccp_component.c | 6 +- orte/mca/plm/lsf/plm_lsf_component.c | 6 +- orte/mca/plm/plm.h | 20 +- orte/mca/plm/process/plm_process_component.c | 10 +- orte/mca/plm/rsh/plm_rsh_component.c | 10 +- orte/mca/plm/slurm/plm_slurm_component.c | 10 +- orte/mca/plm/submit/pls_submit_component.c | 10 +- orte/mca/plm/tm/plm_tm_component.c | 8 +- orte/mca/plm/tmd/plm_tmd_component.c | 6 +- orte/mca/plm/xgrid/src/plm_xgrid_component.m | 10 +- orte/mca/ras/alps/ras_alps_component.c | 6 - orte/mca/ras/bjs/ras_bjs_component.c | 6 - orte/mca/ras/ccp/ras_ccp_component.c | 7 - .../ras/gridengine/ras_gridengine_component.c | 5 - .../loadleveler/ras_loadleveler_component.c | 7 - orte/mca/ras/lsf/ras_lsf_component.c | 11 +- orte/mca/ras/ras.h | 12 +- orte/mca/ras/slurm/ras_slurm_component.c | 7 - orte/mca/ras/tm/ras_tm_component.c | 7 - .../rank_file/rmaps_rank_file_component.c | 6 +- orte/mca/rmaps/rmaps.h | 18 +- .../rmaps/round_robin/rmaps_rr_component.c | 6 +- orte/mca/rmaps/seq/rmaps_seq_component.c | 7 +- orte/mca/rmaps/topo/rmaps_topo_component.c | 6 +- orte/mca/rml/ftrm/rml_ftrm_component.c | 6 +- orte/mca/rml/oob/rml_oob_component.c | 7 +- orte/mca/rml/rml.h | 16 +- .../binomial/routed_binomial_component.c | 7 +- .../routed/direct/routed_direct_component.c | 7 +- .../routed/linear/routed_linear_component.c | 7 +- orte/mca/routed/routed.h | 16 +- orte/mca/snapc/base/snapc_base_select.c | 4 +- orte/mca/snapc/full/snapc_full_component.c | 4 +- orte/mca/snapc/snapc.h | 22 +-- 340 files changed, 1391 insertions(+), 1841 deletions(-) diff --git a/ompi/communicator/comm.c b/ompi/communicator/comm.c index 9a49a4c633..087742b7dc 100644 --- a/ompi/communicator/comm.c +++ b/ompi/communicator/comm.c @@ -64,13 +64,13 @@ static int ompi_comm_fill_rest (ompi_communicator_t *comm, typedef int ompi_comm_allgatherfct (void* inbuf, int incount, MPI_Datatype intype, void* outbuf, int outcount, MPI_Datatype outtype, ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *data); + mca_coll_base_module_t *data); static int ompi_comm_allgather_emulate_intra (void* inbuf, int incount, MPI_Datatype intype, void* outbuf, int outcount, MPI_Datatype outtype, ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *data); + mca_coll_base_module_t *data); static int ompi_comm_copy_topo (ompi_communicator_t *oldcomm, ompi_communicator_t *newcomm); @@ -887,7 +887,7 @@ static int ompi_comm_allgather_emulate_intra( void *inbuf, int incount, MPI_Datatype intype, void* outbuf, int outcount, MPI_Datatype outtype, ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *data) + mca_coll_base_module_t *data) { int rank, size, rsize, i, rc; int *tmpbuf=NULL; diff --git a/ompi/include/ompi/memchecker.h b/ompi/include/ompi/memchecker.h index 723dea3610..d591c0591b 100644 --- a/ompi/include/ompi/memchecker.h +++ b/ompi/include/ompi/memchecker.h @@ -235,7 +235,7 @@ static inline int memchecker_comm(MPI_Comm comm) opal_memchecker_base_isdefined (&comm->c_coll.coll_scatter, sizeof(mca_coll_base_module_scatter_fn_t)); opal_memchecker_base_isdefined (&comm->c_coll.coll_scatterv, sizeof(mca_coll_base_module_scatterv_fn_t)); - opal_memchecker_base_isdefined (&comm->c_coll_selected_component, sizeof(const mca_coll_base_component_1_0_0_t *)); + opal_memchecker_base_isdefined (&comm->c_coll_selected_component, sizeof(const mca_coll_base_component_2_0_0_t *)); opal_memchecker_base_isdefined (&comm->c_coll_selected_module, sizeof(const mca_coll_base_module_1_0_0_t *)); /* Somehow, this often shows up in petsc with comm_dup'ed communicators*/ /* opal_memchecker_base_isdefined (&comm->c_coll_selected_data, sizeof(struct mca_coll_base_comm_t *)); */ diff --git a/ompi/mca/allocator/allocator.h b/ompi/mca/allocator/allocator.h index 806e208970..4508e5f37e 100644 --- a/ompi/mca/allocator/allocator.h +++ b/ompi/mca/allocator/allocator.h @@ -132,10 +132,10 @@ typedef struct mca_allocator_base_module_t* * The data structure provided by each component to the framework which * describes the component. */ -struct mca_allocator_base_component_1_0_0_t { +struct mca_allocator_base_component_2_0_0_t { mca_base_component_t allocator_version; /**< The version of the component */ - mca_base_component_data_1_0_0_t allocator_data; + mca_base_component_data_t allocator_data; /**< The component metadata */ mca_allocator_base_component_init_fn_t allocator_init; /**< The component initialization function. */ @@ -144,16 +144,14 @@ struct mca_allocator_base_component_1_0_0_t { /** * Convenience typedef. */ -typedef struct mca_allocator_base_component_1_0_0_t mca_allocator_base_component_t; +typedef struct mca_allocator_base_component_2_0_0_t mca_allocator_base_component_t; /** - * Macro for use in components that are of type allocator v1.0.0 + * Macro for use in components that are of type allocator */ -#define MCA_ALLOCATOR_BASE_VERSION_1_0_0 \ - /* allocator v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* allocator v1.0 */ \ - "allocator", 1, 0, 0 +#define MCA_ALLOCATOR_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "allocator", 2, 0, 0 /** * The output integer used for the mca base diff --git a/ompi/mca/allocator/basic/allocator_basic.c b/ompi/mca/allocator/basic/allocator_basic.c index d2874585cf..bd5f5de1e9 100644 --- a/ompi/mca/allocator/basic/allocator_basic.c +++ b/ompi/mca/allocator/basic/allocator_basic.c @@ -31,10 +31,7 @@ mca_allocator_base_component_t mca_allocator_basic_component = { about the module itself */ { - /* Indicate that we are a allocator v1.0.0 module (which also implies a - specific MCA version) */ - - MCA_ALLOCATOR_BASE_VERSION_1_0_0, + MCA_ALLOCATOR_BASE_VERSION_2_0_0, "basic", /* MCA module name */ OMPI_MAJOR_VERSION, @@ -43,9 +40,6 @@ mca_allocator_base_component_t mca_allocator_basic_component = { mca_allocator_basic_component_open, /* module open */ mca_allocator_basic_component_close /* module close */ }, - - /* Next the MCA v1.0.0 module meta data */ - { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/ompi/mca/allocator/bucket/allocator_bucket.c b/ompi/mca/allocator/bucket/allocator_bucket.c index c0cfdec4f4..fcf5629e0b 100644 --- a/ompi/mca/allocator/bucket/allocator_bucket.c +++ b/ompi/mca/allocator/bucket/allocator_bucket.c @@ -110,10 +110,7 @@ mca_allocator_base_component_t mca_allocator_bucket_component = { about the module itself */ { - /* Indicate that we are a allocator v1.0.0 module (which also implies a - specific MCA version) */ - - MCA_ALLOCATOR_BASE_VERSION_1_0_0, + MCA_ALLOCATOR_BASE_VERSION_2_0_0, "bucket", /* MCA module name */ OMPI_MAJOR_VERSION, @@ -122,9 +119,6 @@ mca_allocator_base_component_t mca_allocator_bucket_component = { mca_allocator_bucket_module_open, /* module open */ mca_allocator_bucket_module_close /* module close */ }, - - /* Next the MCA v1.0.0 module meta data */ - { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/ompi/mca/bml/bml.h b/ompi/mca/bml/bml.h index fac0ddbc2a..f11e7c8f8f 100644 --- a/ompi/mca/bml/bml.h +++ b/ompi/mca/bml/bml.h @@ -431,13 +431,13 @@ typedef int (*mca_bml_base_module_progress_fn_t)(void); * and component open/close/init functions. */ -struct mca_bml_base_component_1_0_0_t { +struct mca_bml_base_component_2_0_0_t { mca_base_component_t bml_version; - mca_base_component_data_1_0_0_t bml_data; + mca_base_component_data_t bml_data; mca_bml_base_component_init_fn_t bml_init; }; -typedef struct mca_bml_base_component_1_0_0_t mca_bml_base_component_1_0_0_t; -typedef struct mca_bml_base_component_1_0_0_t mca_bml_base_component_t; +typedef struct mca_bml_base_component_2_0_0_t mca_bml_base_component_2_0_0_t; +typedef struct mca_bml_base_component_2_0_0_t mca_bml_base_component_t; /* @@ -609,12 +609,10 @@ struct mca_bml_base_module_t { typedef struct mca_bml_base_module_t mca_bml_base_module_t; /* - * Macro for use in modules that are of type bml v1.0.0 + * Macro for use in modules that are of type bml */ -#define MCA_BML_BASE_VERSION_1_0_0 \ - /* v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* bml v1.0 */ \ - "bml", 1, 0, 0 +#define MCA_BML_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "bml", 2, 0, 0 #endif /* OMPI_MCA_BML_H */ diff --git a/ompi/mca/bml/r2/bml_r2.h b/ompi/mca/bml/r2/bml_r2.h index a719c1a997..eca3997718 100644 --- a/ompi/mca/bml/r2/bml_r2.h +++ b/ompi/mca/bml/r2/bml_r2.h @@ -51,7 +51,7 @@ struct mca_bml_r2_module_t { typedef struct mca_bml_r2_module_t mca_bml_r2_module_t; -OMPI_DECLSPEC extern mca_bml_base_component_1_0_0_t mca_bml_r2_component; +OMPI_DECLSPEC extern mca_bml_base_component_2_0_0_t mca_bml_r2_component; extern mca_bml_r2_module_t mca_bml_r2; int mca_bml_r2_component_open(void); diff --git a/ompi/mca/bml/r2/bml_r2_component.c b/ompi/mca/bml/r2/bml_r2_component.c index b4298c39c9..af3b32cfa4 100644 --- a/ompi/mca/bml/r2/bml_r2_component.c +++ b/ompi/mca/bml/r2/bml_r2_component.c @@ -27,15 +27,14 @@ #include "bml_r2.h" -mca_bml_base_component_1_0_0_t mca_bml_r2_component = { +mca_bml_base_component_2_0_0_t mca_bml_r2_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a bml v1.0.0 component (which also implies - a specific MCA version) */ - MCA_BML_BASE_VERSION_1_0_0, + MCA_BML_BASE_VERSION_2_0_0, + "r2", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ OMPI_MINOR_VERSION, /* MCA component minor version */ @@ -43,8 +42,6 @@ mca_bml_base_component_1_0_0_t mca_bml_r2_component = { mca_bml_r2_component_open, /* component open */ mca_bml_r2_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/ompi/mca/btl/btl.h b/ompi/mca/btl/btl.h index 57c03c96f1..79b176e700 100644 --- a/ompi/mca/btl/btl.h +++ b/ompi/mca/btl/btl.h @@ -379,14 +379,14 @@ mca_btl_active_message_callback_t mca_btl_base_active_message_trigger[MCA_BTL_TA * and component open/close/init functions. */ -struct mca_btl_base_component_1_0_1_t { +struct mca_btl_base_component_2_0_0_t { mca_base_component_t btl_version; - mca_base_component_data_1_0_0_t btl_data; + mca_base_component_data_t btl_data; mca_btl_base_component_init_fn_t btl_init; mca_btl_base_component_progress_fn_t btl_progress; }; -typedef struct mca_btl_base_component_1_0_1_t mca_btl_base_component_1_0_1_t; -typedef struct mca_btl_base_component_1_0_1_t mca_btl_base_component_t; +typedef struct mca_btl_base_component_2_0_0_t mca_btl_base_component_2_0_0_t; +typedef struct mca_btl_base_component_2_0_0_t mca_btl_base_component_t; /* add the 1_0_0_t typedef for source compatibility * we can do this safely because 1_0_0 components are the same as @@ -396,7 +396,8 @@ typedef struct mca_btl_base_component_1_0_1_t mca_btl_base_component_t; * just like the new one so long as we check the component version * prior to invoking the new interface function. */ -typedef struct mca_btl_base_component_1_0_1_t mca_btl_base_component_1_0_0_t; +typedef struct mca_btl_base_component_2_0_0_t mca_btl_base_component_1_0_1_t; +typedef struct mca_btl_base_component_2_0_0_t mca_btl_base_component_1_0_0_t; @@ -788,13 +789,19 @@ struct mca_btl_base_module_t { }; typedef struct mca_btl_base_module_t mca_btl_base_module_t; +/* + * Macro for use in modules that are of type btl v2.0.1 + */ +#define MCA_BTL_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "btl", 2, 0, 0 + /* * Macro for use in modules that are of type btl v1.0.1 + * alows older btl sources to compile.. */ #define MCA_BTL_BASE_VERSION_1_0_1 \ - /* coll v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* btl v1.0 */ \ + MCA_BASE_VERSION_2_0_0, \ "btl", 1, 0, 1 @@ -803,9 +810,7 @@ typedef struct mca_btl_base_module_t mca_btl_base_module_t; * alows older btl sources to compile.. */ #define MCA_BTL_BASE_VERSION_1_0_0 \ - /* coll v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* btl v1.0 */ \ + MCA_BASE_VERSION_2_0_0, \ "btl", 1, 0, 0 END_C_DECLS diff --git a/ompi/mca/btl/elan/btl_elan.h b/ompi/mca/btl/elan/btl_elan.h index 5466dc48c7..e18c501cb7 100644 --- a/ompi/mca/btl/elan/btl_elan.h +++ b/ompi/mca/btl/elan/btl_elan.h @@ -41,7 +41,7 @@ BEGIN_C_DECLS */ struct mca_btl_elan_component_t { - mca_btl_base_component_1_0_1_t super; /**< base BTL component */ + mca_btl_base_component_2_0_0_t super; /**< base BTL component */ size_t queue_max_size; /**< maximum amount of data transfered using the queues */ diff --git a/ompi/mca/btl/elan/btl_elan_component.c b/ompi/mca/btl/elan/btl_elan_component.c index 2d6e1919ff..be5a12d0fa 100644 --- a/ompi/mca/btl/elan/btl_elan_component.c +++ b/ompi/mca/btl/elan/btl_elan_component.c @@ -48,9 +48,8 @@ mca_btl_elan_component_t mca_btl_elan_component = { about the component itself */ { - /* Indicate that we are a pml v1.0.0 component (which also implies a - specific MCA version) */ - MCA_BTL_BASE_VERSION_1_0_1, + MCA_BTL_BASE_VERSION_2_0_0, + "elan", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ OMPI_MINOR_VERSION, /* MCA component minor version */ @@ -58,9 +57,6 @@ mca_btl_elan_component_t mca_btl_elan_component = { mca_btl_elan_component_open, /* component open */ mca_btl_elan_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/ompi/mca/btl/gm/btl_gm.h b/ompi/mca/btl/gm/btl_gm.h index a8716bba8f..a02fca99c0 100644 --- a/ompi/mca/btl/gm/btl_gm.h +++ b/ompi/mca/btl/gm/btl_gm.h @@ -51,7 +51,7 @@ extern "C" { */ struct mca_btl_gm_component_t { - mca_btl_base_component_1_0_1_t super; /**< base BTL component */ + mca_btl_base_component_2_0_0_t super; /**< base BTL component */ size_t gm_num_btls; /**< number of hcas available to the GM component */ size_t gm_max_btls; /**< maximum number of supported hcas */ diff --git a/ompi/mca/btl/gm/btl_gm_component.c b/ompi/mca/btl/gm/btl_gm_component.c index 797f49c2fd..4399a0da0e 100644 --- a/ompi/mca/btl/gm/btl_gm_component.c +++ b/ompi/mca/btl/gm/btl_gm_component.c @@ -63,10 +63,7 @@ mca_btl_gm_component_t mca_btl_gm_component = { about the component itself */ { - /* Indicate that we are a pml v1.0.0 component (which also implies a - specific MCA version) */ - - MCA_BTL_BASE_VERSION_1_0_1, + MCA_BTL_BASE_VERSION_2_0_0, "gm", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ @@ -75,9 +72,6 @@ mca_btl_gm_component_t mca_btl_gm_component = { mca_btl_gm_component_open, /* component open */ mca_btl_gm_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/ompi/mca/btl/mx/btl_mx.h b/ompi/mca/btl/mx/btl_mx.h index 10705c891e..c2610ddecd 100644 --- a/ompi/mca/btl/mx/btl_mx.h +++ b/ompi/mca/btl/mx/btl_mx.h @@ -55,7 +55,7 @@ BEGIN_C_DECLS */ struct mca_btl_mx_component_t { - mca_btl_base_component_1_0_1_t super; /**< base BTL component */ + mca_btl_base_component_2_0_0_t super; /**< base BTL component */ int32_t mx_num_btls; int32_t mx_max_btls; diff --git a/ompi/mca/btl/mx/btl_mx_component.c b/ompi/mca/btl/mx/btl_mx_component.c index ff56f17a13..82a639c240 100644 --- a/ompi/mca/btl/mx/btl_mx_component.c +++ b/ompi/mca/btl/mx/btl_mx_component.c @@ -48,10 +48,7 @@ mca_btl_mx_component_t mca_btl_mx_component = { about the component itself */ { - /* Indicate that we are a pml v1.0.0 component (which also implies a - specific MCA version) */ - - MCA_BTL_BASE_VERSION_1_0_1, + MCA_BTL_BASE_VERSION_2_0_0, "mx", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ @@ -60,9 +57,6 @@ mca_btl_mx_component_t mca_btl_mx_component = { mca_btl_mx_component_open, /* component open */ mca_btl_mx_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/ompi/mca/btl/ofud/btl_ofud.h b/ompi/mca/btl/ofud/btl_ofud.h index 4e8d535157..f16bb0b817 100644 --- a/ompi/mca/btl/ofud/btl_ofud.h +++ b/ompi/mca/btl/ofud/btl_ofud.h @@ -56,7 +56,7 @@ extern "C" { */ struct mca_btl_ud_component_t { - mca_btl_base_component_1_0_1_t super; /**< base BTL component */ + mca_btl_base_component_2_0_0_t super; /**< base BTL component */ uint32_t max_btls; /**< Maximum number of BTL modules */ uint32_t num_btls; /**< Number of available/initialized BTL modules */ diff --git a/ompi/mca/btl/ofud/btl_ofud_component.c b/ompi/mca/btl/ofud/btl_ofud_component.c index bcba4935bc..f0dee11f40 100644 --- a/ompi/mca/btl/ofud/btl_ofud_component.c +++ b/ompi/mca/btl/ofud/btl_ofud_component.c @@ -47,9 +47,7 @@ mca_btl_ud_component_t mca_btl_ofud_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a pml v1.0.0 component (which also implies a - specific MCA version) */ - MCA_BTL_BASE_VERSION_1_0_1, + MCA_BTL_BASE_VERSION_2_0_0, "ofud", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ @@ -58,8 +56,6 @@ mca_btl_ud_component_t mca_btl_ofud_component = { mca_btl_ud_component_open, /* component open */ mca_btl_ud_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/ompi/mca/btl/openib/btl_openib.h b/ompi/mca/btl/openib/btl_openib.h index c698572430..296eb21ea4 100644 --- a/ompi/mca/btl/openib/btl_openib.h +++ b/ompi/mca/btl/openib/btl_openib.h @@ -118,7 +118,7 @@ typedef enum { } btl_openib_receive_queues_source_t; struct mca_btl_openib_component_t { - mca_btl_base_component_1_0_1_t super; /**< base BTL component */ + mca_btl_base_component_2_0_0_t super; /**< base BTL component */ int ib_max_btls; /**< maximum number of devices available to openib component */ diff --git a/ompi/mca/btl/openib/btl_openib_component.c b/ompi/mca/btl/openib/btl_openib_component.c index ccb64bdac8..3f7b444ced 100644 --- a/ompi/mca/btl/openib/btl_openib_component.c +++ b/ompi/mca/btl/openib/btl_openib_component.c @@ -99,10 +99,7 @@ mca_btl_openib_component_t mca_btl_openib_component = { about the component itself */ { - /* Indicate that we are a pml v1.0.0 component (which also implies a - specific MCA version) */ - - MCA_BTL_BASE_VERSION_1_0_1, + MCA_BTL_BASE_VERSION_2_0_0, "openib", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ @@ -111,9 +108,6 @@ mca_btl_openib_component_t mca_btl_openib_component = { btl_openib_component_open, /* component open */ btl_openib_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/ompi/mca/btl/portals/btl_portals.h b/ompi/mca/btl/portals/btl_portals.h index aa496c7b66..d4685a5498 100644 --- a/ompi/mca/btl/portals/btl_portals.h +++ b/ompi/mca/btl/portals/btl_portals.h @@ -38,7 +38,7 @@ */ struct mca_btl_portals_component_t { /* base BTL component */ - mca_btl_base_component_1_0_1_t super; + mca_btl_base_component_2_0_0_t super; /* output channel for debugging. Value settings when using * output_verbose: diff --git a/ompi/mca/btl/portals/btl_portals_component.c b/ompi/mca/btl/portals/btl_portals_component.c index 713be0c968..4749b64a8a 100644 --- a/ompi/mca/btl/portals/btl_portals_component.c +++ b/ompi/mca/btl/portals/btl_portals_component.c @@ -41,10 +41,7 @@ mca_btl_portals_component_t mca_btl_portals_component = { /* First, the mca_base_module_t struct containing meta information about the module itself */ { - /* Indicate that we are a pml v1.0.0 module (which also - implies a specific MCA version) */ - - MCA_BTL_BASE_VERSION_1_0_1, + MCA_BTL_BASE_VERSION_2_0_0, "portals", /* MCA module name */ OMPI_MAJOR_VERSION, /* MCA module major version */ @@ -53,9 +50,6 @@ mca_btl_portals_component_t mca_btl_portals_component = { mca_btl_portals_component_open, /* module open */ mca_btl_portals_component_close /* module close */ }, - - /* Next the MCA v1.0.0 module meta data */ - { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/ompi/mca/btl/sctp/btl_sctp.h b/ompi/mca/btl/sctp/btl_sctp.h index 5ea9f4e5ba..a74408f2d4 100644 --- a/ompi/mca/btl/sctp/btl_sctp.h +++ b/ompi/mca/btl/sctp/btl_sctp.h @@ -68,7 +68,7 @@ extern "C" { */ struct mca_btl_sctp_component_t { - mca_btl_base_component_1_0_1_t super; /**< base BTL component */ + mca_btl_base_component_2_0_0_t super; /**< base BTL component */ uint32_t sctp_num_btls; /**< number of hcas available to the SCTP component */ struct mca_btl_sctp_module_t **sctp_btls; /**< array of available BTL modules */ struct mca_btl_sctp_proc_t* sctp_local; /**< local proc struct */ diff --git a/ompi/mca/btl/sctp/btl_sctp_component.c b/ompi/mca/btl/sctp/btl_sctp_component.c index 70334e07c9..db7c7bf383 100644 --- a/ompi/mca/btl/sctp/btl_sctp_component.c +++ b/ompi/mca/btl/sctp/btl_sctp_component.c @@ -74,10 +74,7 @@ mca_btl_sctp_component_t mca_btl_sctp_component = { about the component itself */ { - /* Indicate that we are a pml v1.0.0 component (which also implies a - specific MCA version) */ - - MCA_BTL_BASE_VERSION_1_0_1, + MCA_BTL_BASE_VERSION_2_0_0, "sctp", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ @@ -86,12 +83,8 @@ mca_btl_sctp_component_t mca_btl_sctp_component = { mca_btl_sctp_component_open, /* component open */ mca_btl_sctp_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ - { /* Whether the component is checkpointable or not */ - MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/ompi/mca/btl/self/btl_self.h b/ompi/mca/btl/self/btl_self.h index 8ea5f99843..aa57d9f13d 100644 --- a/ompi/mca/btl/self/btl_self.h +++ b/ompi/mca/btl/self/btl_self.h @@ -43,7 +43,7 @@ extern "C" { * Shared Memory (SELF) BTL module. */ struct mca_btl_self_component_t { - mca_btl_base_component_1_0_1_t super; /**< base BTL component */ + mca_btl_base_component_2_0_0_t super; /**< base BTL component */ int free_list_num; /**< initial size of free lists */ int free_list_max; /**< maximum size of free lists */ int free_list_inc; /**< number of elements to alloc when growing free lists */ diff --git a/ompi/mca/btl/self/btl_self_component.c b/ompi/mca/btl/self/btl_self_component.c index 4ae8964df5..cefe6f6155 100644 --- a/ompi/mca/btl/self/btl_self_component.c +++ b/ompi/mca/btl/self/btl_self_component.c @@ -49,9 +49,8 @@ mca_btl_self_component_t mca_btl_self_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a pml v1.0.0 component (which also implies a - specific MCA version) */ - MCA_BTL_BASE_VERSION_1_0_1, + MCA_BTL_BASE_VERSION_2_0_0, + "self", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ OMPI_MINOR_VERSION, /* MCA component minor version */ @@ -59,8 +58,6 @@ mca_btl_self_component_t mca_btl_self_component = { mca_btl_self_component_open, /* component open */ mca_btl_self_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/ompi/mca/btl/sm/btl_sm.h b/ompi/mca/btl/sm/btl_sm.h index 9edb42c84f..6b1bf8598a 100644 --- a/ompi/mca/btl/sm/btl_sm.h +++ b/ompi/mca/btl/sm/btl_sm.h @@ -71,7 +71,7 @@ typedef struct mca_btl_sm_mem_node_t { * Shared Memory (SM) BTL module. */ struct mca_btl_sm_component_t { - mca_btl_base_component_1_0_1_t super; /**< base BTL component */ + mca_btl_base_component_2_0_0_t super; /**< base BTL component */ int sm_free_list_num; /**< initial size of free lists */ int sm_free_list_max; /**< maximum size of free lists */ int sm_free_list_inc; /**< number of elements to alloc when growing free lists */ diff --git a/ompi/mca/btl/sm/btl_sm_component.c b/ompi/mca/btl/sm/btl_sm_component.c index e6534e67d4..f5a503125b 100644 --- a/ompi/mca/btl/sm/btl_sm_component.c +++ b/ompi/mca/btl/sm/btl_sm_component.c @@ -67,9 +67,8 @@ mca_btl_sm_component_t mca_btl_sm_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a pml v1.0.0 component (which also implies a - specific MCA version) */ - MCA_BTL_BASE_VERSION_1_0_1, + MCA_BTL_BASE_VERSION_2_0_0, + "sm", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ OMPI_MINOR_VERSION, /* MCA component minor version */ @@ -77,8 +76,6 @@ mca_btl_sm_component_t mca_btl_sm_component = { mca_btl_sm_component_open, /* component open */ mca_btl_sm_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/ompi/mca/btl/tcp/btl_tcp.h b/ompi/mca/btl/tcp/btl_tcp.h index 976db56340..099525e7bc 100644 --- a/ompi/mca/btl/tcp/btl_tcp.h +++ b/ompi/mca/btl/tcp/btl_tcp.h @@ -57,7 +57,7 @@ extern "C" { */ struct mca_btl_tcp_component_t { - mca_btl_base_component_1_0_1_t super; /**< base BTL component */ + mca_btl_base_component_2_0_0_t super; /**< base BTL component */ uint32_t tcp_addr_count; /**< total number of addresses */ uint32_t tcp_num_btls; /**< number of hcas available to the TCP component */ uint32_t tcp_num_links; /**< number of logical links per physical device */ diff --git a/ompi/mca/btl/tcp/btl_tcp_component.c b/ompi/mca/btl/tcp/btl_tcp_component.c index e41b659549..4b646521ff 100644 --- a/ompi/mca/btl/tcp/btl_tcp_component.c +++ b/ompi/mca/btl/tcp/btl_tcp_component.c @@ -74,10 +74,7 @@ mca_btl_tcp_component_t mca_btl_tcp_component = { about the component itself */ { - /* Indicate that we are a pml v1.0.0 component (which also implies a - specific MCA version) */ - - MCA_BTL_BASE_VERSION_1_0_1, + MCA_BTL_BASE_VERSION_2_0_0, "tcp", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ @@ -86,9 +83,6 @@ mca_btl_tcp_component_t mca_btl_tcp_component = { mca_btl_tcp_component_open, /* component open */ mca_btl_tcp_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/ompi/mca/btl/template/btl_template.h b/ompi/mca/btl/template/btl_template.h index d7bd60a000..4049d0dd4d 100644 --- a/ompi/mca/btl/template/btl_template.h +++ b/ompi/mca/btl/template/btl_template.h @@ -1,4 +1,3 @@ - /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -48,7 +47,7 @@ extern "C" { */ struct mca_btl_template_component_t { - mca_btl_base_component_1_0_1_t super; /**< base BTL component */ + mca_btl_base_component_2_0_0_t super; /**< base BTL component */ uint32_t template_num_btls; /**< number of hcas available to the TEMPLATE component */ diff --git a/ompi/mca/btl/template/btl_template_component.c b/ompi/mca/btl/template/btl_template_component.c index c13dc83e02..d6e1f31840 100644 --- a/ompi/mca/btl/template/btl_template_component.c +++ b/ompi/mca/btl/template/btl_template_component.c @@ -41,10 +41,7 @@ mca_btl_template_component_t mca_btl_template_component = { about the component itself */ { - /* Indicate that we are a pml v1.0.0 component (which also implies a - specific MCA version) */ - - MCA_BTL_BASE_VERSION_1_0_1, + MCA_BTL_BASE_VERSION_2_0_0, "template", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ @@ -53,9 +50,6 @@ mca_btl_template_component_t mca_btl_template_component = { mca_btl_template_component_open, /* component open */ mca_btl_template_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/ompi/mca/btl/udapl/btl_udapl.h b/ompi/mca/btl/udapl/btl_udapl.h index 6a32dc6bc5..3a7f95ee0c 100644 --- a/ompi/mca/btl/udapl/btl_udapl.h +++ b/ompi/mca/btl/udapl/btl_udapl.h @@ -53,7 +53,7 @@ extern "C" { */ struct mca_btl_udapl_component_t { - mca_btl_base_component_1_0_1_t super; /**< base BTL component */ + mca_btl_base_component_2_0_0_t super; /**< base BTL component */ int32_t udapl_verbosity; /**< report out level, see "Report Out from uDAPL BTL" below for details. */ diff --git a/ompi/mca/btl/udapl/btl_udapl_component.c b/ompi/mca/btl/udapl/btl_udapl_component.c index 774c6d0c52..bd2109cc5c 100644 --- a/ompi/mca/btl/udapl/btl_udapl_component.c +++ b/ompi/mca/btl/udapl/btl_udapl_component.c @@ -68,10 +68,7 @@ mca_btl_udapl_component_t mca_btl_udapl_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a pml v1.0.0 component (which also implies a - specific MCA version) */ - - MCA_BTL_BASE_VERSION_1_0_0, + MCA_BTL_BASE_VERSION_2_0_0, "udapl", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ @@ -80,8 +77,6 @@ mca_btl_udapl_component_t mca_btl_udapl_component = { mca_btl_udapl_component_open, /* component open */ mca_btl_udapl_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/ompi/mca/coll/base/coll_base_comm_select.c b/ompi/mca/coll/base/coll_base_comm_select.c index 69ec4426b9..646328c871 100644 --- a/ompi/mca/coll/base/coll_base_comm_select.c +++ b/ompi/mca/coll/base/coll_base_comm_select.c @@ -12,6 +12,7 @@ * Copyright (c) 2007 Lawrence Livermore National Security, LLC. All * rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -49,7 +50,7 @@ struct avail_coll_t { opal_list_item_t super; int ac_priority; - mca_coll_base_module_1_1_0_t *ac_module; + mca_coll_base_module_2_0_0_t *ac_module; }; typedef struct avail_coll_t avail_coll_t; @@ -62,15 +63,15 @@ static opal_list_t *check_components(opal_list_t *components, char **names, int num_names); static int check_one_component(ompi_communicator_t *comm, const mca_base_component_t *component, - mca_coll_base_module_1_1_0_t **module); + mca_coll_base_module_2_0_0_t **module); static int query(const mca_base_component_t *component, ompi_communicator_t *comm, int *priority, - mca_coll_base_module_1_1_0_t **module); + mca_coll_base_module_2_0_0_t **module); -static int query_1_1_0(const mca_coll_base_component_1_1_0_t *coll_component, +static int query_2_0_0(const mca_coll_base_component_2_0_0_t *coll_component, ompi_communicator_t *comm, int *priority, - mca_coll_base_module_1_1_0_t **module); + mca_coll_base_module_2_0_0_t **module); /* * Stuff for the OBJ interface @@ -233,7 +234,7 @@ static opal_list_t *check_components(opal_list_t *components, int i, priority; const mca_base_component_t *component; opal_list_item_t *item, *item2; - mca_coll_base_module_1_1_0_t *module; + mca_coll_base_module_2_0_0_t *module; bool want_to_check; opal_list_t *selectable; avail_coll_t *avail, *avail2; @@ -313,7 +314,7 @@ static opal_list_t *check_components(opal_list_t *components, */ static int check_one_component(ompi_communicator_t *comm, const mca_base_component_t *component, - mca_coll_base_module_1_1_0_t **module) + mca_coll_base_module_2_0_0_t **module) { int err; int priority = -1; @@ -347,18 +348,16 @@ static int check_one_component(ompi_communicator_t *comm, */ static int query(const mca_base_component_t *component, ompi_communicator_t *comm, - int *priority, mca_coll_base_module_1_1_0_t **module) + int *priority, mca_coll_base_module_2_0_0_t **module) { - /* coll v1.1.0 */ - *module = NULL; - if (1 == component->mca_type_major_version && - 1 == component->mca_type_minor_version && + if (2 == component->mca_type_major_version && + 0 == component->mca_type_minor_version && 0 == component->mca_type_release_version) { - const mca_coll_base_component_1_1_0_t *coll100 = - (mca_coll_base_component_1_1_0_t *) component; + const mca_coll_base_component_2_0_0_t *coll100 = + (mca_coll_base_component_2_0_0_t *) component; - return query_1_1_0(coll100, comm, priority, module); + return query_2_0_0(coll100, comm, priority, module); } /* Unknown coll API version -- return error */ @@ -367,11 +366,11 @@ static int query(const mca_base_component_t *component, } -static int query_1_1_0(const mca_coll_base_component_1_1_0_t *component, +static int query_2_0_0(const mca_coll_base_component_2_0_0_t *component, ompi_communicator_t *comm, int *priority, - mca_coll_base_module_1_1_0_t **module) + mca_coll_base_module_2_0_0_t **module) { - mca_coll_base_module_1_1_0_t *ret; + mca_coll_base_module_2_0_0_t *ret; /* There's currently no need for conversion */ diff --git a/ompi/mca/coll/base/coll_base_find_available.c b/ompi/mca/coll/base/coll_base_find_available.c index 49cda78cb8..3efc8a56d9 100644 --- a/ompi/mca/coll/base/coll_base_find_available.c +++ b/ompi/mca/coll/base/coll_base_find_available.c @@ -9,6 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -47,7 +48,7 @@ static int init_query(const mca_base_component_t *ls, mca_base_component_priority_list_item_t *entry, bool enable_progress_threads, bool enable_mpi_threads); -static int init_query_1_1_0(const mca_base_component_t *ls, +static int init_query_2_0_0(const mca_base_component_t *ls, mca_base_component_priority_list_item_t *entry, bool enable_progress_threads, bool enable_mpi_threads); @@ -157,10 +158,10 @@ static int init_query(const mca_base_component_t *m, /* This component has already been successfully opened. So now query it. */ - if (1 == m->mca_type_major_version && - 1 == m->mca_type_minor_version && + if (2 == m->mca_type_major_version && + 0 == m->mca_type_minor_version && 0 == m->mca_type_release_version) { - ret = init_query_1_1_0(m, entry, enable_progress_threads, + ret = init_query_2_0_0(m, entry, enable_progress_threads, enable_mpi_threads); } else { /* Unrecognized coll API version */ @@ -197,13 +198,13 @@ static int init_query(const mca_base_component_t *m, /* * Query a specific component, coll v1.0.0 */ -static int init_query_1_1_0(const mca_base_component_t *component, +static int init_query_2_0_0(const mca_base_component_t *component, mca_base_component_priority_list_item_t *entry, bool enable_progress_threads, bool enable_mpi_threads) { - mca_coll_base_component_1_1_0_t *coll = - (mca_coll_base_component_1_1_0_t *) component; + mca_coll_base_component_2_0_0_t *coll = + (mca_coll_base_component_2_0_0_t *) component; return coll->collm_init_query(enable_progress_threads, enable_mpi_threads); diff --git a/ompi/mca/coll/base/coll_base_open.c b/ompi/mca/coll/base/coll_base_open.c index 0436523fa7..e94d21bb90 100644 --- a/ompi/mca/coll/base/coll_base_open.c +++ b/ompi/mca/coll/base/coll_base_open.c @@ -54,7 +54,7 @@ int mca_coll_base_associative = 1; bool mca_coll_base_components_opened_valid = false; opal_list_t mca_coll_base_components_opened; -OBJ_CLASS_INSTANCE(mca_coll_base_module_1_1_0_t, opal_object_t, NULL, NULL); +OBJ_CLASS_INSTANCE(mca_coll_base_module_t, opal_object_t, NULL, NULL); /* * Function for finding and opening either all MCA components, or the one diff --git a/ompi/mca/coll/basic/coll_basic.h b/ompi/mca/coll/basic/coll_basic.h index 140b7c6759..38fc16d804 100644 --- a/ompi/mca/coll/basic/coll_basic.h +++ b/ompi/mca/coll/basic/coll_basic.h @@ -9,6 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -32,7 +33,7 @@ BEGIN_C_DECLS /* Globally exported variables */ - OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_1_1_0_t + OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_2_0_0_t mca_coll_basic_component; extern int mca_coll_basic_priority; extern int mca_coll_basic_crossover; @@ -41,11 +42,11 @@ BEGIN_C_DECLS int mca_coll_basic_init_query(bool enable_progress_threads, bool enable_mpi_threads); - struct mca_coll_base_module_1_1_0_t + mca_coll_base_module_t *mca_coll_basic_comm_query(struct ompi_communicator_t *comm, int *priority); - int mca_coll_basic_module_enable(struct mca_coll_base_module_1_1_0_t *module, + int mca_coll_basic_module_enable(mca_coll_base_module_t *module, struct ompi_communicator_t *comm); int mca_coll_basic_allgather_intra(void *sbuf, int scount, @@ -53,13 +54,13 @@ BEGIN_C_DECLS void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_allgather_inter(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_allgatherv_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, @@ -67,38 +68,38 @@ BEGIN_C_DECLS int *disps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_allgatherv_inter(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_allreduce_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_allreduce_inter(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_alltoall_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_alltoall_inter(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_alltoallv_intra(void *sbuf, int *scounts, int *sdisps, @@ -107,7 +108,7 @@ BEGIN_C_DECLS int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_alltoallv_inter(void *sbuf, int *scounts, int *sdisps, struct ompi_datatype_t *sdtype, @@ -115,7 +116,7 @@ BEGIN_C_DECLS int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_alltoallw_intra(void *sbuf, int *scounts, int *sdisps, @@ -124,7 +125,7 @@ BEGIN_C_DECLS int *rdisps, struct ompi_datatype_t **rdtypes, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_alltoallw_inter(void *sbuf, int *scounts, int *sdisps, struct ompi_datatype_t **sdtypes, @@ -132,52 +133,52 @@ BEGIN_C_DECLS int *rdisps, struct ompi_datatype_t **rdtypes, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_barrier_intra_lin(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_barrier_inter_lin(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_barrier_intra_log(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_bcast_lin_intra(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_bcast_lin_inter(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_bcast_log_intra(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_bcast_log_inter(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_exscan_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_exscan_inter(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_gather_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, @@ -185,14 +186,14 @@ BEGIN_C_DECLS struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_gather_inter(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_gatherv_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, @@ -200,7 +201,7 @@ BEGIN_C_DECLS struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_gatherv_inter(void *sbuf, int scount, struct ompi_datatype_t *sdtype, @@ -208,57 +209,57 @@ BEGIN_C_DECLS struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_reduce_lin_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_reduce_lin_inter(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_reduce_log_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_reduce_log_inter(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_reduce_scatter_intra(void *sbuf, void *rbuf, int *rcounts, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_reduce_scatter_inter(void *sbuf, void *rbuf, int *rcounts, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_scan_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_scan_inter(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_scatter_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, @@ -266,14 +267,14 @@ BEGIN_C_DECLS struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_scatter_inter(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_scatterv_intra(void *sbuf, int *scounts, int *disps, struct ompi_datatype_t *sdtype, @@ -281,14 +282,14 @@ BEGIN_C_DECLS struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_scatterv_inter(void *sbuf, int *scounts, int *disps, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_basic_ft_event(int status); @@ -305,7 +306,7 @@ BEGIN_C_DECLS struct mca_coll_basic_module_t { - mca_coll_base_module_1_1_0_t super; + mca_coll_base_module_t super; ompi_request_t **mccb_reqs; int mccb_num_reqs; diff --git a/ompi/mca/coll/basic/coll_basic_allgather.c b/ompi/mca/coll/basic/coll_basic_allgather.c index bee2e8418d..1043c3d4b5 100644 --- a/ompi/mca/coll/basic/coll_basic_allgather.c +++ b/ompi/mca/coll/basic/coll_basic_allgather.c @@ -42,7 +42,7 @@ mca_coll_basic_allgather_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int err; ptrdiff_t lb, extent; @@ -87,7 +87,7 @@ mca_coll_basic_allgather_inter(void *sbuf, int scount, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int rank, root = 0, size, rsize, err, i; char *tmpbuf = NULL, *ptmp; diff --git a/ompi/mca/coll/basic/coll_basic_allgatherv.c b/ompi/mca/coll/basic/coll_basic_allgatherv.c index d1d7bf9850..dcdd2bcda6 100644 --- a/ompi/mca/coll/basic/coll_basic_allgatherv.c +++ b/ompi/mca/coll/basic/coll_basic_allgatherv.c @@ -40,7 +40,7 @@ mca_coll_basic_allgatherv_intra(void *sbuf, int scount, void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i, size, rank ; int err; @@ -121,7 +121,7 @@ mca_coll_basic_allgatherv_inter(void *sbuf, int scount, void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int size, rsize; int err, i; diff --git a/ompi/mca/coll/basic/coll_basic_allreduce.c b/ompi/mca/coll/basic/coll_basic_allreduce.c index a017641dd7..df34ca2e7c 100644 --- a/ompi/mca/coll/basic/coll_basic_allreduce.c +++ b/ompi/mca/coll/basic/coll_basic_allreduce.c @@ -41,7 +41,7 @@ mca_coll_basic_allreduce_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int err; @@ -76,7 +76,7 @@ mca_coll_basic_allreduce_inter(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int err, i, rank, root = 0, rsize; ptrdiff_t lb, extent; diff --git a/ompi/mca/coll/basic/coll_basic_alltoall.c b/ompi/mca/coll/basic/coll_basic_alltoall.c index 026f37c9be..a607daa81f 100644 --- a/ompi/mca/coll/basic/coll_basic_alltoall.c +++ b/ompi/mca/coll/basic/coll_basic_alltoall.c @@ -40,7 +40,7 @@ mca_coll_basic_alltoall_intra(void *sbuf, int scount, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i; int rank; @@ -163,7 +163,7 @@ mca_coll_basic_alltoall_inter(void *sbuf, int scount, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i; int rank; diff --git a/ompi/mca/coll/basic/coll_basic_alltoallv.c b/ompi/mca/coll/basic/coll_basic_alltoallv.c index a7a0064810..6da60b2d41 100644 --- a/ompi/mca/coll/basic/coll_basic_alltoallv.c +++ b/ompi/mca/coll/basic/coll_basic_alltoallv.c @@ -40,7 +40,7 @@ mca_coll_basic_alltoallv_intra(void *sbuf, int *scounts, int *sdisps, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i; int size; @@ -161,7 +161,7 @@ mca_coll_basic_alltoallv_inter(void *sbuf, int *scounts, int *sdisps, int *rcounts, int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i; int rsize; diff --git a/ompi/mca/coll/basic/coll_basic_alltoallw.c b/ompi/mca/coll/basic/coll_basic_alltoallw.c index 7f2ec0b226..73862b7626 100644 --- a/ompi/mca/coll/basic/coll_basic_alltoallw.c +++ b/ompi/mca/coll/basic/coll_basic_alltoallw.c @@ -39,7 +39,7 @@ mca_coll_basic_alltoallw_intra(void *sbuf, int *scounts, int *sdisps, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t **rdtypes, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i; int size; @@ -154,7 +154,7 @@ mca_coll_basic_alltoallw_inter(void *sbuf, int *scounts, int *sdisps, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t **rdtypes, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i; int size; diff --git a/ompi/mca/coll/basic/coll_basic_barrier.c b/ompi/mca/coll/basic/coll_basic_barrier.c index 757524d72b..8588fef511 100644 --- a/ompi/mca/coll/basic/coll_basic_barrier.c +++ b/ompi/mca/coll/basic/coll_basic_barrier.c @@ -37,7 +37,7 @@ */ int mca_coll_basic_barrier_intra_lin(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i; int err; @@ -103,7 +103,7 @@ mca_coll_basic_barrier_intra_lin(struct ompi_communicator_t *comm, */ int mca_coll_basic_barrier_intra_log(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i; int err; @@ -182,7 +182,7 @@ mca_coll_basic_barrier_intra_log(struct ompi_communicator_t *comm, */ int mca_coll_basic_barrier_inter_lin(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int rank; int result; diff --git a/ompi/mca/coll/basic/coll_basic_bcast.c b/ompi/mca/coll/basic/coll_basic_bcast.c index 377e7da555..647af35b8d 100644 --- a/ompi/mca/coll/basic/coll_basic_bcast.c +++ b/ompi/mca/coll/basic/coll_basic_bcast.c @@ -40,7 +40,7 @@ int mca_coll_basic_bcast_lin_intra(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i; int size; @@ -112,7 +112,7 @@ int mca_coll_basic_bcast_log_intra(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i; int size; @@ -210,7 +210,7 @@ int mca_coll_basic_bcast_lin_inter(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i; int rsize; @@ -261,7 +261,7 @@ int mca_coll_basic_bcast_log_inter(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { return OMPI_ERR_NOT_IMPLEMENTED; } diff --git a/ompi/mca/coll/basic/coll_basic_component.c b/ompi/mca/coll/basic/coll_basic_component.c index 8d595df243..b5dc262366 100644 --- a/ompi/mca/coll/basic/coll_basic_component.c +++ b/ompi/mca/coll/basic/coll_basic_component.c @@ -9,6 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -44,39 +45,33 @@ int mca_coll_basic_crossover = 4; /* * Local function */ -static int basic_open(void); +static int basic_register(void); /* * Instantiate the public struct with all of our public information * and pointers to our public functions in it */ -const mca_coll_base_component_1_1_0_t mca_coll_basic_component = { +const mca_coll_base_component_2_0_0_t mca_coll_basic_component = { /* First, the mca_component_t struct containing meta information * about the component itself */ { - /* Indicate that we are a coll v1.0.0 component (which also implies a - * specific MCA version) */ - - MCA_COLL_BASE_VERSION_1_1_0, + MCA_COLL_BASE_VERSION_2_0_0, /* Component name and version */ - "basic", OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, OMPI_RELEASE_VERSION, /* Component open and close functions */ - - basic_open, - NULL + NULL, + NULL, + NULL, + basic_register }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT @@ -90,7 +85,7 @@ const mca_coll_base_component_1_1_0_t mca_coll_basic_component = { static int -basic_open(void) +basic_register(void) { /* Use a low priority, but allow other components to be lower */ @@ -124,6 +119,6 @@ mca_coll_basic_module_destruct(mca_coll_basic_module_t *module) OBJ_CLASS_INSTANCE(mca_coll_basic_module_t, - mca_coll_base_module_1_1_0_t, + mca_coll_base_module_t, mca_coll_basic_module_construct, mca_coll_basic_module_destruct); diff --git a/ompi/mca/coll/basic/coll_basic_exscan.c b/ompi/mca/coll/basic/coll_basic_exscan.c index fc304c0505..6862f112fe 100644 --- a/ompi/mca/coll/basic/coll_basic_exscan.c +++ b/ompi/mca/coll/basic/coll_basic_exscan.c @@ -43,7 +43,7 @@ mca_coll_basic_exscan_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int size, rank, err; ptrdiff_t true_lb, true_extent, lb, extent; @@ -178,7 +178,7 @@ mca_coll_basic_exscan_inter(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { return OMPI_ERR_NOT_IMPLEMENTED; } diff --git a/ompi/mca/coll/basic/coll_basic_gather.c b/ompi/mca/coll/basic/coll_basic_gather.c index b63b998b3c..4e44e5c8f4 100644 --- a/ompi/mca/coll/basic/coll_basic_gather.c +++ b/ompi/mca/coll/basic/coll_basic_gather.c @@ -40,7 +40,7 @@ mca_coll_basic_gather_intra(void *sbuf, int scount, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i; int err; @@ -103,7 +103,7 @@ mca_coll_basic_gather_inter(void *sbuf, int scount, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i; int err; diff --git a/ompi/mca/coll/basic/coll_basic_gatherv.c b/ompi/mca/coll/basic/coll_basic_gatherv.c index a723874e9e..8c9f5aaf84 100644 --- a/ompi/mca/coll/basic/coll_basic_gatherv.c +++ b/ompi/mca/coll/basic/coll_basic_gatherv.c @@ -39,7 +39,7 @@ mca_coll_basic_gatherv_intra(void *sbuf, int scount, void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i, rank, size, err; char *ptmp; @@ -112,7 +112,7 @@ mca_coll_basic_gatherv_inter(void *sbuf, int scount, void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i, rank, size, err; char *ptmp; diff --git a/ompi/mca/coll/basic/coll_basic_module.c b/ompi/mca/coll/basic/coll_basic_module.c index 1ff844c3a1..49fc80fdc5 100644 --- a/ompi/mca/coll/basic/coll_basic_module.c +++ b/ompi/mca/coll/basic/coll_basic_module.c @@ -48,7 +48,7 @@ mca_coll_basic_init_query(bool enable_progress_threads, * Look at the communicator and decide which set of functions and * priority we want to return. */ -mca_coll_base_module_1_1_0_t * +mca_coll_base_module_t * mca_coll_basic_comm_query(struct ompi_communicator_t *comm, int *priority) { @@ -137,7 +137,7 @@ mca_coll_basic_comm_query(struct ompi_communicator_t *comm, * Init module on the communicator */ int -mca_coll_basic_module_enable(mca_coll_base_module_1_1_0_t *module, +mca_coll_basic_module_enable(mca_coll_base_module_t *module, struct ompi_communicator_t *comm) { /* All done */ diff --git a/ompi/mca/coll/basic/coll_basic_reduce.c b/ompi/mca/coll/basic/coll_basic_reduce.c index 9668235ae6..826dd4e0f3 100644 --- a/ompi/mca/coll/basic/coll_basic_reduce.c +++ b/ompi/mca/coll/basic/coll_basic_reduce.c @@ -39,7 +39,7 @@ mca_coll_basic_reduce_lin_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i, rank, err, size; ptrdiff_t true_lb, true_extent, lb, extent; @@ -318,7 +318,7 @@ mca_coll_basic_reduce_log_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i, size, rank, vrank; int err, peer, dim, mask; @@ -527,7 +527,7 @@ mca_coll_basic_reduce_lin_inter(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i, rank, err, size; ptrdiff_t true_lb, true_extent, lb, extent; @@ -607,7 +607,7 @@ mca_coll_basic_reduce_log_inter(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { return OMPI_ERR_NOT_IMPLEMENTED; } diff --git a/ompi/mca/coll/basic/coll_basic_reduce_scatter.c b/ompi/mca/coll/basic/coll_basic_reduce_scatter.c index b0105de560..033c7ab68c 100644 --- a/ompi/mca/coll/basic/coll_basic_reduce_scatter.c +++ b/ompi/mca/coll/basic/coll_basic_reduce_scatter.c @@ -59,7 +59,7 @@ mca_coll_basic_reduce_scatter_intra(void *sbuf, void *rbuf, int *rcounts, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i, rank, size, count, err = OMPI_SUCCESS; ptrdiff_t true_lb, true_extent, lb, extent, buf_size; @@ -356,7 +356,7 @@ mca_coll_basic_reduce_scatter_inter(void *sbuf, void *rbuf, int *rcounts, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int err, i, rank, root = 0, rsize; int totalcounts, tcount; diff --git a/ompi/mca/coll/basic/coll_basic_scan.c b/ompi/mca/coll/basic/coll_basic_scan.c index f6a6461f0f..d80e679632 100644 --- a/ompi/mca/coll/basic/coll_basic_scan.c +++ b/ompi/mca/coll/basic/coll_basic_scan.c @@ -41,7 +41,7 @@ mca_coll_basic_scan_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int size, rank, err; ptrdiff_t true_lb, true_extent, lb, extent; diff --git a/ompi/mca/coll/basic/coll_basic_scatter.c b/ompi/mca/coll/basic/coll_basic_scatter.c index 57c9e3bbc3..d0ecde9064 100644 --- a/ompi/mca/coll/basic/coll_basic_scatter.c +++ b/ompi/mca/coll/basic/coll_basic_scatter.c @@ -41,7 +41,7 @@ mca_coll_basic_scatter_intra(void *sbuf, int scount, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i, rank, size, err; char *ptmp; @@ -108,7 +108,7 @@ mca_coll_basic_scatter_inter(void *sbuf, int scount, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i, rank, size, err; char *ptmp; diff --git a/ompi/mca/coll/basic/coll_basic_scatterv.c b/ompi/mca/coll/basic/coll_basic_scatterv.c index 51a90ec957..701dc52e66 100644 --- a/ompi/mca/coll/basic/coll_basic_scatterv.c +++ b/ompi/mca/coll/basic/coll_basic_scatterv.c @@ -41,7 +41,7 @@ mca_coll_basic_scatterv_intra(void *sbuf, int *scounts, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i, rank, size, err; char *ptmp; @@ -114,7 +114,7 @@ mca_coll_basic_scatterv_inter(void *sbuf, int *scounts, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i, rank, size, err; char *ptmp; diff --git a/ompi/mca/coll/coll.h b/ompi/mca/coll/coll.h index 519584cafc..89d0fb5f81 100644 --- a/ompi/mca/coll/coll.h +++ b/ompi/mca/coll/coll.h @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2007-2008 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2007-2008 UT-Battelle, LLC * $COPYRIGHT$ * @@ -128,8 +128,8 @@ typedef int (*mca_coll_base_component_init_query_fn_t) * provide a module with the requested functionality or NULL if the * component should not be used on the given communicator. */ -typedef struct mca_coll_base_module_1_1_0_t * - (*mca_coll_base_component_comm_query_1_1_0_fn_t) +typedef struct mca_coll_base_module_2_0_0_t * + (*mca_coll_base_component_comm_query_2_0_0_fn_t) (struct ompi_communicator_t *comm, int *priority); @@ -168,66 +168,66 @@ typedef struct mca_coll_base_module_1_1_0_t * * @param[in] comm Communicator being created */ typedef int -(*mca_coll_base_module_enable_1_1_0_fn_t)(struct mca_coll_base_module_1_1_0_t* module, +(*mca_coll_base_module_enable_1_1_0_fn_t)(struct mca_coll_base_module_2_0_0_t* module, struct ompi_communicator_t *comm); typedef int (*mca_coll_base_module_allgather_fn_t) (void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, - struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module); + struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module); typedef int (*mca_coll_base_module_allgatherv_fn_t) (void *sbuf, int scount, struct ompi_datatype_t *sdtype, void * rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, - struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module); + struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module); typedef int (*mca_coll_base_module_allreduce_fn_t) (void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, - struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module); + struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module); typedef int (*mca_coll_base_module_alltoall_fn_t) (void *sbuf, int scount, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, - struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module); + struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module); typedef int (*mca_coll_base_module_alltoallv_fn_t) (void *sbuf, int *scounts, int *sdisps, struct ompi_datatype_t *sdtype, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t *rdtype, - struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module); + struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module); typedef int (*mca_coll_base_module_alltoallw_fn_t) (void *sbuf, int *scounts, int *sdisps, struct ompi_datatype_t **sdtypes, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t **rdtypes, - struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module); + struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module); typedef int (*mca_coll_base_module_barrier_fn_t) - (struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module); + (struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module); typedef int (*mca_coll_base_module_bcast_fn_t) (void *buff, int count, struct ompi_datatype_t *datatype, int root, - struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module); + struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module); typedef int (*mca_coll_base_module_exscan_fn_t) (void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, - struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module); + struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module); typedef int (*mca_coll_base_module_gather_fn_t) (void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, - int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module); + int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module); typedef int (*mca_coll_base_module_gatherv_fn_t) (void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, - int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module); + int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module); typedef int (*mca_coll_base_module_reduce_fn_t) (void *sbuf, void* rbuf, int count, struct ompi_datatype_t *dtype, - struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module); + struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module); typedef int (*mca_coll_base_module_reduce_scatter_fn_t) (void *sbuf, void *rbuf, int *rcounts, struct ompi_datatype_t *dtype, - struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module); + struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module); typedef int (*mca_coll_base_module_scan_fn_t) (void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, - struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module); + struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module); typedef int (*mca_coll_base_module_scatter_fn_t) (void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, - int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module); + int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module); typedef int (*mca_coll_base_module_scatterv_fn_t) (void *sbuf, int *scounts, int *disps, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, - int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module); + int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module); /** @@ -254,18 +254,23 @@ typedef int (*mca_coll_base_module_ft_event_fn_t) (int state); * mca_coll_[component_name]_component, must exist in any collective * component. */ -struct mca_coll_base_component_1_1_0_t { +struct mca_coll_base_component_2_0_0_t { /** Base component description */ mca_base_component_t collm_version; /** Base component data block */ - mca_base_component_data_1_0_0_t collm_data; + mca_base_component_data_t collm_data; /** Component initialization function */ mca_coll_base_component_init_query_fn_t collm_init_query; /** Query whether component is useable for given communicator */ - mca_coll_base_component_comm_query_1_1_0_fn_t collm_comm_query; + mca_coll_base_component_comm_query_2_0_0_fn_t collm_comm_query; }; -typedef struct mca_coll_base_component_1_1_0_t mca_coll_base_component_1_1_0_t; +typedef struct mca_coll_base_component_2_0_0_t mca_coll_base_component_2_0_0_t; + +/** Per guidence in mca.h, use the unversioned struct name if you just + want to always keep up with the most recent version of the + interace. */ +typedef struct mca_coll_base_component_2_0_0_t mca_coll_base_component_t; /** @@ -282,7 +287,7 @@ typedef struct mca_coll_base_component_1_1_0_t mca_coll_base_component_1_1_0_t; * function, so the component is free to create a structure that * inherits from this one for use as the module structure. */ -struct mca_coll_base_module_1_1_0_t { +struct mca_coll_base_module_2_0_0_t { /** Collective modules all inherit from opal_object */ opal_object_t super; @@ -311,9 +316,13 @@ struct mca_coll_base_module_1_1_0_t { /** Fault tolerance event trigger function */ mca_coll_base_module_ft_event_fn_t ft_event; }; -typedef struct mca_coll_base_module_1_1_0_t mca_coll_base_module_1_1_0_t; -OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_coll_base_module_1_1_0_t); +typedef struct mca_coll_base_module_2_0_0_t mca_coll_base_module_2_0_0_t; +/** Per guidence in mca.h, use the unversioned struct name if you just + want to always keep up with the most recent version of the + interace. */ +typedef struct mca_coll_base_module_2_0_0_t mca_coll_base_module_t; +OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_coll_base_module_t); /** * Collectives communicator cache structure @@ -326,37 +335,37 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_coll_base_module_1_1_0_t); */ struct mca_coll_base_comm_coll_t { mca_coll_base_module_allgather_fn_t coll_allgather; - mca_coll_base_module_1_1_0_t *coll_allgather_module; + mca_coll_base_module_2_0_0_t *coll_allgather_module; mca_coll_base_module_allgatherv_fn_t coll_allgatherv; - mca_coll_base_module_1_1_0_t *coll_allgatherv_module; + mca_coll_base_module_2_0_0_t *coll_allgatherv_module; mca_coll_base_module_allreduce_fn_t coll_allreduce; - mca_coll_base_module_1_1_0_t *coll_allreduce_module; + mca_coll_base_module_2_0_0_t *coll_allreduce_module; mca_coll_base_module_alltoall_fn_t coll_alltoall; - mca_coll_base_module_1_1_0_t *coll_alltoall_module; + mca_coll_base_module_2_0_0_t *coll_alltoall_module; mca_coll_base_module_alltoallv_fn_t coll_alltoallv; - mca_coll_base_module_1_1_0_t *coll_alltoallv_module; + mca_coll_base_module_2_0_0_t *coll_alltoallv_module; mca_coll_base_module_alltoallw_fn_t coll_alltoallw; - mca_coll_base_module_1_1_0_t *coll_alltoallw_module; + mca_coll_base_module_2_0_0_t *coll_alltoallw_module; mca_coll_base_module_barrier_fn_t coll_barrier; - mca_coll_base_module_1_1_0_t *coll_barrier_module; + mca_coll_base_module_2_0_0_t *coll_barrier_module; mca_coll_base_module_bcast_fn_t coll_bcast; - mca_coll_base_module_1_1_0_t *coll_bcast_module; + mca_coll_base_module_2_0_0_t *coll_bcast_module; mca_coll_base_module_exscan_fn_t coll_exscan; - mca_coll_base_module_1_1_0_t *coll_exscan_module; + mca_coll_base_module_2_0_0_t *coll_exscan_module; mca_coll_base_module_gather_fn_t coll_gather; - mca_coll_base_module_1_1_0_t *coll_gather_module; + mca_coll_base_module_2_0_0_t *coll_gather_module; mca_coll_base_module_gatherv_fn_t coll_gatherv; - mca_coll_base_module_1_1_0_t *coll_gatherv_module; + mca_coll_base_module_2_0_0_t *coll_gatherv_module; mca_coll_base_module_reduce_fn_t coll_reduce; - mca_coll_base_module_1_1_0_t *coll_reduce_module; + mca_coll_base_module_2_0_0_t *coll_reduce_module; mca_coll_base_module_reduce_scatter_fn_t coll_reduce_scatter; - mca_coll_base_module_1_1_0_t *coll_reduce_scatter_module; + mca_coll_base_module_2_0_0_t *coll_reduce_scatter_module; mca_coll_base_module_scan_fn_t coll_scan; - mca_coll_base_module_1_1_0_t *coll_scan_module; + mca_coll_base_module_2_0_0_t *coll_scan_module; mca_coll_base_module_scatter_fn_t coll_scatter; - mca_coll_base_module_1_1_0_t *coll_scatter_module; + mca_coll_base_module_2_0_0_t *coll_scatter_module; mca_coll_base_module_scatterv_fn_t coll_scatterv; - mca_coll_base_module_1_1_0_t *coll_scatterv_module; + mca_coll_base_module_2_0_0_t *coll_scatterv_module; }; typedef struct mca_coll_base_comm_coll_t mca_coll_base_comm_coll_t; @@ -365,13 +374,11 @@ typedef struct mca_coll_base_comm_coll_t mca_coll_base_comm_coll_t; /* - * Macro for use in components that are of type coll v1.1.0 + * Macro for use in components that are of type coll */ -#define MCA_COLL_BASE_VERSION_1_1_0 \ - /* coll v1.1 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* coll v1.1 */ \ - "coll", 1, 1, 0 +#define MCA_COLL_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "coll", 2, 0, 0 /* ******************************************************************** */ diff --git a/ompi/mca/coll/demo/coll_demo.h b/ompi/mca/coll/demo/coll_demo.h index a668bc4f42..0577b37e14 100644 --- a/ompi/mca/coll/demo/coll_demo.h +++ b/ompi/mca/coll/demo/coll_demo.h @@ -9,6 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -31,7 +32,7 @@ BEGIN_C_DECLS /* Globally exported variables */ -OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_1_1_0_t mca_coll_demo_component; +OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_2_0_0_t mca_coll_demo_component; extern int mca_coll_demo_priority_param; extern int mca_coll_demo_verbose_param; extern int mca_coll_demo_verbose; @@ -41,12 +42,12 @@ OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_1_1_0_t mca_coll_demo_ int mca_coll_demo_init_query(bool enable_progress_threads, bool enable_mpi_threads); -struct mca_coll_base_module_1_1_0_t * +mca_coll_base_module_t * mca_coll_demo_comm_query(struct ompi_communicator_t *comm, int *priority); /* Module functions */ -int mca_coll_demo_module_enable(struct mca_coll_base_module_1_1_0_t *module, +int mca_coll_demo_module_enable(mca_coll_base_module_t *module, struct ompi_communicator_t *comm); int mca_coll_demo_allgather_intra(void *sbuf, int scount, @@ -54,194 +55,194 @@ int mca_coll_demo_module_enable(struct mca_coll_base_module_1_1_0_t *module, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_allgather_inter(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_allgatherv_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void * rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_allgatherv_inter(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void * rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_allreduce_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_allreduce_inter(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_alltoall_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_alltoall_inter(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_alltoallv_intra(void *sbuf, int *scounts, int *sdisps, struct ompi_datatype_t *sdtype, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_alltoallv_inter(void *sbuf, int *scounts, int *sdisps, struct ompi_datatype_t *sdtype, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_alltoallw_intra(void *sbuf, int *scounts, int *sdisps, struct ompi_datatype_t **sdtypes, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t **rdtypes, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_alltoallw_inter(void *sbuf, int *scounts, int *sdisps, struct ompi_datatype_t **sdtypes, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t **rdtypes, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_barrier_intra(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_barrier_inter(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_bcast_intra(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_bcast_inter(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_exscan_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_exscan_inter(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_gather_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_gather_inter(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_gatherv_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_gatherv_inter(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_reduce_intra(void *sbuf, void* rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_reduce_inter(void *sbuf, void* rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_reduce_scatter_intra(void *sbuf, void *rbuf, int *rcounts, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_reduce_scatter_inter(void *sbuf, void *rbuf, int *rcounts, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_scan_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_scan_inter(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_scatter_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_scatter_inter(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_scatterv_intra(void *sbuf, int *scounts, int *disps, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_scatterv_inter(void *sbuf, int *scounts, int *disps, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_demo_ft_event(int status); struct mca_coll_demo_module_t { - mca_coll_base_module_1_1_0_t super; + mca_coll_base_module_t super; mca_coll_base_comm_coll_t underlying; }; diff --git a/ompi/mca/coll/demo/coll_demo_allgather.c b/ompi/mca/coll/demo/coll_demo_allgather.c index 4f951e469d..82a9cf9060 100644 --- a/ompi/mca/coll/demo/coll_demo_allgather.c +++ b/ompi/mca/coll/demo/coll_demo_allgather.c @@ -37,7 +37,7 @@ int mca_coll_demo_allgather_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo allgather_intra"); @@ -59,7 +59,7 @@ int mca_coll_demo_allgather_inter(void *sbuf, int scount, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo allgather_inter"); diff --git a/ompi/mca/coll/demo/coll_demo_allgatherv.c b/ompi/mca/coll/demo/coll_demo_allgatherv.c index f565ca8a0d..c924b6fcbc 100644 --- a/ompi/mca/coll/demo/coll_demo_allgatherv.c +++ b/ompi/mca/coll/demo/coll_demo_allgatherv.c @@ -38,7 +38,7 @@ int mca_coll_demo_allgatherv_intra(void *sbuf, int scount, void * rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo allgatherv_intra"); @@ -61,7 +61,7 @@ int mca_coll_demo_allgatherv_inter(void *sbuf, int scount, void * rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo allgatherv_inter"); diff --git a/ompi/mca/coll/demo/coll_demo_allreduce.c b/ompi/mca/coll/demo/coll_demo_allreduce.c index aa041322cb..cb7f77b0b0 100644 --- a/ompi/mca/coll/demo/coll_demo_allreduce.c +++ b/ompi/mca/coll/demo/coll_demo_allreduce.c @@ -37,7 +37,7 @@ int mca_coll_demo_allreduce_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo allreduce_intra"); @@ -58,7 +58,7 @@ int mca_coll_demo_allreduce_inter(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo allreduce_inter"); diff --git a/ompi/mca/coll/demo/coll_demo_alltoall.c b/ompi/mca/coll/demo/coll_demo_alltoall.c index 7e2a1f630e..eea60d5f01 100644 --- a/ompi/mca/coll/demo/coll_demo_alltoall.c +++ b/ompi/mca/coll/demo/coll_demo_alltoall.c @@ -38,7 +38,7 @@ int mca_coll_demo_alltoall_intra(void *sbuf, int scount, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo alltoall_intra\n"); @@ -61,7 +61,7 @@ int mca_coll_demo_alltoall_inter(void *sbuf, int scount, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo alltoall_inter\n"); diff --git a/ompi/mca/coll/demo/coll_demo_alltoallv.c b/ompi/mca/coll/demo/coll_demo_alltoallv.c index 383d86d61c..cdfe827d1e 100644 --- a/ompi/mca/coll/demo/coll_demo_alltoallv.c +++ b/ompi/mca/coll/demo/coll_demo_alltoallv.c @@ -39,7 +39,7 @@ mca_coll_demo_alltoallv_intra(void *sbuf, int *scounts, int *sdisps, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo alltoallv_intra"); @@ -63,7 +63,7 @@ mca_coll_demo_alltoallv_inter(void *sbuf, int *scounts, int *sdisps, int *rcounts, int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo alltoallv_inter"); diff --git a/ompi/mca/coll/demo/coll_demo_alltoallw.c b/ompi/mca/coll/demo/coll_demo_alltoallw.c index 875e59c4d3..a4fc325784 100644 --- a/ompi/mca/coll/demo/coll_demo_alltoallw.c +++ b/ompi/mca/coll/demo/coll_demo_alltoallw.c @@ -38,7 +38,7 @@ int mca_coll_demo_alltoallw_intra(void *sbuf, int *scounts, int *sdisps, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t **rdtypes, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo alltoallw_intra"); @@ -61,7 +61,7 @@ int mca_coll_demo_alltoallw_inter(void *sbuf, int *scounts, int *sdisps, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t **rdtypes, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo alltoallw_inter"); diff --git a/ompi/mca/coll/demo/coll_demo_barrier.c b/ompi/mca/coll/demo/coll_demo_barrier.c index e5ac4d4c2c..1f924cb8c9 100644 --- a/ompi/mca/coll/demo/coll_demo_barrier.c +++ b/ompi/mca/coll/demo/coll_demo_barrier.c @@ -34,7 +34,7 @@ * Returns: - MPI_SUCCESS or error code */ int mca_coll_demo_barrier_intra(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo barrier_intra"); @@ -51,7 +51,7 @@ int mca_coll_demo_barrier_intra(struct ompi_communicator_t *comm, * Returns: - MPI_SUCCESS or error code */ int mca_coll_demo_barrier_inter(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo barrier_inter"); diff --git a/ompi/mca/coll/demo/coll_demo_bcast.c b/ompi/mca/coll/demo/coll_demo_bcast.c index 5e1ce54d0d..8a851a9278 100644 --- a/ompi/mca/coll/demo/coll_demo_bcast.c +++ b/ompi/mca/coll/demo/coll_demo_bcast.c @@ -36,7 +36,7 @@ int mca_coll_demo_bcast_intra(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo bcast_intra"); @@ -56,7 +56,7 @@ int mca_coll_demo_bcast_intra(void *buff, int count, int mca_coll_demo_bcast_inter(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo bcast_inter"); diff --git a/ompi/mca/coll/demo/coll_demo_component.c b/ompi/mca/coll/demo/coll_demo_component.c index af3f93ac95..259e11c978 100644 --- a/ompi/mca/coll/demo/coll_demo_component.c +++ b/ompi/mca/coll/demo/coll_demo_component.c @@ -9,6 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -52,32 +53,24 @@ static int demo_open(void); * and pointers to our public functions in it */ -const mca_coll_base_component_1_1_0_t mca_coll_demo_component = { +const mca_coll_base_component_2_0_0_t mca_coll_demo_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a coll v1.0.0 component (which also - implies a specific MCA version) */ - - MCA_COLL_BASE_VERSION_1_1_0, + MCA_COLL_BASE_VERSION_2_0_0, /* Component name and version */ - "demo", OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, OMPI_RELEASE_VERSION, /* Component open and close functions */ - demo_open, NULL }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT @@ -138,6 +131,6 @@ mca_coll_demo_module_destruct(mca_coll_demo_module_t *module) OBJ_CLASS_INSTANCE(mca_coll_demo_module_t, - mca_coll_base_module_1_1_0_t, + mca_coll_base_module_t, mca_coll_demo_module_construct, mca_coll_demo_module_destruct); diff --git a/ompi/mca/coll/demo/coll_demo_exscan.c b/ompi/mca/coll/demo/coll_demo_exscan.c index a7784c467e..b8fea65ad9 100644 --- a/ompi/mca/coll/demo/coll_demo_exscan.c +++ b/ompi/mca/coll/demo/coll_demo_exscan.c @@ -37,7 +37,7 @@ int mca_coll_demo_exscan_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo exscan_intra"); diff --git a/ompi/mca/coll/demo/coll_demo_gather.c b/ompi/mca/coll/demo/coll_demo_gather.c index 0f7ea7c680..c5e8b68bae 100644 --- a/ompi/mca/coll/demo/coll_demo_gather.c +++ b/ompi/mca/coll/demo/coll_demo_gather.c @@ -37,7 +37,7 @@ int mca_coll_demo_gather_intra(void *sbuf, int scount, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo gather_intra"); @@ -60,7 +60,7 @@ int mca_coll_demo_gather_inter(void *sbuf, int scount, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo gather_inter"); diff --git a/ompi/mca/coll/demo/coll_demo_gatherv.c b/ompi/mca/coll/demo/coll_demo_gatherv.c index 2ce28c8c6e..c2454b039a 100644 --- a/ompi/mca/coll/demo/coll_demo_gatherv.c +++ b/ompi/mca/coll/demo/coll_demo_gatherv.c @@ -38,7 +38,7 @@ int mca_coll_demo_gatherv_intra(void *sbuf, int scount, void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo gatherv_intra"); @@ -61,7 +61,7 @@ int mca_coll_demo_gatherv_inter(void *sbuf, int scount, void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo gatherv_inter"); diff --git a/ompi/mca/coll/demo/coll_demo_module.c b/ompi/mca/coll/demo/coll_demo_module.c index ac7877448e..dc71410879 100644 --- a/ompi/mca/coll/demo/coll_demo_module.c +++ b/ompi/mca/coll/demo/coll_demo_module.c @@ -112,7 +112,7 @@ int mca_coll_demo_init_query(bool enable_progress_threads, * Look at the communicator and decide which set of functions and * priority we want to return. */ -mca_coll_base_module_1_1_0_t * +mca_coll_base_module_t * mca_coll_demo_comm_query(struct ompi_communicator_t *comm, int *priority) { mca_coll_demo_module_t *demo_module; @@ -177,7 +177,7 @@ mca_coll_demo_comm_query(struct ompi_communicator_t *comm, int *priority) } while (0) int -mca_coll_demo_module_enable(mca_coll_base_module_1_1_0_t *module, +mca_coll_demo_module_enable(mca_coll_base_module_t *module, struct ompi_communicator_t *comm) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; diff --git a/ompi/mca/coll/demo/coll_demo_reduce.c b/ompi/mca/coll/demo/coll_demo_reduce.c index f2de433e97..ed8d157b7e 100644 --- a/ompi/mca/coll/demo/coll_demo_reduce.c +++ b/ompi/mca/coll/demo/coll_demo_reduce.c @@ -37,7 +37,7 @@ int mca_coll_demo_reduce_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo reduce_intra"); @@ -58,7 +58,7 @@ int mca_coll_demo_reduce_inter(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo reduce_inter"); diff --git a/ompi/mca/coll/demo/coll_demo_reduce_scatter.c b/ompi/mca/coll/demo/coll_demo_reduce_scatter.c index 058fc1b899..8295d9d8c4 100644 --- a/ompi/mca/coll/demo/coll_demo_reduce_scatter.c +++ b/ompi/mca/coll/demo/coll_demo_reduce_scatter.c @@ -37,7 +37,7 @@ int mca_coll_demo_reduce_scatter_intra(void *sbuf, void *rbuf, int *rcounts, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo scatter_intra"); @@ -58,7 +58,7 @@ int mca_coll_demo_reduce_scatter_inter(void *sbuf, void *rbuf, int *rcounts, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo scatter_inter"); diff --git a/ompi/mca/coll/demo/coll_demo_scan.c b/ompi/mca/coll/demo/coll_demo_scan.c index 84b40843fc..a8953d0dbb 100644 --- a/ompi/mca/coll/demo/coll_demo_scan.c +++ b/ompi/mca/coll/demo/coll_demo_scan.c @@ -37,7 +37,7 @@ int mca_coll_demo_scan_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo scan_intra"); diff --git a/ompi/mca/coll/demo/coll_demo_scatter.c b/ompi/mca/coll/demo/coll_demo_scatter.c index 84e3462a8a..e2cca1bf1d 100644 --- a/ompi/mca/coll/demo/coll_demo_scatter.c +++ b/ompi/mca/coll/demo/coll_demo_scatter.c @@ -39,7 +39,7 @@ int mca_coll_demo_scatter_intra(void *sbuf, int scount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo scatter_intra"); @@ -63,7 +63,7 @@ int mca_coll_demo_scatter_inter(void *sbuf, int scount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo scatter_inter"); diff --git a/ompi/mca/coll/demo/coll_demo_scatterv.c b/ompi/mca/coll/demo/coll_demo_scatterv.c index b837f60666..f23aea1805 100644 --- a/ompi/mca/coll/demo/coll_demo_scatterv.c +++ b/ompi/mca/coll/demo/coll_demo_scatterv.c @@ -38,7 +38,7 @@ int mca_coll_demo_scatterv_intra(void *sbuf, int *scounts, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo scatterv_intra"); @@ -61,7 +61,7 @@ int mca_coll_demo_scatterv_inter(void *sbuf, int *scounts, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; opal_output_verbose(10, mca_coll_base_output, "In demo scatterv_inter"); diff --git a/ompi/mca/coll/hierarch/coll_hierarch.c b/ompi/mca/coll/hierarch/coll_hierarch.c index 3a06def17f..b09145d22f 100644 --- a/ompi/mca/coll/hierarch/coll_hierarch.c +++ b/ompi/mca/coll/hierarch/coll_hierarch.c @@ -76,7 +76,7 @@ int mca_coll_hierarch_init_query(bool allow_hierarch_user_threads, * Look at the communicator and decide which set of functions and * priority we want to return. */ -mca_coll_base_module_1_1_0_t * +mca_coll_base_module_t * mca_coll_hierarch_comm_query(struct ompi_communicator_t *comm, int *priority ) { int size, rank; @@ -247,7 +247,7 @@ mca_coll_hierarch_comm_query(struct ompi_communicator_t *comm, int *priority ) /* * Init module on the communicator */ -int mca_coll_hierarch_module_enable (mca_coll_base_module_1_1_0_t *module, +int mca_coll_hierarch_module_enable (mca_coll_base_module_t *module, struct ompi_communicator_t *comm) { int color; diff --git a/ompi/mca/coll/hierarch/coll_hierarch.h b/ompi/mca/coll/hierarch/coll_hierarch.h index 47132428bc..96bd02284b 100644 --- a/ompi/mca/coll/hierarch/coll_hierarch.h +++ b/ompi/mca/coll/hierarch/coll_hierarch.h @@ -11,6 +11,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2008 University of Houston. All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -37,7 +38,7 @@ BEGIN_C_DECLS * Globally exported variable */ -OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_1_1_0_t mca_coll_hierarch_component; +OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_2_0_0_t mca_coll_hierarch_component; extern int mca_coll_hierarch_priority_param; extern int mca_coll_hierarch_verbose_param; @@ -60,7 +61,7 @@ extern int mca_coll_hierarch_detection_alg_param; */ struct mca_coll_hierarch_module_t { - struct mca_coll_base_module_1_1_0_t super; + mca_coll_base_module_t super; struct ompi_communicator_t *hier_comm; /* link back to the attached comm */ struct ompi_communicator_t *hier_lcomm; /* low level communicator */ @@ -200,11 +201,11 @@ int mca_coll_hierarch_get_all_lleaders ( int rank, mca_coll_hierarch_module_t *h */ int mca_coll_hierarch_init_query(bool allow_hierarch_user_threads, bool have_hidden_threads); -struct mca_coll_base_module_1_1_0_t * +mca_coll_base_module_t * mca_coll_hierarch_comm_query(struct ompi_communicator_t *comm, int *priority ); -int mca_coll_hierarch_module_enable( struct mca_coll_base_module_1_1_0_t *module, +int mca_coll_hierarch_module_enable( mca_coll_base_module_t *module, struct ompi_communicator_t *comm); int mca_coll_hierarch_module_finalize(struct ompi_communicator_t *comm); @@ -214,25 +215,25 @@ int mca_coll_hierarch_allgather_intra(void *sbuf, int scount, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module ); + mca_coll_base_module_t *module ); int mca_coll_hierarch_allgatherv_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void * rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_hierarch_allreduce_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_hierarch_alltoall_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_hierarch_alltoallv_intra(void *sbuf, int *scounts, int *sdisps, struct ompi_datatype_t *sdtype, @@ -240,7 +241,7 @@ int mca_coll_hierarch_alltoallv_intra(void *sbuf, int *scounts, int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_hierarch_alltoallw_intra(void *sbuf, int *scounts, int *sdisps, struct ompi_datatype_t **sdtypes, @@ -248,14 +249,14 @@ int mca_coll_hierarch_alltoallw_intra(void *sbuf, int *scounts, int *rdisps, struct ompi_datatype_t **rdtypes, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_hierarch_barrier_intra(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_hierarch_bcast_intra(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_hierarch_exscan_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, @@ -266,42 +267,42 @@ int mca_coll_hierarch_gather_intra(void *sbuf, int scount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_hierarch_gatherv_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_hierarch_reduce_intra(void *sbuf, void* rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_hierarch_reduce_scatter_intra(void *sbuf, void *rbuf, int *rcounts, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_hierarch_scan_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_hierarch_scatter_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_hierarch_scatterv_intra(void *sbuf, int *scounts, int *disps, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); /* * These are trivial implementations of these routines used during comm_query/init, diff --git a/ompi/mca/coll/hierarch/coll_hierarch_allreduce.c b/ompi/mca/coll/hierarch/coll_hierarch_allreduce.c index 06624684a4..750700a019 100644 --- a/ompi/mca/coll/hierarch/coll_hierarch_allreduce.c +++ b/ompi/mca/coll/hierarch/coll_hierarch_allreduce.c @@ -41,7 +41,7 @@ int mca_coll_hierarch_allreduce_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { struct ompi_communicator_t *llcomm=NULL; struct ompi_communicator_t *lcomm=NULL; diff --git a/ompi/mca/coll/hierarch/coll_hierarch_barrier.c b/ompi/mca/coll/hierarch/coll_hierarch_barrier.c index c7cc8f5946..f57b687116 100644 --- a/ompi/mca/coll/hierarch/coll_hierarch_barrier.c +++ b/ompi/mca/coll/hierarch/coll_hierarch_barrier.c @@ -36,7 +36,7 @@ * Returns: - MPI_SUCCESS or error code */ int mca_coll_hierarch_barrier_intra(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { struct ompi_communicator_t *llcomm=NULL; struct ompi_communicator_t *lcomm=NULL; diff --git a/ompi/mca/coll/hierarch/coll_hierarch_bcast.c b/ompi/mca/coll/hierarch/coll_hierarch_bcast.c index 860abecc1d..3b95016353 100644 --- a/ompi/mca/coll/hierarch/coll_hierarch_bcast.c +++ b/ompi/mca/coll/hierarch/coll_hierarch_bcast.c @@ -40,7 +40,7 @@ int mca_coll_hierarch_bcast_intra(void *buff, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { struct ompi_communicator_t *llcomm=NULL; struct ompi_communicator_t *lcomm=NULL; diff --git a/ompi/mca/coll/hierarch/coll_hierarch_component.c b/ompi/mca/coll/hierarch/coll_hierarch_component.c index 1c834ba35b..aa7048c3d7 100644 --- a/ompi/mca/coll/hierarch/coll_hierarch_component.c +++ b/ompi/mca/coll/hierarch/coll_hierarch_component.c @@ -11,6 +11,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2008 University of Houston. All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -56,32 +57,24 @@ static int hierarch_open(void); * and pointers to our public functions in it */ -const mca_coll_base_component_1_1_0_t mca_coll_hierarch_component = { +const mca_coll_base_component_2_0_0_t mca_coll_hierarch_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a coll v1.1.0 component (which also implies a - specific MCA version) */ - - MCA_COLL_BASE_VERSION_1_1_0, + MCA_COLL_BASE_VERSION_2_0_0, /* Component name and version */ - "hierarch", OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, OMPI_RELEASE_VERSION, /* Component open and close functions */ - hierarch_open, NULL }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT @@ -185,6 +178,6 @@ mca_coll_hierarch_module_destruct(mca_coll_hierarch_module_t *hierarch_module) OBJ_CLASS_INSTANCE(mca_coll_hierarch_module_t, - mca_coll_base_module_1_1_0_t, + mca_coll_base_module_t, mca_coll_hierarch_module_construct, mca_coll_hierarch_module_destruct); diff --git a/ompi/mca/coll/hierarch/coll_hierarch_reduce.c b/ompi/mca/coll/hierarch/coll_hierarch_reduce.c index 47180ccb32..ef4bb21ebe 100644 --- a/ompi/mca/coll/hierarch/coll_hierarch_reduce.c +++ b/ompi/mca/coll/hierarch/coll_hierarch_reduce.c @@ -41,7 +41,7 @@ int mca_coll_hierarch_reduce_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { struct ompi_communicator_t *llcomm=NULL; struct ompi_communicator_t *lcomm=NULL; diff --git a/ompi/mca/coll/inter/coll_inter.c b/ompi/mca/coll/inter/coll_inter.c index ff211d8a6e..c71da5395c 100644 --- a/ompi/mca/coll/inter/coll_inter.c +++ b/ompi/mca/coll/inter/coll_inter.c @@ -90,7 +90,7 @@ int mca_coll_inter_init_query(bool allow_inter_user_threads, * Look at the communicator and decide which set of functions and * priority we want to return. */ -mca_coll_base_module_1_1_0_t * +mca_coll_base_module_t * mca_coll_inter_comm_query(struct ompi_communicator_t *comm, int *priority) { int size, rsize; @@ -148,7 +148,7 @@ mca_coll_inter_comm_query(struct ompi_communicator_t *comm, int *priority) * Init module on the communicator */ int -mca_coll_inter_module_enable(struct mca_coll_base_module_1_1_0_t *module, +mca_coll_inter_module_enable(mca_coll_base_module_t *module, struct ompi_communicator_t *comm) { int size, rank; diff --git a/ompi/mca/coll/inter/coll_inter.h b/ompi/mca/coll/inter/coll_inter.h index 43672afa87..6cb01f8d61 100644 --- a/ompi/mca/coll/inter/coll_inter.h +++ b/ompi/mca/coll/inter/coll_inter.h @@ -10,6 +10,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2007 University of Houston. All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -35,7 +36,7 @@ BEGIN_C_DECLS * Globally exported variable */ -OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_1_1_0_t mca_coll_inter_component; +OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_2_0_0_t mca_coll_inter_component; extern int mca_coll_inter_priority_param; extern int mca_coll_inter_verbose_param; @@ -45,10 +46,10 @@ extern int mca_coll_inter_verbose_param; */ int mca_coll_inter_init_query(bool allow_inter_user_threads, bool have_hidden_threads); -struct mca_coll_base_module_1_1_0_t * +mca_coll_base_module_t * mca_coll_inter_comm_query(struct ompi_communicator_t *comm, int *priority); -int mca_coll_inter_module_enable(struct mca_coll_base_module_1_1_0_t *module, +int mca_coll_inter_module_enable(mca_coll_base_module_t *module, struct ompi_communicator_t *comm); int mca_coll_inter_allgather_inter(void *sbuf, int scount, @@ -56,58 +57,58 @@ int mca_coll_inter_allgather_inter(void *sbuf, int scount, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_inter_allgatherv_inter(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_inter_allreduce_inter(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_inter_bcast_inter(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_inter_gather_inter(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_inter_gatherv_inter(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_inter_reduce_inter(void *sbuf, void* rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_inter_scatter_inter(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_inter_scatterv_inter(void *sbuf, int *scounts, int *disps, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); struct mca_coll_inter_module_t { - mca_coll_base_module_1_1_0_t super; + mca_coll_base_module_t super; /* Clarifying some terminology: * comm: the input communicator, consisting of several lower level communicators. diff --git a/ompi/mca/coll/inter/coll_inter_allgather.c b/ompi/mca/coll/inter/coll_inter_allgather.c index ff2f85239d..755520e799 100644 --- a/ompi/mca/coll/inter/coll_inter_allgather.c +++ b/ompi/mca/coll/inter/coll_inter_allgather.c @@ -42,7 +42,7 @@ mca_coll_inter_allgather_inter(void *sbuf, int scount, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int rank, root = 0, size, rsize, err; char *ptmp = NULL; diff --git a/ompi/mca/coll/inter/coll_inter_allgatherv.c b/ompi/mca/coll/inter/coll_inter_allgatherv.c index 11ee36659e..04d3b889f9 100644 --- a/ompi/mca/coll/inter/coll_inter_allgatherv.c +++ b/ompi/mca/coll/inter/coll_inter_allgatherv.c @@ -41,7 +41,7 @@ mca_coll_inter_allgatherv_inter(void *sbuf, int scount, void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i, rank, size, size_local, total=0, err; int *count=NULL,*displace=NULL; diff --git a/ompi/mca/coll/inter/coll_inter_allreduce.c b/ompi/mca/coll/inter/coll_inter_allreduce.c index 354fcc881a..fb0db18236 100644 --- a/ompi/mca/coll/inter/coll_inter_allreduce.c +++ b/ompi/mca/coll/inter/coll_inter_allreduce.c @@ -40,7 +40,7 @@ mca_coll_inter_allreduce_inter(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int err, rank, root = 0, rsize; ptrdiff_t lb, extent; diff --git a/ompi/mca/coll/inter/coll_inter_bcast.c b/ompi/mca/coll/inter/coll_inter_bcast.c index 029bfe6aca..e1e61e3031 100644 --- a/ompi/mca/coll/inter/coll_inter_bcast.c +++ b/ompi/mca/coll/inter/coll_inter_bcast.c @@ -40,7 +40,7 @@ int mca_coll_inter_bcast_inter(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int rsize; int rank; diff --git a/ompi/mca/coll/inter/coll_inter_component.c b/ompi/mca/coll/inter/coll_inter_component.c index 2384037f4f..f7d644fae0 100644 --- a/ompi/mca/coll/inter/coll_inter_component.c +++ b/ompi/mca/coll/inter/coll_inter_component.c @@ -10,6 +10,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2007 University of Houston. All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -52,35 +53,27 @@ static int inter_open(void); * and pointers to our public functions in it */ -const mca_coll_base_component_1_1_0_t mca_coll_inter_component = { +const mca_coll_base_component_2_0_0_t mca_coll_inter_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a coll v1.0.0 component (which also implies a - specific MCA version) */ - - MCA_COLL_BASE_VERSION_1_1_0, + MCA_COLL_BASE_VERSION_2_0_0, /* Component name and version */ - "inter", OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, OMPI_RELEASE_VERSION, /* Component open and close functions */ - inter_open, NULL }, - - /* Next the MCA v1.0.0 component meta data */ - { - /* Whether the component is checkpointable or not */ - true + /* This component is checkpointable */ + MCA_BASE_METADATA_PARAM_CHECKPOINT }, /* Initialization / querying functions */ @@ -125,6 +118,6 @@ mca_coll_inter_module_destruct(mca_coll_inter_module_t *module) OBJ_CLASS_INSTANCE(mca_coll_inter_module_t, - mca_coll_base_module_1_1_0_t, + mca_coll_base_module_t, mca_coll_inter_module_construct, mca_coll_inter_module_destruct); diff --git a/ompi/mca/coll/inter/coll_inter_gather.c b/ompi/mca/coll/inter/coll_inter_gather.c index 62d6451304..1000d6410c 100644 --- a/ompi/mca/coll/inter/coll_inter_gather.c +++ b/ompi/mca/coll/inter/coll_inter_gather.c @@ -41,7 +41,7 @@ mca_coll_inter_gather_inter(void *sbuf, int scount, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int err; int rank; diff --git a/ompi/mca/coll/inter/coll_inter_gatherv.c b/ompi/mca/coll/inter/coll_inter_gatherv.c index b737492f5e..bd8000a589 100644 --- a/ompi/mca/coll/inter/coll_inter_gatherv.c +++ b/ompi/mca/coll/inter/coll_inter_gatherv.c @@ -40,7 +40,7 @@ mca_coll_inter_gatherv_inter(void *sbuf, int scount, void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i, rank, size, size_local, total=0, err; diff --git a/ompi/mca/coll/inter/coll_inter_reduce.c b/ompi/mca/coll/inter/coll_inter_reduce.c index ea4f8ce148..d94d558f6b 100644 --- a/ompi/mca/coll/inter/coll_inter_reduce.c +++ b/ompi/mca/coll/inter/coll_inter_reduce.c @@ -41,7 +41,7 @@ mca_coll_inter_reduce_inter(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int rank, err, size; ptrdiff_t true_lb, true_extent, lb, extent; diff --git a/ompi/mca/coll/inter/coll_inter_scatter.c b/ompi/mca/coll/inter/coll_inter_scatter.c index 0184691670..abff0b9c15 100644 --- a/ompi/mca/coll/inter/coll_inter_scatter.c +++ b/ompi/mca/coll/inter/coll_inter_scatter.c @@ -40,7 +40,7 @@ mca_coll_inter_scatter_inter(void *sbuf, int scount, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int rank, size, size_local, err; char *ptmp = NULL; diff --git a/ompi/mca/coll/inter/coll_inter_scatterv.c b/ompi/mca/coll/inter/coll_inter_scatterv.c index 18fdf405d0..eb2339f02a 100644 --- a/ompi/mca/coll/inter/coll_inter_scatterv.c +++ b/ompi/mca/coll/inter/coll_inter_scatterv.c @@ -41,7 +41,7 @@ mca_coll_inter_scatterv_inter(void *sbuf, int *scounts, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i, rank, size, err, total, size_local; int *counts=NULL,*displace=NULL; diff --git a/ompi/mca/coll/self/coll_self.h b/ompi/mca/coll/self/coll_self.h index 768c7266b2..2715ef7fd8 100644 --- a/ompi/mca/coll/self/coll_self.h +++ b/ompi/mca/coll/self/coll_self.h @@ -9,6 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -33,7 +34,7 @@ BEGIN_C_DECLS * Globally exported variable */ -OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_1_1_0_t mca_coll_self_component; +OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_2_0_0_t mca_coll_self_component; extern int mca_coll_self_priority_param; @@ -46,10 +47,10 @@ extern int mca_coll_self_priority_param; int mca_coll_self_init_query(bool enable_progress_threads, bool enable_mpi_threads); -struct mca_coll_base_module_1_1_0_t * +mca_coll_base_module_t * mca_coll_self_comm_query(struct ompi_communicator_t *comm, int *priority); -int mca_coll_self_module_enable(struct mca_coll_base_module_1_1_0_t *module, +int mca_coll_self_module_enable(mca_coll_base_module_t *module, struct ompi_communicator_t *comm); int mca_coll_self_allgather_intra(void *sbuf, int scount, @@ -57,93 +58,93 @@ int mca_coll_self_allgather_intra(void *sbuf, int scount, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_self_allgatherv_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void * rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_self_allreduce_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_self_alltoall_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_self_alltoallv_intra(void *sbuf, int *scounts, int *sdisps, struct ompi_datatype_t *sdtype, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_self_alltoallw_intra(void *sbuf, int *scounts, int *sdisps, struct ompi_datatype_t **sdtypes, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t **rdtypes, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_self_barrier_intra(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_self_bcast_intra(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_self_exscan_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_self_gather_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_self_gatherv_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_self_reduce_intra(void *sbuf, void* rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_self_reduce_scatter_intra(void *sbuf, void *rbuf, int *rcounts, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_self_scan_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_self_scatter_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_self_scatterv_intra(void *sbuf, int *scounts, int *disps, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_self_ft_event(int state); struct mca_coll_self_module_t { - mca_coll_base_module_1_1_0_t super; + mca_coll_base_module_t super; ompi_request_t **mccb_reqs; int mccb_num_reqs; diff --git a/ompi/mca/coll/self/coll_self_allgather.c b/ompi/mca/coll/self/coll_self_allgather.c index ef0ef5fe73..3175988620 100644 --- a/ompi/mca/coll/self/coll_self_allgather.c +++ b/ompi/mca/coll/self/coll_self_allgather.c @@ -34,7 +34,7 @@ int mca_coll_self_allgather_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { if (MPI_IN_PLACE == sbuf) { return MPI_SUCCESS; diff --git a/ompi/mca/coll/self/coll_self_allgatherv.c b/ompi/mca/coll/self/coll_self_allgatherv.c index bc15e72986..ce6133d327 100644 --- a/ompi/mca/coll/self/coll_self_allgatherv.c +++ b/ompi/mca/coll/self/coll_self_allgatherv.c @@ -35,7 +35,7 @@ int mca_coll_self_allgatherv_intra(void *sbuf, int scount, void * rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { if (MPI_IN_PLACE == sbuf) { return MPI_SUCCESS; diff --git a/ompi/mca/coll/self/coll_self_allreduce.c b/ompi/mca/coll/self/coll_self_allreduce.c index ddde90cec4..601eea2304 100644 --- a/ompi/mca/coll/self/coll_self_allreduce.c +++ b/ompi/mca/coll/self/coll_self_allreduce.c @@ -34,7 +34,7 @@ int mca_coll_self_allreduce_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { if (MPI_IN_PLACE == sbuf) { return MPI_SUCCESS; diff --git a/ompi/mca/coll/self/coll_self_alltoall.c b/ompi/mca/coll/self/coll_self_alltoall.c index 669931a015..e25f53d036 100644 --- a/ompi/mca/coll/self/coll_self_alltoall.c +++ b/ompi/mca/coll/self/coll_self_alltoall.c @@ -35,7 +35,7 @@ int mca_coll_self_alltoall_intra(void *sbuf, int scount, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { return ompi_ddt_sndrcv(sbuf, scount, sdtype, rbuf, rcount, rdtype); diff --git a/ompi/mca/coll/self/coll_self_alltoallv.c b/ompi/mca/coll/self/coll_self_alltoallv.c index b2ffcfd8d9..10e06f0e22 100644 --- a/ompi/mca/coll/self/coll_self_alltoallv.c +++ b/ompi/mca/coll/self/coll_self_alltoallv.c @@ -36,7 +36,7 @@ mca_coll_self_alltoallv_intra(void *sbuf, int *scounts, int *sdisps, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int err; ptrdiff_t lb, rextent, sextent; diff --git a/ompi/mca/coll/self/coll_self_alltoallw.c b/ompi/mca/coll/self/coll_self_alltoallw.c index 08e63d4add..ac7c8049a1 100644 --- a/ompi/mca/coll/self/coll_self_alltoallw.c +++ b/ompi/mca/coll/self/coll_self_alltoallw.c @@ -35,7 +35,7 @@ int mca_coll_self_alltoallw_intra(void *sbuf, int *scounts, int *sdisps, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t **rdtypes, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int err; ptrdiff_t lb, rextent, sextent; diff --git a/ompi/mca/coll/self/coll_self_barrier.c b/ompi/mca/coll/self/coll_self_barrier.c index 84d8ad47ad..d8371713e7 100644 --- a/ompi/mca/coll/self/coll_self_barrier.c +++ b/ompi/mca/coll/self/coll_self_barrier.c @@ -30,7 +30,7 @@ * Returns: - MPI_SUCCESS */ int mca_coll_self_barrier_intra(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { /* Since there is only one process, this is a no-op */ diff --git a/ompi/mca/coll/self/coll_self_bcast.c b/ompi/mca/coll/self/coll_self_bcast.c index f2c5e859ee..96565f2dc7 100644 --- a/ompi/mca/coll/self/coll_self_bcast.c +++ b/ompi/mca/coll/self/coll_self_bcast.c @@ -33,7 +33,7 @@ int mca_coll_self_bcast_intra(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { /* Since there's only one process, there's nothing to do */ diff --git a/ompi/mca/coll/self/coll_self_component.c b/ompi/mca/coll/self/coll_self_component.c index 5ba70c8114..1bde96bcee 100644 --- a/ompi/mca/coll/self/coll_self_component.c +++ b/ompi/mca/coll/self/coll_self_component.c @@ -9,6 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -51,32 +52,24 @@ static int self_open(void); * and pointers to our public functions in it */ -const mca_coll_base_component_1_1_0_t mca_coll_self_component = { +const mca_coll_base_component_2_0_0_t mca_coll_self_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a coll v1.0.0 component (which also - implies a specific MCA version) */ - - MCA_COLL_BASE_VERSION_1_1_0, + MCA_COLL_BASE_VERSION_2_0_0, /* Component name and version */ - "self", OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, OMPI_RELEASE_VERSION, /* Component open and close functions */ - self_open, NULL }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT @@ -102,5 +95,5 @@ static int self_open(void) OBJ_CLASS_INSTANCE(mca_coll_self_module_t, - mca_coll_base_module_1_1_0_t, + mca_coll_base_module_t, NULL, NULL); diff --git a/ompi/mca/coll/self/coll_self_exscan.c b/ompi/mca/coll/self/coll_self_exscan.c index c4ef5b8473..353d1490b4 100644 --- a/ompi/mca/coll/self/coll_self_exscan.c +++ b/ompi/mca/coll/self/coll_self_exscan.c @@ -33,7 +33,7 @@ int mca_coll_self_exscan_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { /* Since there's only one process, there's nothing to do */ diff --git a/ompi/mca/coll/self/coll_self_gather.c b/ompi/mca/coll/self/coll_self_gather.c index f6fe684225..786c602ca2 100644 --- a/ompi/mca/coll/self/coll_self_gather.c +++ b/ompi/mca/coll/self/coll_self_gather.c @@ -35,7 +35,7 @@ int mca_coll_self_gather_intra(void *sbuf, int scount, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { if (MPI_IN_PLACE == sbuf) { return MPI_SUCCESS; diff --git a/ompi/mca/coll/self/coll_self_gatherv.c b/ompi/mca/coll/self/coll_self_gatherv.c index f0d7461604..fa476527c2 100644 --- a/ompi/mca/coll/self/coll_self_gatherv.c +++ b/ompi/mca/coll/self/coll_self_gatherv.c @@ -35,7 +35,7 @@ int mca_coll_self_gatherv_intra(void *sbuf, int scount, void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { if (MPI_IN_PLACE == sbuf) { return MPI_SUCCESS; diff --git a/ompi/mca/coll/self/coll_self_module.c b/ompi/mca/coll/self/coll_self_module.c index 78deff48be..9f1bd44877 100644 --- a/ompi/mca/coll/self/coll_self_module.c +++ b/ompi/mca/coll/self/coll_self_module.c @@ -47,7 +47,7 @@ int mca_coll_self_init_query(bool enable_progress_threads, * Look at the communicator and decide which set of functions and * priority we want to return. */ -mca_coll_base_module_1_1_0_t * +mca_coll_base_module_t * mca_coll_self_comm_query(struct ompi_communicator_t *comm, int *priority) { @@ -95,7 +95,7 @@ mca_coll_self_comm_query(struct ompi_communicator_t *comm, * Init module on the communicator */ int -mca_coll_self_module_enable(struct mca_coll_base_module_1_1_0_t *module, +mca_coll_self_module_enable(mca_coll_base_module_t *module, struct ompi_communicator_t *comm) { return OMPI_SUCCESS; diff --git a/ompi/mca/coll/self/coll_self_reduce.c b/ompi/mca/coll/self/coll_self_reduce.c index 308d32b801..9c94b56d06 100644 --- a/ompi/mca/coll/self/coll_self_reduce.c +++ b/ompi/mca/coll/self/coll_self_reduce.c @@ -34,7 +34,7 @@ int mca_coll_self_reduce_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { if (MPI_IN_PLACE == sbuf) { return MPI_SUCCESS; diff --git a/ompi/mca/coll/self/coll_self_reduce_scatter.c b/ompi/mca/coll/self/coll_self_reduce_scatter.c index f7e173fa8d..eae1eb0a16 100644 --- a/ompi/mca/coll/self/coll_self_reduce_scatter.c +++ b/ompi/mca/coll/self/coll_self_reduce_scatter.c @@ -34,7 +34,7 @@ int mca_coll_self_reduce_scatter_intra(void *sbuf, void *rbuf, int *rcounts, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { if (MPI_IN_PLACE == sbuf) { return MPI_SUCCESS; diff --git a/ompi/mca/coll/self/coll_self_scan.c b/ompi/mca/coll/self/coll_self_scan.c index cb4599c891..6b94c16f9d 100644 --- a/ompi/mca/coll/self/coll_self_scan.c +++ b/ompi/mca/coll/self/coll_self_scan.c @@ -34,7 +34,7 @@ int mca_coll_self_scan_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { if (MPI_IN_PLACE == sbuf) { return MPI_SUCCESS; diff --git a/ompi/mca/coll/self/coll_self_scatter.c b/ompi/mca/coll/self/coll_self_scatter.c index bc55f7dcb7..548ef86b72 100644 --- a/ompi/mca/coll/self/coll_self_scatter.c +++ b/ompi/mca/coll/self/coll_self_scatter.c @@ -36,7 +36,7 @@ int mca_coll_self_scatter_intra(void *sbuf, int scount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { if (MPI_IN_PLACE == rbuf) { return MPI_SUCCESS; diff --git a/ompi/mca/coll/self/coll_self_scatterv.c b/ompi/mca/coll/self/coll_self_scatterv.c index 18a6a6123b..7ae5188f28 100644 --- a/ompi/mca/coll/self/coll_self_scatterv.c +++ b/ompi/mca/coll/self/coll_self_scatterv.c @@ -35,7 +35,7 @@ int mca_coll_self_scatterv_intra(void *sbuf, int *scounts, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { if (MPI_IN_PLACE == rbuf) { return MPI_SUCCESS; diff --git a/ompi/mca/coll/sm/coll_sm.h b/ompi/mca/coll/sm/coll_sm.h index 640fcf3a4f..117a570159 100644 --- a/ompi/mca/coll/sm/coll_sm.h +++ b/ompi/mca/coll/sm/coll_sm.h @@ -9,6 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -127,7 +128,7 @@ BEGIN_C_DECLS */ struct mca_coll_sm_component_t { /** Base coll component */ - mca_coll_base_component_1_1_0_t super; + mca_coll_base_component_2_0_0_t super; /** MCA parameter: Priority of this component */ int sm_priority; @@ -328,11 +329,11 @@ BEGIN_C_DECLS struct mca_coll_sm_module_t { - mca_coll_base_module_1_1_0_t super; + mca_coll_base_module_t super; mca_coll_sm_comm_t *sm_data; mca_coll_base_module_reduce_fn_t previous_reduce; - mca_coll_base_module_1_1_0_t *previous_reduce_module; + mca_coll_base_module_t *previous_reduce_module; }; typedef struct mca_coll_sm_module_t mca_coll_sm_module_t; OBJ_CLASS_DECLARATION(mca_coll_sm_module_t); @@ -350,7 +351,7 @@ BEGIN_C_DECLS int mca_coll_sm_init_query(bool enable_progress_threads, bool enable_mpi_threads); - struct mca_coll_base_module_1_1_0_t * + mca_coll_base_module_t * mca_coll_sm_comm_query(struct ompi_communicator_t *comm, int *priority); int mca_coll_sm_bootstrap_finalize(void); @@ -360,99 +361,99 @@ BEGIN_C_DECLS void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm_allgatherv_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void * rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm_allreduce_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm_alltoall_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm_alltoallv_intra(void *sbuf, int *scounts, int *sdisps, struct ompi_datatype_t *sdtype, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm_alltoallw_intra(void *sbuf, int *scounts, int *sdisps, struct ompi_datatype_t **sdtypes, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t **rdtypes, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm_barrier_intra(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm_bcast_intra(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm_bcast_log_intra(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm_exscan_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm_gather_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm_gatherv_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm_reduce_intra(void *sbuf, void* rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm_reduce_log_intra(void *sbuf, void* rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm_reduce_scatter_intra(void *sbuf, void *rbuf, int *rcounts, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm_scan_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm_scatter_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm_scatterv_intra(void *sbuf, int *scounts, int *disps, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm_ft_event(int state); diff --git a/ompi/mca/coll/sm/coll_sm_allgather.c b/ompi/mca/coll/sm/coll_sm_allgather.c index 0287d8359b..ee29213bc7 100644 --- a/ompi/mca/coll/sm/coll_sm_allgather.c +++ b/ompi/mca/coll/sm/coll_sm_allgather.c @@ -33,7 +33,7 @@ int mca_coll_sm_allgather_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { return OMPI_ERR_NOT_IMPLEMENTED; } diff --git a/ompi/mca/coll/sm/coll_sm_allgatherv.c b/ompi/mca/coll/sm/coll_sm_allgatherv.c index 01f56e3a2b..34a6ef91a5 100644 --- a/ompi/mca/coll/sm/coll_sm_allgatherv.c +++ b/ompi/mca/coll/sm/coll_sm_allgatherv.c @@ -34,7 +34,7 @@ int mca_coll_sm_allgatherv_intra(void *sbuf, int scount, void * rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { return OMPI_ERR_NOT_IMPLEMENTED; } diff --git a/ompi/mca/coll/sm/coll_sm_allreduce.c b/ompi/mca/coll/sm/coll_sm_allreduce.c index 986de1354d..8576d948fd 100644 --- a/ompi/mca/coll/sm/coll_sm_allreduce.c +++ b/ompi/mca/coll/sm/coll_sm_allreduce.c @@ -33,7 +33,7 @@ int mca_coll_sm_allreduce_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int ret; diff --git a/ompi/mca/coll/sm/coll_sm_alltoall.c b/ompi/mca/coll/sm/coll_sm_alltoall.c index 69c89c2d72..2a807cb1e4 100644 --- a/ompi/mca/coll/sm/coll_sm_alltoall.c +++ b/ompi/mca/coll/sm/coll_sm_alltoall.c @@ -33,7 +33,7 @@ int mca_coll_sm_alltoall_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { return OMPI_ERR_NOT_IMPLEMENTED; } diff --git a/ompi/mca/coll/sm/coll_sm_alltoallv.c b/ompi/mca/coll/sm/coll_sm_alltoallv.c index c67a2702e6..b28ca4a90f 100644 --- a/ompi/mca/coll/sm/coll_sm_alltoallv.c +++ b/ompi/mca/coll/sm/coll_sm_alltoallv.c @@ -34,7 +34,7 @@ int mca_coll_sm_alltoallv_intra(void *sbuf, int *scounts, int *sdisps, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { return OMPI_ERR_NOT_IMPLEMENTED; } diff --git a/ompi/mca/coll/sm/coll_sm_alltoallw.c b/ompi/mca/coll/sm/coll_sm_alltoallw.c index 09d9ae134e..8f8bbdded6 100644 --- a/ompi/mca/coll/sm/coll_sm_alltoallw.c +++ b/ompi/mca/coll/sm/coll_sm_alltoallw.c @@ -34,7 +34,7 @@ int mca_coll_sm_alltoallw_intra(void *sbuf, int *scounts, int *sdisps, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t **rdtypes, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { return OMPI_ERR_NOT_IMPLEMENTED; } diff --git a/ompi/mca/coll/sm/coll_sm_barrier.c b/ompi/mca/coll/sm/coll_sm_barrier.c index f3e8915419..97de285b29 100644 --- a/ompi/mca/coll/sm/coll_sm_barrier.c +++ b/ompi/mca/coll/sm/coll_sm_barrier.c @@ -50,7 +50,7 @@ * general idea. */ int mca_coll_sm_barrier_intra(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int rank, buffer_set; mca_coll_sm_comm_t *data; diff --git a/ompi/mca/coll/sm/coll_sm_bcast.c b/ompi/mca/coll/sm/coll_sm_bcast.c index c1734c73d7..2726338030 100644 --- a/ompi/mca/coll/sm/coll_sm_bcast.c +++ b/ompi/mca/coll/sm/coll_sm_bcast.c @@ -53,7 +53,7 @@ int mca_coll_sm_bcast_intra(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { struct iovec iov; mca_coll_sm_module_t *sm_module = (mca_coll_sm_module_t*) module; diff --git a/ompi/mca/coll/sm/coll_sm_component.c b/ompi/mca/coll/sm/coll_sm_component.c index 70d6f6a33c..11d712a6ec 100644 --- a/ompi/mca/coll/sm/coll_sm_component.c +++ b/ompi/mca/coll/sm/coll_sm_component.c @@ -9,6 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -53,33 +54,25 @@ static int sm_close(void); mca_coll_sm_component_t mca_coll_sm_component = { - /* First, fill in the super (mca_coll_base_component_1_1_0_t) */ + /* First, fill in the super */ { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a coll v1.1.0 component (which - also implies a specific MCA version) */ - - MCA_COLL_BASE_VERSION_1_1_0, + MCA_COLL_BASE_VERSION_2_0_0, /* Component name and version */ - "sm", OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, OMPI_RELEASE_VERSION, /* Component open and close functions */ - sm_open, sm_close, }, - - /* Next the MCA v1.1.0 component meta data */ - { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE @@ -322,6 +315,6 @@ mca_coll_sm_module_destruct(mca_coll_sm_module_t *module) OBJ_CLASS_INSTANCE(mca_coll_sm_module_t, - mca_coll_base_module_1_1_0_t, + mca_coll_base_module_t, mca_coll_sm_module_construct, mca_coll_sm_module_destruct); diff --git a/ompi/mca/coll/sm/coll_sm_exscan.c b/ompi/mca/coll/sm/coll_sm_exscan.c index 98e496b0c6..c17e1f402d 100644 --- a/ompi/mca/coll/sm/coll_sm_exscan.c +++ b/ompi/mca/coll/sm/coll_sm_exscan.c @@ -33,7 +33,7 @@ int mca_coll_sm_exscan_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { return OMPI_ERR_NOT_IMPLEMENTED; } diff --git a/ompi/mca/coll/sm/coll_sm_gather.c b/ompi/mca/coll/sm/coll_sm_gather.c index 1c7bd32c2e..61218b5088 100644 --- a/ompi/mca/coll/sm/coll_sm_gather.c +++ b/ompi/mca/coll/sm/coll_sm_gather.c @@ -33,7 +33,7 @@ int mca_coll_sm_gather_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { return OMPI_ERR_NOT_IMPLEMENTED; } diff --git a/ompi/mca/coll/sm/coll_sm_gatherv.c b/ompi/mca/coll/sm/coll_sm_gatherv.c index 5523bf22be..fee7edcbbb 100644 --- a/ompi/mca/coll/sm/coll_sm_gatherv.c +++ b/ompi/mca/coll/sm/coll_sm_gatherv.c @@ -34,7 +34,7 @@ int mca_coll_sm_gatherv_intra(void *sbuf, int scount, void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { return OMPI_ERR_NOT_IMPLEMENTED; } diff --git a/ompi/mca/coll/sm/coll_sm_module.c b/ompi/mca/coll/sm/coll_sm_module.c index 1642b2c870..1865deef24 100644 --- a/ompi/mca/coll/sm/coll_sm_module.c +++ b/ompi/mca/coll/sm/coll_sm_module.c @@ -66,7 +66,7 @@ uint32_t mca_coll_sm_iov_size = 1; /* * Local functions */ -static int sm_module_enable(struct mca_coll_base_module_1_1_0_t *module, +static int sm_module_enable(mca_coll_base_module_t *module, struct ompi_communicator_t *comm); static bool have_local_peers(ompi_group_t *group, size_t size); static int bootstrap_init(void); @@ -129,7 +129,7 @@ int mca_coll_sm_init_query(bool enable_progress_threads, * Look at the communicator and decide which set of functions and * priority we want to return. */ -mca_coll_base_module_1_1_0_t * +mca_coll_base_module_t * mca_coll_sm_comm_query(struct ompi_communicator_t *comm, int *priority) { mca_coll_sm_module_t *sm_module; @@ -200,7 +200,7 @@ mca_coll_sm_comm_query(struct ompi_communicator_t *comm, int *priority) * Init module on the communicator */ static int -sm_module_enable(struct mca_coll_base_module_1_1_0_t *module, +sm_module_enable(mca_coll_base_module_t *module, struct ompi_communicator_t *comm) { int i, j, root, ret; diff --git a/ompi/mca/coll/sm/coll_sm_reduce.c b/ompi/mca/coll/sm/coll_sm_reduce.c index 4437541995..f615be1896 100644 --- a/ompi/mca/coll/sm/coll_sm_reduce.c +++ b/ompi/mca/coll/sm/coll_sm_reduce.c @@ -34,14 +34,14 @@ static int reduce_inorder(void *sbuf, void* rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); #define WANT_REDUCE_NO_ORDER 0 #if WANT_REDUCE_NO_ORDER static int reduce_no_order(void *sbuf, void* rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); #endif /* @@ -63,7 +63,7 @@ int mca_coll_sm_reduce_intra(void *sbuf, void* rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { size_t size; mca_coll_sm_module_t *sm_module = (mca_coll_sm_module_t*) module; @@ -146,7 +146,7 @@ static int reduce_inorder(void *sbuf, void* rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { struct iovec iov; mca_coll_sm_module_t *sm_module = (mca_coll_sm_module_t*) module; @@ -502,7 +502,7 @@ static int reduce_no_order(void *sbuf, void* rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { return OMPI_ERR_NOT_IMPLEMENTED; } diff --git a/ompi/mca/coll/sm/coll_sm_reduce_scatter.c b/ompi/mca/coll/sm/coll_sm_reduce_scatter.c index d33a85bbcc..d05c8c9bab 100644 --- a/ompi/mca/coll/sm/coll_sm_reduce_scatter.c +++ b/ompi/mca/coll/sm/coll_sm_reduce_scatter.c @@ -33,7 +33,7 @@ int mca_coll_sm_reduce_scatter_intra(void *sbuf, void *rbuf, int *rcounts, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { return OMPI_ERR_NOT_IMPLEMENTED; } diff --git a/ompi/mca/coll/sm/coll_sm_scan.c b/ompi/mca/coll/sm/coll_sm_scan.c index 7fab66baa4..1e42ba419f 100644 --- a/ompi/mca/coll/sm/coll_sm_scan.c +++ b/ompi/mca/coll/sm/coll_sm_scan.c @@ -33,7 +33,7 @@ int mca_coll_sm_scan_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { return OMPI_ERR_NOT_IMPLEMENTED; } diff --git a/ompi/mca/coll/sm/coll_sm_scatter.c b/ompi/mca/coll/sm/coll_sm_scatter.c index a9433ab167..d14a9c60f6 100644 --- a/ompi/mca/coll/sm/coll_sm_scatter.c +++ b/ompi/mca/coll/sm/coll_sm_scatter.c @@ -33,7 +33,7 @@ int mca_coll_sm_scatter_intra(void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { return OMPI_ERR_NOT_IMPLEMENTED; } diff --git a/ompi/mca/coll/sm/coll_sm_scatterv.c b/ompi/mca/coll/sm/coll_sm_scatterv.c index 5072bc84dc..8519d390cd 100644 --- a/ompi/mca/coll/sm/coll_sm_scatterv.c +++ b/ompi/mca/coll/sm/coll_sm_scatterv.c @@ -34,7 +34,7 @@ int mca_coll_sm_scatterv_intra(void *sbuf, int *scounts, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { return OMPI_ERR_NOT_IMPLEMENTED; } diff --git a/ompi/mca/coll/sm2/coll_sm2.h b/ompi/mca/coll/sm2/coll_sm2.h index f13b4be2bd..769addd160 100644 --- a/ompi/mca/coll/sm2/coll_sm2.h +++ b/ompi/mca/coll/sm2/coll_sm2.h @@ -9,6 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -65,7 +66,7 @@ BEGIN_C_DECLS */ struct mca_coll_sm2_component_t { /** Base coll component */ - mca_coll_base_component_1_1_0_t super; + mca_coll_base_component_2_0_0_t super; /** MCA parameter: Priority of this component */ int sm2_priority; @@ -352,7 +353,7 @@ BEGIN_C_DECLS /* end debug */ struct mca_coll_sm2_module_t { /* base structure */ - mca_coll_base_module_1_1_0_t super; + mca_coll_base_module_t super; /* size */ int comm_size; @@ -565,7 +566,7 @@ BEGIN_C_DECLS /* query to see if the module is available for use on the given * communicator, and if so, what it's priority is. */ - struct mca_coll_base_module_1_1_0_t * + mca_coll_base_module_t * mca_coll_sm2_comm_query(struct ompi_communicator_t *comm, int *priority); /* setup an multi-nomial tree - for each node in the tree @@ -581,12 +582,12 @@ BEGIN_C_DECLS /* non-blocking barrier - init function */ int mca_coll_sm2_nbbarrier_intra(struct ompi_communicator_t *comm, mca_coll_sm2_nb_request_process_private_mem_t *request, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); /* non-blocking barrier - completion function */ int mca_coll_sm2_nbbarrier_intra_progress(struct ompi_communicator_t *comm, mca_coll_sm2_nb_request_process_private_mem_t *request, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); /* allocate working buffer */ sm_work_buffer_t *alloc_sm2_shared_buffer(mca_coll_sm2_module_t *module); @@ -604,17 +605,17 @@ BEGIN_C_DECLS struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm2_allreduce_intra_reducescatter_allgather( void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm2_allreduce_intra_fanin_fanout(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); /** * Shared memory blocking reduce @@ -622,17 +623,17 @@ BEGIN_C_DECLS int mca_coll_sm2_reduce_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm2_reduce_intra_reducescatter_gather(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm2_reduce_intra_fanin(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); /** * Shared memory blocking broadcast. @@ -640,21 +641,21 @@ BEGIN_C_DECLS int mca_coll_sm2_bcast_intra(void *buf, int count, struct ompi_datatype_t *dtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); /** * Shared memory blocking barrier */ int mca_coll_sm2_barrier_intra( struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm2_barrier_intra_fanin_fanout( struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); int mca_coll_sm2_barrier_intra_recursive_doubling( struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module); + mca_coll_base_module_t *module); END_C_DECLS diff --git a/ompi/mca/coll/sm2/coll_sm2_allreduce.c b/ompi/mca/coll/sm2/coll_sm2_allreduce.c index 826c4563d4..49d03794ca 100644 --- a/ompi/mca/coll/sm2/coll_sm2_allreduce.c +++ b/ompi/mca/coll/sm2/coll_sm2_allreduce.c @@ -30,7 +30,7 @@ int mca_coll_sm2_allreduce_intra_fanin_fanout(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { /* local variables */ int rc=OMPI_SUCCESS,n_dts_per_buffer,n_data_segments,stripe_number; @@ -575,7 +575,7 @@ static int mca_coll_sm2_allreduce_intra_fanin_fanout_pipeline (void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { /* local variables */ @@ -769,7 +769,7 @@ static int mca_coll_sm2_allreduce_intra_recursive_doubling(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { /* local variables */ int rc=OMPI_SUCCESS,n_dts_per_buffer,n_data_segments,stripe_number; @@ -1165,7 +1165,7 @@ Error: int mca_coll_sm2_allreduce_intra_reducescatter_allgather(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { /* local varibles */ int i,rc=OMPI_SUCCESS,n_dts_per_buffer,n_data_segments,stripe_number; @@ -1547,7 +1547,7 @@ static int mca_coll_sm2_allreduce_intra_recursive_doubling(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { /* local variables */ int rc=OMPI_SUCCESS,n_dts_per_buffer,n_data_segments,stripe_number; @@ -1875,7 +1875,7 @@ int mca_coll_sm2_allreduce_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { /* local variables */ int rc; diff --git a/ompi/mca/coll/sm2/coll_sm2_barrier.c b/ompi/mca/coll/sm2/coll_sm2_barrier.c index 9915acf7f6..85ac8b6cc0 100644 --- a/ompi/mca/coll/sm2/coll_sm2_barrier.c +++ b/ompi/mca/coll/sm2/coll_sm2_barrier.c @@ -56,7 +56,7 @@ extern int debug_print; /* non-blocking barrier - init function */ int mca_coll_sm2_nbbarrier_intra(struct ompi_communicator_t *comm, mca_coll_sm2_nb_request_process_private_mem_t *request, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { /* since completion must be in-order for the sm collective buffer allocation @@ -118,7 +118,7 @@ int mca_coll_sm2_nbbarrier_intra(struct ompi_communicator_t *comm, /* non-blocking barrier - completion function */ int mca_coll_sm2_nbbarrier_intra_progress(struct ompi_communicator_t *comm, mca_coll_sm2_nb_request_process_private_mem_t *request, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { /* local variables */ @@ -316,7 +316,7 @@ DONE: */ int mca_coll_sm2_barrier_intra_fanin_fanout( struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { /* local variables */ int rc=OMPI_SUCCESS,bar_buff_index; @@ -494,7 +494,7 @@ Error: */ int mca_coll_sm2_barrier_intra_recursive_doubling( struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { /* local variables */ int rc=OMPI_SUCCESS; @@ -691,7 +691,7 @@ Error: * Shared memory blocking barrier */ int mca_coll_sm2_barrier_intra( struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { /* local variables */ int rc; diff --git a/ompi/mca/coll/sm2/coll_sm2_bcast.c b/ompi/mca/coll/sm2/coll_sm2_bcast.c index 05279795c9..ad16b74d37 100644 --- a/ompi/mca/coll/sm2/coll_sm2_bcast.c +++ b/ompi/mca/coll/sm2/coll_sm2_bcast.c @@ -29,7 +29,7 @@ static int mca_coll_sm2_fanout(void *buf, int count, struct ompi_datatype_t *dtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { /* local variables */ int rc=OMPI_SUCCESS,n_dts_per_buffer,n_data_segments,stripe_number; @@ -218,7 +218,7 @@ Error: int mca_coll_sm2_bcast_intra(void *buf, int count, struct ompi_datatype_t *dtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { /* local variables */ int rc; diff --git a/ompi/mca/coll/sm2/coll_sm2_component.c b/ompi/mca/coll/sm2/coll_sm2_component.c index 2d5e42c336..e175d633d7 100644 --- a/ompi/mca/coll/sm2/coll_sm2_component.c +++ b/ompi/mca/coll/sm2/coll_sm2_component.c @@ -9,6 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -66,17 +67,14 @@ static inline int mca_coll_sm2_param_register_int( mca_coll_sm2_component_t mca_coll_sm2_component = { - /* First, fill in the super (mca_coll_base_component_1_1_0_t) */ + /* First, fill in the super */ { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a coll v1.1.0 component (which - also implies a specific MCA version) */ - - MCA_COLL_BASE_VERSION_1_1_0, + MCA_COLL_BASE_VERSION_2_0_0, /* Component name and version */ @@ -90,9 +88,6 @@ mca_coll_sm2_component_t mca_coll_sm2_component = { sm2_open, sm2_close, }, - - /* Next the MCA v1.1.0 component meta data */ - { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/ompi/mca/coll/sm2/coll_sm2_module.c b/ompi/mca/coll/sm2/coll_sm2_module.c index 1617f480b8..27d03bafda 100644 --- a/ompi/mca/coll/sm2/coll_sm2_module.c +++ b/ompi/mca/coll/sm2/coll_sm2_module.c @@ -41,7 +41,7 @@ /* * Local functions */ -static int sm2_module_enable(struct mca_coll_base_module_1_1_0_t *module, +static int sm2_module_enable(mca_coll_base_module_t *module, struct ompi_communicator_t *comm); #if 0 @@ -665,7 +665,7 @@ Error: * communicator, and if so, what it's priority is. This is where * the backing shared-memory file is created. */ -struct mca_coll_base_module_1_1_0_t * +mca_coll_base_module_t * mca_coll_sm2_comm_query(struct ompi_communicator_t *comm, int *priority) { /* local variables */ @@ -1214,7 +1214,7 @@ CLEANUP: * Init module on the communicator */ static int -sm2_module_enable(struct mca_coll_base_module_1_1_0_t *module, +sm2_module_enable(mca_coll_base_module_t *module, struct ompi_communicator_t *comm) { /* local variables */ @@ -1249,7 +1249,7 @@ int progress_nb_barrier(mca_coll_sm2_module_t *module) rc=mca_coll_sm2_nbbarrier_intra_progress(module->module_comm, &(module->barrier_request[barrier_index]), - (struct mca_coll_base_module_1_1_0_t *)module); + (mca_coll_base_module_t *)module); if( OMPI_SUCCESS != rc ) { return rc; } @@ -1356,7 +1356,7 @@ int free_sm2_shared_buffer(mca_coll_sm2_module_t *module) /* start non-blocking barrier */ request=&(module->barrier_request[barrier_index]); rc=mca_coll_sm2_nbbarrier_intra(module->module_comm, - request,(mca_coll_base_module_1_1_0_t *)module); + request,(mca_coll_base_module_t *)module); if( OMPI_SUCCESS !=rc ) { return rc; } @@ -1373,6 +1373,6 @@ int free_sm2_shared_buffer(mca_coll_sm2_module_t *module) OBJ_CLASS_INSTANCE(mca_coll_sm2_module_t, - mca_coll_base_module_1_1_0_t, + mca_coll_base_module_t, mca_coll_sm2_module_construct, mca_coll_sm2_module_destruct); diff --git a/ompi/mca/coll/sm2/coll_sm2_reduce.c b/ompi/mca/coll/sm2/coll_sm2_reduce.c index 55e0703d3b..2163297c7f 100644 --- a/ompi/mca/coll/sm2/coll_sm2_reduce.c +++ b/ompi/mca/coll/sm2/coll_sm2_reduce.c @@ -29,7 +29,7 @@ int mca_coll_sm2_reduce_intra_fanin(void *sbuf, void *rbuf, int count, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { /* local variables */ int rc=OMPI_SUCCESS,n_dts_per_buffer,n_data_segments,stripe_number; @@ -393,7 +393,7 @@ int mca_coll_sm2_reduce_intra_reducescatter_gather(void *sbuf, void *rbuf, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { /* local varibles */ int i,rc=OMPI_SUCCESS,n_dts_per_buffer,n_data_segments,stripe_number; @@ -795,7 +795,7 @@ Error: int mca_coll_sm2_reduce_intra(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { /* local variables */ int rc; diff --git a/ompi/mca/coll/tuned/coll_tuned.h b/ompi/mca/coll/tuned/coll_tuned.h index 259ecc3e44..823f2002a6 100644 --- a/ompi/mca/coll/tuned/coll_tuned.h +++ b/ompi/mca/coll/tuned/coll_tuned.h @@ -10,6 +10,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -42,22 +43,22 @@ typedef enum COLLTYPE {ALLGATHER, ALLGATHERV, ALLREDUCE, ALLTOALL, ALLTOALLV, AL EXSCAN, GATHER, GATHERV, REDUCE, REDUCESCATTER, SCAN, SCATTER, SCATTERV, COLLCOUNT} COLLTYPE_T; /* defined arg lists to simply auto inclusion of user overriding decision functions */ -#define ALLGATHER_ARGS void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module -#define ALLGATHERV_ARGS void *sbuf, int scount, struct ompi_datatype_t *sdtype, void * rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module -#define ALLREDUCE_ARGS void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module -#define ALLTOALL_ARGS void *sbuf, int scount, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module -#define ALLTOALLV_ARGS void *sbuf, int *scounts, int *sdisps, struct ompi_datatype_t *sdtype, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module -#define ALLTOALLW_ARGS void *sbuf, int *scounts, int *sdisps, struct ompi_datatype_t **sdtypes, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t **rdtypes, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module -#define BARRIER_ARGS struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module -#define BCAST_ARGS void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module -#define EXSCAN_ARGS void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module -#define GATHER_ARGS void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module -#define GATHERV_ARGS void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module -#define REDUCE_ARGS void *sbuf, void* rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module -#define REDUCESCATTER_ARGS void *sbuf, void *rbuf, int *rcounts, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module -#define SCAN_ARGS void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module -#define SCATTER_ARGS void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module -#define SCATTERV_ARGS void *sbuf, int *scounts, int *disps, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module +#define ALLGATHER_ARGS void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, mca_coll_base_module_t *module +#define ALLGATHERV_ARGS void *sbuf, int scount, struct ompi_datatype_t *sdtype, void * rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, mca_coll_base_module_t *module +#define ALLREDUCE_ARGS void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, mca_coll_base_module_t *module +#define ALLTOALL_ARGS void *sbuf, int scount, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, mca_coll_base_module_t *module +#define ALLTOALLV_ARGS void *sbuf, int *scounts, int *sdisps, struct ompi_datatype_t *sdtype, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, mca_coll_base_module_t *module +#define ALLTOALLW_ARGS void *sbuf, int *scounts, int *sdisps, struct ompi_datatype_t **sdtypes, void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t **rdtypes, struct ompi_communicator_t *comm, mca_coll_base_module_t *module +#define BARRIER_ARGS struct ompi_communicator_t *comm, mca_coll_base_module_t *module +#define BCAST_ARGS void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, mca_coll_base_module_t *module +#define EXSCAN_ARGS void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, mca_coll_base_module_t *module +#define GATHER_ARGS void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, mca_coll_base_module_t *module +#define GATHERV_ARGS void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, mca_coll_base_module_t *module +#define REDUCE_ARGS void *sbuf, void* rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, mca_coll_base_module_t *module +#define REDUCESCATTER_ARGS void *sbuf, void *rbuf, int *rcounts, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, mca_coll_base_module_t *module +#define SCAN_ARGS void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, mca_coll_base_module_t *module +#define SCATTER_ARGS void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, mca_coll_base_module_t *module +#define SCATTERV_ARGS void *sbuf, int *scounts, int *disps, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, mca_coll_base_module_t *module /* end defined arg lists to simply auto inclusion of user overriding decision functions */ #if defined(c_plusplus) || defined(__cplusplus) @@ -89,7 +90,7 @@ extern "C" { int ompi_coll_tuned_init_query(bool enable_progress_threads, bool enable_mpi_threads); - struct mca_coll_base_module_1_1_0_t * + mca_coll_base_module_t * ompi_coll_tuned_comm_query(struct ompi_communicator_t *comm, int *priority); /* API functions of decision functions and any implementations */ @@ -296,7 +297,7 @@ extern "C" { struct mca_coll_tuned_component_t { /** Base coll component */ - mca_coll_base_component_1_1_0_t super; + mca_coll_base_component_2_0_0_t super; /** MCA parameter: Priority of this component */ int tuned_priority; @@ -387,7 +388,7 @@ extern "C" { typedef struct mca_coll_tuned_comm_t mca_coll_tuned_comm_t; struct mca_coll_tuned_module_t { - mca_coll_base_module_1_1_0_t super; + mca_coll_base_module_t super; mca_coll_tuned_comm_t *tuned_data; }; diff --git a/ompi/mca/coll/tuned/coll_tuned_allgather.c b/ompi/mca/coll/tuned/coll_tuned_allgather.c index d7d0209c78..1ce9ae45af 100644 --- a/ompi/mca/coll/tuned/coll_tuned_allgather.c +++ b/ompi/mca/coll/tuned/coll_tuned_allgather.c @@ -84,7 +84,7 @@ int ompi_coll_tuned_allgather_intra_bruck(void *sbuf, int scount, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int line = -1; int rank, size; @@ -260,7 +260,7 @@ ompi_coll_tuned_allgather_intra_recursivedoubling(void *sbuf, int scount, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int line = -1; int rank, size, pow2size; @@ -369,7 +369,7 @@ int ompi_coll_tuned_allgather_intra_ring(void *sbuf, int scount, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int line = -1; int rank, size; @@ -500,7 +500,7 @@ ompi_coll_tuned_allgather_intra_neighborexchange(void *sbuf, int scount, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int line = -1; int rank, size; @@ -619,7 +619,7 @@ int ompi_coll_tuned_allgather_intra_two_procs(void *sbuf, int scount, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int line = -1, err = 0; int rank; @@ -703,7 +703,7 @@ ompi_coll_tuned_allgather_intra_basic_linear(void *sbuf, int scount, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int err; ptrdiff_t lb, extent; @@ -805,7 +805,7 @@ int ompi_coll_tuned_allgather_intra_do_forced(void *sbuf, int scount, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; @@ -859,7 +859,7 @@ int ompi_coll_tuned_allgather_intra_do_this(void *sbuf, int scount, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, int algorithm, int faninout, int segsize) { OPAL_OUTPUT((ompi_coll_tuned_stream, diff --git a/ompi/mca/coll/tuned/coll_tuned_allgatherv.c b/ompi/mca/coll/tuned/coll_tuned_allgatherv.c index e112283d01..903eb3d0b6 100644 --- a/ompi/mca/coll/tuned/coll_tuned_allgatherv.c +++ b/ompi/mca/coll/tuned/coll_tuned_allgatherv.c @@ -91,7 +91,7 @@ int ompi_coll_tuned_allgatherv_intra_bruck(void *sbuf, int scount, int *rdispls, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int line = -1, err = 0; int rank, size; @@ -231,7 +231,7 @@ int ompi_coll_tuned_allgatherv_intra_ring(void *sbuf, int scount, void* rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int line = -1; int rank, size; @@ -364,7 +364,7 @@ ompi_coll_tuned_allgatherv_intra_neighborexchange(void *sbuf, int scount, void* rbuf, int *rcounts, int *rdispls, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int line = -1; int rank, size; @@ -515,7 +515,7 @@ int ompi_coll_tuned_allgatherv_intra_two_procs(void *sbuf, int scount, int *rdispls, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int line = -1, err = 0; int rank; @@ -601,7 +601,7 @@ ompi_coll_tuned_allgatherv_intra_basic_default(void *sbuf, int scount, int *disps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i, size, rank ; int err; @@ -742,7 +742,7 @@ int ompi_coll_tuned_allgatherv_intra_do_forced(void *sbuf, int scount, int *rdispls, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; @@ -793,7 +793,7 @@ int ompi_coll_tuned_allgatherv_intra_do_this(void *sbuf, int scount, int *rdispls, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, int algorithm, int faninout, int segsize) { diff --git a/ompi/mca/coll/tuned/coll_tuned_allreduce.c b/ompi/mca/coll/tuned/coll_tuned_allreduce.c index d8958723fb..a122f3a618 100644 --- a/ompi/mca/coll/tuned/coll_tuned_allreduce.c +++ b/ompi/mca/coll/tuned/coll_tuned_allreduce.c @@ -46,7 +46,7 @@ ompi_coll_tuned_allreduce_intra_nonoverlapping(void *sbuf, void *rbuf, int count struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int err; int rank; @@ -122,7 +122,7 @@ ompi_coll_tuned_allreduce_intra_recursivedoubling(void *sbuf, void *rbuf, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int ret, line; int rank, size, adjsize, remote, distance; @@ -338,7 +338,7 @@ ompi_coll_tuned_allreduce_intra_ring(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int ret, line; int rank, size, k, recv_from, send_to; @@ -616,7 +616,7 @@ ompi_coll_tuned_allreduce_intra_ring_segmented(void *sbuf, void *rbuf, int count struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, uint32_t segsize) { int ret, line; @@ -882,7 +882,7 @@ ompi_coll_tuned_allreduce_intra_basic_linear(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int err; int rank; @@ -978,7 +978,7 @@ int ompi_coll_tuned_allreduce_intra_do_forced(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; @@ -1008,7 +1008,7 @@ int ompi_coll_tuned_allreduce_intra_do_this(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, int algorithm, int faninout, int segsize) { OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:allreduce_intra_do_this algorithm %d topo fan in/out %d segsize %d", diff --git a/ompi/mca/coll/tuned/coll_tuned_alltoall.c b/ompi/mca/coll/tuned/coll_tuned_alltoall.c index d5c9af7e8d..9fe7cff773 100644 --- a/ompi/mca/coll/tuned/coll_tuned_alltoall.c +++ b/ompi/mca/coll/tuned/coll_tuned_alltoall.c @@ -35,7 +35,7 @@ int ompi_coll_tuned_alltoall_intra_pairwise(void *sbuf, int scount, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int line = -1, err = 0; int rank, size, step; @@ -90,7 +90,7 @@ int ompi_coll_tuned_alltoall_intra_bruck(void *sbuf, int scount, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i, k, line = -1; int rank, size; @@ -254,7 +254,7 @@ int ompi_coll_tuned_alltoall_intra_linear_sync(void *sbuf, int scount, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, int max_outstanding_reqs) { int line, error; @@ -403,7 +403,7 @@ int ompi_coll_tuned_alltoall_intra_two_procs(void *sbuf, int scount, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int line = -1, err = 0; int rank; @@ -474,7 +474,7 @@ int ompi_coll_tuned_alltoall_intra_basic_linear(void *sbuf, int scount, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i; int rank; @@ -678,7 +678,7 @@ int ompi_coll_tuned_alltoall_intra_do_forced(void *sbuf, int scount, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; @@ -707,7 +707,7 @@ int ompi_coll_tuned_alltoall_intra_do_this(void *sbuf, int scount, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, int algorithm, int faninout, int segsize, int max_requests) { diff --git a/ompi/mca/coll/tuned/coll_tuned_alltoallv.c b/ompi/mca/coll/tuned/coll_tuned_alltoallv.c index df7b439202..f60b66ac43 100644 --- a/ompi/mca/coll/tuned/coll_tuned_alltoallv.c +++ b/ompi/mca/coll/tuned/coll_tuned_alltoallv.c @@ -37,7 +37,7 @@ ompi_coll_tuned_alltoallv_intra_pairwise(void *sbuf, int *scounts, int *sdisps, void* rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int line = -1, err = 0; int rank, size, step; @@ -114,7 +114,7 @@ ompi_coll_tuned_alltoallv_intra_basic_linear(void *sbuf, int *scounts, int *sdis void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i, size, rank, err; char *psnd, *prcv; @@ -254,7 +254,7 @@ int ompi_coll_tuned_alltoallv_intra_do_forced(void *sbuf, int *scounts, int *sdi void* rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; @@ -293,7 +293,7 @@ int ompi_coll_tuned_alltoallv_intra_do_this(void *sbuf, int *scounts, int *sdisp void* rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, int algorithm) { OPAL_OUTPUT((ompi_coll_tuned_stream, diff --git a/ompi/mca/coll/tuned/coll_tuned_barrier.c b/ompi/mca/coll/tuned/coll_tuned_barrier.c index 4c781ac937..67fcea9352 100644 --- a/ompi/mca/coll/tuned/coll_tuned_barrier.c +++ b/ompi/mca/coll/tuned/coll_tuned_barrier.c @@ -51,7 +51,7 @@ * */ int ompi_coll_tuned_barrier_intra_doublering(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int rank, size; int err=0, line=0; @@ -123,7 +123,7 @@ int ompi_coll_tuned_barrier_intra_doublering(struct ompi_communicator_t *comm, */ int ompi_coll_tuned_barrier_intra_recursivedoubling(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int rank, size, adjsize; int err, line; @@ -207,7 +207,7 @@ int ompi_coll_tuned_barrier_intra_recursivedoubling(struct ompi_communicator_t * */ int ompi_coll_tuned_barrier_intra_bruck(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int rank, size; int distance, to, from; @@ -246,7 +246,7 @@ int ompi_coll_tuned_barrier_intra_bruck(struct ompi_communicator_t *comm, */ /* special case for two processes */ int ompi_coll_tuned_barrier_intra_two_procs(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int remote, err; @@ -279,7 +279,7 @@ int ompi_coll_tuned_barrier_intra_two_procs(struct ompi_communicator_t *comm, /* copied function (with appropriate renaming) starts here */ static int ompi_coll_tuned_barrier_intra_basic_linear(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i, err; int size = ompi_comm_size(comm); @@ -344,7 +344,7 @@ static int ompi_coll_tuned_barrier_intra_basic_linear(struct ompi_communicator_t * we go up the tree and back down the tree. */ int ompi_coll_tuned_barrier_intra_tree(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int rank, size, depth; int err, jump, partner; @@ -444,7 +444,7 @@ int ompi_coll_tuned_barrier_intra_check_forced_init (coll_tuned_force_algorithm_ int ompi_coll_tuned_barrier_intra_do_forced(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; @@ -472,7 +472,7 @@ int ompi_coll_tuned_barrier_intra_do_forced(struct ompi_communicator_t *comm, int ompi_coll_tuned_barrier_intra_do_this (struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, int algorithm, int faninout, int segsize) { OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:barrier_intra_do_this selected algorithm %d topo fanin/out%d", algorithm, faninout)); diff --git a/ompi/mca/coll/tuned/coll_tuned_bcast.c b/ompi/mca/coll/tuned/coll_tuned_bcast.c index f1e9ad5b9a..4ad03b3a81 100644 --- a/ompi/mca/coll/tuned/coll_tuned_bcast.c +++ b/ompi/mca/coll/tuned/coll_tuned_bcast.c @@ -35,7 +35,7 @@ ompi_coll_tuned_bcast_intra_generic( void* buffer, struct ompi_datatype_t* datatype, int root, struct ompi_communicator_t* comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, uint32_t count_by_segment, ompi_coll_tree_t* tree ) { @@ -259,7 +259,7 @@ ompi_coll_tuned_bcast_intra_bintree ( void* buffer, struct ompi_datatype_t* datatype, int root, struct ompi_communicator_t* comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, uint32_t segsize ) { int segcount = count; @@ -288,7 +288,7 @@ ompi_coll_tuned_bcast_intra_pipeline( void* buffer, struct ompi_datatype_t* datatype, int root, struct ompi_communicator_t* comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, uint32_t segsize ) { int segcount = count; @@ -317,7 +317,7 @@ ompi_coll_tuned_bcast_intra_chain( void* buffer, struct ompi_datatype_t* datatype, int root, struct ompi_communicator_t* comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, uint32_t segsize, int32_t chains ) { int segcount = count; @@ -346,7 +346,7 @@ ompi_coll_tuned_bcast_intra_binomial( void* buffer, struct ompi_datatype_t* datatype, int root, struct ompi_communicator_t* comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, uint32_t segsize ) { int segcount = count; @@ -375,7 +375,7 @@ ompi_coll_tuned_bcast_intra_split_bintree ( void* buffer, struct ompi_datatype_t* datatype, int root, struct ompi_communicator_t* comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, uint32_t segsize ) { int err=0, line; @@ -643,7 +643,7 @@ int ompi_coll_tuned_bcast_intra_basic_linear (void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i; int size; @@ -775,7 +775,7 @@ int ompi_coll_tuned_bcast_intra_do_forced(void *buf, int count, struct ompi_datatype_t *dtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; @@ -809,7 +809,7 @@ int ompi_coll_tuned_bcast_intra_do_this(void *buf, int count, struct ompi_datatype_t *dtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, int algorithm, int faninout, int segsize) { diff --git a/ompi/mca/coll/tuned/coll_tuned_component.c b/ompi/mca/coll/tuned/coll_tuned_component.c index 2520f38c9a..2fa6b5683c 100644 --- a/ompi/mca/coll/tuned/coll_tuned_component.c +++ b/ompi/mca/coll/tuned/coll_tuned_component.c @@ -10,6 +10,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -72,7 +73,7 @@ static int tuned_close(void); mca_coll_tuned_component_t mca_coll_tuned_component = { - /* First, fill in the super (mca_coll_base_component_1_0_0_t) */ + /* First, fill in the super */ { @@ -80,25 +81,18 @@ mca_coll_tuned_component_t mca_coll_tuned_component = { about the component itself */ { - /* Indicate that we are a coll v1.0.0 component (which also implies a - specific MCA version) */ - - MCA_COLL_BASE_VERSION_1_1_0, + MCA_COLL_BASE_VERSION_2_0_0, /* Component name and version */ - "tuned", OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, OMPI_RELEASE_VERSION, /* Component open and close functions */ - tuned_open, tuned_close }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT @@ -278,6 +272,6 @@ mca_coll_tuned_module_destruct(mca_coll_tuned_module_t *module) OBJ_CLASS_INSTANCE(mca_coll_tuned_module_t, - mca_coll_base_module_1_1_0_t, + mca_coll_base_module_t, mca_coll_tuned_module_construct, mca_coll_tuned_module_destruct); diff --git a/ompi/mca/coll/tuned/coll_tuned_decision_dynamic.c b/ompi/mca/coll/tuned/coll_tuned_decision_dynamic.c index 0ebe0c5420..68b6379f2d 100644 --- a/ompi/mca/coll/tuned/coll_tuned_decision_dynamic.c +++ b/ompi/mca/coll/tuned/coll_tuned_decision_dynamic.c @@ -58,7 +58,7 @@ ompi_coll_tuned_allreduce_intra_dec_dynamic (void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; @@ -106,7 +106,7 @@ int ompi_coll_tuned_alltoall_intra_dec_dynamic(void *sbuf, int scount, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; @@ -158,7 +158,7 @@ int ompi_coll_tuned_alltoallv_intra_dec_dynamic(void *sbuf, int *scounts, int *s void* rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; @@ -193,7 +193,7 @@ int ompi_coll_tuned_alltoallv_intra_dec_dynamic(void *sbuf, int *scounts, int *s * Returns: - MPI_SUCCESS or error code (passed from the barrier implementation) */ int ompi_coll_tuned_barrier_intra_dec_dynamic(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; @@ -231,7 +231,7 @@ int ompi_coll_tuned_barrier_intra_dec_dynamic(struct ompi_communicator_t *comm, int ompi_coll_tuned_bcast_intra_dec_dynamic(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; @@ -279,7 +279,7 @@ int ompi_coll_tuned_reduce_intra_dec_dynamic( void *sendbuf, void *recvbuf, int count, struct ompi_datatype_t* datatype, struct ompi_op_t* op, int root, struct ompi_communicator_t* comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; @@ -334,7 +334,7 @@ int ompi_coll_tuned_reduce_scatter_intra_dec_dynamic(void *sbuf, void *rbuf, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; @@ -389,7 +389,7 @@ int ompi_coll_tuned_allgather_intra_dec_dynamic(void *sbuf, int scount, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; @@ -449,7 +449,7 @@ int ompi_coll_tuned_allgatherv_intra_dec_dynamic(void *sbuf, int scount, int *rdispls, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; @@ -504,7 +504,7 @@ int ompi_coll_tuned_gather_intra_dec_dynamic(void *sbuf, int scount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; @@ -528,7 +528,7 @@ int ompi_coll_tuned_scatter_intra_dec_dynamic(void *sbuf, int scount, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; diff --git a/ompi/mca/coll/tuned/coll_tuned_decision_fixed.c b/ompi/mca/coll/tuned/coll_tuned_decision_fixed.c index 11f202b179..34abc4270d 100644 --- a/ompi/mca/coll/tuned/coll_tuned_decision_fixed.c +++ b/ompi/mca/coll/tuned/coll_tuned_decision_fixed.c @@ -42,7 +42,7 @@ ompi_coll_tuned_allreduce_intra_dec_fixed (void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { size_t dsize, block_dsize; int comm_size = ompi_comm_size(comm); @@ -95,7 +95,7 @@ int ompi_coll_tuned_alltoall_intra_dec_fixed(void *sbuf, int scount, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int communicator_size; size_t dsize, block_dsize; @@ -164,7 +164,7 @@ int ompi_coll_tuned_alltoallv_intra_dec_fixed(void *sbuf, int *scounts, int *sdi void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { /* For starters, just keep the original algorithm. */ return ompi_coll_tuned_alltoallv_intra_basic_linear(sbuf, scounts, sdisps, sdtype, @@ -181,7 +181,7 @@ int ompi_coll_tuned_alltoallv_intra_dec_fixed(void *sbuf, int *scounts, int *sdi * Returns: - MPI_SUCCESS or error code (passed from the barrier implementation) */ int ompi_coll_tuned_barrier_intra_dec_fixed(struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int communicator_size = ompi_comm_size(comm); @@ -221,7 +221,7 @@ int ompi_coll_tuned_barrier_intra_dec_fixed(struct ompi_communicator_t *comm, int ompi_coll_tuned_bcast_intra_dec_fixed(void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { /* Decision function based on MX results for messages up to 36MB and communicator sizes up to 64 nodes */ @@ -342,7 +342,7 @@ int ompi_coll_tuned_reduce_intra_dec_fixed( void *sendbuf, void *recvbuf, int count, struct ompi_datatype_t* datatype, struct ompi_op_t* op, int root, struct ompi_communicator_t* comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int communicator_size, segsize = 0; size_t message_size, dsize; @@ -457,7 +457,7 @@ int ompi_coll_tuned_reduce_scatter_intra_dec_fixed( void *sbuf, void *rbuf, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int comm_size, i, pow2; size_t total_message_size, dsize; @@ -511,7 +511,7 @@ int ompi_coll_tuned_allgather_intra_dec_fixed(void *sbuf, int scount, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int communicator_size, pow2_size; size_t dsize, total_dsize; @@ -606,7 +606,7 @@ int ompi_coll_tuned_allgatherv_intra_dec_fixed(void *sbuf, int scount, int *rdispls, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i; int communicator_size, pow2_size; @@ -669,7 +669,7 @@ int ompi_coll_tuned_gather_intra_dec_fixed(void *sbuf, int scount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { const int large_segment_size = 32768; const int small_segment_size = 1024; @@ -739,7 +739,7 @@ int ompi_coll_tuned_scatter_intra_dec_fixed(void *sbuf, int scount, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { const size_t small_block_size = 300; const int small_comm_size = 10; diff --git a/ompi/mca/coll/tuned/coll_tuned_gather.c b/ompi/mca/coll/tuned/coll_tuned_gather.c index 66fc944644..9df34fcba0 100644 --- a/ompi/mca/coll/tuned/coll_tuned_gather.c +++ b/ompi/mca/coll/tuned/coll_tuned_gather.c @@ -40,7 +40,7 @@ ompi_coll_tuned_gather_intra_binomial(void *sbuf, int scount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int line = -1; int i; @@ -214,7 +214,7 @@ ompi_coll_tuned_gather_intra_linear_sync(void *sbuf, int scount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, int first_segment_size) { int i; @@ -368,7 +368,7 @@ ompi_coll_tuned_gather_intra_basic_linear(void *sbuf, int scount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i; int err; @@ -492,7 +492,7 @@ ompi_coll_tuned_gather_intra_do_forced(void *sbuf, int scount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; @@ -538,7 +538,7 @@ ompi_coll_tuned_gather_intra_do_this(void *sbuf, int scount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, int algorithm, int faninout, int segsize) { OPAL_OUTPUT((ompi_coll_tuned_stream, diff --git a/ompi/mca/coll/tuned/coll_tuned_module.c b/ompi/mca/coll/tuned/coll_tuned_module.c index 7cf69490c1..36eff0eb12 100644 --- a/ompi/mca/coll/tuned/coll_tuned_module.c +++ b/ompi/mca/coll/tuned/coll_tuned_module.c @@ -33,7 +33,7 @@ #include "coll_tuned_dynamic_file.h" #include "coll_tuned_forced.h" -static int tuned_module_enable(struct mca_coll_base_module_1_1_0_t *module, +static int tuned_module_enable(mca_coll_base_module_t *module, struct ompi_communicator_t *comm); /* * Initial query function that is invoked during MPI_INIT, allowing @@ -54,7 +54,7 @@ int ompi_coll_tuned_init_query(bool enable_progress_threads, * Look at the communicator and decide which set of functions and * priority we want to return. */ -mca_coll_base_module_1_1_0_t * +mca_coll_base_module_t * ompi_coll_tuned_comm_query(struct ompi_communicator_t *comm, int *priority) { mca_coll_tuned_module_t *tuned_module; @@ -148,7 +148,7 @@ ompi_coll_tuned_comm_query(struct ompi_communicator_t *comm, int *priority) * Init module on the communicator */ static int -tuned_module_enable(struct mca_coll_base_module_1_1_0_t *module, +tuned_module_enable(mca_coll_base_module_t *module, struct ompi_communicator_t *comm) { int size; diff --git a/ompi/mca/coll/tuned/coll_tuned_reduce.c b/ompi/mca/coll/tuned/coll_tuned_reduce.c index 5c00035f38..67a45963bf 100644 --- a/ompi/mca/coll/tuned/coll_tuned_reduce.c +++ b/ompi/mca/coll/tuned/coll_tuned_reduce.c @@ -43,7 +43,7 @@ int ompi_coll_tuned_reduce_generic( void* sendbuf, void* recvbuf, int original_count, ompi_datatype_t* datatype, ompi_op_t* op, int root, ompi_communicator_t* comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, ompi_coll_tree_t* tree, int count_by_segment, int max_outstanding_reqs ) { @@ -346,7 +346,7 @@ int ompi_coll_tuned_reduce_intra_chain( void *sendbuf, void *recvbuf, int count, ompi_datatype_t* datatype, ompi_op_t* op, int root, ompi_communicator_t* comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, uint32_t segsize, int fanout, int max_outstanding_reqs ) { @@ -376,7 +376,7 @@ int ompi_coll_tuned_reduce_intra_pipeline( void *sendbuf, void *recvbuf, int count, ompi_datatype_t* datatype, ompi_op_t* op, int root, ompi_communicator_t* comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, uint32_t segsize, int max_outstanding_reqs ) { @@ -407,7 +407,7 @@ int ompi_coll_tuned_reduce_intra_binary( void *sendbuf, void *recvbuf, int count, ompi_datatype_t* datatype, ompi_op_t* op, int root, ompi_communicator_t* comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, uint32_t segsize, int max_outstanding_reqs ) { @@ -438,7 +438,7 @@ int ompi_coll_tuned_reduce_intra_binomial( void *sendbuf, void *recvbuf, int count, ompi_datatype_t* datatype, ompi_op_t* op, int root, ompi_communicator_t* comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, uint32_t segsize, int max_outstanding_reqs ) { @@ -477,7 +477,7 @@ int ompi_coll_tuned_reduce_intra_in_order_binary( void *sendbuf, void *recvbuf, ompi_datatype_t* datatype, ompi_op_t* op, int root, ompi_communicator_t* comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, uint32_t segsize, int max_outstanding_reqs ) { @@ -597,7 +597,7 @@ ompi_coll_tuned_reduce_intra_basic_linear(void *sbuf, void *rbuf, int count, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i, rank, err, size; ptrdiff_t true_lb, true_extent, lb, extent; @@ -783,7 +783,7 @@ int ompi_coll_tuned_reduce_intra_do_forced(void *sbuf, void* rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; @@ -828,7 +828,7 @@ int ompi_coll_tuned_reduce_intra_do_this(void *sbuf, void* rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, int algorithm, int faninout, int segsize, int max_requests ) { diff --git a/ompi/mca/coll/tuned/coll_tuned_reduce_scatter.c b/ompi/mca/coll/tuned/coll_tuned_reduce_scatter.c index bd2131fbbe..c9a28f3dbd 100644 --- a/ompi/mca/coll/tuned/coll_tuned_reduce_scatter.c +++ b/ompi/mca/coll/tuned/coll_tuned_reduce_scatter.c @@ -40,7 +40,7 @@ int ompi_coll_tuned_reduce_scatter_intra_nonoverlapping(void *sbuf, void *rbuf, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int err, i; int rank, size; @@ -127,7 +127,7 @@ ompi_coll_tuned_reduce_scatter_intra_basic_recursivehalving(void *sbuf, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i, rank, size, count, err = OMPI_SUCCESS; int tmp_size = 1, remain = 0, tmp_rank; @@ -452,7 +452,7 @@ ompi_coll_tuned_reduce_scatter_intra_ring(void *sbuf, void *rbuf, int *rcounts, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int ret, line; int rank, size, i, k, recv_from, send_to; @@ -690,7 +690,7 @@ int ompi_coll_tuned_reduce_scatter_intra_do_forced(void *sbuf, void* rbuf, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; @@ -720,7 +720,7 @@ int ompi_coll_tuned_reduce_scatter_intra_do_this(void *sbuf, void* rbuf, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, int algorithm, int faninout, int segsize) { OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_scatter_intra_do_this selected algorithm %d topo faninout %d segsize %d", diff --git a/ompi/mca/coll/tuned/coll_tuned_scatter.c b/ompi/mca/coll/tuned/coll_tuned_scatter.c index 5652463983..b47f2b0de6 100644 --- a/ompi/mca/coll/tuned/coll_tuned_scatter.c +++ b/ompi/mca/coll/tuned/coll_tuned_scatter.c @@ -38,7 +38,7 @@ ompi_coll_tuned_scatter_intra_binomial(void *sbuf, int scount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int line = -1; int i; @@ -206,7 +206,7 @@ ompi_coll_tuned_scatter_intra_basic_linear(void *sbuf, int scount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { int i, rank, size, err; char *ptmp; @@ -332,7 +332,7 @@ ompi_coll_tuned_scatter_intra_do_forced(void *sbuf, int scount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module) + mca_coll_base_module_t *module) { mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; @@ -370,7 +370,7 @@ ompi_coll_tuned_scatter_intra_do_this(void *sbuf, int scount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, - struct mca_coll_base_module_1_1_0_t *module, + mca_coll_base_module_t *module, int algorithm, int faninout, int segsize) { OPAL_OUTPUT((ompi_coll_tuned_stream, diff --git a/ompi/mca/common/portals/common_portals_cray_xt_modex.c b/ompi/mca/common/portals/common_portals_cray_xt_modex.c index a73261f39b..3f83b99fdd 100644 --- a/ompi/mca/common/portals/common_portals_cray_xt_modex.c +++ b/ompi/mca/common/portals/common_portals_cray_xt_modex.c @@ -27,11 +27,11 @@ static mca_base_component_t portals_component = { - MCA_BASE_VERSION_1_0_0, + MCA_BASE_VERSION_2_0_0, "common", - MCA_BASE_VERSION_1_0_0, + MCA_BASE_VERSION_2_0_0, "portals", - MCA_BASE_VERSION_1_0_0, + MCA_BASE_VERSION_2_0_0, NULL, NULL }; diff --git a/ompi/mca/common/portals/common_portals_utcp.c b/ompi/mca/common/portals/common_portals_utcp.c index 4bab27a95c..8d11c687d1 100644 --- a/ompi/mca/common/portals/common_portals_utcp.c +++ b/ompi/mca/common/portals/common_portals_utcp.c @@ -45,11 +45,11 @@ static bool setup_utcp_params = true; static bool init_called = false; static ptl_handle_ni_t active_ni_h = PTL_INVALID_HANDLE; static mca_base_component_t portals_component = { - MCA_BASE_VERSION_1_0_0, + MCA_BASE_VERSION_2_0_0, "common", - MCA_BASE_VERSION_1_0_0, + MCA_BASE_VERSION_2_0_0, "portals", - MCA_BASE_VERSION_1_0_0, + MCA_BASE_VERSION_2_0_0, NULL, NULL }; diff --git a/ompi/mca/crcp/base/crcp_base_select.c b/ompi/mca/crcp/base/crcp_base_select.c index 50f1d43012..5f9490286c 100644 --- a/ompi/mca/crcp/base/crcp_base_select.c +++ b/ompi/mca/crcp/base/crcp_base_select.c @@ -31,7 +31,8 @@ static ompi_crcp_base_component_t none_component = { * meta information about the component itself */ { - OMPI_CRCP_BASE_VERSION_1_0_0, + OMPI_CRCP_BASE_VERSION_2_0_0, + /* Component name and version */ "none", OMPI_MAJOR_VERSION, @@ -43,11 +44,9 @@ static ompi_crcp_base_component_t none_component = { ompi_crcp_base_none_close, ompi_crcp_base_none_query }, - - /* Next the MCA v1.0.0 component meta data */ { - /* Is the component checkpointable ? */ - true + /* Component is checkpointable */ + MCA_BASE_METADATA_PARAM_CHECKPOINT }, /* Verbosity level */ diff --git a/ompi/mca/crcp/coord/crcp_coord_component.c b/ompi/mca/crcp/coord/crcp_coord_component.c index 32ce604eb3..0ecae5dcfa 100644 --- a/ompi/mca/crcp/coord/crcp_coord_component.c +++ b/ompi/mca/crcp/coord/crcp_coord_component.c @@ -47,7 +47,8 @@ ompi_crcp_coord_component_t mca_crcp_coord_component = { * meta information about the component */ { - OMPI_CRCP_BASE_VERSION_1_0_0, + OMPI_CRCP_BASE_VERSION_2_0_0, + /* Component name and version */ "coord", OMPI_MAJOR_VERSION, @@ -59,8 +60,6 @@ ompi_crcp_coord_component_t mca_crcp_coord_component = { crcp_coord_close, ompi_crcp_coord_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/ompi/mca/crcp/crcp.h b/ompi/mca/crcp/crcp.h index c01df19c5b..3dbf9a3bab 100644 --- a/ompi/mca/crcp/crcp.h +++ b/ompi/mca/crcp/crcp.h @@ -257,13 +257,13 @@ typedef ompi_crcp_base_btl_state_t* (*mca_crcp_base_btl_module_ft_event_fn_t) /** - * Structure for CRCP v1.0.0 components. + * Structure for CRCP components. */ -struct ompi_crcp_base_component_1_0_0_t { +struct ompi_crcp_base_component_2_0_0_t { /** MCA base component */ mca_base_component_t base_version; /** MCA base data */ - mca_base_component_data_1_0_0_t base_data; + mca_base_component_data_t base_data; /** Verbosity Level */ int verbose; @@ -273,11 +273,11 @@ struct ompi_crcp_base_component_1_0_0_t { int priority; }; -typedef struct ompi_crcp_base_component_1_0_0_t ompi_crcp_base_component_1_0_0_t; -typedef struct ompi_crcp_base_component_1_0_0_t ompi_crcp_base_component_t; +typedef struct ompi_crcp_base_component_2_0_0_t ompi_crcp_base_component_2_0_0_t; +typedef struct ompi_crcp_base_component_2_0_0_t ompi_crcp_base_component_t; /** - * Structure for CRCP v1.0.0 modules + * Structure for CRCP modules */ struct ompi_crcp_base_module_1_0_0_t { /** Initialization Function */ @@ -342,13 +342,11 @@ typedef struct ompi_crcp_base_module_1_0_0_t ompi_crcp_base_module_t; OMPI_DECLSPEC extern ompi_crcp_base_module_t ompi_crcp; /** - * Macro for use in components that are of type CRCP v1.0.0 + * Macro for use in components that are of type CRCP */ -#define OMPI_CRCP_BASE_VERSION_1_0_0 \ - /* CRCP v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* CRCP v1.0 */ \ - "crcp", 1, 0, 0 +#define OMPI_CRCP_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "crcp", 2, 0, 0 /** * Macro to call the CRCP Request Complete function diff --git a/ompi/mca/dpm/dpm.h b/ompi/mca/dpm/dpm.h index 2f98456272..3152f57de9 100644 --- a/ompi/mca/dpm/dpm.h +++ b/ompi/mca/dpm/dpm.h @@ -126,7 +126,7 @@ typedef int (*ompi_dpm_base_module_close_port_fn_t)(char *port_name); typedef int (*ompi_dpm_base_module_finalize_fn_t)(void); /** -* Structure for DPM v1.0.0 modules +* Structure for DPM modules */ struct ompi_dpm_base_module_1_0_0_t { /** Initialization Function */ @@ -157,25 +157,23 @@ OMPI_DECLSPEC extern ompi_dpm_base_module_t ompi_dpm; /** - * Structure for DPM v1.0.0 components. + * Structure for DPM components. */ -struct ompi_dpm_base_component_1_0_0_t { +struct ompi_dpm_base_component_2_0_0_t { /** MCA base component */ mca_base_component_t base_version; /** MCA base data */ - mca_base_component_data_1_0_0_t base_data; + mca_base_component_data_t base_data; }; -typedef struct ompi_dpm_base_component_1_0_0_t ompi_dpm_base_component_1_0_0_t; -typedef struct ompi_dpm_base_component_1_0_0_t ompi_dpm_base_component_t; +typedef struct ompi_dpm_base_component_2_0_0_t ompi_dpm_base_component_2_0_0_t; +typedef struct ompi_dpm_base_component_2_0_0_t ompi_dpm_base_component_t; /** - * Macro for use in components that are of type CRCP v1.0.0 + * Macro for use in components that are of type DPM */ -#define OMPI_DPM_BASE_VERSION_1_0_0 \ - /* DPM v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* DPM v1.0 */ \ - "dpm", 1, 0, 0 +#define OMPI_DPM_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "dpm", 2, 0, 0 END_C_DECLS diff --git a/ompi/mca/dpm/orte/dpm_orte_component.c b/ompi/mca/dpm/orte/dpm_orte_component.c index 090e78e0ac..67d535bfee 100644 --- a/ompi/mca/dpm/orte/dpm_orte_component.c +++ b/ompi/mca/dpm/orte/dpm_orte_component.c @@ -30,10 +30,7 @@ ompi_dpm_base_component_t mca_dpm_orte_component = { information about the component itself */ { - /* Indicate that we are a dpm v1.0.0 component (which also implies - a specific MCA version) */ - - OMPI_DPM_BASE_VERSION_1_0_0, + OMPI_DPM_BASE_VERSION_2_0_0, "orte", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ @@ -43,8 +40,6 @@ ompi_dpm_base_component_t mca_dpm_orte_component = { dpm_orte_component_close, /* component close */ dpm_orte_component_query /* component query */ }, - - /* Next the MCA v1.0.0 component meta data */ { /* This component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/ompi/mca/io/base/base.h b/ompi/mca/io/base/base.h index e15d89ebf9..d96a7b6094 100644 --- a/ompi/mca/io/base/base.h +++ b/ompi/mca/io/base/base.h @@ -9,6 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -141,7 +142,7 @@ extern "C" { * returned up the stack. */ OMPI_DECLSPEC int mca_io_base_file_select(struct ompi_file_t *file, - struct mca_base_component_t *preferred); + mca_base_component_t *preferred); /** * Finalize a io component on a specific file handle. diff --git a/ompi/mca/io/base/io_base_delete.c b/ompi/mca/io/base/io_base_delete.c index 452108f933..52c3e3624b 100644 --- a/ompi/mca/io/base/io_base_delete.c +++ b/ompi/mca/io/base/io_base_delete.c @@ -57,7 +57,7 @@ static avail_io_t *check_one_component(const mca_base_component_t *component, static avail_io_t *query(const mca_base_component_t *component, char *filename, struct ompi_info_t *info); -static avail_io_t *query_1_0_0(const mca_io_base_component_1_0_0_t *io_component, +static avail_io_t *query_1_0_0(const mca_io_base_component_2_0_0_t *io_component, char *filename, struct ompi_info_t *info); static void unquery(avail_io_t *avail, char *filename, struct ompi_info_t *info); @@ -313,14 +313,14 @@ static avail_io_t *check_one_component(const mca_base_component_t *component, static avail_io_t *query(const mca_base_component_t *component, char *filename, struct ompi_info_t *info) { - const mca_io_base_component_1_0_0_t *ioc_100; + const mca_io_base_component_2_0_0_t *ioc_100; /* io v1.0.0 */ if (1 == component->mca_major_version && 0 == component->mca_minor_version && 0 == component->mca_release_version) { - ioc_100 = (mca_io_base_component_1_0_0_t *) component; + ioc_100 = (mca_io_base_component_2_0_0_t *) component; return query_1_0_0(ioc_100, filename, info); } @@ -331,7 +331,7 @@ static avail_io_t *query(const mca_base_component_t *component, } -static avail_io_t *query_1_0_0(const mca_io_base_component_1_0_0_t *component, +static avail_io_t *query_1_0_0(const mca_io_base_component_2_0_0_t *component, char *filename, struct ompi_info_t *info) { bool usable; @@ -364,7 +364,7 @@ static avail_io_t *query_1_0_0(const mca_io_base_component_1_0_0_t *component, static void unquery(avail_io_t *avail, char *filename, struct ompi_info_t *info) { - const mca_io_base_component_1_0_0_t *ioc_100; + const mca_io_base_component_2_0_0_t *ioc_100; switch(avail->ai_version) { case MCA_IO_BASE_V_1_0_0: @@ -389,7 +389,7 @@ static void unquery(avail_io_t *avail, char *filename, struct ompi_info_t *info) */ static int delete_file(avail_io_t *avail, char *filename, struct ompi_info_t *info) { - const mca_io_base_component_1_0_0_t *ioc_100; + const mca_io_base_component_2_0_0_t *ioc_100; switch(avail->ai_version) { case MCA_IO_BASE_V_1_0_0: diff --git a/ompi/mca/io/base/io_base_file_select.c b/ompi/mca/io/base/io_base_file_select.c index e466b06802..3ce60012f6 100644 --- a/ompi/mca/io/base/io_base_file_select.c +++ b/ompi/mca/io/base/io_base_file_select.c @@ -61,7 +61,7 @@ static avail_io_t *check_one_component(ompi_file_t *file, static avail_io_t *query(const mca_base_component_t *component, ompi_file_t *file); -static avail_io_t *query_1_0_0(const mca_io_base_component_1_0_0_t *io_component, +static avail_io_t *query_1_0_0(const mca_io_base_component_2_0_0_t *io_component, ompi_file_t *file); static void unquery(avail_io_t *avail, ompi_file_t *file); @@ -365,14 +365,14 @@ static avail_io_t *check_one_component(ompi_file_t *file, static avail_io_t *query(const mca_base_component_t *component, ompi_file_t *file) { - const mca_io_base_component_1_0_0_t *ioc_100; + const mca_io_base_component_2_0_0_t *ioc_100; /* io v1.0.0 */ if (1 == component->mca_major_version && 0 == component->mca_minor_version && 0 == component->mca_release_version) { - ioc_100 = (mca_io_base_component_1_0_0_t *) component; + ioc_100 = (mca_io_base_component_2_0_0_t *) component; return query_1_0_0(ioc_100, file); } @@ -383,7 +383,7 @@ static avail_io_t *query(const mca_base_component_t *component, } -static avail_io_t *query_1_0_0(const mca_io_base_component_1_0_0_t *component, +static avail_io_t *query_1_0_0(const mca_io_base_component_2_0_0_t *component, ompi_file_t *file) { int priority; @@ -415,7 +415,7 @@ static avail_io_t *query_1_0_0(const mca_io_base_component_1_0_0_t *component, static void unquery(avail_io_t *avail, ompi_file_t *file) { - const mca_io_base_component_1_0_0_t *ioc_100; + const mca_io_base_component_2_0_0_t *ioc_100; switch(avail->ai_version) { case MCA_IO_BASE_V_1_0_0: diff --git a/ompi/mca/io/base/io_base_find_available.c b/ompi/mca/io/base/io_base_find_available.c index fb7c24051d..75ed2487fb 100644 --- a/ompi/mca/io/base/io_base_find_available.c +++ b/ompi/mca/io/base/io_base_find_available.c @@ -195,8 +195,8 @@ static int init_query_1_0_0(const mca_base_component_t *component, bool enable_progress_threads, bool enable_mpi_threads) { - mca_io_base_component_1_0_0_t *io = - (mca_io_base_component_1_0_0_t *) component; + mca_io_base_component_2_0_0_t *io = + (mca_io_base_component_2_0_0_t *) component; return io->io_init_query(enable_progress_threads, enable_mpi_threads); diff --git a/ompi/mca/io/base/io_base_register_datarep.c b/ompi/mca/io/base/io_base_register_datarep.c index b894b8a803..48e96910d7 100644 --- a/ompi/mca/io/base/io_base_register_datarep.c +++ b/ompi/mca/io/base/io_base_register_datarep.c @@ -34,7 +34,7 @@ mca_io_base_register_datarep(char *datarep, { opal_list_item_t *p; const mca_base_component_t *component; - const mca_io_base_component_1_0_0_t *v100; + const mca_io_base_component_2_0_0_t *v100; int tmp, ret = OMPI_SUCCESS; /* Find the maximum additional number of bytes required by all io @@ -50,7 +50,7 @@ mca_io_base_register_datarep(char *datarep, if (component->mca_type_major_version == 1 && component->mca_type_minor_version == 0 && component->mca_type_release_version == 0) { - v100 = (mca_io_base_component_1_0_0_t *) component; + v100 = (mca_io_base_component_2_0_0_t *) component; /* return first non-good error-code */ tmp = v100->io_register_datarep(datarep, read_fn, write_fn, diff --git a/ompi/mca/io/base/io_base_request.c b/ompi/mca/io/base/io_base_request.c index 095f4e3650..0dace37508 100644 --- a/ompi/mca/io/base/io_base_request.c +++ b/ompi/mca/io/base/io_base_request.c @@ -69,7 +69,7 @@ int mca_io_base_request_create_freelist(void) { opal_list_item_t *p; const mca_base_component_t *component; - const mca_io_base_component_1_0_0_t *v100; + const mca_io_base_component_2_0_0_t *v100; size_t size = 0; int i, init, incr; @@ -87,7 +87,7 @@ int mca_io_base_request_create_freelist(void) if (component->mca_type_major_version == 1 && component->mca_type_minor_version == 0 && component->mca_type_release_version == 0) { - v100 = (mca_io_base_component_1_0_0_t *) component; + v100 = (mca_io_base_component_2_0_0_t *) component; if (v100->io_request_bytes > size) { size = v100->io_request_bytes; } diff --git a/ompi/mca/io/io.h b/ompi/mca/io/io.h index ac1c4c7233..d80d42c7b0 100644 --- a/ompi/mca/io/io.h +++ b/ompi/mca/io/io.h @@ -67,15 +67,15 @@ typedef enum mca_io_base_version_t mca_io_base_version_t; /* - * Macro for use in components that are of type io v1.0.0 + * Macro for use in components that are of type io * 1-1 mapping of all MPI-IO functions */ -#define MCA_IO_BASE_VERSION_1_0_0 \ - MCA_BASE_VERSION_1_0_0, \ - "io", 1, 0, 0 +#define MCA_IO_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "io", 2, 0, 0 /* - * Component v1.0.0 + * Component */ struct mca_io_base_module_1_0_0_t; @@ -110,9 +110,9 @@ typedef int (*mca_io_base_component_register_datarep_fn_t)( /* IO component version and interface functions. */ -struct mca_io_base_component_1_0_0_t { +struct mca_io_base_component_2_0_0_t { mca_base_component_t io_version; - mca_base_component_data_1_0_0_t io_data; + mca_base_component_data_t io_data; /** Additional bytes that this module needs to be allocated when an MPI_Request (ompi_request_t) is allocated. */ @@ -131,14 +131,14 @@ struct mca_io_base_component_1_0_0_t { mca_io_base_component_register_datarep_fn_t io_register_datarep; }; -typedef struct mca_io_base_component_1_0_0_t mca_io_base_component_1_0_0_t; +typedef struct mca_io_base_component_2_0_0_t mca_io_base_component_2_0_0_t; /* * All component versions */ union mca_io_base_components_t { - mca_io_base_component_1_0_0_t v1_0_0; + mca_io_base_component_2_0_0_t v1_0_0; }; typedef union mca_io_base_components_t mca_io_base_components_t; diff --git a/ompi/mca/io/romio/src/io_romio.h b/ompi/mca/io/romio/src/io_romio.h index 13c6eaec0a..4080fe7877 100644 --- a/ompi/mca/io/romio/src/io_romio.h +++ b/ompi/mca/io/romio/src/io_romio.h @@ -32,7 +32,7 @@ extern "C" { #endif -OMPI_DECLSPEC extern mca_io_base_component_1_0_0_t mca_io_romio_component; +OMPI_DECLSPEC extern mca_io_base_component_2_0_0_t mca_io_romio_component; /* * global variables, instantiated in module.c @@ -40,7 +40,7 @@ OMPI_DECLSPEC extern mca_io_base_component_1_0_0_t mca_io_romio_component; extern opal_mutex_t mca_io_romio_mutex; extern mca_io_base_module_1_0_0_t mca_io_romio_module; extern opal_list_t mca_io_romio_pending_requests; -OMPI_DECLSPEC extern mca_io_base_component_1_0_0_t mca_io_romio_component; +OMPI_DECLSPEC extern mca_io_base_component_2_0_0_t mca_io_romio_component; /* * The romio component will "inherit" from the mca_io_base_request_t, diff --git a/ompi/mca/io/romio/src/io_romio_component.c b/ompi/mca/io/romio/src/io_romio_component.c index c663a8e262..db420c661e 100644 --- a/ompi/mca/io/romio/src/io_romio_component.c +++ b/ompi/mca/io/romio/src/io_romio_component.c @@ -81,14 +81,12 @@ const char *mca_io_romio_component_version_string = "OMPI/MPI ROMIO io MCA component version " OMPI_VERSION ", " ROMIO_VERSION_STRING; -mca_io_base_component_1_0_0_t mca_io_romio_component = { +mca_io_base_component_2_0_0_t mca_io_romio_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a io v1.0.0 component (which also implies a - specific MCA version) */ - MCA_IO_BASE_VERSION_1_0_0, + MCA_IO_BASE_VERSION_2_0_0, "romio", OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, @@ -96,9 +94,6 @@ mca_io_base_component_1_0_0_t mca_io_romio_component = { open_component, close_component, }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/ompi/mca/mpool/mpool.h b/ompi/mca/mpool/mpool.h index 1bc2a70ad7..71a4e643b5 100644 --- a/ompi/mca/mpool/mpool.h +++ b/ompi/mca/mpool/mpool.h @@ -146,20 +146,20 @@ typedef int (*mca_mpool_base_module_ft_event_fn_t)(int state); * mpool component descriptor. Contains component version information * and open/close/init functions. */ -struct mca_mpool_base_component_1_0_0_t { +struct mca_mpool_base_component_2_0_0_t { mca_base_component_t mpool_version; /**< version */ - mca_base_component_data_1_0_0_t mpool_data;/**< metadata */ + mca_base_component_data_t mpool_data;/**< metadata */ mca_mpool_base_component_init_fn_t mpool_init; /**< init function */ }; /** * Convenience typedef. */ -typedef struct mca_mpool_base_component_1_0_0_t mca_mpool_base_component_1_0_0_t; +typedef struct mca_mpool_base_component_2_0_0_t mca_mpool_base_component_2_0_0_t; /** * Convenience typedef */ -typedef struct mca_mpool_base_component_1_0_0_t mca_mpool_base_component_t; +typedef struct mca_mpool_base_component_2_0_0_t mca_mpool_base_component_t; /** * mpool module descriptor. Contains the interface functions exported @@ -243,13 +243,11 @@ OMPI_DECLSPEC int mca_mpool_base_insert( OMPI_DECLSPEC int mca_mpool_base_remove(void * base); /** - * Macro for use in components that are of type mpool v1.0.0 + * Macro for use in components that are of type mpool */ -#define MCA_MPOOL_BASE_VERSION_1_0_0 \ - /* mpool v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* mpool v1.0 */ \ - "mpool", 1, 0, 0 +#define MCA_MPOOL_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "mpool", 2, 0, 0 #endif /* MCA_MPOOL_H */ diff --git a/ompi/mca/mpool/rdma/mpool_rdma_component.c b/ompi/mca/mpool/rdma/mpool_rdma_component.c index b6b07a628b..6b91932936 100644 --- a/ompi/mca/mpool/rdma/mpool_rdma_component.c +++ b/ompi/mca/mpool/rdma/mpool_rdma_component.c @@ -46,10 +46,7 @@ mca_mpool_rdma_component_t mca_mpool_rdma_component = { information about the component itself */ { - /* Indicate that we are a mpool v1.0.0 component (which also - implies a specific MCA version) */ - - MCA_MPOOL_BASE_VERSION_1_0_0, + MCA_MPOOL_BASE_VERSION_2_0_0, "rdma", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ @@ -58,9 +55,6 @@ mca_mpool_rdma_component_t mca_mpool_rdma_component = { mca_mpool_rdma_open, /* component open */ NULL }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/ompi/mca/mpool/sm/mpool_sm_component.c b/ompi/mca/mpool/sm/mpool_sm_component.c index 3401cb393b..ba3af30874 100644 --- a/ompi/mca/mpool/sm/mpool_sm_component.c +++ b/ompi/mca/mpool/sm/mpool_sm_component.c @@ -51,10 +51,7 @@ mca_mpool_sm_component_t mca_mpool_sm_component = { information about the component itself */ { - /* Indicate that we are a mpool v1.0.0 component (which also - implies a specific MCA version) */ - - MCA_MPOOL_BASE_VERSION_1_0_0, + MCA_MPOOL_BASE_VERSION_2_0_0, "sm", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ @@ -63,9 +60,6 @@ mca_mpool_sm_component_t mca_mpool_sm_component = { mca_mpool_sm_open, /* component open */ mca_mpool_sm_close }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/ompi/mca/mtl/mtl.h b/ompi/mca/mtl/mtl.h index 929d7e9d8f..d12ec554bd 100644 --- a/ompi/mca/mtl/mtl.h +++ b/ompi/mca/mtl/mtl.h @@ -91,13 +91,13 @@ typedef struct mca_mtl_base_module_t* bool enable_mpi_threads); -struct mca_mtl_base_component_1_0_0_t { +struct mca_mtl_base_component_2_0_0_t { mca_base_component_t mtl_version; - mca_base_component_data_1_0_0_t mtl_data; + mca_base_component_data_t mtl_data; mca_mtl_base_component_init_fn_t mtl_init; }; -typedef struct mca_mtl_base_component_1_0_0_t mca_mtl_base_component_1_0_0_t; -typedef struct mca_mtl_base_component_1_0_0_t mca_mtl_base_component_t; +typedef struct mca_mtl_base_component_2_0_0_t mca_mtl_base_component_2_0_0_t; +typedef struct mca_mtl_base_component_2_0_0_t mca_mtl_base_component_t; /** @@ -382,13 +382,11 @@ struct mca_mtl_base_module_t { typedef struct mca_mtl_base_module_t mca_mtl_base_module_t; /* - * Macro for use in modules that are of type mtl v1.0.0 + * Macro for use in modules that are of type mtl */ -#define MCA_MTL_BASE_VERSION_1_0_0 \ - /* coll v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* mtl v1.0 */ \ - "mtl", 1, 0, 0 +#define MCA_MTL_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "mtl", 2, 0, 0 /* * macro for doing direct call / call through struct diff --git a/ompi/mca/mtl/mx/mtl_mx_component.c b/ompi/mca/mtl/mx/mtl_mx_component.c index 04f0d0546f..2d26388501 100644 --- a/ompi/mca/mtl/mx/mtl_mx_component.c +++ b/ompi/mca/mtl/mx/mtl_mx_component.c @@ -45,10 +45,7 @@ mca_mtl_mx_component_t mca_mtl_mx_component = { * information about the component itself */ { - /* Indicate that we are a mtl v1.0.0 component (which also implies - * a specific MCA version) */ - - MCA_MTL_BASE_VERSION_1_0_0, + MCA_MTL_BASE_VERSION_2_0_0, "mx", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ @@ -57,9 +54,6 @@ mca_mtl_mx_component_t mca_mtl_mx_component = { ompi_mtl_mx_component_open, /* component open */ ompi_mtl_mx_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/ompi/mca/mtl/mx/mtl_mx_types.h b/ompi/mca/mtl/mx/mtl_mx_types.h index c7fd851ed4..675aa13d40 100644 --- a/ompi/mca/mtl/mx/mtl_mx_types.h +++ b/ompi/mca/mtl/mx/mtl_mx_types.h @@ -54,7 +54,7 @@ typedef struct mca_mtl_mx_module_t mca_mtl_mx_module_t; extern mca_mtl_mx_module_t ompi_mtl_mx; struct mca_mtl_mx_component_t{ - mca_mtl_base_component_1_0_0_t super; /**< base MTL component */ + mca_mtl_base_component_2_0_0_t super; /**< base MTL component */ }; typedef struct mca_mtl_mx_component_t mca_mtl_mx_component_t; diff --git a/ompi/mca/mtl/portals/mtl_portals.h b/ompi/mca/mtl/portals/mtl_portals.h index ddc803c1d2..cdaf7cbd45 100644 --- a/ompi/mca/mtl/portals/mtl_portals.h +++ b/ompi/mca/mtl/portals/mtl_portals.h @@ -100,7 +100,7 @@ typedef struct mca_mtl_portals_module_t mca_mtl_portals_module_t; extern mca_mtl_portals_module_t ompi_mtl_portals; -OMPI_DECLSPEC mca_mtl_base_component_1_0_0_t mca_mtl_portals_component; +OMPI_DECLSPEC mca_mtl_base_component_2_0_0_t mca_mtl_portals_component; struct ompi_mtl_portals_event_t { diff --git a/ompi/mca/mtl/portals/mtl_portals_component.c b/ompi/mca/mtl/portals/mtl_portals_component.c index 105fd4a318..f76ed624e3 100644 --- a/ompi/mca/mtl/portals/mtl_portals_component.c +++ b/ompi/mca/mtl/portals/mtl_portals_component.c @@ -33,16 +33,13 @@ static int ompi_mtl_portals_component_close(void); static mca_mtl_base_module_t* ompi_mtl_portals_component_init( bool enable_progress_threads, bool enable_mpi_threads); -mca_mtl_base_component_1_0_0_t mca_mtl_portals_component = { +mca_mtl_base_component_2_0_0_t mca_mtl_portals_component = { /* First, the mca_base_component_t struct containing meta * information about the component itself */ { - /* Indicate that we are a mtl v1.0.0 component (which also implies - * a specific MCA version) */ - - MCA_MTL_BASE_VERSION_1_0_0, + MCA_MTL_BASE_VERSION_2_0_0, "portals", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ @@ -51,9 +48,6 @@ mca_mtl_base_component_1_0_0_t mca_mtl_portals_component = { ompi_mtl_portals_component_open, /* component open */ ompi_mtl_portals_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/ompi/mca/mtl/psm/mtl_psm_component.c b/ompi/mca/mtl/psm/mtl_psm_component.c index aa309b6b59..4310846e5e 100644 --- a/ompi/mca/mtl/psm/mtl_psm_component.c +++ b/ompi/mca/mtl/psm/mtl_psm_component.c @@ -43,10 +43,7 @@ mca_mtl_psm_component_t mca_mtl_psm_component = { * information about the component itself */ { - /* Indicate that we are a mtl v1.0.0 component (which also implies - * a specific MCA version) */ - - MCA_MTL_BASE_VERSION_1_0_0, + MCA_MTL_BASE_VERSION_2_0_0, "psm", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ @@ -55,9 +52,6 @@ mca_mtl_psm_component_t mca_mtl_psm_component = { ompi_mtl_psm_component_open, /* component open */ ompi_mtl_psm_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/ompi/mca/mtl/psm/mtl_psm_types.h b/ompi/mca/mtl/psm/mtl_psm_types.h index 6319c3c232..9024e56711 100644 --- a/ompi/mca/mtl/psm/mtl_psm_types.h +++ b/ompi/mca/mtl/psm/mtl_psm_types.h @@ -59,7 +59,7 @@ typedef struct mca_mtl_psm_module_t mca_mtl_psm_module_t; extern mca_mtl_psm_module_t ompi_mtl_psm; struct mca_mtl_psm_component_t { - mca_mtl_base_component_1_0_0_t super; /**< base MTL component */ + mca_mtl_base_component_2_0_0_t super; /**< base MTL component */ }; typedef struct mca_mtl_psm_component_t mca_mtl_psm_component_t; diff --git a/ompi/mca/osc/osc.h b/ompi/mca/osc/osc.h index f9a4ca234f..3284a699d2 100644 --- a/ompi/mca/osc/osc.h +++ b/ompi/mca/osc/osc.h @@ -144,11 +144,11 @@ typedef int (*ompi_osc_base_component_select_fn_t)(struct ompi_win_t *win, * this structure, called mca_osc_[component_name]_component, must * exist in any OSC component. */ -struct ompi_osc_base_component_1_0_0_t { +struct ompi_osc_base_component_2_0_0_t { /** Base component description */ mca_base_component_t osc_version; /** Base component data block */ - mca_base_component_data_1_0_0_t osc_data; + mca_base_component_data_t osc_data; /** Component initialization function */ ompi_osc_base_component_init_fn_t osc_init; /** Query whether component is useable for give comm/info */ @@ -158,8 +158,8 @@ struct ompi_osc_base_component_1_0_0_t { /* Finalize the component infrastructure */ ompi_osc_base_component_finalize_fn_t osc_finalize; }; -typedef struct ompi_osc_base_component_1_0_0_t ompi_osc_base_component_1_0_0_t; -typedef ompi_osc_base_component_1_0_0_t ompi_osc_base_component_t; +typedef struct ompi_osc_base_component_2_0_0_t ompi_osc_base_component_2_0_0_t; +typedef ompi_osc_base_component_2_0_0_t ompi_osc_base_component_t; /* ******************************************************************** */ @@ -296,12 +296,10 @@ typedef ompi_osc_base_module_1_0_0_t ompi_osc_base_module_t; /* ******************************************************************** */ -/** Macro for use in components that are of type osc v1.0.0 */ -#define OMPI_OSC_BASE_VERSION_1_0_0 \ - /* osc v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* osc v1.0 */ \ - "osc", 1, 0, 0 +/** Macro for use in components that are of type osc */ +#define OMPI_OSC_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "osc", 2, 0, 0 /* ******************************************************************** */ diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_component.c b/ompi/mca/osc/pt2pt/osc_pt2pt_component.c index 3cb67e85da..ddbde6a5be 100644 --- a/ompi/mca/osc/pt2pt/osc_pt2pt_component.c +++ b/ompi/mca/osc/pt2pt/osc_pt2pt_component.c @@ -47,7 +47,7 @@ static void* component_thread_fn(opal_object_t *obj); ompi_osc_pt2pt_component_t mca_osc_pt2pt_component = { { /* ompi_osc_base_component_t */ { /* ompi_base_component_t */ - OMPI_OSC_BASE_VERSION_1_0_0, + OMPI_OSC_BASE_VERSION_2_0_0, "pt2pt", OMPI_MAJOR_VERSION, /* MCA component major version */ OMPI_MINOR_VERSION, /* MCA component minor version */ diff --git a/ompi/mca/osc/rdma/osc_rdma_component.c b/ompi/mca/osc/rdma/osc_rdma_component.c index a9aa05ccb9..9df972ac3b 100644 --- a/ompi/mca/osc/rdma/osc_rdma_component.c +++ b/ompi/mca/osc/rdma/osc_rdma_component.c @@ -54,7 +54,7 @@ static int setup_rdma(ompi_osc_rdma_module_t *module); ompi_osc_rdma_component_t mca_osc_rdma_component = { { /* ompi_osc_base_component_t */ { /* ompi_base_component_t */ - OMPI_OSC_BASE_VERSION_1_0_0, + OMPI_OSC_BASE_VERSION_2_0_0, "rdma", OMPI_MAJOR_VERSION, /* MCA component major version */ OMPI_MINOR_VERSION, /* MCA component minor version */ diff --git a/ompi/mca/pml/base/pml_base_select.c b/ompi/mca/pml/base/pml_base_select.c index 8fb260dff1..e94a7b089f 100644 --- a/ompi/mca/pml/base/pml_base_select.c +++ b/ompi/mca/pml/base/pml_base_select.c @@ -300,11 +300,11 @@ int mca_pml_base_select(bool enable_progress_threads, /* need a "commonly" named PML structure so everything ends up in the same modex field */ static mca_base_component_t pml_base_component = { - MCA_BASE_VERSION_1_0_0, + MCA_BASE_VERSION_2_0_0, "pml", - MCA_BASE_VERSION_1_0_0, + MCA_BASE_VERSION_2_0_0, "base", - MCA_BASE_VERSION_1_0_0, + MCA_BASE_VERSION_2_0_0, NULL, NULL }; diff --git a/ompi/mca/pml/cm/pml_cm.h b/ompi/mca/pml/cm/pml_cm.h index b7c7f8815a..c1637f0ae8 100644 --- a/ompi/mca/pml/cm/pml_cm.h +++ b/ompi/mca/pml/cm/pml_cm.h @@ -28,7 +28,7 @@ BEGIN_C_DECLS -OMPI_MODULE_DECLSPEC extern mca_pml_base_component_1_0_0_t mca_pml_cm_component; +OMPI_MODULE_DECLSPEC extern mca_pml_base_component_2_0_0_t mca_pml_cm_component; struct mca_mtl_request_t; diff --git a/ompi/mca/pml/cm/pml_cm_component.c b/ompi/mca/pml/cm/pml_cm_component.c index 6f1a6f88b7..5751f4a3d4 100644 --- a/ompi/mca/pml/cm/pml_cm_component.c +++ b/ompi/mca/pml/cm/pml_cm_component.c @@ -34,16 +34,13 @@ static mca_pml_base_module_t* mca_pml_cm_component_init( int* priority, bool enable_progress_threads, bool enable_mpi_threads); static int mca_pml_cm_component_fini(void); -mca_pml_base_component_1_0_0_t mca_pml_cm_component = { +mca_pml_base_component_2_0_0_t mca_pml_cm_component = { /* First, the mca_base_component_t struct containing meta * information about the component itself */ { - /* Indicate that we are a pml v1.0.0 component (which also implies - * a specific MCA version) */ - - MCA_PML_BASE_VERSION_1_0_0, + MCA_PML_BASE_VERSION_2_0_0, "cm", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ @@ -52,9 +49,6 @@ mca_pml_base_component_1_0_0_t mca_pml_cm_component = { mca_pml_cm_component_open, /* component open */ mca_pml_cm_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ - { /* This component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/ompi/mca/pml/cm/pml_cm_component.h b/ompi/mca/pml/cm/pml_cm_component.h index 5a057449dd..880f9afd02 100755 --- a/ompi/mca/pml/cm/pml_cm_component.h +++ b/ompi/mca/pml/cm/pml_cm_component.h @@ -27,7 +27,7 @@ extern "C" { /* * PML module functions. */ -extern mca_pml_base_component_1_0_0_t mca_pml_cm_component; +extern mca_pml_base_component_2_0_0_t mca_pml_cm_component; #if defined(c_plusplus) || defined(__cplusplus) } diff --git a/ompi/mca/pml/crcpw/pml_crcpw_component.c b/ompi/mca/pml/crcpw/pml_crcpw_component.c index 97e1e82d96..d613606641 100644 --- a/ompi/mca/pml/crcpw/pml_crcpw_component.c +++ b/ompi/mca/pml/crcpw/pml_crcpw_component.c @@ -38,10 +38,7 @@ mca_pml_crcpw_component_t mca_pml_crcpw_component = { information about the component itself */ { - /* Indicate that we are a pml v1.0.0 component (which also implies - a specific MCA version) */ - - MCA_PML_BASE_VERSION_1_0_0, + MCA_PML_BASE_VERSION_2_0_0, "crcpw", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ @@ -50,9 +47,6 @@ mca_pml_crcpw_component_t mca_pml_crcpw_component = { mca_pml_crcpw_component_open, /* component open */ mca_pml_crcpw_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/ompi/mca/pml/dr/pml_dr_component.c b/ompi/mca/pml/dr/pml_dr_component.c index 7dfc07288f..ed45f427fd 100644 --- a/ompi/mca/pml/dr/pml_dr_component.c +++ b/ompi/mca/pml/dr/pml_dr_component.c @@ -42,16 +42,13 @@ mca_pml_dr_component_init( int* priority, bool enable_mpi_threads ); static int mca_pml_dr_component_fini(void); -mca_pml_base_component_1_0_0_t mca_pml_dr_component = { +mca_pml_base_component_2_0_0_t mca_pml_dr_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a pml v1.0.0 component (which also implies - a specific MCA version) */ - - MCA_PML_BASE_VERSION_1_0_0, + MCA_PML_BASE_VERSION_2_0_0, "dr", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ @@ -60,9 +57,6 @@ mca_pml_base_component_1_0_0_t mca_pml_dr_component = { mca_pml_dr_component_open, /* component open */ mca_pml_dr_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ - { /* This component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/ompi/mca/pml/dr/pml_dr_component.h b/ompi/mca/pml/dr/pml_dr_component.h index 5d367e4f97..53e026912a 100644 --- a/ompi/mca/pml/dr/pml_dr_component.h +++ b/ompi/mca/pml/dr/pml_dr_component.h @@ -27,7 +27,7 @@ extern "C" { /* * PML module functions. */ -OMPI_MODULE_DECLSPEC extern mca_pml_base_component_1_0_0_t mca_pml_dr_component; +OMPI_MODULE_DECLSPEC extern mca_pml_base_component_2_0_0_t mca_pml_dr_component; #if defined(c_plusplus) || defined(__cplusplus) } diff --git a/ompi/mca/pml/example/pml_example_component.c b/ompi/mca/pml/example/pml_example_component.c index 1ccab2cb92..40a1cad34a 100644 --- a/ompi/mca/pml/example/pml_example_component.c +++ b/ompi/mca/pml/example/pml_example_component.c @@ -24,16 +24,13 @@ static mca_pml_base_module_t* mca_pml_example_component_init( int* priority, bool *allow_multi_user_threads, bool *have_hidden_threads ); static int mca_pml_example_component_fini(void); -mca_pml_base_component_1_0_0_t mca_pml_example_component = { +mca_pml_base_component_2_0_0_t mca_pml_example_component = { /* First, the mca_base_component_t struct containing meta * information about the component itself */ { - /* Indicate that we are a pml v1.0.0 component (which also implies - * a specific MCA version) */ - - MCA_PML_BASE_VERSION_1_0_0, + MCA_PML_BASE_VERSION_2_0_0, "example", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ @@ -42,9 +39,6 @@ mca_pml_base_component_1_0_0_t mca_pml_example_component = { mca_pml_example_component_open, /* component open */ mca_pml_example_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/ompi/mca/pml/ob1/pml_ob1_component.c b/ompi/mca/pml/ob1/pml_ob1_component.c index 1807870269..b5dd3dba32 100644 --- a/ompi/mca/pml/ob1/pml_ob1_component.c +++ b/ompi/mca/pml/ob1/pml_ob1_component.c @@ -47,16 +47,13 @@ mca_pml_ob1_component_init( int* priority, bool enable_progress_threads, bool enable_mpi_threads ); static int mca_pml_ob1_component_fini(void); -mca_pml_base_component_1_0_0_t mca_pml_ob1_component = { +mca_pml_base_component_2_0_0_t mca_pml_ob1_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a pml v1.0.0 component (which also implies - a specific MCA version) */ - - MCA_PML_BASE_VERSION_1_0_0, + MCA_PML_BASE_VERSION_2_0_0, "ob1", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ @@ -65,9 +62,6 @@ mca_pml_base_component_1_0_0_t mca_pml_ob1_component = { mca_pml_ob1_component_open, /* component open */ mca_pml_ob1_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/ompi/mca/pml/ob1/pml_ob1_component.h b/ompi/mca/pml/ob1/pml_ob1_component.h index 4648df2f5e..271d2d45f3 100644 --- a/ompi/mca/pml/ob1/pml_ob1_component.h +++ b/ompi/mca/pml/ob1/pml_ob1_component.h @@ -27,7 +27,7 @@ extern "C" { /* * PML module functions. */ -OMPI_MODULE_DECLSPEC extern mca_pml_base_component_1_0_0_t mca_pml_ob1_component; +OMPI_MODULE_DECLSPEC extern mca_pml_base_component_2_0_0_t mca_pml_ob1_component; #if defined(c_plusplus) || defined(__cplusplus) } diff --git a/ompi/mca/pml/pml.h b/ompi/mca/pml/pml.h index fec6e17ceb..15d32d34f1 100644 --- a/ompi/mca/pml/pml.h +++ b/ompi/mca/pml/pml.h @@ -146,14 +146,14 @@ typedef int (*mca_pml_base_component_finalize_fn_t)(void); * PML component version and interface functions. */ -struct mca_pml_base_component_1_0_0_t { +struct mca_pml_base_component_2_0_0_t { mca_base_component_t pmlm_version; - mca_base_component_data_1_0_0_t pmlm_data; + mca_base_component_data_t pmlm_data; mca_pml_base_component_init_fn_t pmlm_init; mca_pml_base_component_finalize_fn_t pmlm_finalize; }; -typedef struct mca_pml_base_component_1_0_0_t mca_pml_base_component_1_0_0_t; -typedef mca_pml_base_component_1_0_0_t mca_pml_base_component_t; +typedef struct mca_pml_base_component_2_0_0_t mca_pml_base_component_2_0_0_t; +typedef mca_pml_base_component_2_0_0_t mca_pml_base_component_t; /** @@ -531,13 +531,11 @@ typedef struct mca_pml_base_module_1_0_0_t mca_pml_base_module_1_0_0_t; typedef mca_pml_base_module_1_0_0_t mca_pml_base_module_t; /* - * Macro for use in components that are of type pml v1.0.0 + * Macro for use in components that are of type pml */ -#define MCA_PML_BASE_VERSION_1_0_0 \ - /* pml v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* pml v1.0 */ \ - "pml", 1, 0, 0 +#define MCA_PML_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "pml", 2, 0, 0 /* * macro for doing direct call / call through struct diff --git a/ompi/mca/pml/v/mca/vprotocol/base/base.h b/ompi/mca/pml/v/mca/vprotocol/base/base.h index 10ed9e6abc..3a5c2dbdaf 100644 --- a/ompi/mca/pml/v/mca/vprotocol/base/base.h +++ b/ompi/mca/pml/v/mca/vprotocol/base/base.h @@ -31,20 +31,18 @@ OMPI_DECLSPEC extern mca_vprotocol_base_component_t mca_vprotocol_component; OMPI_DECLSPEC extern mca_vprotocol_base_module_t mca_vprotocol; -/* Macro for use in components that are of type vprotocol v1.0.0 +/* Macro for use in components that are of type vprotocol */ -#define MCA_VPROTOCOL_BASE_VERSION_1_0_0 \ - /* vprotocol v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* vprotocol v1.0 */ \ - "vprotocol", 1, 0, 0 +#define MCA_VPROTOCOL_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "vprotocol", 2, 0, 0 /* Macro to mark an invalid component version (0.0.0). Any component showing * that version number will be ignored. */ #define MCA_VPROTOCOL_BASE_VERSION_0_0_0 \ - /* vprotocol v0.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ + /* vprotocol v0.0 is chained to MCA v2.0 */ \ + MCA_BASE_VERSION_2_0_0, \ /* vprotocol v0.0 */ \ "vprotocol", 0, 0, 0 diff --git a/ompi/mca/pml/v/mca/vprotocol/example/vprotocol_example_component.c b/ompi/mca/pml/v/mca/vprotocol/example/vprotocol_example_component.c index e9a3569ba6..a7efadb5a0 100644 --- a/ompi/mca/pml/v/mca/vprotocol/example/vprotocol_example_component.c +++ b/ompi/mca/pml/v/mca/vprotocol/example/vprotocol_example_component.c @@ -31,14 +31,13 @@ static int mca_vprotocol_example_component_finalize(void); static int _priority; -mca_pml_v_protocol_base_component_1_0_0_t mca_vprotocol_example_component = +mca_pml_v_protocol_base_component_2_0_0_t mca_vprotocol_example_component = { /* First, the mca_base_component_t struct containing meta * information about the component itself */ { - /* Indicate that we are a pml v1.0.0 component (which also implies - a specific MCA version) */ - MCA_VPROTOCOL_BASE_VERSION_1_0_0, + MCA_VPROTOCOL_BASE_VERSION_2_0_0, + "example", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ OMPI_MINOR_VERSION, /* MCA component minor version */ @@ -46,11 +45,9 @@ mca_pml_v_protocol_base_component_1_0_0_t mca_vprotocol_example_component = mca_vprotocol_example_component_open, /* component open */ mca_vprotocol_example_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ { - /* Whether the component is checkpointable or not */ - false + /* component is not checkpointable */ + MCA_BASE_METADATA_PARAM_NONE }, mca_vprotocol_example_component_init, /* component init */ diff --git a/ompi/mca/pml/v/mca/vprotocol/pessimist/vprotocol_pessimist.h b/ompi/mca/pml/v/mca/vprotocol/pessimist/vprotocol_pessimist.h index 9bf008bc3b..aec1b9eed7 100644 --- a/ompi/mca/pml/v/mca/vprotocol/pessimist/vprotocol_pessimist.h +++ b/ompi/mca/pml/v/mca/vprotocol/pessimist/vprotocol_pessimist.h @@ -46,7 +46,7 @@ typedef struct mca_vprotocol_pessimist_module_t { } mca_vprotocol_pessimist_module_t; OMPI_DECLSPEC extern mca_vprotocol_pessimist_module_t mca_vprotocol_pessimist; -OMPI_DECLSPEC extern mca_vprotocol_base_component_1_0_0_t mca_vprotocol_pessimist_component; +OMPI_DECLSPEC extern mca_vprotocol_base_component_2_0_0_t mca_vprotocol_pessimist_component; int mca_vprotocol_pessimist_enable(bool enable); int mca_vprotocol_pessimist_dump(struct ompi_communicator_t* comm, int verbose); diff --git a/ompi/mca/pml/v/mca/vprotocol/pessimist/vprotocol_pessimist_component.c b/ompi/mca/pml/v/mca/vprotocol/pessimist/vprotocol_pessimist_component.c index ff864e9596..214e34bedc 100644 --- a/ompi/mca/pml/v/mca/vprotocol/pessimist/vprotocol_pessimist_component.c +++ b/ompi/mca/pml/v/mca/vprotocol/pessimist/vprotocol_pessimist_component.c @@ -31,14 +31,13 @@ static int _sender_based_size; static int _event_buffer_size; static char *_mmap_file_name; -mca_vprotocol_base_component_1_0_0_t mca_vprotocol_pessimist_component = +mca_vprotocol_base_component_2_0_0_t mca_vprotocol_pessimist_component = { /* First, the mca_base_component_t struct containing meta * information about the component itself */ { - /* Indicate that we are a vprotocol v1.0.0 component (which also implies - a specific MCA version) */ - MCA_VPROTOCOL_BASE_VERSION_1_0_0, + MCA_VPROTOCOL_BASE_VERSION_2_0_0, + "pessimist", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ OMPI_MINOR_VERSION, /* MCA component minor version */ @@ -46,11 +45,9 @@ mca_vprotocol_base_component_1_0_0_t mca_vprotocol_pessimist_component = mca_vprotocol_pessimist_component_open, /* component open */ mca_vprotocol_pessimist_component_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ { - /* Whether the component is checkpointable or not */ - false + /* component is not checkpointable */ + MCA_BASE_METADATA_PARAM_NONE }, mca_vprotocol_pessimist_component_init, /* component init */ diff --git a/ompi/mca/pml/v/mca/vprotocol/vprotocol.h b/ompi/mca/pml/v/mca/vprotocol/vprotocol.h index 16b4642d43..bc863cee30 100644 --- a/ompi/mca/pml/v/mca/vprotocol/vprotocol.h +++ b/ompi/mca/pml/v/mca/vprotocol/vprotocol.h @@ -45,13 +45,13 @@ typedef int (*mca_vprotocol_base_component_finalize_fn_t)(void); /* The MCA type for class instance */ -typedef struct mca_vprotocol_base_component_1_0_0_t { +typedef struct mca_vprotocol_base_component_2_0_0_t { mca_base_component_t pmlm_version; - mca_base_component_data_1_0_0_t pmlm_data; + mca_base_component_data_t pmlm_data; mca_vprotocol_base_component_init_fn_t pmlm_init; mca_vprotocol_base_component_finalize_fn_t pmlm_finalize; -} mca_vprotocol_base_component_1_0_0_t; -typedef mca_vprotocol_base_component_1_0_0_t mca_vprotocol_base_component_t; +} mca_vprotocol_base_component_2_0_0_t; +typedef mca_vprotocol_base_component_2_0_0_t mca_vprotocol_base_component_t; /* The base module of the component */ diff --git a/ompi/mca/pml/v/pml_v.h b/ompi/mca/pml/v/pml_v.h index 55546df525..b5391ab069 100644 --- a/ompi/mca/pml/v/pml_v.h +++ b/ompi/mca/pml/v/pml_v.h @@ -28,7 +28,7 @@ struct mca_pml_v_t { typedef struct mca_pml_v_t mca_pml_v_t; OMPI_MODULE_DECLSPEC extern mca_pml_v_t mca_pml_v; -OMPI_MODULE_DECLSPEC extern mca_pml_base_component_1_0_0_t mca_pml_v_component; +OMPI_MODULE_DECLSPEC extern mca_pml_base_component_2_0_0_t mca_pml_v_component; END_C_DECLS diff --git a/ompi/mca/pml/v/pml_v_component.c b/ompi/mca/pml/v/pml_v_component.c index f07a9dad9a..3d6a2153ad 100644 --- a/ompi/mca/pml/v/pml_v_component.c +++ b/ompi/mca/pml/v/pml_v_component.c @@ -33,12 +33,12 @@ static int mca_pml_v_enable(bool enable); static inline int mca_pml_v_param_register_int( const char* param_name, int default_value); static inline char *mca_pml_v_param_register_string( const char* param_name, char *default_value); -mca_pml_base_component_1_0_0_t mca_pml_v_component = +mca_pml_base_component_2_0_0_t mca_pml_v_component = { /* First, the mca_base_component_t struct containing meta * information about the component itself */ { - MCA_PML_BASE_VERSION_1_0_0, /* Indicate that we are a pml v1.0.0 component (which also implies a specific MCA version) */ + MCA_PML_BASE_VERSION_2_0_0, "v", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ OMPI_MINOR_VERSION, /* MCA component minor version */ @@ -46,10 +46,8 @@ mca_pml_base_component_1_0_0_t mca_pml_v_component = mca_pml_v_component_open, mca_pml_v_component_close }, - - /* Next the MCA v1.0.0 component meta data */ { - false /* Whether the component is checkpointable or not */ + MCA_BASE_METADATA_PARAM_NONE /* Component is not checkpointable */ }, mca_pml_v_component_init, /* component init */ diff --git a/ompi/mca/pubsub/orte/pubsub_orte_component.c b/ompi/mca/pubsub/orte/pubsub_orte_component.c index 9fd6a5bc7e..62729ce96d 100644 --- a/ompi/mca/pubsub/orte/pubsub_orte_component.c +++ b/ompi/mca/pubsub/orte/pubsub_orte_component.c @@ -31,10 +31,7 @@ ompi_pubsub_orte_component_t mca_pubsub_orte_component = { information about the component itself */ { - /* Indicate that we are a pubsub v1.0.0 component (which also implies - a specific MCA version) */ - - OMPI_PUBSUB_BASE_VERSION_1_0_0, + OMPI_PUBSUB_BASE_VERSION_2_0_0, "orte", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ @@ -44,8 +41,6 @@ ompi_pubsub_orte_component_t mca_pubsub_orte_component = { pubsub_orte_component_close, /* component close */ pubsub_orte_component_query /* component query */ }, - - /* Next the MCA v1.0.0 component meta data */ { /* This component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/ompi/mca/pubsub/pubsub.h b/ompi/mca/pubsub/pubsub.h index 1815701a77..2605924871 100644 --- a/ompi/mca/pubsub/pubsub.h +++ b/ompi/mca/pubsub/pubsub.h @@ -63,7 +63,7 @@ typedef char* (*ompi_pubsub_base_module_lookup_fn_t)(char *service, ompi_info_t typedef int (*ompi_pubsub_base_module_finalize_fn_t)(void); /** -* Structure for PUBSUB v1.0.0 modules +* Structure for PUBSUB modules */ struct ompi_pubsub_base_module_1_0_0_t { /** Initialization Function */ @@ -84,25 +84,23 @@ OMPI_DECLSPEC extern ompi_pubsub_base_module_t ompi_pubsub; /** - * Structure for PUBSUB v1.0.0 components. + * Structure for PUBSUB components. */ -struct ompi_pubsub_base_component_1_0_0_t { +struct ompi_pubsub_base_component_2_0_0_t { /** MCA base component */ mca_base_component_t base_version; /** MCA base data */ - mca_base_component_data_1_0_0_t base_data; + mca_base_component_data_t base_data; }; -typedef struct ompi_pubsub_base_component_1_0_0_t ompi_pubsub_base_component_1_0_0_t; -typedef struct ompi_pubsub_base_component_1_0_0_t ompi_pubsub_base_component_t; +typedef struct ompi_pubsub_base_component_2_0_0_t ompi_pubsub_base_component_2_0_0_t; +typedef struct ompi_pubsub_base_component_2_0_0_t ompi_pubsub_base_component_t; /** - * Macro for use in components that are of type CRCP v1.0.0 + * Macro for use in components that are of type PUBSUB */ -#define OMPI_PUBSUB_BASE_VERSION_1_0_0 \ - /* PUBSUB v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* PUBSUB v1.0 */ \ - "pubsub", 1, 0, 0 +#define OMPI_PUBSUB_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "pubsub", 2, 0, 0 END_C_DECLS diff --git a/ompi/mca/rcache/rb/rcache_rb_component.c b/ompi/mca/rcache/rb/rcache_rb_component.c index 7cd9455d4e..3c11067cd7 100644 --- a/ompi/mca/rcache/rb/rcache_rb_component.c +++ b/ompi/mca/rcache/rb/rcache_rb_component.c @@ -28,10 +28,8 @@ static mca_rcache_base_module_t* mca_rcache_rb_component_init( void ); mca_rcache_rb_component_t mca_rcache_rb_component = { { { - /* Indicate that we are a rcache v1.0.0 component (which also - implies a specific MCA version) */ - - MCA_RCACHE_BASE_VERSION_1_0_0, + MCA_RCACHE_BASE_VERSION_2_0_0, + "rb", /* MCA component name */ OMPI_MAJOR_VERSION, /* MCA component major version */ OMPI_MINOR_VERSION, /* MCA component minor version */ @@ -39,9 +37,6 @@ mca_rcache_rb_component_t mca_rcache_rb_component = { mca_rcache_rb_component_open, /* component open */ NULL }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/ompi/mca/rcache/rcache.h b/ompi/mca/rcache/rcache.h index 5fcbaa0520..85e7161120 100644 --- a/ompi/mca/rcache/rcache.h +++ b/ompi/mca/rcache/rcache.h @@ -62,15 +62,15 @@ typedef void (*mca_rcache_base_module_finalize_fn_t)( * open/close/init functions */ -struct mca_rcache_base_component_1_0_0_t{ +struct mca_rcache_base_component_2_0_0_t{ mca_base_component_t rcache_version; /**< version */ - mca_base_component_data_1_0_0_t rcache_data; /**topom_init_query(enable_progress_threads, enable_mpi_threads); diff --git a/ompi/mca/topo/topo.h b/ompi/mca/topo/topo.h index 46a439b097..90973c23b6 100644 --- a/ompi/mca/topo/topo.h +++ b/ompi/mca/topo/topo.h @@ -27,14 +27,12 @@ /* * ****************************************************************** - * ********** Use in components that are of type topo v1.0.0 ******** + * ********** Use in components that are of type topo v2.0.0 ******** * ****************************************************************** */ -#define MCA_TOPO_BASE_VERSION_1_0_0 \ - /* topo v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* topo v1.0 */ \ - "topo", 1, 0, 0 +#define MCA_TOPO_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "topo", 2, 0, 0 /* * ****************************************************************** * **************************** Macro ends ************************** @@ -76,19 +74,19 @@ typedef int (*mca_topo_base_component_comm_unquery_1_0_0_fn_t) /* * ****************** component struct ****************************** - * Structure for topo v1.0.0 components.This is chained to MCA v1.0.0 + * Structure for topo v2.0.0 components.This is chained to MCA v2.0.0 * ****************** component struct ****************************** */ -struct mca_topo_base_component_1_0_0_t { +struct mca_topo_base_component_2_0_0_t { mca_base_component_t topom_version; - mca_base_component_data_1_0_0_t topom_data; + mca_base_component_data_t topom_data; mca_topo_base_component_init_query_1_0_0_fn_t topom_init_query; mca_topo_base_component_comm_query_1_0_0_fn_t topom_comm_query; mca_topo_base_component_comm_unquery_1_0_0_fn_t topom_comm_unquery; }; -typedef struct mca_topo_base_component_1_0_0_t mca_topo_base_component_1_0_0_t; -typedef mca_topo_base_component_1_0_0_t mca_topo_base_component_t; +typedef struct mca_topo_base_component_2_0_0_t mca_topo_base_component_2_0_0_t; +typedef mca_topo_base_component_2_0_0_t mca_topo_base_component_t; /* * ****************************************************************** diff --git a/ompi/mca/topo/unity/topo_unity.h b/ompi/mca/topo/unity/topo_unity.h index 32d9da562a..03482912e3 100644 --- a/ompi/mca/topo/unity/topo_unity.h +++ b/ompi/mca/topo/unity/topo_unity.h @@ -50,7 +50,7 @@ int mca_topo_unity_component_comm_unquery (struct ompi_communicator_t *comm); int mca_topo_unity_module_init (struct ompi_communicator_t *comm); int mca_topo_unity_module_finalize (struct ompi_communicator_t *comm); -OMPI_MODULE_DECLSPEC extern mca_topo_base_component_1_0_0_t mca_topo_unity_component; +OMPI_MODULE_DECLSPEC extern mca_topo_base_component_2_0_0_t mca_topo_unity_component; /* * ****************************************************************** diff --git a/ompi/mca/topo/unity/topo_unity_component.c b/ompi/mca/topo/unity/topo_unity_component.c index 26ebb09cb2..4d626b2eeb 100644 --- a/ompi/mca/topo/unity/topo_unity_component.c +++ b/ompi/mca/topo/unity/topo_unity_component.c @@ -43,10 +43,11 @@ const char *mca_topo_unity_component_version_string = * and finalize() are called during creation/destruction of a comm * ******************************************************************* */ -mca_topo_base_component_1_0_0_t mca_topo_unity_component = +mca_topo_base_component_2_0_0_t mca_topo_unity_component = { { - MCA_TOPO_BASE_VERSION_1_0_0, /* version number */ + MCA_TOPO_BASE_VERSION_2_0_0, + "unity", /* component name */ OMPI_MAJOR_VERSION, /* major version */ OMPI_MINOR_VERSION, /* minor version */ diff --git a/ompi/runtime/ompi_cr.c b/ompi/runtime/ompi_cr.c index 1e7a4e5459..e558e18f51 100644 --- a/ompi/runtime/ompi_cr.c +++ b/ompi/runtime/ompi_cr.c @@ -85,7 +85,7 @@ int ompi_cr_output = -1; do { \ bool found = false; \ int k; \ - mca_coll_base_module_1_1_0_t *my_module = \ + mca_coll_base_module_t *my_module = \ comm->c_coll.coll_ ## func ## _module; \ if (NULL != my_module) { \ for (k = 0 ; k < highest_module ; ++k) { \ @@ -104,10 +104,10 @@ int ompi_cr_output = -1; static int notify_collectives(int msg) { - mca_coll_base_module_1_1_0_t *modules[NUM_COLLECTIVES]; + mca_coll_base_module_t *modules[NUM_COLLECTIVES]; int i, max, ret, highest_module = 0; - memset(&modules, 0, sizeof(mca_coll_base_module_1_1_0_t*) * NUM_COLLECTIVES); + memset(&modules, 0, sizeof(mca_coll_base_module_t*) * NUM_COLLECTIVES); max = opal_pointer_array_get_size(&ompi_mpi_communicators); for (i = 0 ; i < max ; ++i) { diff --git a/ompi/runtime/ompi_module_exchange.h b/ompi/runtime/ompi_module_exchange.h index 021b0ef5a3..7824d92840 100644 --- a/ompi/runtime/ompi_module_exchange.h +++ b/ompi/runtime/ompi_module_exchange.h @@ -11,6 +11,7 @@ * All rights reserved. * Copyright (c) 2006-2007 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -51,6 +52,8 @@ #include #endif +#include "opal/mca/mca.h" + #include "orte/types.h" struct mca_base_component_t; @@ -102,7 +105,7 @@ BEGIN_C_DECLS * @retval OMPI_SUCCESS On success * @retval OMPI_ERROR An unspecified error occurred */ -OMPI_DECLSPEC int ompi_modex_send(struct mca_base_component_t *source_component, +OMPI_DECLSPEC int ompi_modex_send(mca_base_component_t *source_component, const void *buffer, size_t size); @@ -165,7 +168,7 @@ OMPI_DECLSPEC int ompi_modex_send_string(const char* key, * @retval OMPI_ERR_OUT_OF_RESOURCE No memory could be allocated for the * buffer. */ -OMPI_DECLSPEC int ompi_modex_recv(struct mca_base_component_t *dest_component, +OMPI_DECLSPEC int ompi_modex_recv(mca_base_component_t *dest_component, struct ompi_proc_t *source_proc, void **buffer, size_t *size); diff --git a/opal/mca/backtrace/backtrace.h b/opal/mca/backtrace/backtrace.h index 251aa19973..04db71c7a8 100644 --- a/opal/mca/backtrace/backtrace.h +++ b/opal/mca/backtrace/backtrace.h @@ -53,28 +53,25 @@ OPAL_DECLSPEC int opal_backtrace_buffer(char*** messages, int *len); /** - * Structure for backtrace v1.0.0 components. - * Chained to MCA v1.0.0 + * Structure for backtrace components. */ -struct opal_backtrace_base_component_1_0_0_t { +struct opal_backtrace_base_component_2_0_0_t { /** MCA base component */ mca_base_component_t backtracec_version; /** MCA base data */ - mca_base_component_data_1_0_0_t backtracec_data; + mca_base_component_data_t backtracec_data; }; /** * Convenience typedef */ -typedef struct opal_backtrace_base_component_1_0_0_t opal_backtrace_base_component_1_0_0_t; +typedef struct opal_backtrace_base_component_2_0_0_t opal_backtrace_base_component_2_0_0_t; /* - * Macro for use in components that are of type backtrace v1.0.0 + * Macro for use in components that are of type backtrace */ -#define OPAL_BACKTRACE_BASE_VERSION_1_0_0 \ - /* backtrace v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* backtrace v1.0 */ \ - "backtrace", 1, 0, 0 +#define OPAL_BACKTRACE_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "backtrace", 2, 0, 0 #if defined(c_plusplus) || defined(__cplusplus) } diff --git a/opal/mca/backtrace/darwin/backtrace_darwin_component.c b/opal/mca/backtrace/darwin/backtrace_darwin_component.c index 09704f105a..7aa157ef19 100644 --- a/opal/mca/backtrace/darwin/backtrace_darwin_component.c +++ b/opal/mca/backtrace/darwin/backtrace_darwin_component.c @@ -20,13 +20,11 @@ #include "opal/mca/backtrace/backtrace.h" -OPAL_MODULE_DECLSPEC const opal_backtrace_base_component_1_0_0_t mca_backtrace_darwin_component = { +OPAL_MODULE_DECLSPEC const opal_backtrace_base_component_2_0_0_t mca_backtrace_darwin_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a backtrace v1.0.0 component (which also - implies a specific MCA version) */ - OPAL_BACKTRACE_BASE_VERSION_1_0_0, + OPAL_BACKTRACE_BASE_VERSION_2_0_0, /* Component name and version */ "darwin", @@ -38,8 +36,6 @@ OPAL_MODULE_DECLSPEC const opal_backtrace_base_component_1_0_0_t mca_backtrace_d NULL, NULL }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/opal/mca/backtrace/execinfo/backtrace_execinfo_component.c b/opal/mca/backtrace/execinfo/backtrace_execinfo_component.c index 6a35dcad11..4f3a7fde75 100644 --- a/opal/mca/backtrace/execinfo/backtrace_execinfo_component.c +++ b/opal/mca/backtrace/execinfo/backtrace_execinfo_component.c @@ -20,13 +20,11 @@ #include "opal/mca/backtrace/backtrace.h" -const opal_backtrace_base_component_1_0_0_t mca_backtrace_execinfo_component = { +const opal_backtrace_base_component_2_0_0_t mca_backtrace_execinfo_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a backtrace v1.0.0 component (which also - implies a specific MCA version) */ - OPAL_BACKTRACE_BASE_VERSION_1_0_0, + OPAL_BACKTRACE_BASE_VERSION_2_0_0, /* Component name and version */ "execinfo", @@ -38,8 +36,6 @@ const opal_backtrace_base_component_1_0_0_t mca_backtrace_execinfo_component = { NULL, NULL }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/opal/mca/backtrace/none/backtrace_none_component.c b/opal/mca/backtrace/none/backtrace_none_component.c index c1dcf2c69f..660744c27d 100644 --- a/opal/mca/backtrace/none/backtrace_none_component.c +++ b/opal/mca/backtrace/none/backtrace_none_component.c @@ -23,18 +23,16 @@ #if defined(c_plusplus) || defined(__cplusplus) extern "C" { #endif - OPAL_DECLSPEC extern const opal_backtrace_base_component_1_0_0_t mca_backtrace_none_component; + OPAL_DECLSPEC extern const opal_backtrace_base_component_2_0_0_t mca_backtrace_none_component; #if defined(c_plusplus) || defined(__cplusplus) } #endif -const opal_backtrace_base_component_1_0_0_t mca_backtrace_none_component = { +const opal_backtrace_base_component_2_0_0_t mca_backtrace_none_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a backtrace v1.0.0 component (which also - implies a specific MCA version) */ - OPAL_BACKTRACE_BASE_VERSION_1_0_0, + OPAL_BACKTRACE_BASE_VERSION_2_0_0, /* Component name and version */ "none", @@ -46,8 +44,6 @@ const opal_backtrace_base_component_1_0_0_t mca_backtrace_none_component = { NULL, NULL }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/opal/mca/backtrace/printstack/backtrace_printstack_component.c b/opal/mca/backtrace/printstack/backtrace_printstack_component.c index 8da000a937..3f831bb8d2 100644 --- a/opal/mca/backtrace/printstack/backtrace_printstack_component.c +++ b/opal/mca/backtrace/printstack/backtrace_printstack_component.c @@ -20,13 +20,11 @@ #include "opal/mca/backtrace/backtrace.h" -const opal_backtrace_base_component_1_0_0_t mca_backtrace_printstack_component = { +const opal_backtrace_base_component_2_0_0_t mca_backtrace_printstack_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a backtrace v1.0.0 component (which also - implies a specific MCA version) */ - OPAL_BACKTRACE_BASE_VERSION_1_0_0, + OPAL_BACKTRACE_BASE_VERSION_2_0_0, /* Component name and version */ "printstack", @@ -38,8 +36,6 @@ const opal_backtrace_base_component_1_0_0_t mca_backtrace_printstack_component = NULL, NULL }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/opal/mca/base/mca_base_component_find.c b/opal/mca/base/mca_base_component_find.c index 123ce7bf1e..f619ab7ae0 100644 --- a/opal/mca/base/mca_base_component_find.c +++ b/opal/mca/base/mca_base_component_find.c @@ -390,6 +390,7 @@ static int open_component(component_file_item_t *target_file, mca_base_component_list_item_t *mitem; dependency_item_t *ditem; size_t len; + int vl = show_errors ? 0 : 40; opal_output_verbose(40, 0, "mca: base: component_find: examining dyanmic %s MCA component \"%s\"", target_file->type, target_file->name); @@ -442,11 +443,7 @@ static int open_component(component_file_item_t *target_file, #endif if (NULL == component_handle) { err = strdup(lt_dlerror()); - if (0 != show_errors) { - opal_output(0, "mca: base: component_find: unable to open %s %s: %s (ignored)", - target_file->type, target_file->name, err); - } - opal_output_verbose(40, 0, "mca: base: component_find: unable to open %s: %s (ignored)", + opal_output_verbose(vl, 0, "mca: base: component_find: unable to open %s: %s (ignored)", target_file->filename, err); free(err); target_file->status = FAILED_TO_LOAD; @@ -479,14 +476,9 @@ static int open_component(component_file_item_t *target_file, component_struct = (mca_base_component_t*)lt_dlsym(component_handle, struct_name); if (NULL == component_struct) { - if (0 != show_errors) { - opal_output(0, "mca: base: component_find: \"%s\" does not appear to be a valid " - "%s MCA dynamic component (ignored)", - target_file->basename, target_file->type); - } - opal_output_verbose(40, 0, "mca: base: component_find: \"%s\" does not appear to be a valid " - "%s MCA dynamic component (ignored)", - target_file->basename, target_file->type); + opal_output_verbose(vl, 0, "mca: base: component_find: \"%s\" does not appear to be a valid " + "%s MCA dynamic component (ignored)", + target_file->basename, target_file->type); free(mitem); free(struct_name); lt_dlclose(component_handle); @@ -495,8 +487,28 @@ static int open_component(component_file_item_t *target_file, return OPAL_ERR_BAD_PARAM; } - /* We found the public struct. Save it, and register this component to - be closed later. */ + /* We found the public struct. Make sure its MCA major.minor + version is the same as ours. */ + if (!(MCA_BASE_VERSION_MAJOR == component_struct->mca_major_version && + MCA_BASE_VERSION_MINOR == component_struct->mca_minor_version)) { + opal_output_verbose(vl, 0, "mca: base: component_find: %s \"%s\" uses an MCA interface that is not recognized (component MCA v%d.%d.%d != supported MCA v%d.%d.%d) -- ignored", + target_file->type, target_file->basename, + component_struct->mca_major_version, + component_struct->mca_minor_version, + component_struct->mca_release_version, + MCA_BASE_VERSION_MAJOR, + MCA_BASE_VERSION_MINOR, + MCA_BASE_VERSION_RELEASE); + free(mitem); + free(struct_name); + lt_dlclose(component_handle); + target_file->status = FAILED_TO_LOAD; + free_dependency_list(&dependencies); + return OPAL_ERR_BAD_PARAM; + } + + /* Alles gut. Save the component struct, and register this + component to be closed later. */ mitem->cli_component = component_struct; opal_list_append(found_components, (opal_list_item_t *) mitem); diff --git a/opal/mca/base/mca_base_components_open.c b/opal/mca/base/mca_base_components_open.c index 6f0d4dee11..3e8b335e96 100644 --- a/opal/mca/base/mca_base_components_open.c +++ b/opal/mca/base/mca_base_components_open.c @@ -9,6 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -46,7 +47,7 @@ struct mca_base_open_only_dummy_component_t { /** MCA base component */ mca_base_component_t version; /** MCA base data */ - mca_base_component_data_1_0_0_t data; + mca_base_component_data_t data; }; typedef struct mca_base_open_only_dummy_component_t mca_base_open_only_dummy_component_t; @@ -295,7 +296,7 @@ static int open_components(const char *type_name, int output_id, const mca_base_component_t *component; mca_base_component_list_item_t *cli; bool called_open; - bool opened; + bool opened, registered; /* Announce */ @@ -312,11 +313,44 @@ static int open_components(const char *type_name, int output_id, cli = (mca_base_component_list_item_t *) item; component = cli->cli_component; - opened = called_open = false; + registered = opened = called_open = false; opal_output_verbose(10, output_id, "mca: base: components_open: found loaded component %s", component->mca_component_name); - + + /* Call the component's MCA parameter registration function */ + if (NULL == component->mca_register_component_params) { + registered = true; + opal_output_verbose(10, output_id, + "mca: base: components_open: " + "component %s has no register function", + component->mca_component_name); + } else { + if (MCA_SUCCESS == component->mca_register_component_params()) { + registered = true; + opal_output_verbose(10, output_id, + "mca: base: components_open: " + "component %s register function successful", + component->mca_component_name); + } else { + /* We may end up displaying this twice, but it may go + to separate streams. So better to be redundant + than to not display the error in the stream where + it was expected. */ + + if (show_errors) { + opal_output(0, "mca: base: components_open: " + "component %s / %s register function failed", + component->mca_type_name, + component->mca_component_name); + } + opal_output_verbose(10, output_id, + "mca: base: components_open: " + "component %s register function failed", + component->mca_component_name); + } + } + if (NULL == component->mca_open_component) { opened = true; opal_output_verbose(10, output_id, diff --git a/opal/mca/carto/auto_detect/carto_auto_detect.h b/opal/mca/carto/auto_detect/carto_auto_detect.h index 1386f658bf..f71640b1ee 100644 --- a/opal/mca/carto/auto_detect/carto_auto_detect.h +++ b/opal/mca/carto/auto_detect/carto_auto_detect.h @@ -38,7 +38,7 @@ BEGIN_C_DECLS /** * Globally exported variable */ -OPAL_DECLSPEC extern const opal_carto_base_component_1_0_0_t +OPAL_DECLSPEC extern const opal_carto_base_component_2_0_0_t mca_carto_auto_detect_component; diff --git a/opal/mca/carto/auto_detect/carto_auto_detect_component.c b/opal/mca/carto/auto_detect/carto_auto_detect_component.c index d4590c8154..6d8e7fc70c 100644 --- a/opal/mca/carto/auto_detect/carto_auto_detect_component.c +++ b/opal/mca/carto/auto_detect/carto_auto_detect_component.c @@ -45,32 +45,26 @@ static int auto_detect_open(void); * and pointers to our public functions in it */ -const opal_carto_base_component_1_0_0_t mca_carto_auto_detect_component = { +const opal_carto_base_component_2_0_0_t mca_carto_auto_detect_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a carto v1.1.0 component (which also - implies a specific MCA version) */ - - OPAL_CARTO_BASE_VERSION_1_0_0, + OPAL_CARTO_BASE_VERSION_2_0_0, /* Component name and version */ - "auto_detect", OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, OPAL_RELEASE_VERSION, /* Component open and close functions */ - auto_detect_open, NULL, opal_carto_auto_detect_component_query }, { - /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT } diff --git a/opal/mca/carto/base/base.h b/opal/mca/carto/base/base.h index 53f77bc4a2..edfbf0e8b7 100644 --- a/opal/mca/carto/base/base.h +++ b/opal/mca/carto/base/base.h @@ -107,7 +107,7 @@ OPAL_DECLSPEC extern bool opal_carto_base_selected; /** * Global component struct for the selected component */ -OPAL_DECLSPEC extern const opal_carto_base_component_1_0_0_t +OPAL_DECLSPEC extern const opal_carto_base_component_2_0_0_t *opal_carto_base_component; /** diff --git a/opal/mca/carto/base/carto_base_select.c b/opal/mca/carto/base/carto_base_select.c index 28b09da931..d930535eb4 100644 --- a/opal/mca/carto/base/carto_base_select.c +++ b/opal/mca/carto/base/carto_base_select.c @@ -32,14 +32,14 @@ * Globals */ bool opal_carto_base_selected = false; -const opal_carto_base_component_1_0_0_t *opal_carto_base_component = NULL; +const opal_carto_base_component_2_0_0_t *opal_carto_base_component = NULL; const opal_carto_base_module_1_0_0_t *opal_carto_base_module = NULL; int opal_carto_base_select(void) { int ret, exit_status = OPAL_SUCCESS; - opal_carto_base_component_1_0_0_t *best_component = NULL; + opal_carto_base_component_2_0_0_t *best_component = NULL; opal_carto_base_module_1_0_0_t *best_module = NULL; /* diff --git a/opal/mca/carto/carto.h b/opal/mca/carto/carto.h index dc883570f9..191362714a 100644 --- a/opal/mca/carto/carto.h +++ b/opal/mca/carto/carto.h @@ -113,24 +113,23 @@ typedef int (*opal_carto_base_module_finalize_fn_t)(void); /** - * Structure for carto v1.1.0 components. - * Chained to MCA v1.0.0 + * Structure for carto components. */ -struct opal_carto_base_component_1_0_0_t { +struct opal_carto_base_component_2_0_0_t { /** MCA base component */ mca_base_component_t base_version; /** MCA base data */ - mca_base_component_data_1_0_0_t base_data; + mca_base_component_data_t base_data; }; /** * Convenience typedef */ -typedef struct opal_carto_base_component_1_0_0_t opal_carto_base_component_1_0_0_t; -typedef struct opal_carto_base_component_1_0_0_t opal_carto_base_component_t; +typedef struct opal_carto_base_component_2_0_0_t opal_carto_base_component_2_0_0_t; +typedef struct opal_carto_base_component_2_0_0_t opal_carto_base_component_t; /** - * Structure for carto v1.0.0 modules + * Structure for carto modules */ struct opal_carto_base_module_1_0_0_t { /** Module initialization function */ @@ -156,12 +155,10 @@ typedef struct opal_carto_base_module_1_0_0_t opal_carto_base_module_t; /* - * Macro for use in components that are of type carto v1.1.0 + * Macro for use in components that are of type carto */ -#define OPAL_CARTO_BASE_VERSION_1_0_0 \ - /* carto v1.1 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* carto v1.0 */ \ - "carto", 1, 0, 0 +#define OPAL_CARTO_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "carto", 2, 0, 0 #endif /* OPAL_CARTO_H */ diff --git a/opal/mca/carto/file/carto_file.h b/opal/mca/carto/file/carto_file.h index b0a95323b2..d4f009cd02 100644 --- a/opal/mca/carto/file/carto_file.h +++ b/opal/mca/carto/file/carto_file.h @@ -96,7 +96,7 @@ extern char *carto_file_path; /** * Globally exported variable */ -OPAL_DECLSPEC extern const opal_carto_base_component_1_0_0_t +OPAL_DECLSPEC extern const opal_carto_base_component_2_0_0_t mca_carto_file_component; diff --git a/opal/mca/carto/file/carto_file_component.c b/opal/mca/carto/file/carto_file_component.c index 4ffada706d..13bf61a598 100644 --- a/opal/mca/carto/file/carto_file_component.c +++ b/opal/mca/carto/file/carto_file_component.c @@ -45,26 +45,21 @@ static int file_open(void); * and pointers to our public functions in it */ -const opal_carto_base_component_1_0_0_t mca_carto_file_component = { +const opal_carto_base_component_2_0_0_t mca_carto_file_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a carto v1.1.0 component (which also - implies a specific MCA version) */ - - OPAL_CARTO_BASE_VERSION_1_0_0, + OPAL_CARTO_BASE_VERSION_2_0_0, /* Component name and version */ - "file", OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, OPAL_RELEASE_VERSION, /* Component open and close functions */ - file_open, NULL, opal_carto_file_component_query diff --git a/opal/mca/crs/blcr/crs_blcr_component.c b/opal/mca/crs/blcr/crs_blcr_component.c index 50d009223d..c089231eca 100644 --- a/opal/mca/crs/blcr/crs_blcr_component.c +++ b/opal/mca/crs/blcr/crs_blcr_component.c @@ -40,7 +40,8 @@ opal_crs_blcr_component_t mca_crs_blcr_component = { * meta information about the component itself */ { - OPAL_CRS_BASE_VERSION_1_0_0, + OPAL_CRS_BASE_VERSION_2_0_0, + /* Component name and version */ "blcr", OMPI_MAJOR_VERSION, @@ -52,8 +53,6 @@ opal_crs_blcr_component_t mca_crs_blcr_component = { crs_blcr_close, opal_crs_blcr_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/opal/mca/crs/crs.h b/opal/mca/crs/crs.h index 9cbabf60bc..aa657b8526 100644 --- a/opal/mca/crs/crs.h +++ b/opal/mca/crs/crs.h @@ -210,13 +210,13 @@ typedef int (*opal_crs_base_module_reg_thread_fn_t) (void); /** - * Structure for CRS v1.0.0 components. + * Structure for CRS components. */ -struct opal_crs_base_component_1_0_0_t { +struct opal_crs_base_component_2_0_0_t { /** MCA base component */ mca_base_component_t base_version; /** MCA base data */ - mca_base_component_data_1_0_0_t base_data; + mca_base_component_data_t base_data; /** Verbosity Level */ int verbose; @@ -225,11 +225,11 @@ struct opal_crs_base_component_1_0_0_t { /** Default Priority */ int priority; }; -typedef struct opal_crs_base_component_1_0_0_t opal_crs_base_component_1_0_0_t; -typedef struct opal_crs_base_component_1_0_0_t opal_crs_base_component_t; +typedef struct opal_crs_base_component_2_0_0_t opal_crs_base_component_2_0_0_t; +typedef struct opal_crs_base_component_2_0_0_t opal_crs_base_component_t; /** - * Structure for CRS v1.0.0 modules + * Structure for CRS modules */ struct opal_crs_base_module_1_0_0_t { /** Initialization Function */ @@ -260,13 +260,11 @@ typedef struct opal_crs_base_module_1_0_0_t opal_crs_base_module_t; OPAL_DECLSPEC extern opal_crs_base_module_t opal_crs; /** - * Macro for use in components that are of type CRS v1.0.0 + * Macro for use in components that are of type CRS */ -#define OPAL_CRS_BASE_VERSION_1_0_0 \ - /* CRS v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* CRS v1.0 */ \ - "crs", 1, 0, 0 +#define OPAL_CRS_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "crs", 2, 0, 0 #if defined(c_plusplus) || defined(__cplusplus) } diff --git a/opal/mca/crs/none/crs_none_component.c b/opal/mca/crs/none/crs_none_component.c index 1c24c5fd8b..7db49ccde1 100644 --- a/opal/mca/crs/none/crs_none_component.c +++ b/opal/mca/crs/none/crs_none_component.c @@ -38,7 +38,8 @@ opal_crs_none_component_t mca_crs_none_component = { * meta information about the component itnone */ { - OPAL_CRS_BASE_VERSION_1_0_0, + OPAL_CRS_BASE_VERSION_2_0_0, + /* Component name and version */ "none", OMPI_MAJOR_VERSION, @@ -50,8 +51,6 @@ opal_crs_none_component_t mca_crs_none_component = { crs_none_close, opal_crs_none_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/opal/mca/crs/self/crs_self_component.c b/opal/mca/crs/self/crs_self_component.c index 2340ad7c44..a090868bf2 100644 --- a/opal/mca/crs/self/crs_self_component.c +++ b/opal/mca/crs/self/crs_self_component.c @@ -44,7 +44,8 @@ opal_crs_self_component_t mca_crs_self_component = { * meta information about the component itself */ { - OPAL_CRS_BASE_VERSION_1_0_0, + OPAL_CRS_BASE_VERSION_2_0_0, + /* Component name and version */ "self", OMPI_MAJOR_VERSION, @@ -56,8 +57,6 @@ opal_crs_self_component_t mca_crs_self_component = { crs_self_close, opal_crs_self_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/opal/mca/installdirs/config/opal_installdirs_config.c b/opal/mca/installdirs/config/opal_installdirs_config.c index 259abb6cc9..9fcdf45baa 100644 --- a/opal/mca/installdirs/config/opal_installdirs_config.c +++ b/opal/mca/installdirs/config/opal_installdirs_config.c @@ -17,9 +17,7 @@ const opal_installdirs_base_component_t mca_installdirs_config_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a backtrace v1.0.0 component (which also - implies a specific MCA version) */ - OPAL_INSTALLDIRS_BASE_VERSION_1_0_0, + OPAL_INSTALLDIRS_BASE_VERSION_2_0_0, /* Component name and version */ "config", @@ -31,11 +29,9 @@ const opal_installdirs_base_component_t mca_installdirs_config_component = { NULL, NULL }, - - /* Next the MCA v1.0.0 component meta data */ { - /* Whether the component is checkpointable or not */ - true + /* This component is Checkpointable */ + MCA_BASE_METADATA_PARAM_CHECKPOINT }, { diff --git a/opal/mca/installdirs/env/opal_installdirs_env.c b/opal/mca/installdirs/env/opal_installdirs_env.c index 790174e23d..2279af6e39 100644 --- a/opal/mca/installdirs/env/opal_installdirs_env.c +++ b/opal/mca/installdirs/env/opal_installdirs_env.c @@ -23,9 +23,7 @@ opal_installdirs_base_component_t mca_installdirs_env_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a backtrace v1.0.0 component (which also - implies a specific MCA version) */ - OPAL_INSTALLDIRS_BASE_VERSION_1_0_0, + OPAL_INSTALLDIRS_BASE_VERSION_2_0_0, /* Component name and version */ "env", @@ -37,11 +35,9 @@ opal_installdirs_base_component_t mca_installdirs_env_component = { installdirs_env_open, NULL }, - - /* Next the MCA v1.0.0 component meta data */ { - /* Whether the component is checkpointable or not */ - true + /* This component is checkpointable */ + MCA_BASE_METADATA_PARAM_CHECKPOINT }, /* Next the opal_install_dirs_t install_dirs_data information */ diff --git a/opal/mca/installdirs/installdirs.h b/opal/mca/installdirs/installdirs.h index a52608f23e..1c24635e86 100644 --- a/opal/mca/installdirs/installdirs.h +++ b/opal/mca/installdirs/installdirs.h @@ -55,30 +55,27 @@ OPAL_DECLSPEC char * opal_install_dirs_expand(const char* input); /** - * Structure for installdirs v1.0.0 components. - * Chained to MCA v1.0.0 + * Structure for installdirs components. */ -struct opal_installdirs_base_component_1_0_0_t { +struct opal_installdirs_base_component_2_0_0_t { /** MCA base component */ mca_base_component_t component; /** MCA base data */ - mca_base_component_data_1_0_0_t component_data; + mca_base_component_data_t component_data; /** install directories provided by the given component */ opal_install_dirs_t install_dirs_data; }; /** * Convenience typedef */ -typedef struct opal_installdirs_base_component_1_0_0_t opal_installdirs_base_component_t; +typedef struct opal_installdirs_base_component_2_0_0_t opal_installdirs_base_component_t; /* - * Macro for use in components that are of type installdirs v1.0.0 + * Macro for use in components that are of type installdirs */ -#define OPAL_INSTALLDIRS_BASE_VERSION_1_0_0 \ - /* installdirs v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* installdirs v1.0 */ \ - "installdirs", 1, 0, 0 +#define OPAL_INSTALLDIRS_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "installdirs", 2, 0, 0 #if defined(c_plusplus) || defined(__cplusplus) } diff --git a/opal/mca/installdirs/windows/opal_installdirs_windows.c b/opal/mca/installdirs/windows/opal_installdirs_windows.c index 6739efe547..69754d0db4 100644 --- a/opal/mca/installdirs/windows/opal_installdirs_windows.c +++ b/opal/mca/installdirs/windows/opal_installdirs_windows.c @@ -21,9 +21,7 @@ opal_installdirs_base_component_t mca_installdirs_windows_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a backtrace v1.0.0 component (which also - implies a specific MCA version) */ - OPAL_INSTALLDIRS_BASE_VERSION_1_0_0, + OPAL_INSTALLDIRS_BASE_VERSION_2_0_0, /* Component name and version */ "windows", @@ -35,11 +33,9 @@ opal_installdirs_base_component_t mca_installdirs_windows_component = { installdirs_windows_open, NULL }, - - /* Next the MCA v1.0.0 component meta data */ { - /* Whether the component is checkpointable or not */ - true + /* This component is checkpointable */ + MCA_BASE_METADATA_PARAM_CHECKPOINT }, }; diff --git a/opal/mca/maffinity/base/base.h b/opal/mca/maffinity/base/base.h index 339e6a1d45..073fb4e840 100644 --- a/opal/mca/maffinity/base/base.h +++ b/opal/mca/maffinity/base/base.h @@ -130,7 +130,7 @@ extern bool opal_maffinity_base_selected; /** * Global component struct for the selected component */ -OPAL_DECLSPEC extern const opal_maffinity_base_component_1_0_0_t +OPAL_DECLSPEC extern const opal_maffinity_base_component_2_0_0_t *opal_maffinity_base_component; /** * Global module struct for the selected module diff --git a/opal/mca/maffinity/base/maffinity_base_select.c b/opal/mca/maffinity/base/maffinity_base_select.c index c3a77f8cc0..715c3e8e06 100644 --- a/opal/mca/maffinity/base/maffinity_base_select.c +++ b/opal/mca/maffinity/base/maffinity_base_select.c @@ -31,14 +31,14 @@ * Globals */ bool opal_maffinity_base_selected = false; -const opal_maffinity_base_component_1_0_0_t *opal_maffinity_base_component = NULL; +const opal_maffinity_base_component_2_0_0_t *opal_maffinity_base_component = NULL; const opal_maffinity_base_module_1_0_0_t *opal_maffinity_base_module = NULL; int opal_maffinity_base_select(void) { int ret, exit_status = OPAL_SUCCESS; - opal_maffinity_base_component_1_0_0_t *best_component = NULL; + opal_maffinity_base_component_2_0_0_t *best_component = NULL; opal_maffinity_base_module_1_0_0_t *best_module = NULL; /* diff --git a/opal/mca/maffinity/first_use/maffinity_first_use.h b/opal/mca/maffinity/first_use/maffinity_first_use.h index c3192a9d82..4fccd16557 100644 --- a/opal/mca/maffinity/first_use/maffinity_first_use.h +++ b/opal/mca/maffinity/first_use/maffinity_first_use.h @@ -39,7 +39,7 @@ extern "C" { /** * Globally exported variable */ - OPAL_MODULE_DECLSPEC extern const opal_maffinity_base_component_1_0_0_t + OPAL_MODULE_DECLSPEC extern const opal_maffinity_base_component_2_0_0_t mca_maffinity_first_use_component; diff --git a/opal/mca/maffinity/first_use/maffinity_first_use_component.c b/opal/mca/maffinity/first_use/maffinity_first_use_component.c index 27fcad90e0..5740ec3cf8 100644 --- a/opal/mca/maffinity/first_use/maffinity_first_use_component.c +++ b/opal/mca/maffinity/first_use/maffinity_first_use_component.c @@ -38,33 +38,25 @@ static int first_use_open(void); * and pointers to our public functions in it */ -const opal_maffinity_base_component_1_0_0_t mca_maffinity_first_use_component = { +const opal_maffinity_base_component_2_0_0_t mca_maffinity_first_use_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a maffinity v1.0.0 component (which also - implies a specific MCA version) */ - - OPAL_MAFFINITY_BASE_VERSION_1_0_0, + OPAL_MAFFINITY_BASE_VERSION_2_0_0, /* Component name and version */ - "first_use", OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, OPAL_RELEASE_VERSION, /* Component open and close functions */ - first_use_open, NULL, opal_maffinity_first_use_component_query }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/opal/mca/maffinity/libnuma/maffinity_libnuma.h b/opal/mca/maffinity/libnuma/maffinity_libnuma.h index deb7d51186..fc22fc29e8 100644 --- a/opal/mca/maffinity/libnuma/maffinity_libnuma.h +++ b/opal/mca/maffinity/libnuma/maffinity_libnuma.h @@ -39,7 +39,7 @@ extern "C" { /** * Globally exported variable */ - OPAL_DECLSPEC extern const opal_maffinity_base_component_1_0_0_t + OPAL_DECLSPEC extern const opal_maffinity_base_component_2_0_0_t mca_maffinity_libnuma_component; diff --git a/opal/mca/maffinity/libnuma/maffinity_libnuma_component.c b/opal/mca/maffinity/libnuma/maffinity_libnuma_component.c index 424a5c70ef..53ab82ab9c 100644 --- a/opal/mca/maffinity/libnuma/maffinity_libnuma_component.c +++ b/opal/mca/maffinity/libnuma/maffinity_libnuma_component.c @@ -38,33 +38,25 @@ static int libnuma_open(void); * and pointers to our public functions in it */ -const opal_maffinity_base_component_1_0_0_t mca_maffinity_libnuma_component = { +const opal_maffinity_base_component_2_0_0_t mca_maffinity_libnuma_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a maffinity v1.0.0 component (which also - implies a specific MCA version) */ - - OPAL_MAFFINITY_BASE_VERSION_1_0_0, + OPAL_MAFFINITY_BASE_VERSION_2_0_0, /* Component name and version */ - "libnuma", OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, OPAL_RELEASE_VERSION, /* Component open and close functions */ - libnuma_open, NULL, opal_maffinity_libnuma_component_query }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/opal/mca/maffinity/maffinity.h b/opal/mca/maffinity/maffinity.h index 5a1a5b2d8d..95c656c291 100644 --- a/opal/mca/maffinity/maffinity.h +++ b/opal/mca/maffinity/maffinity.h @@ -95,23 +95,22 @@ typedef int (*opal_maffinity_base_module_bind_fn_t) (opal_maffinity_base_segment_t *segments, size_t num_segments, int node_id); /** - * Structure for maffinity v1.0.0 components. - * Chained to MCA v1.0.0 + * Structure for maffinity components. */ -struct opal_maffinity_base_component_1_0_0_t { +struct opal_maffinity_base_component_2_0_0_t { /** MCA base component */ mca_base_component_t base_version; /** MCA base data */ - mca_base_component_data_1_0_0_t base_data; + mca_base_component_data_t base_data; }; /** * Convenience typedef */ -typedef struct opal_maffinity_base_component_1_0_0_t opal_maffinity_base_component_1_0_0_t; +typedef struct opal_maffinity_base_component_2_0_0_t opal_maffinity_base_component_2_0_0_t; /** - * Structure for maffinity v1.0.0 modules + * Structure for maffinity modules */ struct opal_maffinity_base_module_1_0_0_t { /** Module initialization function */ @@ -129,12 +128,10 @@ typedef struct opal_maffinity_base_module_1_0_0_t opal_maffinity_base_module_1_0 /* - * Macro for use in components that are of type maffinity v1.0.0 + * Macro for use in components that are of type maffinity */ -#define OPAL_MAFFINITY_BASE_VERSION_1_0_0 \ - /* maffinity v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* maffinity v1.0 */ \ - "maffinity", 1, 0, 0 +#define OPAL_MAFFINITY_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "maffinity", 2, 0, 0 #endif /* OPAL_MAFFINITY_H */ diff --git a/opal/mca/mca.h b/opal/mca/mca.h index 7b88ea62f1..ac1942bfbe 100644 --- a/opal/mca/mca.h +++ b/opal/mca/mca.h @@ -20,6 +20,67 @@ * @file * * Top-level interface for \em all MCA components. + * + * Historical notes: + * + * Open MPI originally used a v1.0.0 of the MCA component structs, but + * did not have a version number in the struct name. If I recall + * correctly, this is because we simply didn't think through (or never + * envisioned) changing the MCA base component struct itself. Oops. + * + * We made some changes in the base struct in Open MPI v1.3, and + * decided the following at the same time: + * + * - Bump the MCA version number to 2.0.0 and add some "reserved" + * space at the end of the struct. + * - The major MCA version number is essentially tied to the space + * that the struct occupies; if we make future changes in the struct + * by just using some of the reserved space, it may be possible to + * just increment the minor version number (depending on the scope of + * the change). If we need to add more space to the struct, we'll + * increment the major version number. + * - The MCA base component struct now has a version number in it + * (starting with Open MPI v1.3, it is 2.0.0). + * - As was an unstated assumption in prior versions of Open MPI, the + * unversioned versions of struct names (both in the MCA base and in + * individual framework bases) are intended for components who want + * to be forward source-compatible. That is, the unversioned struct + * name always represents the most recent interface version. If you + * need to use an older version, you can explicitly use that older + * struct version name. Please note, however, the Open MPI + * developers may not generally provide older versions of framework + * interface structs unless they know if someone outside of the Open + * MPI community needs it. + * + * ***IF YOU NEED BACKWARDS SOURCE OR BINARY COMPATIBILITY, you must + * let us know!*** + * + * - We are currently only aware of one external developer making Open + * MPI components for the v1.2 series. He already knows that there + * are major changes coming in the v1.3 series, and does not expect to + * be able to use his v1.2 DSO binaries in v1.3. As such, we are + * breaking backwards binary compatibility in v1.3: there is no + * possibility of loading an MCA v1.0 binary component in Open MPI + * v1.3 or beyond (source compatibility is much easier -- the binary + * "refuse to load MCA components cli_component; } diff --git a/opal/mca/memory/mallopt/memory_mallopt_component.c b/opal/mca/memory/mallopt/memory_mallopt_component.c index 5edaae3140..185c6bbcb0 100644 --- a/opal/mca/memory/mallopt/memory_mallopt_component.c +++ b/opal/mca/memory/mallopt/memory_mallopt_component.c @@ -44,13 +44,11 @@ int __munmap(void* addr, size_t len); static int opal_memory_malloc_open(void); -const opal_memory_base_component_1_0_0_t mca_memory_mallopt_component = { +const opal_memory_base_component_2_0_0_t mca_memory_mallopt_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a memory v1.0.0 component (which also - implies a specific MCA version) */ - OPAL_MEMORY_BASE_VERSION_1_0_0, + OPAL_MEMORY_BASE_VERSION_2_0_0, /* Component name and version */ "mallopt", @@ -62,8 +60,6 @@ const opal_memory_base_component_1_0_0_t mca_memory_mallopt_component = { opal_memory_malloc_open, NULL }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/opal/mca/memory/memory.h b/opal/mca/memory/memory.h index 14a0818a25..e43abc6292 100644 --- a/opal/mca/memory/memory.h +++ b/opal/mca/memory/memory.h @@ -37,29 +37,26 @@ #include "opal/mca/base/base.h" /** - * Structure for memory v1.0.0 components. - * Chained to MCA v1.0.0 + * Structure for memory components. */ -struct opal_memory_base_component_1_0_0_t { +struct opal_memory_base_component_2_0_0_t { /** MCA base component */ mca_base_component_t memoryc_version; /** MCA base data */ - mca_base_component_data_1_0_0_t memoryc_data; + mca_base_component_data_t memoryc_data; }; /** * Convenience typedef */ -typedef struct opal_memory_base_component_1_0_0_t opal_memory_base_component_1_0_0_t; +typedef struct opal_memory_base_component_2_0_0_t opal_memory_base_component_2_0_0_t; -extern opal_memory_base_component_1_0_0_t *opal_memory_active_component; +extern opal_memory_base_component_2_0_0_t *opal_memory_active_component; /* - * Macro for use in components that are of type memory v1.0.0 + * Macro for use in components that are of type memory */ -#define OPAL_MEMORY_BASE_VERSION_1_0_0 \ - /* memory v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* memory v1.0 */ \ - "memory", 1, 0, 0 +#define OPAL_MEMORY_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "memory", 2, 0, 0 #endif /* OPAL_MCA_MEMORY_MEMORY_H */ diff --git a/opal/mca/memory/ptmalloc2/opal_ptmalloc2_component.c b/opal/mca/memory/ptmalloc2/opal_ptmalloc2_component.c index 707fe570ce..d20561a5f3 100644 --- a/opal/mca/memory/ptmalloc2/opal_ptmalloc2_component.c +++ b/opal/mca/memory/ptmalloc2/opal_ptmalloc2_component.c @@ -23,13 +23,11 @@ static int opal_memory_ptmalloc2_open(void); -const opal_memory_base_component_1_0_0_t mca_memory_ptmalloc2_component = { +const opal_memory_base_component_2_0_0_t mca_memory_ptmalloc2_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a memory v1.0.0 component (which also - implies a specific MCA version) */ - OPAL_MEMORY_BASE_VERSION_1_0_0, + OPAL_MEMORY_BASE_VERSION_2_0_0, /* Component name and version */ "ptmalloc2", @@ -41,8 +39,6 @@ const opal_memory_base_component_1_0_0_t mca_memory_ptmalloc2_component = { opal_memory_ptmalloc2_open, NULL }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/opal/mca/paffinity/base/base.h b/opal/mca/paffinity/base/base.h index c62856e173..3de506c7d4 100644 --- a/opal/mca/paffinity/base/base.h +++ b/opal/mca/paffinity/base/base.h @@ -199,7 +199,7 @@ extern "C" { /** * Global component struct for the selected component */ - OPAL_DECLSPEC extern const opal_paffinity_base_component_1_1_0_t + OPAL_DECLSPEC extern const opal_paffinity_base_component_2_0_0_t *opal_paffinity_base_component; /** * Global module struct for the selected module diff --git a/opal/mca/paffinity/base/paffinity_base_select.c b/opal/mca/paffinity/base/paffinity_base_select.c index 7da1195360..f49e8d9348 100644 --- a/opal/mca/paffinity/base/paffinity_base_select.c +++ b/opal/mca/paffinity/base/paffinity_base_select.c @@ -32,14 +32,14 @@ * Globals */ bool opal_paffinity_base_selected = false; -const opal_paffinity_base_component_1_1_0_t *opal_paffinity_base_component = NULL; +const opal_paffinity_base_component_2_0_0_t *opal_paffinity_base_component = NULL; const opal_paffinity_base_module_1_1_0_t *opal_paffinity_base_module = NULL; int opal_paffinity_base_select(void) { int ret, exit_status = OPAL_SUCCESS; - opal_paffinity_base_component_1_1_0_t *best_component = NULL; + opal_paffinity_base_component_2_0_0_t *best_component = NULL; opal_paffinity_base_module_1_1_0_t *best_module = NULL; /* diff --git a/opal/mca/paffinity/linux/paffinity_linux.h b/opal/mca/paffinity/linux/paffinity_linux.h index f6432359ab..7d8e962c13 100644 --- a/opal/mca/paffinity/linux/paffinity_linux.h +++ b/opal/mca/paffinity/linux/paffinity_linux.h @@ -53,7 +53,7 @@ extern "C" { /** * Globally exported variable */ - OPAL_DECLSPEC extern const opal_paffinity_base_component_1_1_0_t + OPAL_DECLSPEC extern const opal_paffinity_base_component_2_0_0_t mca_paffinity_linux_component; diff --git a/opal/mca/paffinity/linux/paffinity_linux_component.c b/opal/mca/paffinity/linux/paffinity_linux_component.c index 4d2ea747b4..09cd95c1aa 100644 --- a/opal/mca/paffinity/linux/paffinity_linux_component.c +++ b/opal/mca/paffinity/linux/paffinity_linux_component.c @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2007 Cisco, Inc. All rights reserved. + * Copyright (c) 2007-2008 Cisco, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -38,36 +38,32 @@ const char *opal_paffinity_linux_component_version_string = /* * Local function */ -static int linux_open(void); +static int linux_register(void); /* * Instantiate the public struct with all of our public information * and pointers to our public functions in it */ -const opal_paffinity_base_component_1_1_0_t mca_paffinity_linux_component = { +const opal_paffinity_base_component_2_0_0_t mca_paffinity_linux_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a paffinity v1.1.0 component (which also - implies a specific MCA version) */ - - OPAL_PAFFINITY_BASE_VERSION_1_1_0, + OPAL_PAFFINITY_BASE_VERSION_2_0_0, /* Component name and version */ - "linux", OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, OPAL_RELEASE_VERSION, /* Component open and close functions */ - - linux_open, NULL, - opal_paffinity_linux_component_query + NULL, + opal_paffinity_linux_component_query, + linux_register, }, { /* The component is checkpoint ready */ @@ -76,7 +72,7 @@ const opal_paffinity_base_component_1_1_0_t mca_paffinity_linux_component = { }; -static int linux_open(void) +static int linux_register(void) { mca_base_param_reg_int(&mca_paffinity_linux_component.base_version, "priority", diff --git a/opal/mca/paffinity/paffinity.h b/opal/mca/paffinity/paffinity.h index 5e9c308e50..449e7baa38 100644 --- a/opal/mca/paffinity/paffinity.h +++ b/opal/mca/paffinity/paffinity.h @@ -212,24 +212,23 @@ typedef int (*opal_paffinity_base_module_finalize_fn_t)(void); /** - * Structure for paffinity v1.1.0 components. - * Chained to MCA v1.0.0 + * Structure for paffinity components. */ -struct opal_paffinity_base_component_1_1_0_t { +struct opal_paffinity_base_component_2_0_0_t { /** MCA base component */ mca_base_component_t base_version; /** MCA base data */ - mca_base_component_data_1_0_0_t base_data; + mca_base_component_data_t base_data; }; /** * Convenience typedef */ -typedef struct opal_paffinity_base_component_1_1_0_t opal_paffinity_base_component_1_1_0_t; -typedef struct opal_paffinity_base_component_1_1_0_t opal_paffinity_base_component_t; +typedef struct opal_paffinity_base_component_2_0_0_t opal_paffinity_base_component_2_0_0_t; +typedef struct opal_paffinity_base_component_2_0_0_t opal_paffinity_base_component_t; /** - * Structure for paffinity v1.0.0 modules + * Structure for paffinity modules */ struct opal_paffinity_base_module_1_1_0_t { /** Module initialization function */ @@ -267,12 +266,10 @@ typedef struct opal_paffinity_base_module_1_1_0_t opal_paffinity_base_module_t; /* - * Macro for use in components that are of type paffinity v1.1.0 + * Macro for use in components that are of type paffinity */ -#define OPAL_PAFFINITY_BASE_VERSION_1_1_0 \ - /* paffinity v1.1 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* paffinity v1.1 */ \ - "paffinity", 1, 1, 0 +#define OPAL_PAFFINITY_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "paffinity", 2, 0, 0 #endif /* OPAL_PAFFINITY_H */ diff --git a/opal/mca/paffinity/posix/paffinity_posix.h b/opal/mca/paffinity/posix/paffinity_posix.h index 0c40924e50..1a3b9595ed 100644 --- a/opal/mca/paffinity/posix/paffinity_posix.h +++ b/opal/mca/paffinity/posix/paffinity_posix.h @@ -31,7 +31,7 @@ BEGIN_C_DECLS * Globally exported variable */ -OPAL_DECLSPEC extern const opal_paffinity_base_component_1_1_0_t mca_paffinity_posix_component; +OPAL_DECLSPEC extern const opal_paffinity_base_component_2_0_0_t mca_paffinity_posix_component; /* query function */ int opal_paffinity_posix_component_query(mca_base_module_t **module, int *priority); diff --git a/opal/mca/paffinity/posix/paffinity_posix_component.c b/opal/mca/paffinity/posix/paffinity_posix_component.c index f1ce790257..b480262cb8 100644 --- a/opal/mca/paffinity/posix/paffinity_posix_component.c +++ b/opal/mca/paffinity/posix/paffinity_posix_component.c @@ -45,7 +45,7 @@ static int posix_open(void); * and pointers to our public functions in it */ -const opal_paffinity_base_component_1_1_0_t mca_paffinity_posix_component = { +const opal_paffinity_base_component_2_0_0_t mca_paffinity_posix_component = { /* First, the mca_component_t struct containing meta information about the component itself */ @@ -54,7 +54,7 @@ const opal_paffinity_base_component_1_1_0_t mca_paffinity_posix_component = { /* Indicate that we are a paffinity v1.1.0 component (which also implies a specific MCA version) */ - OPAL_PAFFINITY_BASE_VERSION_1_1_0, + OPAL_PAFFINITY_BASE_VERSION_2_0_0, /* Component name and version */ diff --git a/opal/mca/paffinity/solaris/paffinity_solaris.h b/opal/mca/paffinity/solaris/paffinity_solaris.h index 8d1c668404..e720f55423 100644 --- a/opal/mca/paffinity/solaris/paffinity_solaris.h +++ b/opal/mca/paffinity/solaris/paffinity_solaris.h @@ -33,7 +33,7 @@ extern "C" { * Globally exported variable */ - OPAL_DECLSPEC extern const opal_paffinity_base_component_1_1_0_t + OPAL_DECLSPEC extern const opal_paffinity_base_component_2_0_0_t mca_paffinity_solaris_component; diff --git a/opal/mca/paffinity/solaris/paffinity_solaris_component.c b/opal/mca/paffinity/solaris/paffinity_solaris_component.c index a6c5670777..2f1d0f58a1 100644 --- a/opal/mca/paffinity/solaris/paffinity_solaris_component.c +++ b/opal/mca/paffinity/solaris/paffinity_solaris_component.c @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2007 Cisco, Inc. All rights reserved. + * Copyright (c) 2007-2008 Cisco, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -38,38 +38,33 @@ const char *opal_paffinity_solaris_component_version_string = /* * Local function */ -static int solaris_open(void); +static int solaris_register(void); /* * Instantiate the public struct with all of our public information * and pointers to our public functions in it */ -const opal_paffinity_base_component_1_1_0_t mca_paffinity_solaris_component = { +const opal_paffinity_base_component_2_0_0_t mca_paffinity_solaris_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a paffinity v1.1.0 component (which also - implies a specific MCA version) */ - - OPAL_PAFFINITY_BASE_VERSION_1_1_0, + OPAL_PAFFINITY_BASE_VERSION_2_0_0, /* Component name and version */ - "solaris", OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, OPAL_RELEASE_VERSION, /* Component open and close functions */ - - solaris_open, NULL, - opal_paffinity_solaris_component_query + NULL, + opal_paffinity_solaris_component_query, + solaris_register, }, - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT @@ -77,7 +72,7 @@ const opal_paffinity_base_component_1_1_0_t mca_paffinity_solaris_component = { }; -static int solaris_open(void) +static int solaris_register(void) { mca_base_param_reg_int(&mca_paffinity_solaris_component.base_version, "priority", diff --git a/opal/mca/paffinity/windows/paffinity_windows.h b/opal/mca/paffinity/windows/paffinity_windows.h index 9420f2b919..c30316829f 100644 --- a/opal/mca/paffinity/windows/paffinity_windows.h +++ b/opal/mca/paffinity/windows/paffinity_windows.h @@ -52,7 +52,7 @@ extern "C" { /** * Globally exported variable */ - OPAL_MODULE_DECLSPEC extern const opal_paffinity_base_component_1_1_0_t + OPAL_MODULE_DECLSPEC extern const opal_paffinity_base_component_2_0_0_t mca_paffinity_windows_component; diff --git a/opal/mca/paffinity/windows/paffinity_windows_component.c b/opal/mca/paffinity/windows/paffinity_windows_component.c index 67893e29d4..1b78899196 100644 --- a/opal/mca/paffinity/windows/paffinity_windows_component.c +++ b/opal/mca/paffinity/windows/paffinity_windows_component.c @@ -44,31 +44,25 @@ static int windows_open(void); * and pointers to our public functions in it */ -const opal_paffinity_base_component_1_1_0_t mca_paffinity_windows_component = { +const opal_paffinity_base_component_2_0_0_t mca_paffinity_windows_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a paffinity v1.0.0 component (which also - implies a specific MCA version) */ - - OPAL_PAFFINITY_BASE_VERSION_1_1_0, + OPAL_PAFFINITY_BASE_VERSION_2_0_0, /* Component name and version */ - "windows", OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, OPAL_RELEASE_VERSION, /* Component open and close functions */ - windows_open, NULL, opal_paffinity_windows_component_query }, - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/opal/mca/timer/aix/timer_aix_component.c b/opal/mca/timer/aix/timer_aix_component.c index 1e2cea56c9..b7b247cf6a 100644 --- a/opal/mca/timer/aix/timer_aix_component.c +++ b/opal/mca/timer/aix/timer_aix_component.c @@ -31,13 +31,11 @@ opal_timer_t opal_timer_aix_freq; static int opal_timer_aix_open(void); -const opal_timer_base_component_1_0_0_t mca_timer_aix_component = { +const opal_timer_base_component_2_0_0_t mca_timer_aix_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a timer v1.0.0 component (which also - implies a specific MCA version) */ - OPAL_TIMER_BASE_VERSION_1_0_0, + OPAL_TIMER_BASE_VERSION_2_0_0, /* Component name and version */ "aix", @@ -49,8 +47,6 @@ const opal_timer_base_component_1_0_0_t mca_timer_aix_component = { opal_timer_aix_open, NULL }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/opal/mca/timer/altix/timer_altix_component.c b/opal/mca/timer/altix/timer_altix_component.c index 69cee8486c..342d92d08b 100644 --- a/opal/mca/timer/altix/timer_altix_component.c +++ b/opal/mca/timer/altix/timer_altix_component.c @@ -39,13 +39,11 @@ static unsigned long *mmdev_map; static int opal_timer_altix_open(void); static int opal_timer_altix_close(void); -const opal_timer_base_component_1_0_0_t mca_timer_altix_component = { +const opal_timer_base_component_2_0_0_t mca_timer_altix_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a timer v1.0.0 component (which also - implies a specific MCA version) */ - OPAL_TIMER_BASE_VERSION_1_0_0, + OPAL_TIMER_BASE_VERSION_2_0_0, /* Component name and version */ "altix", @@ -55,10 +53,8 @@ const opal_timer_base_component_1_0_0_t mca_timer_altix_component = { /* Component open and close functions */ opal_timer_altix_open, - opal_timer_altix_close + opal_timer_altix_close }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/opal/mca/timer/catamount/timer_catamount_component.c b/opal/mca/timer/catamount/timer_catamount_component.c index e376ee746b..71b0331bcf 100644 --- a/opal/mca/timer/catamount/timer_catamount_component.c +++ b/opal/mca/timer/catamount/timer_catamount_component.c @@ -28,13 +28,11 @@ opal_timer_t opal_timer_catamount_freq; static int opal_timer_catamount_open(void); -const opal_timer_base_component_1_0_0_t mca_timer_catamount_component = { +const opal_timer_base_component_2_0_0_t mca_timer_catamount_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a timer v1.0.0 component (which also - implies a specific MCA version) */ - OPAL_TIMER_BASE_VERSION_1_0_0, + OPAL_TIMER_BASE_VERSION_2_0_0, /* Component name and version */ "catamount", @@ -46,8 +44,6 @@ const opal_timer_base_component_1_0_0_t mca_timer_catamount_component = { opal_timer_catamount_open, NULL }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/opal/mca/timer/darwin/timer_darwin_component.c b/opal/mca/timer/darwin/timer_darwin_component.c index 168cf8d6e1..6f05e2f088 100644 --- a/opal/mca/timer/darwin/timer_darwin_component.c +++ b/opal/mca/timer/darwin/timer_darwin_component.c @@ -31,13 +31,11 @@ opal_timer_t opal_timer_darwin_freq; static int opal_timer_darwin_open(void); -const opal_timer_base_component_1_0_0_t mca_timer_darwin_component = { +const opal_timer_base_component_2_0_0_t mca_timer_darwin_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a timer v1.0.0 component (which also - implies a specific MCA version) */ - OPAL_TIMER_BASE_VERSION_1_0_0, + OPAL_TIMER_BASE_VERSION_2_0_0, /* Component name and version */ "darwin", @@ -49,8 +47,6 @@ const opal_timer_base_component_1_0_0_t mca_timer_darwin_component = { opal_timer_darwin_open, NULL }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/opal/mca/timer/linux/timer_linux_component.c b/opal/mca/timer/linux/timer_linux_component.c index e3b3464b64..996bd1f865 100644 --- a/opal/mca/timer/linux/timer_linux_component.c +++ b/opal/mca/timer/linux/timer_linux_component.c @@ -26,13 +26,11 @@ opal_timer_t opal_timer_linux_freq; static int opal_timer_linux_open(void); -const opal_timer_base_component_1_0_0_t mca_timer_linux_component = { +const opal_timer_base_component_2_0_0_t mca_timer_linux_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a timer v1.0.0 component (which also - implies a specific MCA version) */ - OPAL_TIMER_BASE_VERSION_1_0_0, + OPAL_TIMER_BASE_VERSION_2_0_0, /* Component name and version */ "linux", @@ -44,8 +42,6 @@ const opal_timer_base_component_1_0_0_t mca_timer_linux_component = { opal_timer_linux_open, NULL }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/opal/mca/timer/solaris/timer_solaris_component.c b/opal/mca/timer/solaris/timer_solaris_component.c index 2dda29a1c1..ba4fc7cf4a 100644 --- a/opal/mca/timer/solaris/timer_solaris_component.c +++ b/opal/mca/timer/solaris/timer_solaris_component.c @@ -22,13 +22,11 @@ #include "opal/mca/timer/solaris/timer_solaris.h" -const opal_timer_base_component_1_0_0_t mca_timer_solaris_component = { +const opal_timer_base_component_2_0_0_t mca_timer_solaris_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a timer v1.0.0 component (which also - implies a specific MCA version) */ - OPAL_TIMER_BASE_VERSION_1_0_0, + OPAL_TIMER_BASE_VERSION_2_0_0, /* Component name and version */ "solaris", @@ -40,8 +38,6 @@ const opal_timer_base_component_1_0_0_t mca_timer_solaris_component = { NULL, NULL }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/opal/mca/timer/timer.h b/opal/mca/timer/timer.h index 605ab10eba..0d60c4f538 100644 --- a/opal/mca/timer/timer.h +++ b/opal/mca/timer/timer.h @@ -71,27 +71,24 @@ /** - * Structure for timer v1.0.0 components. - * Chained to MCA v1.0.0 + * Structure for timer components. */ -struct opal_timer_base_component_1_0_0_t { +struct opal_timer_base_component_2_0_0_t { /** MCA base component */ mca_base_component_t timerc_version; /** MCA base data */ - mca_base_component_data_1_0_0_t timerc_data; + mca_base_component_data_t timerc_data; }; /** * Convenience typedef */ -typedef struct opal_timer_base_component_1_0_0_t opal_timer_base_component_1_0_0_t; +typedef struct opal_timer_base_component_2_0_0_t opal_timer_base_component_2_0_0_t; /* - * Macro for use in components that are of type timer v1.0.0 + * Macro for use in components that are of type timer */ -#define OPAL_TIMER_BASE_VERSION_1_0_0 \ - /* timer v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* timer v1.0 */ \ - "timer", 1, 0, 0 +#define OPAL_TIMER_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "timer", 2, 0, 0 #endif /* OPAL_MCA_TIMER_TIMER_H */ diff --git a/opal/mca/timer/windows/timer_windows_component.c b/opal/mca/timer/windows/timer_windows_component.c index 5af4fac4b2..5d5bbd3bf5 100644 --- a/opal/mca/timer/windows/timer_windows_component.c +++ b/opal/mca/timer/windows/timer_windows_component.c @@ -28,13 +28,11 @@ opal_timer_t opal_timer_windows_start; static int opal_timer_windows_open(void); const -opal_timer_base_component_1_0_0_t mca_timer_windows_component = { +opal_timer_base_component_2_0_0_t mca_timer_windows_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a timer v1.0.0 component (which also - implies a specific MCA version) */ - OPAL_TIMER_BASE_VERSION_1_0_0, + OPAL_TIMER_BASE_VERSION_2_0_0, /* Component name and version */ "windows", @@ -46,8 +44,6 @@ opal_timer_base_component_1_0_0_t mca_timer_windows_component = { opal_timer_windows_open, NULL }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/opal/mca/timer/windows/timer_windows_component.h b/opal/mca/timer/windows/timer_windows_component.h index 3083658a63..6c6beaeed5 100755 --- a/opal/mca/timer/windows/timer_windows_component.h +++ b/opal/mca/timer/windows/timer_windows_component.h @@ -25,7 +25,7 @@ extern "C" { #endif -OPAL_DECLSPEC extern const opal_timer_base_component_1_0_0_t mca_timer_windows_component; +OPAL_DECLSPEC extern const opal_timer_base_component_2_0_0_t mca_timer_windows_component; #if defined(c_plusplus) || defined(__cplusplus) } diff --git a/orte/mca/errmgr/default/errmgr_default_component.c b/orte/mca/errmgr/default/errmgr_default_component.c index 0a0a1ead05..9b65a3600d 100644 --- a/orte/mca/errmgr/default/errmgr_default_component.c +++ b/orte/mca/errmgr/default/errmgr_default_component.c @@ -50,7 +50,7 @@ */ mca_errmgr_base_component_t mca_errmgr_default_component = { { - ORTE_ERRMGR_BASE_VERSION_1_3_0, + ORTE_ERRMGR_BASE_VERSION_2_0_0, "default", /* MCA component name */ ORTE_MAJOR_VERSION, /* MCA component major version */ diff --git a/orte/mca/errmgr/errmgr.h b/orte/mca/errmgr/errmgr.h index 23210f4dea..02a3625c47 100644 --- a/orte/mca/errmgr/errmgr.h +++ b/orte/mca/errmgr/errmgr.h @@ -135,39 +135,37 @@ typedef int (*orte_errmgr_base_module_register_cb_fn_t)(orte_jobid_t job, typedef void (*orte_errmgr_base_module_abort_fn_t)(int error_code, char *fmt, ...); /* - * Ver 1.0.0 + * */ -struct orte_errmgr_base_module_1_3_0_t { +struct orte_errmgr_base_module_2_3_0_t { orte_errmgr_base_module_proc_aborted_fn_t proc_aborted; orte_errmgr_base_module_incomplete_start_fn_t incomplete_start; orte_errmgr_base_module_register_cb_fn_t register_callback; orte_errmgr_base_module_abort_fn_t abort; }; -typedef struct orte_errmgr_base_module_1_3_0_t orte_errmgr_base_module_1_3_0_t; -typedef orte_errmgr_base_module_1_3_0_t orte_errmgr_base_module_t; +typedef struct orte_errmgr_base_module_2_3_0_t orte_errmgr_base_module_2_3_0_t; +typedef orte_errmgr_base_module_2_3_0_t orte_errmgr_base_module_t; /* * ERRMGR Component * the standard component data structure */ -struct mca_errmgr_base_component_1_3_0_t { +struct mca_errmgr_base_component_2_0_0_t { mca_base_component_t base_version; - mca_base_component_data_1_0_0_t base_data; + mca_base_component_data_t base_data; }; -typedef struct mca_errmgr_base_component_1_3_0_t mca_errmgr_base_component_1_3_0_t; -typedef mca_errmgr_base_component_1_3_0_t mca_errmgr_base_component_t; +typedef struct mca_errmgr_base_component_2_0_0_t mca_errmgr_base_component_2_0_0_t; +typedef mca_errmgr_base_component_2_0_0_t mca_errmgr_base_component_t; /* - * Macro for use in components that are of type errmgr v1.0.0 + * Macro for use in components that are of type errmgr */ -#define ORTE_ERRMGR_BASE_VERSION_1_3_0 \ - /* errmgr v1.3 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* errmgr v1.3 */ \ - "errmgr", 1, 3, 0 +#define ORTE_ERRMGR_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "errmgr", 2, 0, 0 /* Global structure for accessing error manager functions */ diff --git a/orte/mca/ess/alps/ess_alps_component.c b/orte/mca/ess/alps/ess_alps_component.c index fef0dea7a2..13dcd725b4 100644 --- a/orte/mca/ess/alps/ess_alps_component.c +++ b/orte/mca/ess/alps/ess_alps_component.c @@ -40,9 +40,7 @@ orte_ess_base_component_t mca_ess_alps_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a ess v1.0.0 component (which also - implies a specific MCA version) */ - ORTE_ESS_BASE_VERSION_1_0_0, + ORTE_ESS_BASE_VERSION_2_0_0, /* Component name and version */ "alps", @@ -55,7 +53,6 @@ orte_ess_base_component_t mca_ess_alps_component = { orte_ess_alps_component_close, orte_ess_alps_component_query }, - /* Next the MCA v1.0.0 component meta data */ { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/orte/mca/ess/bproc/ess_bproc_component.c b/orte/mca/ess/bproc/ess_bproc_component.c index 0bc864a5b6..c41a02a660 100644 --- a/orte/mca/ess/bproc/ess_bproc_component.c +++ b/orte/mca/ess/bproc/ess_bproc_component.c @@ -40,9 +40,7 @@ orte_ess_base_component_t mca_ess_bproc_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a ess v1.0.0 component (which also - implies a specific MCA version) */ - ORTE_ESS_BASE_VERSION_1_0_0, + ORTE_ESS_BASE_VERSION_2_0_0, /* Component name and version */ "bproc", @@ -55,8 +53,6 @@ orte_ess_base_component_t mca_ess_bproc_component = { orte_ess_bproc_component_close, orte_ess_bproc_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/ess/cnos/ess_cnos_component.c b/orte/mca/ess/cnos/ess_cnos_component.c index 279f2b74ed..8dcd0344dc 100644 --- a/orte/mca/ess/cnos/ess_cnos_component.c +++ b/orte/mca/ess/cnos/ess_cnos_component.c @@ -38,9 +38,7 @@ orte_ess_base_component_t mca_ess_cnos_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a ess v1.0.0 component (which also - implies a specific MCA version) */ - ORTE_ESS_BASE_VERSION_1_0_0, + ORTE_ESS_BASE_VERSION_2_0_0, /* Component name and version */ "cnos", @@ -53,7 +51,6 @@ orte_ess_base_component_t mca_ess_cnos_component = { orte_ess_cnos_component_close, orte_ess_cnos_component_query }, - /* Next the MCA v1.0.0 component meta data */ { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/orte/mca/ess/env/ess_env_component.c b/orte/mca/ess/env/ess_env_component.c index affe8dd401..5e59b307bb 100644 --- a/orte/mca/ess/env/ess_env_component.c +++ b/orte/mca/ess/env/ess_env_component.c @@ -40,9 +40,7 @@ extern orte_ess_base_module_t orte_ess_env_module; */ orte_ess_base_component_t mca_ess_env_component = { { - /* Indicate that we are a ess v1.0.0 component (which also - implies a specific MCA version) */ - ORTE_ESS_BASE_VERSION_1_0_0, + ORTE_ESS_BASE_VERSION_2_0_0, /* Component name and version */ "env", @@ -55,7 +53,6 @@ orte_ess_base_component_t mca_ess_env_component = { orte_ess_env_component_close, orte_ess_env_component_query }, - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/ess/ess.h b/orte/mca/ess/ess.h index 603aaa7a95..73978ac292 100644 --- a/orte/mca/ess/ess.h +++ b/orte/mca/ess/ess.h @@ -142,21 +142,19 @@ typedef struct orte_ess_base_module_1_0_0_t orte_ess_base_module_t; /* * the standard component data structure */ -struct orte_ess_base_component_1_0_0_t { +struct orte_ess_base_component_2_0_0_t { mca_base_component_t base_version; - mca_base_component_data_1_0_0_t base_data; + mca_base_component_data_t base_data; }; -typedef struct orte_ess_base_component_1_0_0_t orte_ess_base_component_1_0_0_t; -typedef struct orte_ess_base_component_1_0_0_t orte_ess_base_component_t; +typedef struct orte_ess_base_component_2_0_0_t orte_ess_base_component_2_0_0_t; +typedef struct orte_ess_base_component_2_0_0_t orte_ess_base_component_t; /* - * Macro for use in components that are of type ess v1.0.0 + * Macro for use in components that are of type ess */ -#define ORTE_ESS_BASE_VERSION_1_0_0 \ - /* ess v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* ess v1.0 */ \ - "ess", 1, 0, 0 +#define ORTE_ESS_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "ess", 2, 0, 0 /* Global structure for accessing ESS functions */ ORTE_DECLSPEC extern orte_ess_base_module_t orte_ess; /* holds selected module's function pointers */ diff --git a/orte/mca/ess/hnp/ess_hnp_component.c b/orte/mca/ess/hnp/ess_hnp_component.c index a8b1ce0b91..06faaf7b0f 100644 --- a/orte/mca/ess/hnp/ess_hnp_component.c +++ b/orte/mca/ess/hnp/ess_hnp_component.c @@ -40,9 +40,7 @@ extern orte_ess_base_module_t orte_ess_hnp_module; */ orte_ess_base_component_t mca_ess_hnp_component = { { - /* Indicate that we are a ess v1.0.0 component (which also - implies a specific MCA version) */ - ORTE_ESS_BASE_VERSION_1_0_0, + ORTE_ESS_BASE_VERSION_2_0_0, /* Component name and version */ "hnp", @@ -55,7 +53,6 @@ orte_ess_base_component_t mca_ess_hnp_component = { orte_ess_hnp_component_close, orte_ess_hnp_component_query }, - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/ess/lsf/ess_lsf_component.c b/orte/mca/ess/lsf/ess_lsf_component.c index 46aad078d0..df6457ae9c 100644 --- a/orte/mca/ess/lsf/ess_lsf_component.c +++ b/orte/mca/ess/lsf/ess_lsf_component.c @@ -37,9 +37,7 @@ extern orte_ess_base_module_t orte_ess_lsf_module; */ orte_ess_base_component_t mca_ess_lsf_component = { { - /* Indicate that we are a ess v1.0.0 component (which also - implies a specific MCA version) */ - ORTE_ESS_BASE_VERSION_1_0_0, + ORTE_ESS_BASE_VERSION_2_0_0, /* Component name and version */ "lsf", @@ -52,7 +50,6 @@ orte_ess_base_component_t mca_ess_lsf_component = { orte_ess_lsf_component_close, orte_ess_lsf_component_query }, - /* Next the MCA v1.0.0 component meta data */ { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/orte/mca/ess/portals_utcp/ess_portals_utcp_component.c b/orte/mca/ess/portals_utcp/ess_portals_utcp_component.c index 19858cfae4..309c46ef2f 100644 --- a/orte/mca/ess/portals_utcp/ess_portals_utcp_component.c +++ b/orte/mca/ess/portals_utcp/ess_portals_utcp_component.c @@ -40,9 +40,7 @@ orte_ess_base_component_t mca_ess_portals_utcp_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a ess v1.0.0 component (which also - implies a specific MCA version) */ - ORTE_ESS_BASE_VERSION_1_0_0, + ORTE_ESS_BASE_VERSION_2_0_0, /* Component name and version */ "portals_utcp", @@ -55,7 +53,6 @@ orte_ess_base_component_t mca_ess_portals_utcp_component = { orte_ess_portals_utcp_component_close, orte_ess_portals_utcp_component_query }, - /* Next the MCA v1.0.0 component meta data */ { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/orte/mca/ess/singleton/ess_singleton_component.c b/orte/mca/ess/singleton/ess_singleton_component.c index 2dce95c101..a2b514b5a0 100644 --- a/orte/mca/ess/singleton/ess_singleton_component.c +++ b/orte/mca/ess/singleton/ess_singleton_component.c @@ -42,9 +42,7 @@ orte_ess_base_component_t mca_ess_singleton_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a ess v1.0.0 component (which also - implies a specific MCA version) */ - ORTE_ESS_BASE_VERSION_1_0_0, + ORTE_ESS_BASE_VERSION_2_0_0, /* Component name and version */ "singleton", @@ -57,7 +55,6 @@ orte_ess_base_component_t mca_ess_singleton_component = { orte_ess_singleton_component_close, orte_ess_singleton_component_query }, - /* Next the MCA v1.0.0 component meta data */ { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE diff --git a/orte/mca/ess/slurm/ess_slurm_component.c b/orte/mca/ess/slurm/ess_slurm_component.c index c13b04ece5..ab7d8a4b6e 100644 --- a/orte/mca/ess/slurm/ess_slurm_component.c +++ b/orte/mca/ess/slurm/ess_slurm_component.c @@ -40,9 +40,7 @@ extern orte_ess_base_module_t orte_ess_slurm_module; */ orte_ess_base_component_t mca_ess_slurm_component = { { - /* Indicate that we are a ess v1.0.0 component (which also - implies a specific MCA version) */ - ORTE_ESS_BASE_VERSION_1_0_0, + ORTE_ESS_BASE_VERSION_2_0_0, /* Component name and version */ "slurm", @@ -55,7 +53,6 @@ orte_ess_base_component_t mca_ess_slurm_component = { orte_ess_slurm_component_close, orte_ess_slurm_component_query }, - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/ess/tool/ess_tool_component.c b/orte/mca/ess/tool/ess_tool_component.c index 6e391ae2b4..eba95ced64 100644 --- a/orte/mca/ess/tool/ess_tool_component.c +++ b/orte/mca/ess/tool/ess_tool_component.c @@ -40,9 +40,7 @@ extern orte_ess_base_module_t orte_ess_tool_module; */ orte_ess_base_component_t mca_ess_tool_component = { { - /* Indicate that we are a ess v1.0.0 component (which also - implies a specific MCA version) */ - ORTE_ESS_BASE_VERSION_1_0_0, + ORTE_ESS_BASE_VERSION_2_0_0, /* Component name and version */ "tool", @@ -55,7 +53,6 @@ orte_ess_base_component_t mca_ess_tool_component = { orte_ess_tool_component_close, orte_ess_tool_component_query }, - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/filem/base/filem_base_select.c b/orte/mca/filem/base/filem_base_select.c index c101e250b2..2bbd128400 100644 --- a/orte/mca/filem/base/filem_base_select.c +++ b/orte/mca/filem/base/filem_base_select.c @@ -32,7 +32,7 @@ static orte_filem_base_component_t none_component = { * meta information about the component itself */ { - ORTE_FILEM_BASE_VERSION_1_0_0, + ORTE_FILEM_BASE_VERSION_2_0_0, /* Component name and version */ "none", OMPI_MAJOR_VERSION, @@ -44,11 +44,9 @@ static orte_filem_base_component_t none_component = { orte_filem_base_none_close, orte_filem_base_none_query }, - - /* Next the MCA v1.0.0 component meta data */ { - /* Is the component checkpointable ? */ - true + /* This component is checkpointable */ + MCA_BASE_METADATA_PARAM_CHECKPOINT }, /* Verbosity level */ diff --git a/orte/mca/filem/filem.h b/orte/mca/filem/filem.h index bfd46320b8..9c86573b97 100644 --- a/orte/mca/filem/filem.h +++ b/orte/mca/filem/filem.h @@ -301,13 +301,13 @@ typedef int (*orte_filem_base_wait_all_fn_t) (opal_list_t *request_list); /** - * Structure for FILEM v1.0.0 components. + * Structure for FILEM components. */ -struct orte_filem_base_component_1_0_0_t { +struct orte_filem_base_component_2_0_0_t { /** MCA base component */ mca_base_component_t base_version; /** MCA base data */ - mca_base_component_data_1_0_0_t base_data; + mca_base_component_data_t base_data; /** Verbosity Level */ int verbose; @@ -316,11 +316,11 @@ struct orte_filem_base_component_1_0_0_t { /** Default Priority */ int priority; }; -typedef struct orte_filem_base_component_1_0_0_t orte_filem_base_component_1_0_0_t; -typedef struct orte_filem_base_component_1_0_0_t orte_filem_base_component_t; +typedef struct orte_filem_base_component_2_0_0_t orte_filem_base_component_2_0_0_t; +typedef struct orte_filem_base_component_2_0_0_t orte_filem_base_component_t; /** - * Structure for FILEM v1.0.0 modules + * Structure for FILEM modules */ struct orte_filem_base_module_1_0_0_t { /** Initialization Function */ @@ -350,13 +350,11 @@ typedef struct orte_filem_base_module_1_0_0_t orte_filem_base_module_t; ORTE_DECLSPEC extern orte_filem_base_module_t orte_filem; /** - * Macro for use in components that are of type FILEM v1.0.0 + * Macro for use in components that are of type FILEM */ -#define ORTE_FILEM_BASE_VERSION_1_0_0 \ - /* FILEM v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* FILEM v1.0 */ \ - "filem", 1, 0, 0 +#define ORTE_FILEM_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "filem", 2, 0, 0 #if defined(c_plusplus) || defined(__cplusplus) } diff --git a/orte/mca/filem/rsh/filem_rsh_component.c b/orte/mca/filem/rsh/filem_rsh_component.c index aacaa43f88..bee536c341 100644 --- a/orte/mca/filem/rsh/filem_rsh_component.c +++ b/orte/mca/filem/rsh/filem_rsh_component.c @@ -51,7 +51,7 @@ orte_filem_rsh_component_t mca_filem_rsh_component = { * meta information about the component itrsh */ { - ORTE_FILEM_BASE_VERSION_1_0_0, + ORTE_FILEM_BASE_VERSION_2_0_0, /* Component name and version */ "rsh", OMPI_MAJOR_VERSION, @@ -63,8 +63,6 @@ orte_filem_rsh_component_t mca_filem_rsh_component = { filem_rsh_close, orte_filem_rsh_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/grpcomm/grpcomm.h b/orte/mca/grpcomm/grpcomm.h index e78c1e3262..778340b684 100644 --- a/orte/mca/grpcomm/grpcomm.h +++ b/orte/mca/grpcomm/grpcomm.h @@ -121,7 +121,7 @@ typedef orte_grpcomm_base_module_2_0_0_t orte_grpcomm_base_module_t; */ struct orte_grpcomm_base_component_2_0_0_t { mca_base_component_t base_version; - mca_base_component_data_1_0_0_t base_data; + mca_base_component_data_t base_data; }; typedef struct orte_grpcomm_base_component_2_0_0_t orte_grpcomm_base_component_2_0_0_t; typedef orte_grpcomm_base_component_2_0_0_t orte_grpcomm_base_component_t; @@ -132,8 +132,8 @@ typedef orte_grpcomm_base_component_2_0_0_t orte_grpcomm_base_component_t; * Macro for use in components that are of type grpcomm v2.0.0 */ #define ORTE_GRPCOMM_BASE_VERSION_2_0_0 \ - /* grpcomm v2.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ + /* grpcomm v2.0 is chained to MCA v2.0 */ \ + MCA_BASE_VERSION_2_0_0, \ /* grpcomm v2.0 */ \ "grpcomm", 2, 0, 0 diff --git a/orte/mca/iof/iof.h b/orte/mca/iof/iof.h index ec453f69b2..6f83a46288 100644 --- a/orte/mca/iof/iof.h +++ b/orte/mca/iof/iof.h @@ -342,23 +342,21 @@ typedef orte_iof_base_module_t* (*orte_iof_base_component_init_fn_t)( bool *have_hidden_threads ); -struct orte_iof_base_component_1_0_0_t { +struct orte_iof_base_component_2_0_0_t { mca_base_component_t iof_version; - mca_base_component_data_1_0_0_t iof_data; + mca_base_component_data_t iof_data; orte_iof_base_component_init_fn_t iof_init; }; -typedef struct orte_iof_base_component_1_0_0_t orte_iof_base_component_1_0_0_t; -typedef struct orte_iof_base_component_1_0_0_t orte_iof_base_component_t; +typedef struct orte_iof_base_component_2_0_0_t orte_iof_base_component_2_0_0_t; +typedef struct orte_iof_base_component_2_0_0_t orte_iof_base_component_t; END_C_DECLS /* - * Macro for use in components that are of type iof v1.0.0 + * Macro for use in components that are of type iof */ -#define ORTE_IOF_BASE_VERSION_1_0_0 \ - /* iof v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* iof v1.0 */ \ - "iof", 1, 0, 0 +#define ORTE_IOF_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "iof", 2, 0, 0 #endif /* ORTE_IOF_H */ diff --git a/orte/mca/iof/null/iof_null_component.c b/orte/mca/iof/null/iof_null_component.c index 476d48128d..0cac5f49fe 100644 --- a/orte/mca/iof/null/iof_null_component.c +++ b/orte/mca/iof/null/iof_null_component.c @@ -44,10 +44,7 @@ orte_iof_null_component_t mca_iof_null_component = { information about the component itself */ { - /* Indicate that we are a iof v1.0.0 component (which also - implies a specific MCA version) */ - - ORTE_IOF_BASE_VERSION_1_0_0, + ORTE_IOF_BASE_VERSION_2_0_0, "null", /* MCA component name */ ORTE_MAJOR_VERSION, /* MCA component major version */ @@ -56,8 +53,6 @@ orte_iof_null_component_t mca_iof_null_component = { orte_iof_null_open, /* component open */ NULL }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/iof/proxy/iof_proxy_component.c b/orte/mca/iof/proxy/iof_proxy_component.c index 7edc54b0f1..712a4162b5 100644 --- a/orte/mca/iof/proxy/iof_proxy_component.c +++ b/orte/mca/iof/proxy/iof_proxy_component.c @@ -56,10 +56,7 @@ orte_iof_proxy_component_t mca_iof_proxy_component = { information about the component itself */ { - /* Indicate that we are a iof v1.0.0 component (which also - implies a specific MCA version) */ - - ORTE_IOF_BASE_VERSION_1_0_0, + ORTE_IOF_BASE_VERSION_2_0_0, "proxy", /* MCA component name */ ORTE_MAJOR_VERSION, /* MCA component major version */ @@ -68,8 +65,6 @@ orte_iof_proxy_component_t mca_iof_proxy_component = { orte_iof_proxy_open, /* component open */ orte_iof_proxy_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/iof/svc/iof_svc_component.c b/orte/mca/iof/svc/iof_svc_component.c index 1fd772f9b9..7008a363ff 100644 --- a/orte/mca/iof/svc/iof_svc_component.c +++ b/orte/mca/iof/svc/iof_svc_component.c @@ -55,10 +55,7 @@ orte_iof_svc_component_t mca_iof_svc_component = { information about the component itself */ { - /* Indicate that we are a iof v1.0.0 component (which also - implies a specific MCA version) */ - - ORTE_IOF_BASE_VERSION_1_0_0, + ORTE_IOF_BASE_VERSION_2_0_0, "svc", /* MCA component name */ ORTE_MAJOR_VERSION, /* MCA component major version */ @@ -67,8 +64,6 @@ orte_iof_svc_component_t mca_iof_svc_component = { orte_iof_svc_open, /* component open */ orte_iof_svc_close /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/odls/bproc/odls_bproc_component.c b/orte/mca/odls/bproc/odls_bproc_component.c index 833abf6c0c..84f17b5b6b 100644 --- a/orte/mca/odls/bproc/odls_bproc_component.c +++ b/orte/mca/odls/bproc/odls_bproc_component.c @@ -42,9 +42,7 @@ orte_odls_bproc_component_t mca_odls_bproc_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a odls v1.3.0 component (which also - implies a specific MCA version) */ - ORTE_ODLS_BASE_VERSION_1_3_0, + ORTE_ODLS_BASE_VERSION_2_0_0, /* Component name and version */ "bproc", ORTE_MAJOR_VERSION, @@ -55,7 +53,6 @@ orte_odls_bproc_component_t mca_odls_bproc_component = { orte_odls_bproc_component_close, orte_odls_bproc_component_query }, - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/odls/default/odls_default_component.c b/orte/mca/odls/default/odls_default_component.c index 0b9e4e4c2f..53f4040c0c 100644 --- a/orte/mca/odls/default/odls_default_component.c +++ b/orte/mca/odls/default/odls_default_component.c @@ -44,25 +44,18 @@ orte_odls_base_component_t mca_odls_default_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a odls v1.3.0 component (which also - implies a specific MCA version) */ - - ORTE_ODLS_BASE_VERSION_1_3_0, + ORTE_ODLS_BASE_VERSION_2_0_0, /* Component name and version */ - "default", ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, ORTE_RELEASE_VERSION, /* Component open and close functions */ - orte_odls_default_component_open, orte_odls_default_component_close, orte_odls_default_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/odls/odls.h b/orte/mca/odls/odls.h index b985f6d8d4..4bc7c9ee8c 100644 --- a/orte/mca/odls/odls.h +++ b/orte/mca/odls/odls.h @@ -93,7 +93,7 @@ typedef int (*orte_odls_base_module_collect_data_fn_t)(orte_process_name_t *proc /** - * pls module version 1.3.0 + * pls module version */ struct orte_odls_base_module_1_3_0_t { orte_odls_base_module_get_add_procs_data_fn_t get_add_procs_data; @@ -111,28 +111,26 @@ typedef struct orte_odls_base_module_1_3_0_t orte_odls_base_module_1_3_0_t; typedef struct orte_odls_base_module_1_3_0_t orte_odls_base_module_t; /** - * odls component v1.3.0 + * odls component */ -struct orte_odls_base_component_1_3_0_t { +struct orte_odls_base_component_2_0_0_t { /** component version */ mca_base_component_t version; /** component data */ - mca_base_component_data_1_0_0_t base_data; + mca_base_component_data_t base_data; }; /** Convenience typedef */ -typedef struct orte_odls_base_component_1_3_0_t orte_odls_base_component_1_3_0_t; +typedef struct orte_odls_base_component_2_0_0_t orte_odls_base_component_2_0_0_t; /** Convenience typedef */ -typedef orte_odls_base_component_1_3_0_t orte_odls_base_component_t; +typedef orte_odls_base_component_2_0_0_t orte_odls_base_component_t; /** - * Macro for use in modules that are of type odls v1.3.0 + * Macro for use in modules that are of type odls */ -#define ORTE_ODLS_BASE_VERSION_1_3_0 \ - /* odls v1.3 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* odls v1.3 */ \ - "odls", 1, 3, 0 +#define ORTE_ODLS_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "odls", 2, 0, 0 /* Global structure for accessing ODLS functions */ diff --git a/orte/mca/odls/process/odls_process_component.c b/orte/mca/odls/process/odls_process_component.c index 94fe4962f1..a7f19b1fe5 100755 --- a/orte/mca/odls/process/odls_process_component.c +++ b/orte/mca/odls/process/odls_process_component.c @@ -40,25 +40,18 @@ orte_odls_base_component_t mca_odls_process_component = { /* First, the mca_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a odls v1.3.0 component (which also - implies a specific MCA version) */ - - ORTE_ODLS_BASE_VERSION_1_3_0, + ORTE_ODLS_BASE_VERSION_2_0_0, /* Component name and version */ - "process", ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, ORTE_RELEASE_VERSION, /* Component open and close functions */ - orte_odls_process_component_open, orte_odls_process_component_close, orte_odls_process_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/oob/oob.h b/orte/mca/oob/oob.h index 81742caafc..e68bed43df 100644 --- a/orte/mca/oob/oob.h +++ b/orte/mca/oob/oob.h @@ -49,13 +49,13 @@ typedef struct mca_oob_1_0_0_t mca_oob_t; typedef mca_oob_t* (*mca_oob_base_component_init_fn_t)(int *priority); -struct mca_oob_base_component_1_0_0_t { +struct mca_oob_base_component_2_0_0_t { mca_base_component_t oob_base; - mca_base_component_data_1_0_0_t oob_data; + mca_base_component_data_t oob_data; mca_oob_base_component_init_fn_t oob_init; }; -typedef struct mca_oob_base_component_1_0_0_t mca_oob_base_component_1_0_0_t; -typedef mca_oob_base_component_1_0_0_t mca_oob_base_component_t; +typedef struct mca_oob_base_component_2_0_0_t mca_oob_base_component_2_0_0_t; +typedef mca_oob_base_component_2_0_0_t mca_oob_base_component_t; @@ -181,13 +181,11 @@ struct mca_oob_1_0_0_t { }; /** - * Macro for use in components that are of type oob v1.0.0 + * Macro for use in components that are of type oob */ -#define MCA_OOB_BASE_VERSION_1_0_0 \ - /* oob v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* oob v1.0 */ \ - "oob", 1, 0, 0 +#define MCA_OOB_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "oob", 2, 0, 0 /* * BWB - FIX ME - This is the first module on the list. This is here diff --git a/orte/mca/oob/tcp/oob_tcp.c b/orte/mca/oob/tcp/oob_tcp.c index 27cd3b0d94..e64101c378 100644 --- a/orte/mca/oob/tcp/oob_tcp.c +++ b/orte/mca/oob/tcp/oob_tcp.c @@ -117,7 +117,7 @@ int mca_oob_tcp_output_handle = 0; mca_oob_tcp_component_t mca_oob_tcp_component = { { { - MCA_OOB_BASE_VERSION_1_0_0, + MCA_OOB_BASE_VERSION_2_0_0, "tcp", /* MCA module name */ ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, diff --git a/orte/mca/oob/tcp/oob_tcp.h b/orte/mca/oob/tcp/oob_tcp.h index de18dbe50a..ecb1ecc4aa 100644 --- a/orte/mca/oob/tcp/oob_tcp.h +++ b/orte/mca/oob/tcp/oob_tcp.h @@ -188,7 +188,7 @@ typedef enum { OOB_TCP_EVENT, OOB_TCP_LISTEN_THREAD } mca_oob_tcp_listen_type_t; * OOB TCP Component */ struct mca_oob_tcp_component_t { - mca_oob_base_component_1_0_0_t super; /**< base OOB component */ + mca_oob_base_component_2_0_0_t super; /**< base OOB component */ char* tcp_include; /**< list of ip interfaces to include */ char* tcp_exclude; /**< list of ip interfaces to exclude */ opal_list_t tcp_peer_list; /**< list of peers sorted in mru order */ diff --git a/orte/mca/plm/alps/plm_alps_component.c b/orte/mca/plm/alps/plm_alps_component.c index 4c2710c005..405433e74d 100644 --- a/orte/mca/plm/alps/plm_alps_component.c +++ b/orte/mca/plm/alps/plm_alps_component.c @@ -64,27 +64,19 @@ orte_plm_alps_component_t mca_plm_alps_component = { information about the component itself */ { - /* Indicate that we are a plm v1.0.0 component (which also - implies a specific MCA version) */ - - ORTE_PLM_BASE_VERSION_1_0_0, + ORTE_PLM_BASE_VERSION_2_0_0, /* Component name and version */ - "alps", ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, ORTE_RELEASE_VERSION, /* Component open and close functions */ - plm_alps_open, plm_alps_close, orte_plm_alps_component_query }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/plm/bproc/plm_bproc_component.c b/orte/mca/plm/bproc/plm_bproc_component.c index 0dbed3fdea..3da86a2206 100644 --- a/orte/mca/plm/bproc/plm_bproc_component.c +++ b/orte/mca/plm/bproc/plm_bproc_component.c @@ -45,7 +45,7 @@ static int orte_plm_bproc_component_query(mca_base_module_t **module, int *prior orte_plm_bproc_component_t mca_plm_bproc_component = { { { - ORTE_PLM_BASE_VERSION_1_0_0, + ORTE_PLM_BASE_VERSION_2_0_0, "bproc", /* MCA component name */ ORTE_MAJOR_VERSION, /* MCA component major version */ ORTE_MINOR_VERSION, /* MCA component minor version */ diff --git a/orte/mca/plm/bproc/smr_bproc_component.c b/orte/mca/plm/bproc/smr_bproc_component.c index 1946935ac7..40dda112d9 100644 --- a/orte/mca/plm/bproc/smr_bproc_component.c +++ b/orte/mca/plm/bproc/smr_bproc_component.c @@ -39,10 +39,7 @@ orte_smr_bproc_component_t mca_smr_bproc_component = { /* First, the mca_base_module_t struct containing meta information about the module itself */ { - /* Indicate that we are a bproc smr v1.3.0 module (which also - implies a specific MCA version) */ - - ORTE_SMR_BASE_VERSION_1_3_0, + ORTE_SMR_BASE_VERSION_2_0_0, "bproc", /* MCA module name */ ORTE_MAJOR_VERSION, /* MCA module major version */ @@ -51,13 +48,9 @@ orte_smr_bproc_component_t mca_smr_bproc_component = { orte_smr_bproc_open, /* component open */ orte_smr_bproc_close /* component close */ }, - - /* Next the MCA v1.0.0 module meta data */ - { - /* Whether the module is checkpointable or not */ - - false + /* Component is not known to be checkpointable */ + MCA_BASE_METADATA_PARAM_NONE }, orte_smr_bproc_init diff --git a/orte/mca/plm/ccp/plm_ccp_component.c b/orte/mca/plm/ccp/plm_ccp_component.c index 47f90a4d11..37df23b4ab 100644 --- a/orte/mca/plm/ccp/plm_ccp_component.c +++ b/orte/mca/plm/ccp/plm_ccp_component.c @@ -63,9 +63,7 @@ orte_plm_ccp_component_t mca_plm_ccp_component = { about the component itself */ { - /* Indicate that we are a plm v1.3.0 component (which also - implies a specific MCA version) */ - ORTE_PLM_BASE_VERSION_1_0_0, + ORTE_PLM_BASE_VERSION_2_0_0, /* Component name and version */ "ccp", @@ -78,8 +76,6 @@ orte_plm_ccp_component_t mca_plm_ccp_component = { plm_ccp_close, orte_plm_ccp_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/plm/lsf/plm_lsf_component.c b/orte/mca/plm/lsf/plm_lsf_component.c index c6ebe14f80..d8a79c7dba 100644 --- a/orte/mca/plm/lsf/plm_lsf_component.c +++ b/orte/mca/plm/lsf/plm_lsf_component.c @@ -70,9 +70,7 @@ orte_plm_lsf_component_t mca_plm_lsf_component = { about the component itself */ { - /* Indicate that we are a plm v1.0.0 component (which also - implies a specific MCA version) */ - ORTE_PLM_BASE_VERSION_1_0_0, + ORTE_PLM_BASE_VERSION_2_0_0, /* Component name and version */ "lsf", @@ -85,8 +83,6 @@ orte_plm_lsf_component_t mca_plm_lsf_component = { plm_lsf_close, orte_plm_lsf_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/plm/plm.h b/orte/mca/plm/plm.h index 762b56e35f..d6c3d49a86 100644 --- a/orte/mca/plm/plm.h +++ b/orte/mca/plm/plm.h @@ -111,28 +111,26 @@ typedef struct orte_plm_base_module_1_0_0_t orte_plm_base_module_t; /** - * plm component v1.0.0 + * plm component */ -struct orte_plm_base_component_1_0_0_t { +struct orte_plm_base_component_2_0_0_t { /** component version */ mca_base_component_t base_version; /** component data */ - mca_base_component_data_1_0_0_t base_data; + mca_base_component_data_t base_data; }; /** Convenience typedef */ -typedef struct orte_plm_base_component_1_0_0_t orte_plm_base_component_1_0_0_t; +typedef struct orte_plm_base_component_2_0_0_t orte_plm_base_component_2_0_0_t; /** Convenience typedef */ -typedef orte_plm_base_component_1_0_0_t orte_plm_base_component_t; +typedef orte_plm_base_component_2_0_0_t orte_plm_base_component_t; /** - * Macro for use in modules that are of type plm v1.0.0 + * Macro for use in modules that are of type plm */ -#define ORTE_PLM_BASE_VERSION_1_0_0 \ -/* plm v1.0 is chained to MCA v1.0 */ \ -MCA_BASE_VERSION_1_0_0, \ -/* plm v1.0 */ \ -"plm", 1, 0, 0 +#define ORTE_PLM_BASE_VERSION_2_0_0 \ +MCA_BASE_VERSION_2_0_0, \ +"plm", 2, 0, 0 /* Global structure for accessing PLM functions */ ORTE_DECLSPEC extern orte_plm_base_module_t orte_plm; /* holds selected module's function pointers */ diff --git a/orte/mca/plm/process/plm_process_component.c b/orte/mca/plm/process/plm_process_component.c index 014993a922..3f884a6c95 100644 --- a/orte/mca/plm/process/plm_process_component.c +++ b/orte/mca/plm/process/plm_process_component.c @@ -70,27 +70,19 @@ orte_plm_process_component_t mca_plm_process_component = { about the component itself */ { - /* Indicate that we are a plm v1.0.0 component (which also - implies a specific MCA version) */ - - ORTE_PLM_BASE_VERSION_1_0_0, + ORTE_PLM_BASE_VERSION_2_0_0, /* Component name and version */ - "process", ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, ORTE_RELEASE_VERSION, /* Component open and close functions */ - orte_plm_process_component_open, orte_plm_process_component_close, orte_plm_process_component_query }, - - /* Next the MCA v1.0.0 component meta data */ - { /* This component is not checkpointable */ MCA_BASE_METADATA_PARAM_NONE diff --git a/orte/mca/plm/rsh/plm_rsh_component.c b/orte/mca/plm/rsh/plm_rsh_component.c index f959f9add7..d57eea2765 100644 --- a/orte/mca/plm/rsh/plm_rsh_component.c +++ b/orte/mca/plm/rsh/plm_rsh_component.c @@ -73,27 +73,19 @@ orte_plm_rsh_component_t mca_plm_rsh_component = { about the component itself */ { - /* Indicate that we are a plm v1.0.0 component (which also - implies a specific MCA version) */ - - ORTE_PLM_BASE_VERSION_1_0_0, + ORTE_PLM_BASE_VERSION_2_0_0, /* Component name and version */ - "rsh", ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, ORTE_RELEASE_VERSION, /* Component open and close functions */ - orte_plm_rsh_component_open, orte_plm_rsh_component_close, orte_plm_rsh_component_query }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/plm/slurm/plm_slurm_component.c b/orte/mca/plm/slurm/plm_slurm_component.c index 7e3e21bb18..b5387923f2 100644 --- a/orte/mca/plm/slurm/plm_slurm_component.c +++ b/orte/mca/plm/slurm/plm_slurm_component.c @@ -63,27 +63,19 @@ orte_plm_slurm_component_t mca_plm_slurm_component = { information about the component itself */ { - /* Indicate that we are a plm v1.0.0 component (which also - implies a specific MCA version) */ - - ORTE_PLM_BASE_VERSION_1_0_0, + ORTE_PLM_BASE_VERSION_2_0_0, /* Component name and version */ - "slurm", ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, ORTE_RELEASE_VERSION, /* Component open and close functions */ - plm_slurm_open, plm_slurm_close, orte_plm_slurm_component_query }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/plm/submit/pls_submit_component.c b/orte/mca/plm/submit/pls_submit_component.c index 45a9a792fc..c1ef11d363 100644 --- a/orte/mca/plm/submit/pls_submit_component.c +++ b/orte/mca/plm/submit/pls_submit_component.c @@ -62,27 +62,19 @@ orte_plm_submit_component_t mca_plm_submit_component = { about the component itself */ { - /* Indicate that we are a plm v1.0.0 component (which also - implies a specific MCA version) */ - - ORTE_PLM_BASE_VERSION_1_0_0, + ORTE_PLM_BASE_VERSION_2_0_0, /* Component name and version */ - "submit", ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, ORTE_RELEASE_VERSION, /* Component open and close functions */ - orte_plm_submit_component_open, orte_plm_submit_component_close, orte_plm_submit_component_query }, - - /* Next the MCA v1.0.0 component meta data */ - { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/plm/tm/plm_tm_component.c b/orte/mca/plm/tm/plm_tm_component.c index b3fa1f00d0..e7fd3f3218 100644 --- a/orte/mca/plm/tm/plm_tm_component.c +++ b/orte/mca/plm/tm/plm_tm_component.c @@ -66,9 +66,7 @@ orte_plm_tm_component_t mca_plm_tm_component = { about the component itself */ { - /* Indicate that we are a plm v1.0.0 component (which also - implies a specific MCA version) */ - ORTE_PLM_BASE_VERSION_1_0_0, + ORTE_PLM_BASE_VERSION_2_0_0, /* Component name and version */ "tm", @@ -81,8 +79,6 @@ orte_plm_tm_component_t mca_plm_tm_component = { plm_tm_close, orte_plm_tm_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT @@ -101,7 +97,7 @@ static int plm_tm_open(void) false, false, "orted", &mca_plm_tm_component.orted); mca_base_param_reg_int(comp, "want_path_check", - "Whether the launching process should check for the plm_tm_orted executable in the PATH before launching (the TM API does not give an idication of failure; this is a somewhat-lame workaround; non-zero values enable this check)", + "Whether the launching process should check for the plm_tm_orted executable in the PATH before launching (the TM API does not give an indication of failure; this is a somewhat-lame workaround; non-zero values enable this check)", false, false, (int) true, &tmp); mca_plm_tm_component.want_path_check = OPAL_INT_TO_BOOL(tmp); diff --git a/orte/mca/plm/tmd/plm_tmd_component.c b/orte/mca/plm/tmd/plm_tmd_component.c index 4942900250..b682d9f815 100644 --- a/orte/mca/plm/tmd/plm_tmd_component.c +++ b/orte/mca/plm/tmd/plm_tmd_component.c @@ -66,9 +66,7 @@ orte_plm_tmd_component_t mca_plm_tmd_component = { about the component itself */ { - /* Indicate that we are a plm v1.0.0 component (which also - implies a specific MCA version) */ - ORTE_PLM_BASE_VERSION_1_0_0, + ORTE_PLM_BASE_VERSION_2_0_0, /* Component name and version */ "tmd", @@ -81,8 +79,6 @@ orte_plm_tmd_component_t mca_plm_tmd_component = { plm_tmd_close, orte_plm_tmd_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/plm/xgrid/src/plm_xgrid_component.m b/orte/mca/plm/xgrid/src/plm_xgrid_component.m index c6c647e3f9..187576924b 100644 --- a/orte/mca/plm/xgrid/src/plm_xgrid_component.m +++ b/orte/mca/plm/xgrid/src/plm_xgrid_component.m @@ -50,27 +50,19 @@ orte_plm_xgrid_component_t mca_plm_xgrid_component = { about the component itself */ { - /* Indicate that we are a plm v1.0.0 component (which also - implies a specific MCA version) */ - - ORTE_PLM_BASE_VERSION_1_0_0, + ORTE_PLM_BASE_VERSION_2_0_0, /* Component name and version */ - "xgrid", ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, ORTE_RELEASE_VERSION, /* Component open and close functions */ - orte_plm_xgrid_component_open, orte_plm_xgrid_component_close, orte_plm_xgrid_component_query }, - - /* Next the MCA v1.0.0 component meta data */ - { /* This component is not checkpointable */ MCA_BASE_METADATA_PARAM_NONE diff --git a/orte/mca/ras/alps/ras_alps_component.c b/orte/mca/ras/alps/ras_alps_component.c index 463f9e4c8b..8bcb00618e 100644 --- a/orte/mca/ras/alps/ras_alps_component.c +++ b/orte/mca/ras/alps/ras_alps_component.c @@ -45,25 +45,19 @@ orte_ras_base_component_t mca_ras_alps_component = { information about the component itself */ { - /* Indicate that we are a ras v2.0.0 component (which also - implies a specific MCA version) */ - ORTE_RAS_BASE_VERSION_2_0_0, /* Component name and version */ - "alps", ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, ORTE_RELEASE_VERSION, /* Component open and close functions */ - ras_alps_open, NULL, orte_ras_alps_component_query }, - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/ras/bjs/ras_bjs_component.c b/orte/mca/ras/bjs/ras_bjs_component.c index fa4bc54793..613d401162 100644 --- a/orte/mca/ras/bjs/ras_bjs_component.c +++ b/orte/mca/ras/bjs/ras_bjs_component.c @@ -33,9 +33,6 @@ static int ras_bjs_component_query(mca_base_module_t **module, int *priority); orte_ras_base_component_t mca_ras_bjs_component = { { - /* Indicate that we are a ras v2.0.0 component (which also - implies a specific MCA version) */ - ORTE_RAS_BASE_VERSION_2_0_0, "bjs", /* MCA component name */ @@ -44,13 +41,10 @@ orte_ras_base_component_t mca_ras_bjs_component = { ORTE_RELEASE_VERSION, /* MCA component release version */ /* Component open and close functions */ - ras_bjs_open, /* component open */ NULL, /* component close */ ras_bjs_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/ras/ccp/ras_ccp_component.c b/orte/mca/ras/ccp/ras_ccp_component.c index aab6bf4217..fee609e9d0 100644 --- a/orte/mca/ras/ccp/ras_ccp_component.c +++ b/orte/mca/ras/ccp/ras_ccp_component.c @@ -50,26 +50,19 @@ orte_ras_ccp_component_t mca_ras_ccp_component = { information about the component itself */ { - /* Indicate that we are a ras v1.3.0 component (which also - implies a specific MCA version) */ - ORTE_RAS_BASE_VERSION_2_0_0, /* Component name and version */ - "ccp", ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, ORTE_RELEASE_VERSION, /* Component open and close functions */ - ras_ccp_open, NULL, orte_ras_ccp_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/ras/gridengine/ras_gridengine_component.c b/orte/mca/ras/gridengine/ras_gridengine_component.c index 714af78c91..fe570494b0 100644 --- a/orte/mca/ras/gridengine/ras_gridengine_component.c +++ b/orte/mca/ras/gridengine/ras_gridengine_component.c @@ -51,9 +51,6 @@ orte_ras_gridengine_component_t mca_ras_gridengine_component = { information about the component itself */ { - /* Indicate that we are a ras v2.0.0 component (which also - implies a specific MCA version) */ - ORTE_RAS_BASE_VERSION_2_0_0, "gridengine", /* MCA component name */ ORTE_MAJOR_VERSION, /* MCA component major version */ @@ -63,8 +60,6 @@ orte_ras_gridengine_component_t mca_ras_gridengine_component = { orte_ras_gridengine_close, /* component close */ orte_ras_gridengine_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/ras/loadleveler/ras_loadleveler_component.c b/orte/mca/ras/loadleveler/ras_loadleveler_component.c index c690766275..8ee8410131 100644 --- a/orte/mca/ras/loadleveler/ras_loadleveler_component.c +++ b/orte/mca/ras/loadleveler/ras_loadleveler_component.c @@ -45,26 +45,19 @@ orte_ras_base_component_t mca_ras_loadleveler_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a ras v2.0.0 component (which also - implies a specific MCA version) */ - ORTE_RAS_BASE_VERSION_2_0_0, /* Component name and version */ - "loadleveler", ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, ORTE_RELEASE_VERSION, /* Component open and close functions */ - orte_ras_loadleveler_open, NULL, orte_ras_loadleveler_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/ras/lsf/ras_lsf_component.c b/orte/mca/ras/lsf/ras_lsf_component.c index 1e40396c04..3eeee9fdce 100644 --- a/orte/mca/ras/lsf/ras_lsf_component.c +++ b/orte/mca/ras/lsf/ras_lsf_component.c @@ -52,12 +52,11 @@ orte_ras_base_component_t mca_ras_lsf_component = { orte_ras_lsf_open, /* component open */ orte_ras_lsf_close, /* component close */ orte_ras_lsf_component_query - }, - - /* Next the MCA v1.0.0 component meta data */ - { - /* The component is checkpoint ready */ - MCA_BASE_METADATA_PARAM_CHECKPOINT + }, + { + /* The component is checkpoint ready */ + MCA_BASE_METADATA_PARAM_CHECKPOINT + } } }; diff --git a/orte/mca/ras/ras.h b/orte/mca/ras/ras.h index 5a3bfa141c..bb9d3861eb 100644 --- a/orte/mca/ras/ras.h +++ b/orte/mca/ras/ras.h @@ -196,7 +196,7 @@ typedef int (*orte_ras_base_module_allocate_fn_t)(opal_list_t *nodes); typedef int (*orte_ras_base_module_finalize_fn_t)(void); /** - * ras module version 2.0 + * ras module */ struct orte_ras_base_module_2_0_0_t { /** Allocation function pointer */ @@ -215,13 +215,13 @@ typedef orte_ras_base_module_2_0_0_t orte_ras_base_module_t; /** * Component init / selection - * ras component version 2.0.0 + * ras component */ struct orte_ras_base_component_2_0_0_t { /** Base MCA structure */ mca_base_component_t base_version; /** Base MCA data */ - mca_base_component_data_1_0_0_t base_data; + mca_base_component_data_t base_data; }; /** Convenience typedef */ typedef struct orte_ras_base_component_2_0_0_t orte_ras_base_component_2_0_0_t; @@ -230,12 +230,10 @@ typedef orte_ras_base_component_2_0_0_t orte_ras_base_component_t; /** - * Macro for use in components that are of type ras v2.0.0 + * Macro for use in components that are of type ras */ #define ORTE_RAS_BASE_VERSION_2_0_0 \ - /* ras v2.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* ras v2.0 */ \ + MCA_BASE_VERSION_2_0_0, \ "ras", 2, 0, 0 diff --git a/orte/mca/ras/slurm/ras_slurm_component.c b/orte/mca/ras/slurm/ras_slurm_component.c index 29a8417dba..e3ba9f5d5a 100644 --- a/orte/mca/ras/slurm/ras_slurm_component.c +++ b/orte/mca/ras/slurm/ras_slurm_component.c @@ -49,26 +49,19 @@ orte_ras_base_component_t mca_ras_slurm_component = { information about the component itself */ { - /* Indicate that we are a ras v2.0.0 component (which also - implies a specific MCA version) */ - ORTE_RAS_BASE_VERSION_2_0_0, /* Component name and version */ - "slurm", ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, ORTE_RELEASE_VERSION, /* Component open and close functions */ - ras_slurm_open, NULL, orte_ras_slurm_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/ras/tm/ras_tm_component.c b/orte/mca/ras/tm/ras_tm_component.c index 7cd5a4b588..f277b88473 100644 --- a/orte/mca/ras/tm/ras_tm_component.c +++ b/orte/mca/ras/tm/ras_tm_component.c @@ -48,26 +48,19 @@ orte_ras_tm_component_t mca_ras_tm_component = { information about the component itself */ { - /* Indicate that we are a ras v2.0.0 component (which also - implies a specific MCA version) */ - ORTE_RAS_BASE_VERSION_2_0_0, /* Component name and version */ - "tm", ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, ORTE_RELEASE_VERSION, /* Component open and close functions */ - ras_tm_open, NULL, orte_ras_tm_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c b/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c index dc19e7f66d..aa7d49e90c 100644 --- a/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c +++ b/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c @@ -48,10 +48,7 @@ orte_rmaps_rank_file_component_t mca_rmaps_rank_file_component = { information about the component itself */ { - /* Indicate that we are a rmaps v1.3.0 component (which also - implies a specific MCA version) */ - - ORTE_RMAPS_BASE_VERSION_1_3_0, + ORTE_RMAPS_BASE_VERSION_2_0_0, "rank_file", /* MCA component name */ ORTE_MAJOR_VERSION, /* MCA component major version */ @@ -61,7 +58,6 @@ orte_rmaps_rank_file_component_t mca_rmaps_rank_file_component = { orte_rmaps_rank_file_close, /* component close */ orte_rmaps_rank_file_query /* component query */ }, - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/rmaps/rmaps.h b/orte/mca/rmaps/rmaps.h index 7028a84b01..1f38b54cdd 100644 --- a/orte/mca/rmaps/rmaps.h +++ b/orte/mca/rmaps/rmaps.h @@ -98,26 +98,24 @@ typedef orte_rmaps_base_module_1_3_0_t orte_rmaps_base_module_t; /** * rmaps component version 1.3.0 */ -struct orte_rmaps_base_component_1_3_0_t { +struct orte_rmaps_base_component_2_0_0_t { /** Base MCA structure */ mca_base_component_t base_version; /** Base MCA data */ - mca_base_component_data_1_0_0_t base_data; + mca_base_component_data_t base_data; }; /** Convenience typedef */ -typedef struct orte_rmaps_base_component_1_3_0_t orte_rmaps_base_component_1_3_0_t; +typedef struct orte_rmaps_base_component_2_0_0_t orte_rmaps_base_component_2_0_0_t; /** Convenience typedef */ -typedef orte_rmaps_base_component_1_3_0_t orte_rmaps_base_component_t; +typedef orte_rmaps_base_component_2_0_0_t orte_rmaps_base_component_t; /** - * Macro for use in components that are of type rmaps v1.0.0 + * Macro for use in components that are of type rmaps */ -#define ORTE_RMAPS_BASE_VERSION_1_3_0 \ - /* rmaps v1.3 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* rmaps v1.3 */ \ - "rmaps", 1, 3, 0 +#define ORTE_RMAPS_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "rmaps", 2, 0, 0 END_C_DECLS diff --git a/orte/mca/rmaps/round_robin/rmaps_rr_component.c b/orte/mca/rmaps/round_robin/rmaps_rr_component.c index 2cb6a49fa5..ebca636fc7 100644 --- a/orte/mca/rmaps/round_robin/rmaps_rr_component.c +++ b/orte/mca/rmaps/round_robin/rmaps_rr_component.c @@ -37,10 +37,7 @@ static int orte_rmaps_round_robin_query(mca_base_module_t **module, int *priorit orte_rmaps_base_component_t mca_rmaps_round_robin_component = { { - /* Indicate that we are a rmaps v1.3.0 component (which also - implies a specific MCA version) */ - - ORTE_RMAPS_BASE_VERSION_1_3_0, + ORTE_RMAPS_BASE_VERSION_2_0_0, "round_robin", /* MCA component name */ ORTE_MAJOR_VERSION, /* MCA component major version */ @@ -50,7 +47,6 @@ orte_rmaps_base_component_t mca_rmaps_round_robin_component = { orte_rmaps_round_robin_close, /* component close */ orte_rmaps_round_robin_query /* component query */ }, - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/rmaps/seq/rmaps_seq_component.c b/orte/mca/rmaps/seq/rmaps_seq_component.c index 96b90a43a5..abe7ad6027 100644 --- a/orte/mca/rmaps/seq/rmaps_seq_component.c +++ b/orte/mca/rmaps/seq/rmaps_seq_component.c @@ -37,10 +37,7 @@ static int orte_rmaps_seq_query(mca_base_module_t **module, int *priority); orte_rmaps_base_component_t mca_rmaps_seq_component = { { - /* Indicate that we are a rmaps v1.3.0 component (which also - implies a specific MCA version) */ - - ORTE_RMAPS_BASE_VERSION_1_3_0, + ORTE_RMAPS_BASE_VERSION_2_0_0, "seq", /* MCA component name */ ORTE_MAJOR_VERSION, /* MCA component major version */ @@ -50,8 +47,6 @@ orte_rmaps_base_component_t mca_rmaps_seq_component = { orte_rmaps_seq_close, /* component close */ orte_rmaps_seq_query /* component query */ }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/rmaps/topo/rmaps_topo_component.c b/orte/mca/rmaps/topo/rmaps_topo_component.c index 7251fb7256..69d5767a77 100644 --- a/orte/mca/rmaps/topo/rmaps_topo_component.c +++ b/orte/mca/rmaps/topo/rmaps_topo_component.c @@ -37,10 +37,7 @@ static int orte_rmaps_topo_query(mca_base_module_t **module, int *priority); orte_rmaps_base_component_t mca_rmaps_topo_component = { { - /* Indicate that we are a rmaps v1.3.0 component (which also - implies a specific MCA version) */ - - ORTE_RMAPS_BASE_VERSION_1_3_0, + ORTE_RMAPS_BASE_VERSION_2_0_0, "topo", /* MCA component name */ ORTE_MAJOR_VERSION, /* MCA component major version */ @@ -50,7 +47,6 @@ orte_rmaps_base_component_t mca_rmaps_topo_component = { orte_rmaps_topo_close, /* component close */ orte_rmaps_topo_query /* component query */ }, - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/rml/ftrm/rml_ftrm_component.c b/orte/mca/rml/ftrm/rml_ftrm_component.c index 715506aa29..2c3d49cda7 100644 --- a/orte/mca/rml/ftrm/rml_ftrm_component.c +++ b/orte/mca/rml/ftrm/rml_ftrm_component.c @@ -41,9 +41,7 @@ orte_rml_component_t mca_rml_ftrm_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ { - /* Indicate that we are a rml v1.0.0 component (which also - implies a specific MCA version) */ - ORTE_RML_BASE_VERSION_1_0_0, + ORTE_RML_BASE_VERSION_2_0_0, "ftrm", /* MCA component name */ ORTE_MAJOR_VERSION, /* MCA component major version */ @@ -53,8 +51,6 @@ orte_rml_component_t mca_rml_ftrm_component = { orte_rml_ftrm_open, /* component open */ orte_rml_ftrm_close, /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/rml/oob/rml_oob_component.c b/orte/mca/rml/oob/rml_oob_component.c index 06a01ec1da..2193c5b49f 100644 --- a/orte/mca/rml/oob/rml_oob_component.c +++ b/orte/mca/rml/oob/rml_oob_component.c @@ -54,10 +54,7 @@ orte_rml_component_t mca_rml_oob_component = { information about the component itself */ { - /* Indicate that we are a rml v1.0.0 component (which also - implies a specific MCA version) */ - - ORTE_RML_BASE_VERSION_1_0_0, + ORTE_RML_BASE_VERSION_2_0_0, "oob", /* MCA component name */ ORTE_MAJOR_VERSION, /* MCA component major version */ @@ -66,8 +63,6 @@ orte_rml_component_t mca_rml_oob_component = { rml_oob_open, /* component open */ rml_oob_close, /* component close */ }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/rml/rml.h b/orte/mca/rml/rml.h index ee42dbacdc..a861653414 100644 --- a/orte/mca/rml/rml.h +++ b/orte/mca/rml/rml.h @@ -86,16 +86,16 @@ typedef struct orte_rml_module_t* (*orte_rml_component_init_fn_t)(int *priority * this structure, called mca_rml_[component name]_component, must * exist in any RML component. */ -struct orte_rml_component_1_0_0_t { +struct orte_rml_component_2_0_0_t { /* Base component description */ mca_base_component_t rml_version; /* Base component data block */ - mca_base_component_data_1_0_0_t rml_data; + mca_base_component_data_t rml_data; /* Component intialization function */ orte_rml_component_init_fn_t rml_init; }; /** Convienence typedef */ -typedef struct orte_rml_component_1_0_0_t orte_rml_component_t; +typedef struct orte_rml_component_2_0_0_t orte_rml_component_t; /* ******************************************************************** */ @@ -640,12 +640,10 @@ ORTE_DECLSPEC extern orte_rml_module_t orte_rml; /* ******************************************************************** */ -/** Macro for use in components that are of type rml v1.0.0 */ -#define ORTE_RML_BASE_VERSION_1_0_0 \ - /* rml v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* rml v1.0 */ \ - "rml", 1, 0, 0 +/** Macro for use in components that are of type rml */ +#define ORTE_RML_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "rml", 2, 0, 0 /* ******************************************************************** */ diff --git a/orte/mca/routed/binomial/routed_binomial_component.c b/orte/mca/routed/binomial/routed_binomial_component.c index 6c07d3af5d..07a44088c5 100644 --- a/orte/mca/routed/binomial/routed_binomial_component.c +++ b/orte/mca/routed/binomial/routed_binomial_component.c @@ -35,10 +35,7 @@ orte_routed_component_t mca_routed_binomial_component = { information about the component itself */ { - /* Indicate that we are a rml v1.0.0 component (which also - implies a specific MCA version) */ - - ORTE_ROUTED_BASE_VERSION_1_0_0, + ORTE_ROUTED_BASE_VERSION_2_0_0, "binomial", /* MCA component name */ ORTE_MAJOR_VERSION, /* MCA component major version */ @@ -48,8 +45,6 @@ orte_routed_component_t mca_routed_binomial_component = { NULL, orte_routed_binomial_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* This component can be checkpointed */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/routed/direct/routed_direct_component.c b/orte/mca/routed/direct/routed_direct_component.c index 025daf8494..56869d1ca3 100644 --- a/orte/mca/routed/direct/routed_direct_component.c +++ b/orte/mca/routed/direct/routed_direct_component.c @@ -27,10 +27,7 @@ orte_routed_component_t mca_routed_direct_component = { information about the component itself */ { - /* Indicate that we are a rml v1.0.0 component (which also - implies a specific MCA version) */ - - ORTE_ROUTED_BASE_VERSION_1_0_0, + ORTE_ROUTED_BASE_VERSION_2_0_0, "direct", /* MCA component name */ ORTE_MAJOR_VERSION, /* MCA component major version */ @@ -40,8 +37,6 @@ orte_routed_component_t mca_routed_direct_component = { NULL, orte_routed_direct_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* This component can be checkpointed */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/routed/linear/routed_linear_component.c b/orte/mca/routed/linear/routed_linear_component.c index 9b931dca00..48ebc193d5 100644 --- a/orte/mca/routed/linear/routed_linear_component.c +++ b/orte/mca/routed/linear/routed_linear_component.c @@ -35,10 +35,7 @@ orte_routed_component_t mca_routed_linear_component = { information about the component itself */ { - /* Indicate that we are a rml v1.0.0 component (which also - implies a specific MCA version) */ - - ORTE_ROUTED_BASE_VERSION_1_0_0, + ORTE_ROUTED_BASE_VERSION_2_0_0, "linear", /* MCA component name */ ORTE_MAJOR_VERSION, /* MCA component major version */ @@ -48,8 +45,6 @@ orte_routed_component_t mca_routed_linear_component = { NULL, orte_routed_linear_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* This component can be checkpointed */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/routed/routed.h b/orte/mca/routed/routed.h index 9f3b10ab7b..4df980e111 100644 --- a/orte/mca/routed/routed.h +++ b/orte/mca/routed/routed.h @@ -56,14 +56,14 @@ struct orte_rml_module_t; * this structure, called mca_routed_[component name]_component, must * exist in any routed component. */ -struct orte_routed_component_1_0_0_t { +struct orte_routed_component_2_0_0_t { /* Base component description */ mca_base_component_t base_version; /* Base component data block */ - mca_base_component_data_1_0_0_t base_data; + mca_base_component_data_t base_data; }; /** Convienence typedef */ -typedef struct orte_routed_component_1_0_0_t orte_routed_component_t; +typedef struct orte_routed_component_2_0_0_t orte_routed_component_t; /* ******************************************************************** */ @@ -262,12 +262,10 @@ ORTE_DECLSPEC extern orte_routed_module_t orte_routed; /* ******************************************************************** */ -/** Macro for use in components that are of type routed v1.0.0 */ -#define ORTE_ROUTED_BASE_VERSION_1_0_0 \ - /* routed v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* routed v1.0 */ \ - "routed", 1, 0, 0 +/** Macro for use in components that are of type routed */ +#define ORTE_ROUTED_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "routed", 2, 0, 0 /* ******************************************************************** */ diff --git a/orte/mca/snapc/base/snapc_base_select.c b/orte/mca/snapc/base/snapc_base_select.c index 7cd20ef96f..4d9756d561 100644 --- a/orte/mca/snapc/base/snapc_base_select.c +++ b/orte/mca/snapc/base/snapc_base_select.c @@ -32,7 +32,7 @@ static orte_snapc_base_component_t none_component = { * meta information about the component itself */ { - ORTE_SNAPC_BASE_VERSION_1_0_0, + ORTE_SNAPC_BASE_VERSION_2_0_0, /* Component name and version */ "none", OMPI_MAJOR_VERSION, @@ -44,8 +44,6 @@ static orte_snapc_base_component_t none_component = { orte_snapc_base_none_close, orte_snapc_base_none_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/snapc/full/snapc_full_component.c b/orte/mca/snapc/full/snapc_full_component.c index 2755226e36..cd541e6c80 100644 --- a/orte/mca/snapc/full/snapc_full_component.c +++ b/orte/mca/snapc/full/snapc_full_component.c @@ -48,7 +48,7 @@ orte_snapc_full_component_t mca_snapc_full_component = { * meta information about the component itfull */ { - ORTE_SNAPC_BASE_VERSION_1_0_0, + ORTE_SNAPC_BASE_VERSION_2_0_0, /* Component name and version */ "full", OMPI_MAJOR_VERSION, @@ -60,8 +60,6 @@ orte_snapc_full_component_t mca_snapc_full_component = { snapc_full_close, orte_snapc_full_component_query }, - - /* Next the MCA v1.0.0 component meta data */ { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT diff --git a/orte/mca/snapc/snapc.h b/orte/mca/snapc/snapc.h index c335cc42fb..47d1800ecf 100644 --- a/orte/mca/snapc/snapc.h +++ b/orte/mca/snapc/snapc.h @@ -204,13 +204,13 @@ typedef int (*orte_snapc_base_release_job_fn_t) typedef int (*orte_snapc_base_ft_event_fn_t)(int state); /** - * Structure for SNAPC v1.0.0 components. + * Structure for SNAPC components. */ -struct orte_snapc_base_component_1_0_0_t { +struct orte_snapc_base_component_2_0_0_t { /** MCA base component */ mca_base_component_t base_version; /** MCA base data */ - mca_base_component_data_1_0_0_t base_data; + mca_base_component_data_t base_data; /** Verbosity Level */ int verbose; @@ -219,11 +219,11 @@ struct orte_snapc_base_component_1_0_0_t { /** Default Priority */ int priority; }; -typedef struct orte_snapc_base_component_1_0_0_t orte_snapc_base_component_1_0_0_t; -typedef struct orte_snapc_base_component_1_0_0_t orte_snapc_base_component_t; +typedef struct orte_snapc_base_component_2_0_0_t orte_snapc_base_component_2_0_0_t; +typedef struct orte_snapc_base_component_2_0_0_t orte_snapc_base_component_t; /** - * Structure for SNAPC v1.0.0 modules + * Structure for SNAPC modules */ struct orte_snapc_base_module_1_0_0_t { /** Initialization Function */ @@ -243,13 +243,11 @@ typedef struct orte_snapc_base_module_1_0_0_t orte_snapc_base_module_t; ORTE_DECLSPEC extern orte_snapc_base_module_t orte_snapc; /** - * Macro for use in components that are of type SNAPC v1.0.0 + * Macro for use in components that are of type SNAPC */ -#define ORTE_SNAPC_BASE_VERSION_1_0_0 \ - /* SNAPC v1.0 is chained to MCA v1.0 */ \ - MCA_BASE_VERSION_1_0_0, \ - /* SNAPC v1.0 */ \ - "snapc", 1, 0, 0 +#define ORTE_SNAPC_BASE_VERSION_2_0_0 \ + MCA_BASE_VERSION_2_0_0, \ + "snapc", 2, 0, 0 END_C_DECLS