From b68d66bb9b04327703005a05780f6178f8ca4bb5 Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Thu, 5 Mar 2015 20:50:44 -0700 Subject: [PATCH 1/3] MCA: Add the project/project version to the MCA base component This commit adds support for project_framework_component_* parameter matching. This is the first step in allowing the same framework name in multiple projects. This change also bumps the MCA component version to 2.1.0. All master frameworks have been updated to use the new component versioning macro. An mca.h has been added to each project to add a project specific versioning macro of the form PROJECT_MCA_VERSION_2_1_0. Signed-off-by: Nathan Hjelm --- ompi/Makefile.am | 3 +- ompi/mca/Makefile.am | 23 ++++++++++ ompi/mca/bcol/base/base.h | 2 +- ompi/mca/bcol/base/bcol_base_frame.c | 2 +- ompi/mca/bcol/base/bcol_base_init.c | 2 +- ompi/mca/bcol/basesmuma/bcol_basesmuma.h | 2 +- ompi/mca/bcol/bcol.h | 5 +-- ompi/mca/bcol/iboffload/bcol_iboffload.h | 2 +- ompi/mca/bcol/ptpcoll/bcol_ptpcoll.h | 2 +- ompi/mca/bml/base/base.h | 2 +- ompi/mca/bml/base/bml_base_btl.h | 2 +- ompi/mca/bml/base/bml_base_init.c | 2 +- ompi/mca/bml/bml.h | 7 ++- ompi/mca/bml/r2/bml_r2.h | 2 +- ompi/mca/coll/base/coll_base_comm_select.c | 2 +- ompi/mca/coll/base/coll_base_comm_unselect.c | 2 +- ompi/mca/coll/base/coll_base_find_available.c | 2 +- ompi/mca/coll/base/coll_base_frame.c | 2 +- ompi/mca/coll/base/coll_base_functions.h | 2 +- ompi/mca/coll/base/coll_base_util.h | 2 +- ompi/mca/coll/basic/coll_basic.h | 2 +- ompi/mca/coll/coll.h | 7 ++- ompi/mca/coll/cuda/coll_cuda.h | 2 +- ompi/mca/coll/demo/coll_demo.h | 2 +- ompi/mca/coll/fca/coll_fca.h | 2 +- ompi/mca/coll/hcoll/coll_hcoll.h | 2 +- ompi/mca/coll/inter/coll_inter.h | 2 +- ompi/mca/coll/ml/coll_ml.h | 2 +- ompi/mca/coll/ml/coll_ml_custom_utils.c | 2 +- ompi/mca/coll/portals4/coll_portals4.h | 2 +- ompi/mca/coll/self/coll_self.h | 2 +- ompi/mca/coll/sm/coll_sm.h | 2 +- ompi/mca/coll/tuned/coll_tuned.h | 2 +- ompi/mca/coll/tuned/coll_tuned_dynamic_file.c | 2 +- .../mca/coll/tuned/coll_tuned_dynamic_rules.c | 2 +- ompi/mca/crcp/base/crcp_base_fns.c | 2 +- ompi/mca/crcp/base/crcp_base_frame.c | 2 +- ompi/mca/crcp/base/crcp_base_select.c | 2 +- ompi/mca/crcp/bkmrk/crcp_bkmrk.h | 2 +- ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.c | 2 +- ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.h | 2 +- ompi/mca/crcp/bkmrk/crcp_bkmrk_module.c | 2 +- ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c | 2 +- ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.h | 2 +- ompi/mca/crcp/crcp.h | 5 +-- ompi/mca/dpm/base/dpm_base_frame.c | 2 +- ompi/mca/dpm/base/dpm_base_select.c | 2 +- ompi/mca/dpm/dpm.h | 7 ++- ompi/mca/fbtl/base/fbtl_base_file_select.c | 2 +- ompi/mca/fbtl/base/fbtl_base_file_unselect.c | 2 +- ompi/mca/fbtl/base/fbtl_base_find_available.c | 2 +- ompi/mca/fbtl/base/fbtl_base_frame.c | 2 +- ompi/mca/fbtl/fbtl.h | 8 ++-- ompi/mca/fbtl/plfs/fbtl_plfs.h | 2 +- ompi/mca/fbtl/posix/fbtl_posix.h | 2 +- ompi/mca/fbtl/pvfs2/fbtl_pvfs2.h | 2 +- ompi/mca/fcoll/base/fcoll_base_file_select.c | 2 +- .../mca/fcoll/base/fcoll_base_file_unselect.c | 2 +- ompi/mca/fcoll/base/fcoll_base_frame.c | 2 +- ompi/mca/fcoll/dynamic/fcoll_dynamic.h | 2 +- ompi/mca/fcoll/fcoll.h | 8 ++-- ompi/mca/fcoll/individual/fcoll_individual.h | 2 +- ompi/mca/fcoll/static/fcoll_static.h | 2 +- ompi/mca/fcoll/two_phase/fcoll_two_phase.h | 2 +- ompi/mca/fs/base/fs_base_file_select.c | 2 +- ompi/mca/fs/base/fs_base_file_unselect.c | 2 +- ompi/mca/fs/base/fs_base_find_available.c | 2 +- ompi/mca/fs/base/fs_base_get_parent_dir.c | 2 +- ompi/mca/fs/fs.h | 8 ++-- ompi/mca/fs/lustre/fs_lustre.h | 2 +- ompi/mca/fs/plfs/fs_plfs.h | 2 +- ompi/mca/fs/pvfs2/fs_pvfs2.h | 2 +- ompi/mca/fs/ufs/fs_ufs.h | 2 +- ompi/mca/io/base/io_base_delete.c | 2 +- ompi/mca/io/base/io_base_file_select.c | 2 +- ompi/mca/io/base/io_base_find_available.c | 2 +- ompi/mca/io/io.h | 8 ++-- ompi/mca/mca.h | 39 +++++++++++++++++ ompi/mca/mtl/base/base.h | 2 +- ompi/mca/mtl/base/mtl_base_datatype.h | 2 +- ompi/mca/mtl/base/mtl_base_frame.c | 2 +- ompi/mca/mtl/mtl.h | 8 ++-- ompi/mca/op/base/op_base_find_available.c | 2 +- ompi/mca/op/base/op_base_frame.c | 2 +- ompi/mca/op/base/op_base_op_select.c | 2 +- ompi/mca/op/example/op_example.h | 2 +- ompi/mca/op/op.h | 7 ++- ompi/mca/op/x86/op_x86.h | 2 +- ompi/mca/osc/base/osc_base_frame.c | 2 +- ompi/mca/osc/base/osc_base_init.c | 2 +- ompi/mca/osc/osc.h | 8 ++-- ompi/mca/pml/base/base.h | 2 +- ompi/mca/pml/base/pml_base_frame.c | 2 +- ompi/mca/pml/base/pml_base_select.c | 14 +++--- ompi/mca/pml/pml.h | 8 ++-- ompi/mca/pubsub/base/pubsub_base_frame.c | 2 +- ompi/mca/pubsub/base/pubsub_base_select.c | 2 +- ompi/mca/pubsub/pubsub.h | 7 ++- ompi/mca/rte/base/rte_base_frame.c | 2 +- ompi/mca/rte/rte.h | 8 ++-- ompi/mca/sbgp/base/base.h | 2 +- ompi/mca/sbgp/base/sbgp_base_close.c | 2 +- ompi/mca/sbgp/base/sbgp_base_frame.c | 2 +- ompi/mca/sbgp/base/sbgp_base_init.c | 2 +- .../mca/sbgp/basesmsocket/sbgp_basesmsocket.h | 2 +- ompi/mca/sbgp/basesmuma/sbgp_basesmuma.h | 2 +- ompi/mca/sbgp/ibnet/sbgp_ibnet.h | 2 +- ompi/mca/sbgp/p2p/sbgp_p2p.h | 2 +- ompi/mca/sbgp/sbgp.h | 8 ++-- ompi/mca/sharedfp/addproc/sharedfp_addproc.h | 2 +- ompi/mca/sharedfp/base/base.h | 2 +- .../sharedfp/base/sharedfp_base_file_select.c | 2 +- .../base/sharedfp_base_file_unselect.c | 2 +- .../base/sharedfp_base_find_available.c | 2 +- ompi/mca/sharedfp/base/sharedfp_base_frame.c | 2 +- .../sharedfp/individual/sharedfp_individual.h | 2 +- .../sharedfp/lockedfile/sharedfp_lockedfile.h | 2 +- ompi/mca/sharedfp/sharedfp.h | 8 ++-- ompi/mca/sharedfp/sm/sharedfp_sm.h | 2 +- ompi/mca/topo/base/base.h | 2 +- ompi/mca/topo/base/topo_base_comm_select.c | 2 +- ompi/mca/topo/base/topo_base_find_available.c | 2 +- ompi/mca/topo/base/topo_base_frame.c | 2 +- ompi/mca/topo/topo.h | 8 ++-- ompi/mca/vprotocol/base/base.h | 12 +++--- ompi/mca/vprotocol/base/vprotocol_base.c | 2 +- .../vprotocol/base/vprotocol_base_select.c | 2 +- .../example/vprotocol_example_component.c | 2 +- .../pessimist/vprotocol_pessimist_component.c | 2 +- ompi/mca/vprotocol/vprotocol.h | 2 +- opal/mca/allocator/allocator.h | 40 +++++++++-------- opal/mca/backtrace/backtrace.h | 6 ++- opal/mca/base/mca_base_var.c | 3 +- opal/mca/btl/btl.h | 6 +-- opal/mca/compress/compress.h | 6 ++- opal/mca/crs/crs.h | 6 ++- opal/mca/dl/dl.h | 6 ++- opal/mca/dstore/dstore.h | 7 +-- opal/mca/event/event.h | 6 ++- opal/mca/hwloc/hwloc.h | 6 ++- opal/mca/if/if.h | 6 ++- opal/mca/installdirs/installdirs.h | 6 +-- opal/mca/mca.h | 43 ++++++++++++++++--- opal/mca/memchecker/memchecker.h | 6 ++- opal/mca/memcpy/memcpy.h | 6 ++- opal/mca/memory/memory.h | 6 ++- opal/mca/mpool/mpool.h | 3 +- opal/mca/pmix/pmix.h | 6 ++- opal/mca/pstat/pstat.h | 6 ++- opal/mca/rcache/rcache.h | 43 ++++++++++--------- opal/mca/reachable/reachable.h | 6 ++- opal/mca/sec/sec.h | 6 ++- opal/mca/shmem/shmem.h | 9 ++-- opal/mca/timer/timer.h | 6 ++- orte/Makefile.am | 3 ++ orte/mca/Makefile.am | 23 ++++++++++ orte/mca/dfs/base/base.h | 2 +- orte/mca/dfs/base/dfs_base_frame.c | 2 +- orte/mca/dfs/base/dfs_base_select.c | 2 +- orte/mca/dfs/dfs.h | 10 ++--- orte/mca/errmgr/base/base.h | 2 +- orte/mca/errmgr/base/errmgr_base_fns.c | 2 +- orte/mca/errmgr/base/errmgr_base_frame.c | 2 +- orte/mca/errmgr/base/errmgr_base_select.c | 2 +- orte/mca/errmgr/base/errmgr_base_tool.c | 2 +- orte/mca/errmgr/errmgr.h | 10 ++--- orte/mca/ess/alps/ess_alps.h | 2 +- orte/mca/ess/base/base.h | 2 +- orte/mca/ess/base/ess_base_frame.c | 2 +- orte/mca/ess/base/ess_base_select.c | 2 +- orte/mca/ess/env/ess_env_module.c | 2 +- orte/mca/ess/ess.h | 8 ++-- orte/mca/filem/base/filem_base_fns.c | 2 +- orte/mca/filem/base/filem_base_frame.c | 2 +- orte/mca/filem/base/filem_base_receive.c | 2 +- orte/mca/filem/base/filem_base_select.c | 2 +- orte/mca/filem/filem.h | 10 ++--- orte/mca/filem/raw/filem_raw.h | 2 +- orte/mca/grpcomm/base/base.h | 2 +- orte/mca/grpcomm/base/grpcomm_base_frame.c | 2 +- orte/mca/grpcomm/base/grpcomm_base_select.c | 2 +- .../mca/grpcomm/brks/grpcomm_brks_component.c | 2 +- .../grpcomm/direct/grpcomm_direct_component.c | 2 +- orte/mca/grpcomm/grpcomm.h | 13 +++--- orte/mca/grpcomm/rcd/grpcomm_rcd_component.c | 2 +- orte/mca/iof/base/base.h | 2 +- orte/mca/iof/base/iof_base_frame.c | 2 +- orte/mca/iof/base/iof_base_select.c | 2 +- orte/mca/iof/iof.h | 10 ++--- orte/mca/mca.h | 39 +++++++++++++++++ orte/mca/notifier/base/notifier_base_frame.c | 2 +- orte/mca/notifier/base/notifier_base_select.c | 2 +- orte/mca/notifier/notifier.h | 13 +++--- orte/mca/odls/alps/odls_alps.h | 2 +- orte/mca/odls/alps/odls_alps_component.c | 2 +- orte/mca/odls/alps/odls_alps_utils.c | 2 +- orte/mca/odls/base/base.h | 2 +- orte/mca/odls/base/odls_base_frame.c | 2 +- orte/mca/odls/base/odls_base_select.c | 2 +- orte/mca/odls/default/odls_default.h | 2 +- .../mca/odls/default/odls_default_component.c | 2 +- orte/mca/odls/odls.h | 13 +++--- orte/mca/oob/base/base.h | 2 +- orte/mca/oob/base/oob_base_frame.c | 2 +- orte/mca/oob/base/oob_base_select.c | 2 +- orte/mca/oob/oob.h | 8 ++-- orte/mca/plm/alps/plm_alps.h | 2 +- orte/mca/plm/base/base.h | 2 +- orte/mca/plm/base/plm_base_frame.c | 2 +- orte/mca/plm/base/plm_base_receive.c | 2 +- orte/mca/plm/base/plm_base_select.c | 2 +- orte/mca/plm/isolated/plm_isolated.h | 2 +- orte/mca/plm/lsf/plm_lsf.h | 2 +- orte/mca/plm/plm.h | 10 ++--- orte/mca/plm/rsh/plm_rsh.h | 2 +- orte/mca/plm/slurm/plm_slurm.h | 2 +- orte/mca/plm/tm/plm_tm.h | 2 +- orte/mca/ras/base/ras_base_allocate.c | 2 +- orte/mca/ras/base/ras_base_close.c | 2 +- orte/mca/ras/base/ras_base_frame.c | 2 +- orte/mca/ras/base/ras_base_select.c | 2 +- orte/mca/ras/ras.h | 8 ++-- orte/mca/rmaps/base/base.h | 2 +- orte/mca/rmaps/base/rmaps_base_binding.c | 2 +- orte/mca/rmaps/base/rmaps_base_frame.c | 2 +- orte/mca/rmaps/base/rmaps_base_map_job.c | 2 +- orte/mca/rmaps/base/rmaps_base_print_fns.c | 2 +- orte/mca/rmaps/base/rmaps_base_ranking.c | 2 +- orte/mca/rmaps/base/rmaps_base_select.c | 2 +- orte/mca/rmaps/base/rmaps_base_support_fns.c | 2 +- orte/mca/rmaps/rmaps.h | 2 +- orte/mca/rmaps/rmaps_types.h | 8 ++-- orte/mca/rml/base/base.h | 2 +- orte/mca/rml/base/rml_base_frame.c | 2 +- orte/mca/rml/rml.h | 8 ++-- orte/mca/routed/base/base.h | 2 +- orte/mca/routed/base/routed_base_frame.c | 2 +- orte/mca/routed/routed.h | 10 ++--- orte/mca/rtc/base/base.h | 2 +- orte/mca/rtc/base/rtc_base_frame.c | 2 +- orte/mca/rtc/base/rtc_base_select.c | 2 +- orte/mca/rtc/rtc.h | 8 ++-- orte/mca/schizo/base/base.h | 2 +- orte/mca/schizo/base/schizo_base_frame.c | 2 +- orte/mca/schizo/base/schizo_base_select.c | 2 +- orte/mca/schizo/schizo.h | 8 ++-- orte/mca/snapc/base/snapc_base_fns.c | 2 +- orte/mca/snapc/base/snapc_base_frame.c | 2 +- orte/mca/snapc/base/snapc_base_select.c | 2 +- orte/mca/snapc/full/snapc_full.h | 2 +- orte/mca/snapc/full/snapc_full_app.c | 2 +- orte/mca/snapc/full/snapc_full_global.c | 2 +- orte/mca/snapc/full/snapc_full_local.c | 2 +- orte/mca/snapc/full/snapc_full_module.c | 2 +- orte/mca/snapc/snapc.h | 8 ++-- orte/mca/sstore/base/sstore_base_fns.c | 2 +- orte/mca/sstore/base/sstore_base_frame.c | 2 +- orte/mca/sstore/base/sstore_base_select.c | 2 +- orte/mca/sstore/central/sstore_central.h | 2 +- orte/mca/sstore/central/sstore_central_app.c | 2 +- .../sstore/central/sstore_central_global.c | 2 +- .../mca/sstore/central/sstore_central_local.c | 2 +- .../sstore/central/sstore_central_module.c | 2 +- orte/mca/sstore/sstore.h | 8 ++-- orte/mca/sstore/stage/sstore_stage.h | 2 +- orte/mca/sstore/stage/sstore_stage_app.c | 2 +- orte/mca/sstore/stage/sstore_stage_global.c | 2 +- orte/mca/sstore/stage/sstore_stage_local.c | 2 +- orte/mca/sstore/stage/sstore_stage_module.c | 2 +- orte/mca/state/base/base.h | 2 +- orte/mca/state/base/state_base_frame.c | 2 +- orte/mca/state/base/state_base_select.c | 2 +- orte/mca/state/state.h | 8 ++-- oshmem/Makefile.am | 3 ++ oshmem/mca/Makefile.am | 23 ++++++++++ oshmem/mca/atomic/atomic.h | 8 ++-- .../mca/atomic/base/atomic_base_available.c | 2 +- oshmem/mca/atomic/base/atomic_base_frame.c | 2 +- oshmem/mca/atomic/base/atomic_base_select.c | 2 +- oshmem/mca/atomic/basic/atomic_basic.h | 2 +- oshmem/mca/atomic/mxm/atomic_mxm.h | 2 +- oshmem/mca/mca.h | 39 +++++++++++++++++ oshmem/mca/memheap/base/base.h | 2 +- oshmem/mca/memheap/base/memheap_base_frame.c | 2 +- oshmem/mca/memheap/base/memheap_base_select.c | 2 +- oshmem/mca/memheap/buddy/memheap_buddy.h | 2 +- oshmem/mca/memheap/memheap.h | 10 +++-- .../mca/memheap/ptmalloc/memheap_ptmalloc.h | 2 +- oshmem/mca/scoll/base/scoll_base_available.c | 2 +- oshmem/mca/scoll/base/scoll_base_frame.c | 2 +- oshmem/mca/scoll/base/scoll_base_select.c | 2 +- oshmem/mca/scoll/basic/scoll_basic.h | 2 +- oshmem/mca/scoll/fca/scoll_fca.h | 2 +- oshmem/mca/scoll/mpi/scoll_mpi.h | 2 +- oshmem/mca/scoll/scoll.h | 8 ++-- oshmem/mca/spml/base/base.h | 2 +- oshmem/mca/spml/base/spml_base_frame.c | 2 +- oshmem/mca/spml/spml.h | 8 ++-- oshmem/mca/sshmem/base/sshmem_base_close.c | 2 +- oshmem/mca/sshmem/base/sshmem_base_open.c | 2 +- oshmem/mca/sshmem/base/sshmem_base_select.c | 2 +- oshmem/mca/sshmem/sshmem.h | 10 +++-- 302 files changed, 774 insertions(+), 503 deletions(-) create mode 100644 ompi/mca/Makefile.am create mode 100644 ompi/mca/mca.h create mode 100644 orte/mca/Makefile.am create mode 100644 orte/mca/mca.h create mode 100644 oshmem/mca/Makefile.am create mode 100644 oshmem/mca/mca.h diff --git a/ompi/Makefile.am b/ompi/Makefile.am index 400dc713e1..850aa6c57d 100644 --- a/ompi/Makefile.am +++ b/ompi/Makefile.am @@ -12,7 +12,7 @@ # Copyright (c) 2008-2014 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. # Copyright (c) 2010-2011 Sandia National Laboratories. All rights reserved. -# Copyright (c) 2013 Los Alamos National Security, LLC. All rights +# Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights # reserved. # $COPYRIGHT$ # @@ -189,6 +189,7 @@ include mpi/man/man3/Makefile.extra include mpiext/Makefile.am include patterns/net/Makefile.am include patterns/comm/Makefile.am +include mca/Makefile.am # Ensure that the man page directory exists before we try to make man # page files (because ompi/mpi/man/man3 has no config.status-generated diff --git a/ompi/mca/Makefile.am b/ompi/mca/Makefile.am new file mode 100644 index 0000000000..8d3fca3fb4 --- /dev/null +++ b/ompi/mca/Makefile.am @@ -0,0 +1,23 @@ +# +# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana +# University Research and Technology +# Corporation. All rights reserved. +# Copyright (c) 2004-2005 The University of Tennessee and The University +# of Tennessee Research Foundation. All rights +# reserved. +# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, +# University of Stuttgart. All rights reserved. +# Copyright (c) 2004-2005 The Regents of the University of California. +# All rights reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +# This makefile.am does not stand on its own - it is included from opal/Makefile.am + +# Source code files +headers += \ + mca/mca.h diff --git a/ompi/mca/bcol/base/base.h b/ompi/mca/bcol/base/base.h index 3ad1d95990..b95bea398b 100644 --- a/ompi/mca/bcol/base/base.h +++ b/ompi/mca/bcol/base/base.h @@ -14,7 +14,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/class/opal_list.h" #include "ompi/mca/bcol/bcol.h" diff --git a/ompi/mca/bcol/base/bcol_base_frame.c b/ompi/mca/bcol/base/bcol_base_frame.c index 8ffa08a449..75e42d0bd6 100644 --- a/ompi/mca/bcol/base/bcol_base_frame.c +++ b/ompi/mca/bcol/base/bcol_base_frame.c @@ -22,7 +22,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNIST_H */ -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/util/argv.h" diff --git a/ompi/mca/bcol/base/bcol_base_init.c b/ompi/mca/bcol/base/bcol_base_init.c index 5eaa8ab6d1..f6f0360cd9 100644 --- a/ompi/mca/bcol/base/bcol_base_init.c +++ b/ompi/mca/bcol/base/bcol_base_init.c @@ -13,7 +13,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/bcol/bcol.h" #include "ompi/mca/bcol/base/base.h" diff --git a/ompi/mca/bcol/basesmuma/bcol_basesmuma.h b/ompi/mca/bcol/basesmuma/bcol_basesmuma.h index fdc9588ccc..7b6c69d2c3 100644 --- a/ompi/mca/bcol/basesmuma/bcol_basesmuma.h +++ b/ompi/mca/bcol/basesmuma/bcol_basesmuma.h @@ -26,7 +26,7 @@ #include "ompi/proc/proc.h" #include "ompi/patterns/net/netpatterns.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/util/arch.h" #include "opal/util/argv.h" #include "opal/datatype/opal_datatype.h" diff --git a/ompi/mca/bcol/bcol.h b/ompi/mca/bcol/bcol.h index c787606766..61b1f96591 100644 --- a/ompi/mca/bcol/bcol.h +++ b/ompi/mca/bcol/bcol.h @@ -16,7 +16,7 @@ #include "ompi_config.h" #include "opal/class/opal_list.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/coll/coll.h" #include "opal/mca/mpool/mpool.h" #include "ompi/mca/sbgp/sbgp.h" @@ -186,8 +186,7 @@ typedef int (*mca_bcol_barrier_init_fn_t)(struct mca_bcol_base_module_t *bcol_mo * Macro for use in modules that are of type btl v2.0.0 */ #define MCA_BCOL_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "bcol", 2, 0, 0 + OMPI_MCA_BASE_VERSION_2_1_0("bcol", 2, 0, 0) /* This is really an abstarction violation, but is the easiest way to get diff --git a/ompi/mca/bcol/iboffload/bcol_iboffload.h b/ompi/mca/bcol/iboffload/bcol_iboffload.h index 81a9b148c2..9566c0aff9 100644 --- a/ompi/mca/bcol/iboffload/bcol_iboffload.h +++ b/ompi/mca/bcol/iboffload/bcol_iboffload.h @@ -22,7 +22,7 @@ #include #include -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/op/op.h" #include "ompi/datatype/ompi_datatype.h" diff --git a/ompi/mca/bcol/ptpcoll/bcol_ptpcoll.h b/ompi/mca/bcol/ptpcoll/bcol_ptpcoll.h index 6a6feda889..6a8b2e53d1 100644 --- a/ompi/mca/bcol/ptpcoll/bcol_ptpcoll.h +++ b/ompi/mca/bcol/ptpcoll/bcol_ptpcoll.h @@ -17,7 +17,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/bcol/bcol.h" #include "ompi/mca/bcol/base/base.h" #include "opal/mca/mpool/mpool.h" diff --git a/ompi/mca/bml/base/base.h b/ompi/mca/bml/base/base.h index a712e2368c..b4f7280d52 100644 --- a/ompi/mca/bml/base/base.h +++ b/ompi/mca/bml/base/base.h @@ -22,7 +22,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/mca_base_framework.h" #include "ompi/mca/bml/bml.h" diff --git a/ompi/mca/bml/base/bml_base_btl.h b/ompi/mca/bml/base/bml_base_btl.h index af38acbc1a..b2957620dc 100644 --- a/ompi/mca/bml/base/bml_base_btl.h +++ b/ompi/mca/bml/base/bml_base_btl.h @@ -21,7 +21,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" /* diff --git a/ompi/mca/bml/base/bml_base_init.c b/ompi/mca/bml/base/bml_base_init.c index 3463fc1741..28da48afcd 100644 --- a/ompi/mca/bml/base/bml_base_init.c +++ b/ompi/mca/bml/base/bml_base_init.c @@ -20,7 +20,7 @@ #include "ompi/mca/bml/base/base.h" #include "opal/mca/base/base.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/runtime/opal.h" mca_bml_base_module_t mca_bml = { diff --git a/ompi/mca/bml/bml.h b/ompi/mca/bml/bml.h index 125cd7fb95..59a2fae645 100644 --- a/ompi/mca/bml/bml.h +++ b/ompi/mca/bml/bml.h @@ -11,7 +11,7 @@ * Copyright (c) 2004-2006 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2012-2014 Los Alamos National Security, LLC. All rights + * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ * @@ -30,7 +30,7 @@ #define MCA_BML_H #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/datatype/opal_convertor.h" #include "opal/mca/crs/crs.h" #include "opal/mca/crs/base/base.h" @@ -577,7 +577,6 @@ typedef struct mca_bml_base_module_t mca_bml_base_module_t; * Macro for use in modules that are of type bml */ #define MCA_BML_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "bml", 2, 0, 0 + OMPI_MCA_BASE_VERSION_2_1_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 b2bc2951c3..087d68eab5 100644 --- a/ompi/mca/bml/r2/bml_r2.h +++ b/ompi/mca/bml/r2/bml_r2.h @@ -23,7 +23,7 @@ */ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/btl/btl.h" #ifndef MCA_BML_R2_H diff --git a/ompi/mca/coll/base/coll_base_comm_select.c b/ompi/mca/coll/base/coll_base_comm_select.c index 540b47e6ad..96c37e6c44 100644 --- a/ompi/mca/coll/base/coll_base_comm_select.c +++ b/ompi/mca/coll/base/coll_base_comm_select.c @@ -38,7 +38,7 @@ #include "opal/util/show_help.h" #include "opal/class/opal_list.h" #include "opal/class/opal_object.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" diff --git a/ompi/mca/coll/base/coll_base_comm_unselect.c b/ompi/mca/coll/base/coll_base_comm_unselect.c index 0e12e93f67..c2b9797097 100644 --- a/ompi/mca/coll/base/coll_base_comm_unselect.c +++ b/ompi/mca/coll/base/coll_base_comm_unselect.c @@ -27,7 +27,7 @@ #include #include -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/communicator/communicator.h" diff --git a/ompi/mca/coll/base/coll_base_find_available.c b/ompi/mca/coll/base/coll_base_find_available.c index f445632c24..feba164777 100644 --- a/ompi/mca/coll/base/coll_base_find_available.c +++ b/ompi/mca/coll/base/coll_base_find_available.c @@ -32,7 +32,7 @@ #include "ompi/constants.h" #include "opal/class/opal_list.h" #include "opal/util/output.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" diff --git a/ompi/mca/coll/base/coll_base_frame.c b/ompi/mca/coll/base/coll_base_frame.c index 0136e2533c..a4e1038b10 100644 --- a/ompi/mca/coll/base/coll_base_frame.c +++ b/ompi/mca/coll/base/coll_base_frame.c @@ -26,7 +26,7 @@ #include #include "ompi/constants.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/ompi/mca/coll/base/coll_base_functions.h b/ompi/mca/coll/base/coll_base_functions.h index 0ba883be1b..d42c0627cb 100644 --- a/ompi/mca/coll/base/coll_base_functions.h +++ b/ompi/mca/coll/base/coll_base_functions.h @@ -29,7 +29,7 @@ #include "ompi_config.h" #include "ompi/mca/coll/base/base.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/coll/coll.h" #include "ompi/request/request.h" diff --git a/ompi/mca/coll/base/coll_base_util.h b/ompi/mca/coll/base/coll_base_util.h index dece73eb26..12523d337f 100644 --- a/ompi/mca/coll/base/coll_base_util.h +++ b/ompi/mca/coll/base/coll_base_util.h @@ -24,7 +24,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/datatype/ompi_datatype.h" #include "ompi/request/request.h" #include "ompi/mca/pml/pml.h" diff --git a/ompi/mca/coll/basic/coll_basic.h b/ompi/mca/coll/basic/coll_basic.h index 6549cd42eb..e0254167af 100644 --- a/ompi/mca/coll/basic/coll_basic.h +++ b/ompi/mca/coll/basic/coll_basic.h @@ -27,7 +27,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/coll/coll.h" #include "ompi/request/request.h" #include "ompi/communicator/communicator.h" diff --git a/ompi/mca/coll/coll.h b/ompi/mca/coll/coll.h index d4cf0f6b9e..acb3b5c563 100644 --- a/ompi/mca/coll/coll.h +++ b/ompi/mca/coll/coll.h @@ -13,7 +13,7 @@ * Copyright (c) 2007-2008 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2007-2008 UT-Battelle, LLC * Copyright (c) 2012 Oak Rigde National Laboratory. All rights reserved. - * Copyright (c) 2013 Los Alamos National Security, LLC. All rights + * Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2014 Research Organization for Information Science * and Technology (RIST). All rights reserved. @@ -64,7 +64,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/crs/crs.h" @@ -595,8 +595,7 @@ typedef struct mca_coll_base_comm_coll_t mca_coll_base_comm_coll_t; * Macro for use in components that are of type coll */ #define MCA_COLL_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "coll", 2, 0, 0 + OMPI_MCA_BASE_VERSION_2_1_0("coll", 2, 0, 0) /* ******************************************************************** */ diff --git a/ompi/mca/coll/cuda/coll_cuda.h b/ompi/mca/coll/cuda/coll_cuda.h index 8e2e868afe..9350424525 100644 --- a/ompi/mca/coll/cuda/coll_cuda.h +++ b/ompi/mca/coll/cuda/coll_cuda.h @@ -18,7 +18,7 @@ #include "mpi.h" #include "opal/class/opal_object.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/constants.h" #include "ompi/mca/coll/coll.h" diff --git a/ompi/mca/coll/demo/coll_demo.h b/ompi/mca/coll/demo/coll_demo.h index e4d6005e03..0cb4827abd 100644 --- a/ompi/mca/coll/demo/coll_demo.h +++ b/ompi/mca/coll/demo/coll_demo.h @@ -23,7 +23,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/coll/coll.h" BEGIN_C_DECLS diff --git a/ompi/mca/coll/fca/coll_fca.h b/ompi/mca/coll/fca/coll_fca.h index cd41001199..7785f6970c 100644 --- a/ompi/mca/coll/fca/coll_fca.h +++ b/ompi/mca/coll/fca/coll_fca.h @@ -15,7 +15,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/coll/coll.h" #include "ompi/request/request.h" #include "ompi/mca/pml/pml.h" diff --git a/ompi/mca/coll/hcoll/coll_hcoll.h b/ompi/mca/coll/hcoll/coll_hcoll.h index 440895f22b..047351887e 100644 --- a/ompi/mca/coll/hcoll/coll_hcoll.h +++ b/ompi/mca/coll/hcoll/coll_hcoll.h @@ -13,7 +13,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/memoryhooks/memory.h" #include "ompi/mca/coll/coll.h" #include "ompi/request/request.h" diff --git a/ompi/mca/coll/inter/coll_inter.h b/ompi/mca/coll/inter/coll_inter.h index 9135868655..a8fa29aa85 100644 --- a/ompi/mca/coll/inter/coll_inter.h +++ b/ompi/mca/coll/inter/coll_inter.h @@ -25,7 +25,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/coll/coll.h" #include "ompi/communicator/communicator.h" diff --git a/ompi/mca/coll/ml/coll_ml.h b/ompi/mca/coll/ml/coll_ml.h index 006b7539d0..e6b6f092f8 100644 --- a/ompi/mca/coll/ml/coll_ml.h +++ b/ompi/mca/coll/ml/coll_ml.h @@ -19,7 +19,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/datatype/opal_convertor.h" #include "opal/threads/mutex.h" diff --git a/ompi/mca/coll/ml/coll_ml_custom_utils.c b/ompi/mca/coll/ml/coll_ml_custom_utils.c index 81da6dfa52..c00c4a5439 100644 --- a/ompi/mca/coll/ml/coll_ml_custom_utils.c +++ b/ompi/mca/coll/ml/coll_ml_custom_utils.c @@ -26,7 +26,7 @@ #include "opal/util/output.h" #include "opal/class/opal_list.h" #include "opal/class/opal_object.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/threads/mutex.h" #include "opal/sys/atomic.h" diff --git a/ompi/mca/coll/portals4/coll_portals4.h b/ompi/mca/coll/portals4/coll_portals4.h index efbe83037b..ff81346dd2 100644 --- a/ompi/mca/coll/portals4/coll_portals4.h +++ b/ompi/mca/coll/portals4/coll_portals4.h @@ -18,7 +18,7 @@ #include #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/coll/coll.h" #include "ompi/request/request.h" #include "ompi/communicator/communicator.h" diff --git a/ompi/mca/coll/self/coll_self.h b/ompi/mca/coll/self/coll_self.h index bf48e624d2..0b9386a155 100644 --- a/ompi/mca/coll/self/coll_self.h +++ b/ompi/mca/coll/self/coll_self.h @@ -23,7 +23,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/coll/coll.h" #include "ompi/request/request.h" diff --git a/ompi/mca/coll/sm/coll_sm.h b/ompi/mca/coll/sm/coll_sm.h index 70bc61601a..520875d3ee 100644 --- a/ompi/mca/coll/sm/coll_sm.h +++ b/ompi/mca/coll/sm/coll_sm.h @@ -24,7 +24,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/datatype/opal_convertor.h" #include "opal/mca/common/sm/common_sm.h" #include "ompi/mca/coll/coll.h" diff --git a/ompi/mca/coll/tuned/coll_tuned.h b/ompi/mca/coll/tuned/coll_tuned.h index 3c3a84cfd0..51edda0421 100644 --- a/ompi/mca/coll/tuned/coll_tuned.h +++ b/ompi/mca/coll/tuned/coll_tuned.h @@ -16,7 +16,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/request/request.h" #include "ompi/mca/coll/base/coll_base_functions.h" diff --git a/ompi/mca/coll/tuned/coll_tuned_dynamic_file.c b/ompi/mca/coll/tuned/coll_tuned_dynamic_file.c index 8532b45005..eab5009183 100644 --- a/ompi/mca/coll/tuned/coll_tuned_dynamic_file.c +++ b/ompi/mca/coll/tuned/coll_tuned_dynamic_file.c @@ -23,7 +23,7 @@ #include #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "coll_tuned.h" /* need to include our own topo prototypes so we can malloc data on the comm correctly */ diff --git a/ompi/mca/coll/tuned/coll_tuned_dynamic_rules.c b/ompi/mca/coll/tuned/coll_tuned_dynamic_rules.c index 5323e79fbd..6b85dac850 100644 --- a/ompi/mca/coll/tuned/coll_tuned_dynamic_rules.c +++ b/ompi/mca/coll/tuned/coll_tuned_dynamic_rules.c @@ -20,7 +20,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/constants.h" #include "coll_tuned.h" diff --git a/ompi/mca/crcp/base/crcp_base_fns.c b/ompi/mca/crcp/base/crcp_base_fns.c index 61980f1809..46f963049f 100644 --- a/ompi/mca/crcp/base/crcp_base_fns.c +++ b/ompi/mca/crcp/base/crcp_base_fns.c @@ -29,7 +29,7 @@ #include #include "opal/class/opal_bitmap.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/base.h" #include "opal/mca/crs/crs.h" diff --git a/ompi/mca/crcp/base/crcp_base_frame.c b/ompi/mca/crcp/base/crcp_base_frame.c index 73671f29e7..e8184dda5b 100644 --- a/ompi/mca/crcp/base/crcp_base_frame.c +++ b/ompi/mca/crcp/base/crcp_base_frame.c @@ -16,7 +16,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/ompi/mca/crcp/base/crcp_base_select.c b/ompi/mca/crcp/base/crcp_base_select.c index 3129962304..84d23955df 100644 --- a/ompi/mca/crcp/base/crcp_base_select.c +++ b/ompi/mca/crcp/base/crcp_base_select.c @@ -16,7 +16,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/ompi/mca/crcp/bkmrk/crcp_bkmrk.h b/ompi/mca/crcp/bkmrk/crcp_bkmrk.h index fd24331214..6c78c44d2c 100644 --- a/ompi/mca/crcp/bkmrk/crcp_bkmrk.h +++ b/ompi/mca/crcp/bkmrk/crcp_bkmrk.h @@ -26,7 +26,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/crcp/crcp.h" #include MCA_timer_IMPLEMENTATION_HEADER diff --git a/ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.c b/ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.c index e5ee76e97d..2728ce84b3 100644 --- a/ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.c +++ b/ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.c @@ -24,7 +24,7 @@ #include "opal/class/opal_bitmap.h" #include "opal/mca/event/event.h" #include "opal/util/opal_environ.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/btl/btl.h" #include "opal/mca/btl/base/base.h" diff --git a/ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.h b/ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.h index cc126cc7c8..792df28f33 100644 --- a/ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.h +++ b/ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.h @@ -26,7 +26,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/crcp/crcp.h" #include "ompi/mca/crcp/bkmrk/crcp_bkmrk.h" diff --git a/ompi/mca/crcp/bkmrk/crcp_bkmrk_module.c b/ompi/mca/crcp/bkmrk/crcp_bkmrk_module.c index 9d840626a9..bffcc618c8 100644 --- a/ompi/mca/crcp/bkmrk/crcp_bkmrk_module.c +++ b/ompi/mca/crcp/bkmrk/crcp_bkmrk_module.c @@ -21,7 +21,7 @@ #include #endif /* HAVE_UNIST_H */ -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/util/output.h" diff --git a/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c b/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c index 493d7c3fbe..fb2430c087 100644 --- a/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c +++ b/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c @@ -31,7 +31,7 @@ #include "opal/util/output.h" #include "opal/util/opal_environ.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/pmix/pmix.h" diff --git a/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.h b/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.h index 825a6beb04..4d3304416b 100644 --- a/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.h +++ b/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.h @@ -27,7 +27,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/crcp/crcp.h" #include "ompi/communicator/communicator.h" diff --git a/ompi/mca/crcp/crcp.h b/ompi/mca/crcp/crcp.h index 21fba5f180..4e31c664d4 100644 --- a/ompi/mca/crcp/crcp.h +++ b/ompi/mca/crcp/crcp.h @@ -31,7 +31,7 @@ #include "ompi_config.h" #include "opal/class/opal_object.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/crs/crs.h" #include "opal/mca/crs/base/base.h" @@ -364,8 +364,7 @@ OMPI_DECLSPEC extern ompi_crcp_base_module_t ompi_crcp; * Macro for use in components that are of type CRCP */ #define OMPI_CRCP_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "crcp", 2, 0, 0 + OMPI_MCA_BASE_VERSION_2_1_0("crcp", 2, 0, 0) /** * Macro to call the CRCP Request Complete function diff --git a/ompi/mca/dpm/base/dpm_base_frame.c b/ompi/mca/dpm/base/dpm_base_frame.c index 18725efc54..cc5fefa3d9 100644 --- a/ompi/mca/dpm/base/dpm_base_frame.c +++ b/ompi/mca/dpm/base/dpm_base_frame.c @@ -20,7 +20,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/ompi/mca/dpm/base/dpm_base_select.c b/ompi/mca/dpm/base/dpm_base_select.c index 285e452931..e65ad9dd55 100644 --- a/ompi/mca/dpm/base/dpm_base_select.c +++ b/ompi/mca/dpm/base/dpm_base_select.c @@ -18,7 +18,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" diff --git a/ompi/mca/dpm/dpm.h b/ompi/mca/dpm/dpm.h index e68ae40604..1acd7024fb 100644 --- a/ompi/mca/dpm/dpm.h +++ b/ompi/mca/dpm/dpm.h @@ -11,7 +11,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2013 Intel, Inc. All rights reserved - * Copyright (c) 2013 Los Alamos National Security, LLC. All rights + * Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ * @@ -38,7 +38,7 @@ #include #endif -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/info/info.h" @@ -227,8 +227,7 @@ typedef struct ompi_dpm_base_component_2_0_0_t ompi_dpm_base_component_t; * Macro for use in components that are of type DPM */ #define OMPI_DPM_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "dpm", 2, 0, 0 + OMPI_MCA_BASE_VERSION_2_1_0("dpm", 2, 0, 0) END_C_DECLS diff --git a/ompi/mca/fbtl/base/fbtl_base_file_select.c b/ompi/mca/fbtl/base/fbtl_base_file_select.c index 5ee56e4880..d7ea46eb7e 100644 --- a/ompi/mca/fbtl/base/fbtl_base_file_select.c +++ b/ompi/mca/fbtl/base/fbtl_base_file_select.c @@ -23,7 +23,7 @@ #include "opal/class/opal_list.h" #include "opal/util/argv.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/fbtl/fbtl.h" #include "ompi/mca/fbtl/base/base.h" diff --git a/ompi/mca/fbtl/base/fbtl_base_file_unselect.c b/ompi/mca/fbtl/base/fbtl_base_file_unselect.c index aaa6751be8..cb47e69e9d 100644 --- a/ompi/mca/fbtl/base/fbtl_base_file_unselect.c +++ b/ompi/mca/fbtl/base/fbtl_base_file_unselect.c @@ -26,7 +26,7 @@ #include "mpi.h" #include "ompi/mca/io/ompio/io_ompio.h" #include "opal/util/show_help.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/fbtl/fbtl.h" #include "ompi/mca/fbtl/base/base.h" diff --git a/ompi/mca/fbtl/base/fbtl_base_find_available.c b/ompi/mca/fbtl/base/fbtl_base_find_available.c index e74712dd72..79fef6e22d 100644 --- a/ompi/mca/fbtl/base/fbtl_base_find_available.c +++ b/ompi/mca/fbtl/base/fbtl_base_find_available.c @@ -25,7 +25,7 @@ #include "mpi.h" #include "ompi/constants.h" #include "opal/class/opal_list.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/fbtl/fbtl.h" #include "ompi/mca/fbtl/base/base.h" diff --git a/ompi/mca/fbtl/base/fbtl_base_frame.c b/ompi/mca/fbtl/base/fbtl_base_frame.c index 94ff8e6eb4..a649aa86a3 100644 --- a/ompi/mca/fbtl/base/fbtl_base_frame.c +++ b/ompi/mca/fbtl/base/fbtl_base_frame.c @@ -24,7 +24,7 @@ #include "ompi_config.h" #include -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/fbtl/fbtl.h" diff --git a/ompi/mca/fbtl/fbtl.h b/ompi/mca/fbtl/fbtl.h index 8205010488..14ac44612b 100644 --- a/ompi/mca/fbtl/fbtl.h +++ b/ompi/mca/fbtl/fbtl.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2014 University of Houston. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -22,7 +25,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/request/request.h" #ifdef HAVE_SYS_UIO_H @@ -38,8 +41,7 @@ struct mca_ompio_request_t; * Macro for use in components that are of type coll */ #define MCA_FBTL_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "fbtl", 2, 0, 0 + OMPI_MCA_BASE_VERSION_2_1_0("fbtl", 2, 0, 0) /* * The file byte transfer layer (fbtl) framework provides the abstraction diff --git a/ompi/mca/fbtl/plfs/fbtl_plfs.h b/ompi/mca/fbtl/plfs/fbtl_plfs.h index a5948ae8eb..b486a6753a 100644 --- a/ompi/mca/fbtl/plfs/fbtl_plfs.h +++ b/ompi/mca/fbtl/plfs/fbtl_plfs.h @@ -21,7 +21,7 @@ #define MCA_FBTL_PLFS_H #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/fbtl/fbtl.h" #include "ompi/mca/io/ompio/io_ompio.h" #include diff --git a/ompi/mca/fbtl/posix/fbtl_posix.h b/ompi/mca/fbtl/posix/fbtl_posix.h index 22d4de2e70..cb8b16a317 100644 --- a/ompi/mca/fbtl/posix/fbtl_posix.h +++ b/ompi/mca/fbtl/posix/fbtl_posix.h @@ -21,7 +21,7 @@ #define MCA_FBTL_POSIX_H #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/fbtl/fbtl.h" #include "ompi/mca/io/ompio/io_ompio.h" #include "ompi/mca/io/ompio/io_ompio_request.h" diff --git a/ompi/mca/fbtl/pvfs2/fbtl_pvfs2.h b/ompi/mca/fbtl/pvfs2/fbtl_pvfs2.h index 34628636e5..5bf2ac5ab5 100644 --- a/ompi/mca/fbtl/pvfs2/fbtl_pvfs2.h +++ b/ompi/mca/fbtl/pvfs2/fbtl_pvfs2.h @@ -21,7 +21,7 @@ #define MCA_FBTL_PVFS2_H #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/fbtl/fbtl.h" #include "ompi/mca/io/ompio/io_ompio.h" #include "ompi/mca/fs/pvfs2/fs_pvfs2.h" diff --git a/ompi/mca/fcoll/base/fcoll_base_file_select.c b/ompi/mca/fcoll/base/fcoll_base_file_select.c index 9d69ead48d..433098af36 100644 --- a/ompi/mca/fcoll/base/fcoll_base_file_select.c +++ b/ompi/mca/fcoll/base/fcoll_base_file_select.c @@ -23,7 +23,7 @@ #include "opal/class/opal_list.h" #include "opal/util/argv.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/fcoll/fcoll.h" #include "ompi/mca/fcoll/base/base.h" diff --git a/ompi/mca/fcoll/base/fcoll_base_file_unselect.c b/ompi/mca/fcoll/base/fcoll_base_file_unselect.c index c59728cce0..f461f770c4 100644 --- a/ompi/mca/fcoll/base/fcoll_base_file_unselect.c +++ b/ompi/mca/fcoll/base/fcoll_base_file_unselect.c @@ -26,7 +26,7 @@ #include "mpi.h" #include "ompi/mca/io/ompio/io_ompio.h" #include "opal/util/show_help.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/fcoll/fcoll.h" #include "ompi/mca/fcoll/base/base.h" diff --git a/ompi/mca/fcoll/base/fcoll_base_frame.c b/ompi/mca/fcoll/base/fcoll_base_frame.c index 940c5e8e80..77bba485db 100644 --- a/ompi/mca/fcoll/base/fcoll_base_frame.c +++ b/ompi/mca/fcoll/base/fcoll_base_frame.c @@ -24,7 +24,7 @@ #include "ompi_config.h" #include -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/fcoll/fcoll.h" diff --git a/ompi/mca/fcoll/dynamic/fcoll_dynamic.h b/ompi/mca/fcoll/dynamic/fcoll_dynamic.h index 62c1097cac..99b8a2a4d0 100644 --- a/ompi/mca/fcoll/dynamic/fcoll_dynamic.h +++ b/ompi/mca/fcoll/dynamic/fcoll_dynamic.h @@ -23,7 +23,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/fcoll/fcoll.h" #include "ompi/mca/fcoll/base/base.h" #include "ompi/mca/io/ompio/io_ompio.h" diff --git a/ompi/mca/fcoll/fcoll.h b/ompi/mca/fcoll/fcoll.h index 480008c134..d04174fa03 100644 --- a/ompi/mca/fcoll/fcoll.h +++ b/ompi/mca/fcoll/fcoll.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2011 University of Houston. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -22,7 +25,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" BEGIN_C_DECLS @@ -33,8 +36,7 @@ struct mca_io_ompio_file_t; * Macro for use in components that are of type coll */ #define MCA_FCOLL_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "fcoll", 2, 0, 0 + OMPI_MCA_BASE_VERSION_2_1_0("fcoll", 2, 0, 0) /* * This framework provides the abstraction for the collective file diff --git a/ompi/mca/fcoll/individual/fcoll_individual.h b/ompi/mca/fcoll/individual/fcoll_individual.h index 0cc40391e7..c9c9e6d2d7 100644 --- a/ompi/mca/fcoll/individual/fcoll_individual.h +++ b/ompi/mca/fcoll/individual/fcoll_individual.h @@ -23,7 +23,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/fcoll/fcoll.h" #include "ompi/mca/fcoll/base/base.h" #include "ompi/mca/io/ompio/io_ompio.h" diff --git a/ompi/mca/fcoll/static/fcoll_static.h b/ompi/mca/fcoll/static/fcoll_static.h index b3590a0579..3d461f0f70 100644 --- a/ompi/mca/fcoll/static/fcoll_static.h +++ b/ompi/mca/fcoll/static/fcoll_static.h @@ -23,7 +23,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/fcoll/fcoll.h" #include "ompi/mca/fcoll/base/base.h" #include "ompi/mca/io/ompio/io_ompio.h" diff --git a/ompi/mca/fcoll/two_phase/fcoll_two_phase.h b/ompi/mca/fcoll/two_phase/fcoll_two_phase.h index 1c06453d30..8619903e0e 100644 --- a/ompi/mca/fcoll/two_phase/fcoll_two_phase.h +++ b/ompi/mca/fcoll/two_phase/fcoll_two_phase.h @@ -23,7 +23,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/fcoll/fcoll.h" #include "ompi/mca/fcoll/base/base.h" #include "ompi/mca/io/ompio/io_ompio.h" diff --git a/ompi/mca/fs/base/fs_base_file_select.c b/ompi/mca/fs/base/fs_base_file_select.c index 647dbadc67..41ea29275a 100644 --- a/ompi/mca/fs/base/fs_base_file_select.c +++ b/ompi/mca/fs/base/fs_base_file_select.c @@ -23,7 +23,7 @@ #include "opal/class/opal_list.h" #include "opal/util/argv.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/fs/fs.h" #include "ompi/mca/fs/base/base.h" diff --git a/ompi/mca/fs/base/fs_base_file_unselect.c b/ompi/mca/fs/base/fs_base_file_unselect.c index 7197a4e0cd..73859b698c 100644 --- a/ompi/mca/fs/base/fs_base_file_unselect.c +++ b/ompi/mca/fs/base/fs_base_file_unselect.c @@ -26,7 +26,7 @@ #include "mpi.h" #include "ompi/mca/io/ompio/io_ompio.h" #include "opal/util/show_help.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/fs/fs.h" #include "ompi/mca/fs/base/base.h" diff --git a/ompi/mca/fs/base/fs_base_find_available.c b/ompi/mca/fs/base/fs_base_find_available.c index cdf9beecfc..9fe2fc6182 100644 --- a/ompi/mca/fs/base/fs_base_find_available.c +++ b/ompi/mca/fs/base/fs_base_find_available.c @@ -24,7 +24,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/fs/fs.h" #include "ompi/mca/fs/base/base.h" diff --git a/ompi/mca/fs/base/fs_base_get_parent_dir.c b/ompi/mca/fs/base/fs_base_get_parent_dir.c index 3970ea95d4..5e62245893 100644 --- a/ompi/mca/fs/base/fs_base_get_parent_dir.c +++ b/ompi/mca/fs/base/fs_base_get_parent_dir.c @@ -23,7 +23,7 @@ #include "ompi_config.h" #include -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/fs/fs.h" diff --git a/ompi/mca/fs/fs.h b/ompi/mca/fs/fs.h index 383f0795c3..a8cd47a98d 100644 --- a/ompi/mca/fs/fs.h +++ b/ompi/mca/fs/fs.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2015 University of Houston. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -22,7 +25,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" BEGIN_C_DECLS @@ -33,8 +36,7 @@ struct mca_io_ompio_file_t; * Macro for use in components that are of type coll */ #define MCA_FS_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "fs", 2, 0, 0 + OMPI_MCA_BASE_VERSION_2_1_0("fs", 2, 0, 0) /* * This framework provides the abstraction for file management operations diff --git a/ompi/mca/fs/lustre/fs_lustre.h b/ompi/mca/fs/lustre/fs_lustre.h index 8e3e10720e..18fb8a3325 100644 --- a/ompi/mca/fs/lustre/fs_lustre.h +++ b/ompi/mca/fs/lustre/fs_lustre.h @@ -21,7 +21,7 @@ #define MCA_FS_LUSTRE_H #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/fs/fs.h" #include "ompi/mca/io/ompio/io_ompio.h" diff --git a/ompi/mca/fs/plfs/fs_plfs.h b/ompi/mca/fs/plfs/fs_plfs.h index 5fed037493..323a4b4216 100644 --- a/ompi/mca/fs/plfs/fs_plfs.h +++ b/ompi/mca/fs/plfs/fs_plfs.h @@ -21,7 +21,7 @@ #define MCA_FS_PLFS_H #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/fs/fs.h" #include "ompi/mca/io/ompio/io_ompio.h" diff --git a/ompi/mca/fs/pvfs2/fs_pvfs2.h b/ompi/mca/fs/pvfs2/fs_pvfs2.h index c9503c30ce..89109159ab 100644 --- a/ompi/mca/fs/pvfs2/fs_pvfs2.h +++ b/ompi/mca/fs/pvfs2/fs_pvfs2.h @@ -32,7 +32,7 @@ #include "pvfs2-compat.h" #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/fs/fs.h" #include "ompi/mca/io/ompio/io_ompio.h" diff --git a/ompi/mca/fs/ufs/fs_ufs.h b/ompi/mca/fs/ufs/fs_ufs.h index 933a1421c1..c884d625b2 100644 --- a/ompi/mca/fs/ufs/fs_ufs.h +++ b/ompi/mca/fs/ufs/fs_ufs.h @@ -21,7 +21,7 @@ #define MCA_FS_UFS_H #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/fs/fs.h" #include "ompi/mca/io/ompio/io_ompio.h" diff --git a/ompi/mca/io/base/io_base_delete.c b/ompi/mca/io/base/io_base_delete.c index cf9e3e46ac..d1609237d4 100644 --- a/ompi/mca/io/base/io_base_delete.c +++ b/ompi/mca/io/base/io_base_delete.c @@ -27,7 +27,7 @@ #include "opal/class/opal_list.h" #include "opal/util/argv.h" #include "opal/util/output.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/io/io.h" #include "ompi/mca/io/base/base.h" diff --git a/ompi/mca/io/base/io_base_file_select.c b/ompi/mca/io/base/io_base_file_select.c index 468002a1e3..01c869d363 100644 --- a/ompi/mca/io/base/io_base_file_select.c +++ b/ompi/mca/io/base/io_base_file_select.c @@ -30,7 +30,7 @@ #include "opal/util/output.h" #include "opal/class/opal_list.h" #include "opal/class/opal_object.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/io/io.h" #include "ompi/mca/io/base/base.h" diff --git a/ompi/mca/io/base/io_base_find_available.c b/ompi/mca/io/base/io_base_find_available.c index 930a4daef9..297277502c 100644 --- a/ompi/mca/io/base/io_base_find_available.c +++ b/ompi/mca/io/base/io_base_find_available.c @@ -25,7 +25,7 @@ #include "mpi.h" #include "ompi/constants.h" #include "opal/util/output.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/io/io.h" #include "ompi/mca/io/base/base.h" diff --git a/ompi/mca/io/io.h b/ompi/mca/io/io.h index c7d0fdf74e..554ca2ff0c 100644 --- a/ompi/mca/io/io.h +++ b/ompi/mca/io/io.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * 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) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -21,7 +24,7 @@ #define MCA_IO_H #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/request/request.h" /* @@ -66,8 +69,7 @@ typedef enum mca_io_base_version_t mca_io_base_version_t; * 1-1 mapping of all MPI-IO functions */ #define MCA_IO_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "io", 2, 0, 0 + OMPI_MCA_BASE_VERSION_2_1_0("io", 2, 0, 0) /* * Component diff --git a/ompi/mca/mca.h b/ompi/mca/mca.h new file mode 100644 index 0000000000..d297c453ea --- /dev/null +++ b/ompi/mca/mca.h @@ -0,0 +1,39 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ +/* + * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana + * University Research and Technology + * Corporation. All rights reserved. + * Copyright (c) 2004-2005 The University of Tennessee and The University + * of Tennessee Research Foundation. All rights + * reserved. + * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, + * University of Stuttgart. All rights reserved. + * Copyright (c) 2004-2005 The Regents of the University of California. + * All rights reserved. + * Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ +/** + * @file + * + * Top-level interface for \em all orte MCA components. + */ + +#ifndef OMPI_MCA_H +#define OMPI_MCA_H + +#include "ompi_config.h" +#include "opal/mca/mca.h" + +#define OMPI_MCA_BASE_VERSION_2_1_0(type, type_major, type_minor, type_release) \ + MCA_BASE_VERSION_2_1_0("ompi", OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, \ + OMPI_RELEASE_VERSION, type, type_major, type_minor, \ + type_release) + +#endif /* OMPI_MCA_H */ diff --git a/ompi/mca/mtl/base/base.h b/ompi/mca/mtl/base/base.h index 56c39e0b3b..4f55371110 100644 --- a/ompi/mca/mtl/base/base.h +++ b/ompi/mca/mtl/base/base.h @@ -21,7 +21,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/mtl/mtl.h" diff --git a/ompi/mca/mtl/base/mtl_base_datatype.h b/ompi/mca/mtl/base/mtl_base_datatype.h index 7fd73ccab5..3ac07ec8b8 100644 --- a/ompi/mca/mtl/base/mtl_base_datatype.h +++ b/ompi/mca/mtl/base/mtl_base_datatype.h @@ -18,7 +18,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/mtl/mtl.h" #include "ompi/mca/mtl/base/base.h" #include "ompi/constants.h" diff --git a/ompi/mca/mtl/base/mtl_base_frame.c b/ompi/mca/mtl/base/mtl_base_frame.c index d0d0427ac8..d49a8e5c50 100644 --- a/ompi/mca/mtl/base/mtl_base_frame.c +++ b/ompi/mca/mtl/base/mtl_base_frame.c @@ -20,7 +20,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/ompi/mca/mtl/mtl.h b/ompi/mca/mtl/mtl.h index ec73196dd1..48272c925c 100644 --- a/ompi/mca/mtl/mtl.h +++ b/ompi/mca/mtl/mtl.h @@ -1,7 +1,10 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2006 The Regents of the University of California. * All rights reserved. * Copyright (c) 2012 Sandia National Laboratories. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -35,7 +38,7 @@ #include "ompi_config.h" #include "mpi.h" /* needed for MPI_ANY_TAG */ -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/pml/pml.h" /* for send_mode enum */ #include "ompi/request/request.h" @@ -420,8 +423,7 @@ typedef struct mca_mtl_base_module_t mca_mtl_base_module_t; * Macro for use in modules that are of type mtl */ #define MCA_MTL_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "mtl", 2, 0, 0 + OMPI_MCA_BASE_VERSION_2_1_0("mtl", 2, 0, 0) /* * macro for doing direct call / call through struct diff --git a/ompi/mca/op/base/op_base_find_available.c b/ompi/mca/op/base/op_base_find_available.c index bc53b5bad2..50ef4e2b50 100644 --- a/ompi/mca/op/base/op_base_find_available.c +++ b/ompi/mca/op/base/op_base_find_available.c @@ -27,7 +27,7 @@ #include "opal/class/opal_list.h" #include "opal/util/output.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" diff --git a/ompi/mca/op/base/op_base_frame.c b/ompi/mca/op/base/op_base_frame.c index 8fc208a002..35b53f5682 100644 --- a/ompi/mca/op/base/op_base_frame.c +++ b/ompi/mca/op/base/op_base_frame.c @@ -25,7 +25,7 @@ #endif #include "opal/util/output.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/constants.h" diff --git a/ompi/mca/op/base/op_base_op_select.c b/ompi/mca/op/base/op_base_op_select.c index aa621a8978..5586882fb7 100644 --- a/ompi/mca/op/base/op_base_op_select.c +++ b/ompi/mca/op/base/op_base_op_select.c @@ -33,7 +33,7 @@ #include "opal/util/output.h" #include "opal/class/opal_list.h" #include "opal/class/opal_object.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" diff --git a/ompi/mca/op/example/op_example.h b/ompi/mca/op/example/op_example.h index 0e40f9431b..c70d0b50a5 100644 --- a/ompi/mca/op/example/op_example.h +++ b/ompi/mca/op/example/op_example.h @@ -22,7 +22,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/class/opal_object.h" #include "ompi/mca/op/op.h" diff --git a/ompi/mca/op/op.h b/ompi/mca/op/op.h index 078b42838b..e27950fb45 100644 --- a/ompi/mca/op/op.h +++ b/ompi/mca/op/op.h @@ -14,7 +14,7 @@ * reserved. * Copyright (c) 2007-2008 UT-Battelle, LLC * Copyright (c) 2007-2009 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2013 Los Alamos National Security, LLC. All rights + * Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ * @@ -84,7 +84,7 @@ #include "ompi_config.h" #include "opal/class/opal_object.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" /* * This file includes some basic struct declarations (but not @@ -410,8 +410,7 @@ typedef ompi_op_base_op_3buff_fns_1_0_0_t ompi_op_base_op_3buff_fns_t; * Macro for use in modules that are of type op v2.0.0 */ #define OMPI_OP_BASE_VERSION_1_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "op", 1, 0, 0 + OMPI_MCA_BASE_VERSION_2_1_0("op", 1, 0, 0) END_C_DECLS diff --git a/ompi/mca/op/x86/op_x86.h b/ompi/mca/op/x86/op_x86.h index b78d7a0434..7a8a51ccc8 100644 --- a/ompi/mca/op/x86/op_x86.h +++ b/ompi/mca/op/x86/op_x86.h @@ -22,7 +22,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/class/opal_object.h" #include "ompi/mca/op/op.h" diff --git a/ompi/mca/osc/base/osc_base_frame.c b/ompi/mca/osc/base/osc_base_frame.c index b0464bb423..fe4751f620 100644 --- a/ompi/mca/osc/base/osc_base_frame.c +++ b/ompi/mca/osc/base/osc_base_frame.c @@ -19,7 +19,7 @@ #include "ompi_config.h" #include "ompi/constants.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/ompi/mca/osc/base/osc_base_init.c b/ompi/mca/osc/base/osc_base_init.c index 7c4358a5c9..57d4208134 100644 --- a/ompi/mca/osc/base/osc_base_init.c +++ b/ompi/mca/osc/base/osc_base_init.c @@ -20,7 +20,7 @@ #include "ompi_config.h" #include "ompi/constants.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/osc/osc.h" #include "ompi/mca/osc/base/base.h" diff --git a/ompi/mca/osc/osc.h b/ompi/mca/osc/osc.h index dd116bf391..e852f68e0d 100644 --- a/ompi/mca/osc/osc.h +++ b/ompi/mca/osc/osc.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University. * All rights reserved. @@ -7,7 +8,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2007 Los Alamos National Security, LLC. All rights + * Copyright (c) 2007-2015 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ @@ -35,7 +36,7 @@ #include #endif -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" BEGIN_C_DECLS @@ -418,8 +419,7 @@ typedef ompi_osc_base_module_3_0_0_t ompi_osc_base_module_t; /** Macro for use in components that are of type osc */ #define OMPI_OSC_BASE_VERSION_3_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "osc", 3, 0, 0 + OMPI_MCA_BASE_VERSION_2_1_0("osc", 3, 0, 0) /* ******************************************************************** */ diff --git a/ompi/mca/pml/base/base.h b/ompi/mca/pml/base/base.h index ea7fd06017..0ccd585922 100644 --- a/ompi/mca/pml/base/base.h +++ b/ompi/mca/pml/base/base.h @@ -23,7 +23,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/mca_base_framework.h" #include "opal/class/opal_list.h" #include "opal/class/opal_pointer_array.h" diff --git a/ompi/mca/pml/base/pml_base_frame.c b/ompi/mca/pml/base/pml_base_frame.c index f7a05b0f9e..ce3fb48e5a 100644 --- a/ompi/mca/pml/base/pml_base_frame.c +++ b/ompi/mca/pml/base/pml_base_frame.c @@ -30,7 +30,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNIST_H */ -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/ompi/mca/pml/base/pml_base_select.c b/ompi/mca/pml/base/pml_base_select.c index c587e3d281..62717bf474 100644 --- a/ompi/mca/pml/base/pml_base_select.c +++ b/ompi/mca/pml/base/pml_base_select.c @@ -31,7 +31,7 @@ #include "opal/util/output.h" #include "opal/util/show_help.h" #include "opal/runtime/opal_progress.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/runtime/opal.h" #include "opal/mca/pmix/pmix.h" @@ -301,13 +301,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_2_0_0, - "pml", - MCA_BASE_VERSION_2_0_0, - "base", - MCA_BASE_VERSION_2_0_0, - NULL, - NULL + OMPI_MCA_BASE_VERSION_2_1_0("pml", 2, 0, 0), + .mca_component_name = "base", + .mca_component_major_version = 2, + .mca_component_minor_version = 0, + .mca_component_release_version = 0, }; diff --git a/ompi/mca/pml/pml.h b/ompi/mca/pml/pml.h index ea4f2ccf12..ca59fa4573 100644 --- a/ompi/mca/pml/pml.h +++ b/ompi/mca/pml/pml.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2006 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2006-2007 Los Alamos National Security, LLC. All rights + * Copyright (c) 2006-2015 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2011 Sandia National Laboratories. All rights reserved. * $COPYRIGHT$ @@ -63,7 +64,7 @@ #define MCA_PML_H #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "mpi.h" /* needed for MPI_ANY_TAG */ BEGIN_C_DECLS @@ -537,8 +538,7 @@ typedef mca_pml_base_module_1_0_0_t mca_pml_base_module_t; * Macro for use in components that are of type pml */ #define MCA_PML_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "pml", 2, 0, 0 + OMPI_MCA_BASE_VERSION_2_1_0("pml", 2, 0, 0) /* * macro for doing direct call / call through struct diff --git a/ompi/mca/pubsub/base/pubsub_base_frame.c b/ompi/mca/pubsub/base/pubsub_base_frame.c index 2865e54166..5270666ee4 100644 --- a/ompi/mca/pubsub/base/pubsub_base_frame.c +++ b/ompi/mca/pubsub/base/pubsub_base_frame.c @@ -18,7 +18,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/ompi/mca/pubsub/base/pubsub_base_select.c b/ompi/mca/pubsub/base/pubsub_base_select.c index f941faea50..e6d01f35ea 100644 --- a/ompi/mca/pubsub/base/pubsub_base_select.c +++ b/ompi/mca/pubsub/base/pubsub_base_select.c @@ -18,7 +18,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" diff --git a/ompi/mca/pubsub/pubsub.h b/ompi/mca/pubsub/pubsub.h index 73206d70d1..72972ddf13 100644 --- a/ompi/mca/pubsub/pubsub.h +++ b/ompi/mca/pubsub/pubsub.h @@ -10,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2013 Los Alamos National Security, LLC. All rights + * Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ * @@ -30,7 +30,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" @@ -100,8 +100,7 @@ typedef struct ompi_pubsub_base_component_2_0_0_t ompi_pubsub_base_component_t; * Macro for use in components that are of type PUBSUB */ #define OMPI_PUBSUB_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "pubsub", 2, 0, 0 + OMPI_MCA_BASE_VERSION_2_1_0("pubsub", 2, 0, 0) END_C_DECLS diff --git a/ompi/mca/rte/base/rte_base_frame.c b/ompi/mca/rte/base/rte_base_frame.c index bb62fad294..bd6d436d6c 100644 --- a/ompi/mca/rte/base/rte_base_frame.c +++ b/ompi/mca/rte/base/rte_base_frame.c @@ -15,7 +15,7 @@ #include "opal_stdint.h" #include "opal/util/output.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/rte/rte.h" diff --git a/ompi/mca/rte/rte.h b/ompi/mca/rte/rte.h index 808481f1eb..60e2e259eb 100644 --- a/ompi/mca/rte/rte.h +++ b/ompi/mca/rte/rte.h @@ -1,5 +1,6 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2012 Los Alamos National Security, LLC. All rights reserved. + * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights reserved. * Copyright (c) 2013 Mellanox Technologies, Inc. * All rights reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved. @@ -161,7 +162,7 @@ #include "ompi_config.h" #include "opal/dss/dss_types.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" BEGIN_C_DECLS @@ -186,8 +187,7 @@ typedef struct ompi_rte_base_component_1_0_0_t ompi_rte_component_t; * Macro for use in components that are of type rte */ #define OMPI_RTE_BASE_VERSION_1_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "rte", 2, 0, 0 + OMPI_MCA_BASE_VERSION_2_1_0("rte", 2, 0, 0) END_C_DECLS diff --git a/ompi/mca/sbgp/base/base.h b/ompi/mca/sbgp/base/base.h index 4b251aac60..8b80312786 100644 --- a/ompi/mca/sbgp/base/base.h +++ b/ompi/mca/sbgp/base/base.h @@ -14,7 +14,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/mca_base_framework.h" /* * Global functions for SBGP diff --git a/ompi/mca/sbgp/base/sbgp_base_close.c b/ompi/mca/sbgp/base/sbgp_base_close.c index 43ef903011..cc7dd26c4e 100644 --- a/ompi/mca/sbgp/base/sbgp_base_close.c +++ b/ompi/mca/sbgp/base/sbgp_base_close.c @@ -14,7 +14,7 @@ #include #include "ompi/constants.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/sbgp/sbgp.h" #include "ompi/mca/sbgp/base/base.h" diff --git a/ompi/mca/sbgp/base/sbgp_base_frame.c b/ompi/mca/sbgp/base/sbgp_base_frame.c index d43c3cc4f9..0dec163eba 100644 --- a/ompi/mca/sbgp/base/sbgp_base_frame.c +++ b/ompi/mca/sbgp/base/sbgp_base_frame.c @@ -16,7 +16,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNIST_H */ -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/sbgp/sbgp.h" diff --git a/ompi/mca/sbgp/base/sbgp_base_init.c b/ompi/mca/sbgp/base/sbgp_base_init.c index 477dc2a436..d1f66da9b5 100644 --- a/ompi/mca/sbgp/base/sbgp_base_init.c +++ b/ompi/mca/sbgp/base/sbgp_base_init.c @@ -10,7 +10,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/sbgp/sbgp.h" #include "ompi/mca/sbgp/base/base.h" diff --git a/ompi/mca/sbgp/basesmsocket/sbgp_basesmsocket.h b/ompi/mca/sbgp/basesmsocket/sbgp_basesmsocket.h index 6de4caed7e..739f913335 100644 --- a/ompi/mca/sbgp/basesmsocket/sbgp_basesmsocket.h +++ b/ompi/mca/sbgp/basesmsocket/sbgp_basesmsocket.h @@ -17,7 +17,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/sbgp/sbgp.h" #include "ompi/mca/sbgp/base/base.h" #include "opal/mca/mpool/mpool.h" diff --git a/ompi/mca/sbgp/basesmuma/sbgp_basesmuma.h b/ompi/mca/sbgp/basesmuma/sbgp_basesmuma.h index 24e2366da0..efe501e046 100644 --- a/ompi/mca/sbgp/basesmuma/sbgp_basesmuma.h +++ b/ompi/mca/sbgp/basesmuma/sbgp_basesmuma.h @@ -15,7 +15,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/sbgp/sbgp.h" #include "opal/mca/mpool/mpool.h" #include "ompi/request/request.h" diff --git a/ompi/mca/sbgp/ibnet/sbgp_ibnet.h b/ompi/mca/sbgp/ibnet/sbgp_ibnet.h index 650a6da2b9..f29ffc33db 100644 --- a/ompi/mca/sbgp/ibnet/sbgp_ibnet.h +++ b/ompi/mca/sbgp/ibnet/sbgp_ibnet.h @@ -16,7 +16,7 @@ #include "mpi.h" #include "infiniband/verbs.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/sbgp/sbgp.h" #include "opal/mca/mpool/mpool.h" #include "ompi/request/request.h" diff --git a/ompi/mca/sbgp/p2p/sbgp_p2p.h b/ompi/mca/sbgp/p2p/sbgp_p2p.h index 7a76bb2f29..f8fa5fc194 100644 --- a/ompi/mca/sbgp/p2p/sbgp_p2p.h +++ b/ompi/mca/sbgp/p2p/sbgp_p2p.h @@ -15,7 +15,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/sbgp/sbgp.h" #include "opal/mca/mpool/mpool.h" #include "ompi/request/request.h" diff --git a/ompi/mca/sbgp/sbgp.h b/ompi/mca/sbgp/sbgp.h index a4836a8274..e6235e57b8 100644 --- a/ompi/mca/sbgp/sbgp.h +++ b/ompi/mca/sbgp/sbgp.h @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved. * Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -13,7 +16,7 @@ #include "ompi_config.h" #include "opal/class/opal_list.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/communicator/communicator.h" #include "opal/util/show_help.h" @@ -126,8 +129,7 @@ typedef struct mca_sbgp_base_component_2_0_0_t mca_sbgp_base_component; * Macro for use in components that are of type coll */ #define MCA_SBGP_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "sbgp", 2, 0, 0 + OMPI_MCA_BASE_VERSION_2_1_0("sbgp", 2, 0, 0) #if defined(c_plusplus) || defined(__cplusplus) } diff --git a/ompi/mca/sharedfp/addproc/sharedfp_addproc.h b/ompi/mca/sharedfp/addproc/sharedfp_addproc.h index a7fb4dd9b3..1467283030 100644 --- a/ompi/mca/sharedfp/addproc/sharedfp_addproc.h +++ b/ompi/mca/sharedfp/addproc/sharedfp_addproc.h @@ -21,7 +21,7 @@ #define MCA_SHAREDFP_ADDPROC_H #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/sharedfp/sharedfp.h" #include "ompi/mca/io/ompio/io_ompio.h" #include diff --git a/ompi/mca/sharedfp/base/base.h b/ompi/mca/sharedfp/base/base.h index 19296eadfb..a7492401a6 100644 --- a/ompi/mca/sharedfp/base/base.h +++ b/ompi/mca/sharedfp/base/base.h @@ -33,7 +33,7 @@ #include "mpi.h" #include "opal/class/opal_list.h" #include "ompi/mca/sharedfp/sharedfp.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" BEGIN_C_DECLS diff --git a/ompi/mca/sharedfp/base/sharedfp_base_file_select.c b/ompi/mca/sharedfp/base/sharedfp_base_file_select.c index 6bcea16191..6a8ba6fc34 100644 --- a/ompi/mca/sharedfp/base/sharedfp_base_file_select.c +++ b/ompi/mca/sharedfp/base/sharedfp_base_file_select.c @@ -24,7 +24,7 @@ #include "opal/class/opal_list.h" #include "opal/util/argv.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/sharedfp/sharedfp.h" #include "ompi/mca/sharedfp/base/base.h" diff --git a/ompi/mca/sharedfp/base/sharedfp_base_file_unselect.c b/ompi/mca/sharedfp/base/sharedfp_base_file_unselect.c index 1776caa4b5..8464e2e402 100644 --- a/ompi/mca/sharedfp/base/sharedfp_base_file_unselect.c +++ b/ompi/mca/sharedfp/base/sharedfp_base_file_unselect.c @@ -26,7 +26,7 @@ #include "mpi.h" #include "ompi/mca/io/ompio/io_ompio.h" #include "opal/util/show_help.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/sharedfp/sharedfp.h" #include "ompi/mca/sharedfp/base/base.h" diff --git a/ompi/mca/sharedfp/base/sharedfp_base_find_available.c b/ompi/mca/sharedfp/base/sharedfp_base_find_available.c index 2770efe539..6529632ebd 100644 --- a/ompi/mca/sharedfp/base/sharedfp_base_find_available.c +++ b/ompi/mca/sharedfp/base/sharedfp_base_find_available.c @@ -26,7 +26,7 @@ #include "ompi/constants.h" #include "opal/class/opal_list.h" #include "opal/util/output.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" #include "ompi/mca/sharedfp/sharedfp.h" diff --git a/ompi/mca/sharedfp/base/sharedfp_base_frame.c b/ompi/mca/sharedfp/base/sharedfp_base_frame.c index c06a3614dc..a1defae9ac 100644 --- a/ompi/mca/sharedfp/base/sharedfp_base_frame.c +++ b/ompi/mca/sharedfp/base/sharedfp_base_frame.c @@ -22,7 +22,7 @@ #include "ompi_config.h" #include -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_framework.h" diff --git a/ompi/mca/sharedfp/individual/sharedfp_individual.h b/ompi/mca/sharedfp/individual/sharedfp_individual.h index 6ad0cd73f3..7339d3ccc2 100644 --- a/ompi/mca/sharedfp/individual/sharedfp_individual.h +++ b/ompi/mca/sharedfp/individual/sharedfp_individual.h @@ -21,7 +21,7 @@ #define MCA_SHAREDFP_INDIVIDUAL_H #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/sharedfp/sharedfp.h" #include "ompi/mca/io/ompio/io_ompio.h" diff --git a/ompi/mca/sharedfp/lockedfile/sharedfp_lockedfile.h b/ompi/mca/sharedfp/lockedfile/sharedfp_lockedfile.h index c1c4b0e90f..3e90e6639a 100644 --- a/ompi/mca/sharedfp/lockedfile/sharedfp_lockedfile.h +++ b/ompi/mca/sharedfp/lockedfile/sharedfp_lockedfile.h @@ -21,7 +21,7 @@ #define MCA_SHAREDFP_LOCKEDFILE_H #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/sharedfp/sharedfp.h" #include "ompi/mca/io/ompio/io_ompio.h" diff --git a/ompi/mca/sharedfp/sharedfp.h b/ompi/mca/sharedfp/sharedfp.h index 42bb7af548..824c674a3f 100644 --- a/ompi/mca/sharedfp/sharedfp.h +++ b/ompi/mca/sharedfp/sharedfp.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2013 University of Houston. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -22,7 +25,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/request/request.h" @@ -35,8 +38,7 @@ struct ompi_file_t; * Macro for use in components that are of type coll */ #define MCA_SHAREDFP_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "sharedfp", 2, 0, 0 + OMPI_MCA_BASE_VERSION_2_1_0("sharedfp", 2, 0, 0) /* * This framework abstracts out operations of the shared filepointer diff --git a/ompi/mca/sharedfp/sm/sharedfp_sm.h b/ompi/mca/sharedfp/sm/sharedfp_sm.h index 621324eb5f..b308c0e33e 100644 --- a/ompi/mca/sharedfp/sm/sharedfp_sm.h +++ b/ompi/mca/sharedfp/sm/sharedfp_sm.h @@ -21,7 +21,7 @@ #define MCA_SHAREDFP_sm_H #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/sharedfp/sharedfp.h" #include "ompi/mca/io/ompio/io_ompio.h" #include diff --git a/ompi/mca/topo/base/base.h b/ompi/mca/topo/base/base.h index 962d18dae0..26fd0013cd 100644 --- a/ompi/mca/topo/base/base.h +++ b/ompi/mca/topo/base/base.h @@ -28,7 +28,7 @@ #include "ompi_config.h" #include "opal/class/opal_list.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/topo/topo.h" #include "ompi/proc/proc.h" #include "ompi/communicator/communicator.h" diff --git a/ompi/mca/topo/base/topo_base_comm_select.c b/ompi/mca/topo/base/topo_base_comm_select.c index a8457e424d..63d0ac418d 100644 --- a/ompi/mca/topo/base/topo_base_comm_select.c +++ b/ompi/mca/topo/base/topo_base_comm_select.c @@ -25,7 +25,7 @@ #include "opal/class/opal_list.h" #include "opal/util/argv.h" #include "opal/util/output.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/topo/topo.h" diff --git a/ompi/mca/topo/base/topo_base_find_available.c b/ompi/mca/topo/base/topo_base_find_available.c index 8332ad3a27..b1ff5e3a9a 100644 --- a/ompi/mca/topo/base/topo_base_find_available.c +++ b/ompi/mca/topo/base/topo_base_find_available.c @@ -26,7 +26,7 @@ #include "opal/class/opal_list.h" #include "opal/util/output.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" #include "ompi/mca/topo/topo.h" diff --git a/ompi/mca/topo/base/topo_base_frame.c b/ompi/mca/topo/base/topo_base_frame.c index 05e609f93e..78ffbd4eb9 100644 --- a/ompi/mca/topo/base/topo_base_frame.c +++ b/ompi/mca/topo/base/topo_base_frame.c @@ -27,7 +27,7 @@ #include "ompi/constants.h" #include "opal/class/opal_list.h" #include "opal/util/output.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" diff --git a/ompi/mca/topo/topo.h b/ompi/mca/topo/topo.h index 63f9fbbd81..e33cb66d25 100644 --- a/ompi/mca/topo/topo.h +++ b/ompi/mca/topo/topo.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -13,6 +14,8 @@ * Copyright (c) 2012-2013 Inria. All rights reserved. * Copyright (c) 2014 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,7 +28,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/communicator/communicator.h" @@ -344,7 +347,6 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_topo_base_module_t); * ****************************************************************** */ #define MCA_TOPO_BASE_VERSION_2_2_0 \ - MCA_BASE_VERSION_2_0_0, \ - "topo", 2, 2, 0 + OMPI_MCA_BASE_VERSION_2_1_0("topo", 2, 2, 0) #endif /* MCA_TOPO_H */ diff --git a/ompi/mca/vprotocol/base/base.h b/ompi/mca/vprotocol/base/base.h index 9f43450285..7623589913 100644 --- a/ompi/mca/vprotocol/base/base.h +++ b/ompi/mca/vprotocol/base/base.h @@ -1,8 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. * All rights reserved. * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved. + * Copyright (c) 2012-2015 Los Alamos National Security, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -15,7 +16,7 @@ #include "ompi_config.h" #include "ompi/constants.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/vprotocol/vprotocol.h" BEGIN_C_DECLS @@ -55,17 +56,14 @@ OMPI_DECLSPEC extern mca_vprotocol_base_module_t mca_vprotocol; /* Macro for use in components that are of type vprotocol */ #define MCA_VPROTOCOL_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "vprotocol", 2, 0, 0 + OMPI_MCA_BASE_VERSION_2_1_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 v2.0 */ \ - MCA_BASE_VERSION_2_0_0, \ - /* vprotocol v0.0 */ \ - "vprotocol", 0, 0, 0 + OMPI_MCA_BASE_VERSION_2_1_0("vprotocol", 0, 0, 0) #define mca_vprotocol_base_selected() ( \ 0 != mca_vprotocol_component.pmlm_version.mca_type_major_version \ diff --git a/ompi/mca/vprotocol/base/vprotocol_base.c b/ompi/mca/vprotocol/base/vprotocol_base.c index 5c1a3d0c19..2b6e71d13a 100644 --- a/ompi/mca/vprotocol/base/vprotocol_base.c +++ b/ompi/mca/vprotocol/base/vprotocol_base.c @@ -12,7 +12,7 @@ #include "ompi_config.h" #include "base.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/vprotocol/base/static-components.h" diff --git a/ompi/mca/vprotocol/base/vprotocol_base_select.c b/ompi/mca/vprotocol/base/vprotocol_base_select.c index 17a2eebf53..fe589d8c6c 100644 --- a/ompi/mca/vprotocol/base/vprotocol_base_select.c +++ b/ompi/mca/vprotocol/base/vprotocol_base_select.c @@ -16,7 +16,7 @@ #endif #include "base.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/pml/v/pml_v_output.h" diff --git a/ompi/mca/vprotocol/example/vprotocol_example_component.c b/ompi/mca/vprotocol/example/vprotocol_example_component.c index 9a72fee047..63ee88b3f9 100644 --- a/ompi/mca/vprotocol/example/vprotocol_example_component.c +++ b/ompi/mca/vprotocol/example/vprotocol_example_component.c @@ -10,7 +10,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "../pml_v.h" #include "../pml_v_protocol_base.h" #include "vprotocol_example.h" diff --git a/ompi/mca/vprotocol/pessimist/vprotocol_pessimist_component.c b/ompi/mca/vprotocol/pessimist/vprotocol_pessimist_component.c index 8a6d322ec1..fccf730ce2 100644 --- a/ompi/mca/vprotocol/pessimist/vprotocol_pessimist_component.c +++ b/ompi/mca/vprotocol/pessimist/vprotocol_pessimist_component.c @@ -13,7 +13,7 @@ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "vprotocol_pessimist.h" static int mca_vprotocol_pessimist_component_register(void); diff --git a/ompi/mca/vprotocol/vprotocol.h b/ompi/mca/vprotocol/vprotocol.h index f24a603224..f4a33b5ff1 100644 --- a/ompi/mca/vprotocol/vprotocol.h +++ b/ompi/mca/vprotocol/vprotocol.h @@ -13,7 +13,7 @@ #define __INCLUDE_VPROTOCOL_H_ #include "ompi_config.h" -#include "opal/mca/mca.h" +#include "ompi/mca/mca.h" #include "ompi/mca/pml/pml.h" #include "ompi/request/request.h" diff --git a/opal/mca/allocator/allocator.h b/opal/mca/allocator/allocator.h index 88a14dcb0d..a4c11749eb 100644 --- a/opal/mca/allocator/allocator.h +++ b/opal/mca/allocator/allocator.h @@ -1,20 +1,23 @@ -/** - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2006 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * University of Stuttgart. All rights reserved. - * Copyright (c) 2004-2005 The Regents of the University of California. - * All rights reserved. - * $COPYRIGHT$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ +/* + * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * University Research and Technology + * Corporation. All rights reserved. + * Copyright (c) 2004-2006 The University of Tennessee and The University + * of Tennessee Research Foundation. All rights + * reserved. + * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, + * University of Stuttgart. All rights reserved. + * Copyright (c) 2004-2005 The Regents of the University of California. + * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ /** * @file * The public definition of the MCA Allocator framework. @@ -148,8 +151,7 @@ typedef struct mca_allocator_base_component_2_0_0_t mca_allocator_base_component * Macro for use in components that are of type allocator */ #define MCA_ALLOCATOR_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "allocator", 2, 0, 0 + OPAL_MCA_BASE_VERSION_2_1_0("allocator", 2, 0, 0) END_C_DECLS diff --git a/opal/mca/backtrace/backtrace.h b/opal/mca/backtrace/backtrace.h index f19b9abfdf..6b223b28bd 100644 --- a/opal/mca/backtrace/backtrace.h +++ b/opal/mca/backtrace/backtrace.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2006 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -69,8 +72,7 @@ typedef struct opal_backtrace_base_component_2_0_0_t opal_backtrace_base_compone * Macro for use in components that are of type backtrace */ #define OPAL_BACKTRACE_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "backtrace", 2, 0, 0 + OPAL_MCA_BASE_VERSION_2_1_0("backtrace", 2, 0, 0) END_C_DECLS diff --git a/opal/mca/base/mca_base_var.c b/opal/mca/base/mca_base_var.c index d3b2be7088..68e66e90d4 100644 --- a/opal/mca/base/mca_base_var.c +++ b/opal/mca/base/mca_base_var.c @@ -1457,8 +1457,7 @@ int mca_base_component_var_register (const mca_base_component_t *component, mca_base_var_info_lvl_t info_lvl, mca_base_var_scope_t scope, void *storage) { - /* XXX -- component_update -- We will stash the project name in the component */ - return mca_base_var_register (NULL, component->mca_type_name, + return mca_base_var_register (component->mca_project_name, component->mca_type_name, component->mca_component_name, variable_name, description, type, enumerator, bind, flags | MCA_BASE_VAR_FLAG_DWG, diff --git a/opal/mca/btl/btl.h b/opal/mca/btl/btl.h index 321c5a08a1..b3d4e61c4e 100644 --- a/opal/mca/btl/btl.h +++ b/opal/mca/btl/btl.h @@ -1166,11 +1166,7 @@ typedef struct mca_btl_base_module_t mca_btl_base_module_t; * alpha until this comment is removed. */ #define MCA_BTL_BASE_VERSION_3_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - .mca_type_name = "btl", \ - .mca_type_major_version = 3, \ - .mca_type_minor_version = 0, \ - .mca_type_release_version = 0 + OPAL_MCA_BASE_VERSION_2_1_0("btl", 3, 0, 0) #define MCA_BTL_DEFAULT_VERSION(name) \ MCA_BTL_BASE_VERSION_3_0_0, \ diff --git a/opal/mca/compress/compress.h b/opal/mca/compress/compress.h index f377d04a21..e3688e980a 100644 --- a/opal/mca/compress/compress.h +++ b/opal/mca/compress/compress.h @@ -1,7 +1,10 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -124,8 +127,7 @@ OPAL_DECLSPEC extern opal_compress_base_module_t opal_compress; * Macro for use in components that are of type COMPRESS */ #define OPAL_COMPRESS_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "compress", 2, 0, 0 + OPAL_MCA_BASE_VERSION_2_1_0("compress", 2, 0, 0) #if defined(c_plusplus) || defined(__cplusplus) } diff --git a/opal/mca/crs/crs.h b/opal/mca/crs/crs.h index c042875d97..08c239e480 100644 --- a/opal/mca/crs/crs.h +++ b/opal/mca/crs/crs.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana * University Research and Technology @@ -11,6 +12,8 @@ * All rights reserved. * Copyright (c) 2007 Evergrid, Inc. All rights reserved. * Copyright (c) 2010-2011 Oak Ridge National Labs. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -296,8 +299,7 @@ OPAL_DECLSPEC extern opal_crs_base_module_t opal_crs; * Macro for use in components that are of type CRS */ #define OPAL_CRS_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "crs", 2, 0, 0 + OPAL_MCA_BASE_VERSION_2_1_0("crs", 2, 0, 0) END_C_DECLS diff --git a/opal/mca/dl/dl.h b/opal/mca/dl/dl.h index c79e9482ae..7c6d2ef5a5 100644 --- a/opal/mca/dl/dl.h +++ b/opal/mca/dl/dl.h @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -176,8 +179,7 @@ typedef struct opal_dl_base_module_1_0_0_t opal_dl_base_module_t; * Macro for use in components that are of type DL */ #define OPAL_DL_BASE_VERSION_1_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "dl", 1, 0, 0 + OPAL_MCA_BASE_VERSION_2_1_0("dl", 1, 0, 0) END_C_DECLS diff --git a/opal/mca/dstore/dstore.h b/opal/mca/dstore/dstore.h index 0ec90fa331..30245f94d6 100644 --- a/opal/mca/dstore/dstore.h +++ b/opal/mca/dstore/dstore.h @@ -1,6 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved. + * Copyright (c) 2012-2014 Los Alamos National Security, Inc. All rights + * reserved. * Copyright (c) 2013-2014 Intel, Inc. All rights reserved. * $COPYRIGHT$ * @@ -213,8 +215,7 @@ typedef struct { * Macro for use in components that are of type dstore */ #define OPAL_DSTORE_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "dstore", 2, 0, 0 + OPAL_MCA_BASE_VERSION_2_1_0("dstore", 2, 0, 0) /* Global structure for accessing store functions */ OPAL_DECLSPEC extern opal_dstore_base_API_t opal_dstore; /* holds base function pointers */ diff --git a/opal/mca/event/event.h b/opal/mca/event/event.h index ecabeccc16..abf2f6feac 100644 --- a/opal/mca/event/event.h +++ b/opal/mca/event/event.h @@ -1,7 +1,10 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -69,8 +72,7 @@ typedef struct opal_event_base_component_2_0_0_t opal_event_component_t; * Macro for use in components that are of type event */ #define OPAL_EVENT_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "event", 2, 0, 0 + OPAL_MCA_BASE_VERSION_2_1_0("event", 2, 0, 0) END_C_DECLS diff --git a/opal/mca/hwloc/hwloc.h b/opal/mca/hwloc/hwloc.h index f9ef947621..87e2986ae9 100644 --- a/opal/mca/hwloc/hwloc.h +++ b/opal/mca/hwloc/hwloc.h @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -61,8 +64,7 @@ typedef struct opal_hwloc_base_component_2_0_0_t opal_hwloc_component_t; * Macro for use in components that are of type hwloc */ #define OPAL_HWLOC_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "hwloc", 2, 0, 0 + OPAL_MCA_BASE_VERSION_2_1_0("hwloc", 2, 0, 0) /* ******************************************************************** */ diff --git a/opal/mca/if/if.h b/opal/mca/if/if.h index 787b9e0fca..c9da6a8e12 100644 --- a/opal/mca/if/if.h +++ b/opal/mca/if/if.h @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2010-2013 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -126,8 +129,7 @@ typedef struct opal_if_base_component_2_0_0_t opal_if_base_component_t; * Macro for use in components that are of type if */ #define OPAL_IF_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "if", 2, 0, 0 + OPAL_MCA_BASE_VERSION_2_1_0("if", 2, 0, 0) END_C_DECLS diff --git a/opal/mca/installdirs/installdirs.h b/opal/mca/installdirs/installdirs.h index 744fadc9dd..e3833d5249 100644 --- a/opal/mca/installdirs/installdirs.h +++ b/opal/mca/installdirs/installdirs.h @@ -1,5 +1,6 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2006-2007 Los Alamos National Security, LLC. All rights + * Copyright (c) 2006-2015 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ * @@ -89,8 +90,7 @@ typedef struct opal_installdirs_base_component_2_0_0_t opal_installdirs_base_com * Macro for use in components that are of type installdirs */ #define OPAL_INSTALLDIRS_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "installdirs", 2, 0, 0 + OPAL_MCA_BASE_VERSION_2_1_0("installdirs", 2, 0, 0) END_C_DECLS diff --git a/opal/mca/mca.h b/opal/mca/mca.h index 0eb6c8db02..481163d42d 100644 --- a/opal/mca/mca.h +++ b/opal/mca/mca.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -240,6 +243,10 @@ typedef int (*mca_base_query_component_2_0_0_fn_t)(mca_base_module_2_0_0_t **mod typedef int (*mca_base_register_component_params_2_0_0_fn_t)(void); +/** + * Maximum length of MCA project string names. + */ +#define MCA_BASE_MAX_PROJECT_NAME_LEN 15 /** * Maximum length of MCA framework string names. */ @@ -257,7 +264,7 @@ typedef int (*mca_base_register_component_params_2_0_0_fn_t)(void); * particular version of a specific framework, and to publish its own * name and version. */ -struct mca_base_component_2_0_0_t { +struct mca_base_component_2_1_0_t { int mca_major_version; /**< Major number of the MCA. */ @@ -266,6 +273,18 @@ struct mca_base_component_2_0_0_t { int mca_release_version; /**< Release number of the MCA. */ + char mca_project_name[MCA_BASE_MAX_PROJECT_NAME_LEN + 1]; + /**< String name of the project that this component belongs to. */ + int mca_project_major_version; + /**< Major version number of the project that this component + belongs to. */ + int mca_project_minor_version; + /**< Minor version number of the project that this component + belongs to. */ + int mca_project_release_version; + /**< Release version number of the project that this component + belongs to. */ + char mca_type_name[MCA_BASE_MAX_TYPE_NAME_LEN + 1]; /**< String name of the framework that this component belongs to. */ int mca_type_major_version; @@ -302,9 +321,9 @@ struct mca_base_component_2_0_0_t { }; /** Unversioned convenience typedef; use this name in frameworks/components to stay forward source-compatible */ -typedef struct mca_base_component_2_0_0_t mca_base_component_t; +typedef struct mca_base_component_2_1_0_t mca_base_component_t; /** Versioned convenience typedef */ -typedef struct mca_base_component_2_0_0_t mca_base_component_2_0_0_t; +typedef struct mca_base_component_2_1_0_t mca_base_component_2_1_0_t; /* * Metadata Bit field parameters @@ -339,9 +358,23 @@ typedef struct mca_base_component_data_2_0_0_t mca_base_component_data_2_0_0_t; * component header files (e.g., coll.h) for examples of its usage. */ #define MCA_BASE_VERSION_MAJOR 2 -#define MCA_BASE_VERSION_MINOR 0 +#define MCA_BASE_VERSION_MINOR 1 #define MCA_BASE_VERSION_RELEASE 0 -#define MCA_BASE_VERSION_2_0_0 MCA_BASE_VERSION_MAJOR, MCA_BASE_VERSION_MINOR, MCA_BASE_VERSION_RELEASE +#define MCA_BASE_VERSION_2_1_0(project, project_major, project_minor, project_release, type, type_major, type_minor, type_release) \ + .mca_major_version = MCA_BASE_VERSION_MAJOR, \ + .mca_minor_version = MCA_BASE_VERSION_MINOR, \ + .mca_release_version = MCA_BASE_VERSION_RELEASE, \ + .mca_project_name = project, \ + .mca_project_major_version = project_major, \ + .mca_project_minor_version = project_minor, \ + .mca_project_release_version = project_release, \ + .mca_type_name = type, \ + .mca_type_major_version = type_major, \ + .mca_type_minor_version = type_minor, \ + .mca_type_release_version = type_release + +#define OPAL_MCA_BASE_VERSION_2_1_0(type, type_major, type_minor, type_release) \ + MCA_BASE_VERSION_2_1_0("opal", OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, OPAL_RELEASE_VERSION, type, type_major, type_minor, type_release) #endif /* OPAL_MCA_H */ diff --git a/opal/mca/memchecker/memchecker.h b/opal/mca/memchecker/memchecker.h index 8e99bae034..11b0d10d7a 100644 --- a/opal/mca/memchecker/memchecker.h +++ b/opal/mca/memchecker/memchecker.h @@ -1,8 +1,11 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 High Performance Computing Center Stuttgart, * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2008 The Trustees of Indiana University. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -178,7 +181,6 @@ typedef struct opal_memchecker_base_module_1_0_0_t opal_memchecker_base_module_t * Macro for use in components that are of type memchecker */ #define OPAL_MEMCHECKER_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "memchecker", 2, 0, 0 + OPAL_MCA_BASE_VERSION_2_1_0("memchecker", 2, 0, 0) #endif /* OPAL_MCA_MEMCHECKER_MEMCHECKER_H */ diff --git a/opal/mca/memcpy/memcpy.h b/opal/mca/memcpy/memcpy.h index f28b082b0a..9f7ea62910 100644 --- a/opal/mca/memcpy/memcpy.h +++ b/opal/mca/memcpy/memcpy.h @@ -1,7 +1,10 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2006 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -41,7 +44,6 @@ typedef struct opal_memcpy_base_component_2_0_0_t opal_memcpy_base_component_2_0 * Macro for use in components that are of type memcpy */ #define OPAL_MEMCPY_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "memcpy", 2, 0, 0 + OPAL_MCA_BASE_VERSION_2_1_0("memcpy", 2, 0, 0) #endif /* OPAL_MCA_MEMCPY_MEMCPY_H */ diff --git a/opal/mca/memory/memory.h b/opal/mca/memory/memory.h index 89989506d1..6ca9d4b3aa 100644 --- a/opal/mca/memory/memory.h +++ b/opal/mca/memory/memory.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -139,7 +142,6 @@ END_C_DECLS * Macro for use in components that are of type memory */ #define OPAL_MEMORY_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "memory", 2, 0, 0 + OPAL_MCA_BASE_VERSION_2_1_0("memory", 2, 0, 0) #endif /* OPAL_MCA_MEMORY_MEMORY_H */ diff --git a/opal/mca/mpool/mpool.h b/opal/mca/mpool/mpool.h index 3d6c1792ce..fbfb5ba784 100644 --- a/opal/mca/mpool/mpool.h +++ b/opal/mca/mpool/mpool.h @@ -265,8 +265,7 @@ OPAL_DECLSPEC int mca_mpool_base_remove(void * base); * Macro for use in components that are of type mpool */ #define MCA_MPOOL_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "mpool", 2, 0, 0 + OPAL_MCA_BASE_VERSION_2_1_0("mpool", 2, 0, 0) #endif /* MCA_MPOOL_H */ diff --git a/opal/mca/pmix/pmix.h b/opal/mca/pmix/pmix.h index 6765b6b45d..873870af74 100644 --- a/opal/mca/pmix/pmix.h +++ b/opal/mca/pmix/pmix.h @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -449,8 +452,7 @@ typedef struct { * Macro for use in components that are of type pmix */ #define OPAL_PMIX_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "pmix", 2, 0, 0 + OPAL_MCA_BASE_VERSION_2_1_0("pmix", 2, 0, 0) /* Global structure for accessing store functions */ OPAL_DECLSPEC extern opal_pmix_base_module_t opal_pmix; /* holds base function pointers */ diff --git a/opal/mca/pstat/pstat.h b/opal/mca/pstat/pstat.h index 49f68554e4..2ad8ce2d79 100644 --- a/opal/mca/pstat/pstat.h +++ b/opal/mca/pstat/pstat.h @@ -1,8 +1,11 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 High Performance Computing Center Stuttgart, * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2008 The Trustees of Indiana University. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -80,8 +83,7 @@ typedef struct opal_pstat_base_module_1_0_0_t opal_pstat_base_module_t; * Macro for use in components that are of type pstat */ #define OPAL_PSTAT_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "pstat", 2, 0, 0 + OPAL_MCA_BASE_VERSION_2_1_0("pstat", 2, 0, 0) /* Global structure for accessing pstat functions */ OPAL_DECLSPEC extern opal_pstat_base_module_t opal_pstat; diff --git a/opal/mca/rcache/rcache.h b/opal/mca/rcache/rcache.h index 4d5d674a55..78c8b2141c 100644 --- a/opal/mca/rcache/rcache.h +++ b/opal/mca/rcache/rcache.h @@ -1,22 +1,24 @@ -/* -*- Mode: C; c-basic-offset:4 ; -*- */ -/** - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2007 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * University of Stuttgart. All rights reserved. - * Copyright (c) 2004-2005 The Regents of the University of California. - * All rights reserved. - * Copyright (c) 2009 IBM Corporation. All rights reserved. - * $COPYRIGHT$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ +/* + * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * University Research and Technology + * Corporation. All rights reserved. + * Copyright (c) 2004-2007 The University of Tennessee and The University + * of Tennessee Research Foundation. All rights + * reserved. + * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, + * University of Stuttgart. All rights reserved. + * Copyright (c) 2004-2005 The Regents of the University of California. + * All rights reserved. + * Copyright (c) 2009 IBM Corporation. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ /** * @file * Description of the Registration Cache framework @@ -99,8 +101,7 @@ typedef struct mca_rcache_base_module_t mca_rcache_base_module_t; * Macro for use in components that are of type rcache */ #define MCA_RCACHE_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "rcache", 2, 0, 0 + OPAL_MCA_BASE_VERSION_2_1_0("rcache", 2, 0, 0) #endif /* MCA_RCACHE_H */ diff --git a/opal/mca/reachable/reachable.h b/opal/mca/reachable/reachable.h index db77271786..77630b7d0d 100644 --- a/opal/mca/reachable/reachable.h +++ b/opal/mca/reachable/reachable.h @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,8 +66,7 @@ typedef struct { * Macro for use in components that are of type reachable */ #define OPAL_REACHABLE_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "reachable", 2, 0, 0 + OPAL_MCA_BASE_VERSION_2_1_0("reachable", 2, 0, 0) /* Global structure for accessing reachability functions */ OPAL_DECLSPEC extern opal_reachable_base_module_t opal_reachable; diff --git a/opal/mca/sec/sec.h b/opal/mca/sec/sec.h index 4fff46bfe0..410ef6694a 100644 --- a/opal/mca/sec/sec.h +++ b/opal/mca/sec/sec.h @@ -1,7 +1,10 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. * Copyright (c) 2014 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -127,8 +130,7 @@ typedef struct opal_sec_base_component_1_0_0_t opal_sec_base_component_t; * Macro for use in components that are of type sec */ #define OPAL_SEC_BASE_VERSION_1_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "sec", 1, 0, 0 + OPAL_MCA_BASE_VERSION_2_1_0("sec", 1, 0, 0) /* Global structure for accessing SEC functions */ OPAL_DECLSPEC extern opal_sec_API_module_t opal_sec; /* holds base function pointers */ diff --git a/opal/mca/shmem/shmem.h b/opal/mca/shmem/shmem.h index e491df149d..c10f47ed4e 100644 --- a/opal/mca/shmem/shmem.h +++ b/opal/mca/shmem/shmem.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -12,7 +13,7 @@ * Copyright (c) 2007-2015 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2010 IBM Corporation. All rights reserved. - * Copyright (c) 2010-2011 Los Alamos National Security, LLC. + * Copyright (c) 2010-2015 Los Alamos National Security, LLC. * All rights reserved. * $COPYRIGHT$ * @@ -182,11 +183,7 @@ typedef struct opal_shmem_base_module_2_0_0_t opal_shmem_base_module_t; * see: opal/mca/mca.h for more information */ #define OPAL_SHMEM_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - .mca_type_name = "shmem", \ - .mca_type_major_version = 2, \ - .mca_type_minor_version = 0, \ - .mca_type_release_version = 0 + OPAL_MCA_BASE_VERSION_2_1_0("shmem", 2, 0, 0) END_C_DECLS diff --git a/opal/mca/timer/timer.h b/opal/mca/timer/timer.h index 0d60c4f538..caf946e1b6 100644 --- a/opal/mca/timer/timer.h +++ b/opal/mca/timer/timer.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -88,7 +91,6 @@ typedef struct opal_timer_base_component_2_0_0_t opal_timer_base_component_2_0_0 * Macro for use in components that are of type timer */ #define OPAL_TIMER_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "timer", 2, 0, 0 + OPAL_MCA_BASE_VERSION_2_1_0("timer", 2, 0, 0) #endif /* OPAL_MCA_TIMER_TIMER_H */ diff --git a/orte/Makefile.am b/orte/Makefile.am index 71ea590174..2bcde23d68 100644 --- a/orte/Makefile.am +++ b/orte/Makefile.am @@ -10,6 +10,8 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2015 Los Alamos National Security, LLC. All rights +# reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -63,3 +65,4 @@ include tools/Makefile.am include orted/Makefile.am include test/mpi/Makefile.include include test/system/Makefile.include +include mca/Makefile.am diff --git a/orte/mca/Makefile.am b/orte/mca/Makefile.am new file mode 100644 index 0000000000..8d3fca3fb4 --- /dev/null +++ b/orte/mca/Makefile.am @@ -0,0 +1,23 @@ +# +# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana +# University Research and Technology +# Corporation. All rights reserved. +# Copyright (c) 2004-2005 The University of Tennessee and The University +# of Tennessee Research Foundation. All rights +# reserved. +# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, +# University of Stuttgart. All rights reserved. +# Copyright (c) 2004-2005 The Regents of the University of California. +# All rights reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +# This makefile.am does not stand on its own - it is included from opal/Makefile.am + +# Source code files +headers += \ + mca/mca.h diff --git a/orte/mca/dfs/base/base.h b/orte/mca/dfs/base/base.h index 09882da456..991f3e3cd0 100644 --- a/orte/mca/dfs/base/base.h +++ b/orte/mca/dfs/base/base.h @@ -22,7 +22,7 @@ #include "opal/class/opal_list.h" #include "opal/mca/event/event.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/mca/dfs/dfs.h" diff --git a/orte/mca/dfs/base/dfs_base_frame.c b/orte/mca/dfs/base/dfs_base_frame.c index 7682d5552d..8b88fb3c9d 100644 --- a/orte/mca/dfs/base/dfs_base_frame.c +++ b/orte/mca/dfs/base/dfs_base_frame.c @@ -24,7 +24,7 @@ #include #endif -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/util/opal_environ.h" diff --git a/orte/mca/dfs/base/dfs_base_select.c b/orte/mca/dfs/base/dfs_base_select.c index c14f176c3b..16484b6535 100644 --- a/orte/mca/dfs/base/dfs_base_select.c +++ b/orte/mca/dfs/base/dfs_base_select.c @@ -15,7 +15,7 @@ #include #endif -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/util/output.h" diff --git a/orte/mca/dfs/dfs.h b/orte/mca/dfs/dfs.h index 4a53fa2816..7f2b6320a2 100644 --- a/orte/mca/dfs/dfs.h +++ b/orte/mca/dfs/dfs.h @@ -1,6 +1,7 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2012 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -18,7 +19,7 @@ #include #endif -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "orte/mca/dfs/dfs_types.h" @@ -176,8 +177,7 @@ typedef orte_dfs_base_component_1_0_0_t orte_dfs_base_component_t; * Macro for use in components that are of type errmgr */ #define ORTE_DFS_BASE_VERSION_1_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "dfs", 1, 0, 0 + ORTE_MCA_BASE_VERSION_2_1_0("dfs", 1, 0, 0) END_C_DECLS diff --git a/orte/mca/errmgr/base/base.h b/orte/mca/errmgr/base/base.h index 3aff1aa9d3..1b36e03d25 100644 --- a/orte/mca/errmgr/base/base.h +++ b/orte/mca/errmgr/base/base.h @@ -30,7 +30,7 @@ #include "opal/class/opal_list.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/mca/snapc/base/base.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/mca/errmgr/base/errmgr_base_fns.c b/orte/mca/errmgr/base/errmgr_base_fns.c index af9838fd2b..e965d5756c 100644 --- a/orte/mca/errmgr/base/errmgr_base_fns.c +++ b/orte/mca/errmgr/base/errmgr_base_fns.c @@ -50,7 +50,7 @@ #include #include -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/util/os_dirpath.h" #include "opal/util/output.h" diff --git a/orte/mca/errmgr/base/errmgr_base_frame.c b/orte/mca/errmgr/base/errmgr_base_frame.c index 21e2b55120..e20858f10a 100644 --- a/orte/mca/errmgr/base/errmgr_base_frame.c +++ b/orte/mca/errmgr/base/errmgr_base_frame.c @@ -36,7 +36,7 @@ #include #endif -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/util/opal_environ.h" diff --git a/orte/mca/errmgr/base/errmgr_base_select.c b/orte/mca/errmgr/base/errmgr_base_select.c index 57df31a2ae..7a21caa143 100644 --- a/orte/mca/errmgr/base/errmgr_base_select.c +++ b/orte/mca/errmgr/base/errmgr_base_select.c @@ -26,7 +26,7 @@ #include #endif -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/util/output.h" diff --git a/orte/mca/errmgr/base/errmgr_base_tool.c b/orte/mca/errmgr/base/errmgr_base_tool.c index fcf9a1d48f..ef19b18e83 100644 --- a/orte/mca/errmgr/base/errmgr_base_tool.c +++ b/orte/mca/errmgr/base/errmgr_base_tool.c @@ -36,7 +36,7 @@ #include "opal/dss/dss.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/util/os_dirpath.h" diff --git a/orte/mca/errmgr/errmgr.h b/orte/mca/errmgr/errmgr.h index bfe4522c07..df8226a2cc 100644 --- a/orte/mca/errmgr/errmgr.h +++ b/orte/mca/errmgr/errmgr.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana * University Research and Technology @@ -11,8 +12,8 @@ * All rights reserved. * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2010-2011 Oak Ridge National Labs. All rights reserved. - * Copyright (c) 2011-2013 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights + * reserved. * Copyright (c) 2013 Intel, Inc. All rights reserved. * Copyright (c) 2014 NVIDIA Corporation. All rights reserved. * $COPYRIGHT$ @@ -49,7 +50,7 @@ #include "orte/constants.h" #include "orte/types.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/class/opal_object.h" @@ -315,8 +316,7 @@ typedef orte_errmgr_base_component_3_0_0_t orte_errmgr_base_component_t; * Macro for use in components that are of type errmgr */ #define ORTE_ERRMGR_BASE_VERSION_3_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "errmgr", 3, 0, 0 + ORTE_MCA_BASE_VERSION_2_1_0("errmgr", 3, 0, 0) END_C_DECLS diff --git a/orte/mca/ess/alps/ess_alps.h b/orte/mca/ess/alps/ess_alps.h index 70c4098c6a..92f74d5a8e 100644 --- a/orte/mca/ess/alps/ess_alps.h +++ b/orte/mca/ess/alps/ess_alps.h @@ -20,7 +20,7 @@ #define ORTE_ESS_ALPS_H #include "orte_config.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/mca/ess/ess.h" #include "alps/alps.h" diff --git a/orte/mca/ess/base/base.h b/orte/mca/ess/base/base.h index 2794180e47..0b7382a3ee 100644 --- a/orte/mca/ess/base/base.h +++ b/orte/mca/ess/base/base.h @@ -28,7 +28,7 @@ #include "orte_config.h" #include "orte/types.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/dss/dss_types.h" #include "orte/mca/ess/ess.h" diff --git a/orte/mca/ess/base/ess_base_frame.c b/orte/mca/ess/base/ess_base_frame.c index 5d6ae9c857..40dfc1c3da 100644 --- a/orte/mca/ess/base/ess_base_frame.c +++ b/orte/mca/ess/base/ess_base_frame.c @@ -22,7 +22,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/ess/base/ess_base_select.c b/orte/mca/ess/base/ess_base_select.c index ee5e3f8923..352911ee2c 100644 --- a/orte/mca/ess/base/ess_base_select.c +++ b/orte/mca/ess/base/ess_base_select.c @@ -21,7 +21,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" diff --git a/orte/mca/ess/env/ess_env_module.c b/orte/mca/ess/env/ess_env_module.c index 1ea17cc07b..dc548c38d1 100644 --- a/orte/mca/ess/env/ess_env_module.c +++ b/orte/mca/ess/env/ess_env_module.c @@ -36,7 +36,7 @@ #include "opal/runtime/opal.h" #include "orte/util/show_help.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/pmix/pmix.h" #include "opal/util/output.h" diff --git a/orte/mca/ess/ess.h b/orte/mca/ess/ess.h index cb5a232f45..458e66e28e 100644 --- a/orte/mca/ess/ess.h +++ b/orte/mca/ess/ess.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2011 Los Alamos National Security, LLC. All rights + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ @@ -30,7 +31,7 @@ #include "orte_config.h" #include "orte/types.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/hwloc/base/base.h" #include "orte/util/proc_info.h" @@ -101,8 +102,7 @@ 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 */ #define ORTE_ESS_BASE_VERSION_3_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "ess", 3, 0, 0 + ORTE_MCA_BASE_VERSION_2_1_0("ess", 3, 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/filem/base/filem_base_fns.c b/orte/mca/filem/base/filem_base_fns.c index abeb137c77..870e0d09b8 100644 --- a/orte/mca/filem/base/filem_base_fns.c +++ b/orte/mca/filem/base/filem_base_fns.c @@ -31,7 +31,7 @@ #include "orte/constants.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/mca/filem/base/filem_base_frame.c b/orte/mca/filem/base/filem_base_frame.c index 1fce8eeafa..1fa2d4ea21 100644 --- a/orte/mca/filem/base/filem_base_frame.c +++ b/orte/mca/filem/base/filem_base_frame.c @@ -19,7 +19,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/filem/base/filem_base_receive.c b/orte/mca/filem/base/filem_base_receive.c index 1f6cbb8c12..9970e546f8 100644 --- a/orte/mca/filem/base/filem_base_receive.c +++ b/orte/mca/filem/base/filem_base_receive.c @@ -40,7 +40,7 @@ #include #endif -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/util/output.h" #include "opal/dss/dss.h" diff --git a/orte/mca/filem/base/filem_base_select.c b/orte/mca/filem/base/filem_base_select.c index c95a7d8841..c738527317 100644 --- a/orte/mca/filem/base/filem_base_select.c +++ b/orte/mca/filem/base/filem_base_select.c @@ -24,7 +24,7 @@ #include "orte/constants.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/filem/filem.h b/orte/mca/filem/filem.h index b37e7ff2bf..ff5996df65 100644 --- a/orte/mca/filem/filem.h +++ b/orte/mca/filem/filem.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2009 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,8 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2012 Los Alamos National Security, LLC. - * All rights reserved + * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights + * reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -31,7 +32,7 @@ #include "orte/constants.h" #include "orte/types.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/class/opal_object.h" @@ -393,8 +394,7 @@ ORTE_DECLSPEC extern orte_filem_base_module_t orte_filem; * Macro for use in components that are of type FILEM */ #define ORTE_FILEM_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "filem", 2, 0, 0 + ORTE_MCA_BASE_VERSION_2_1_0("filem", 2, 0, 0) END_C_DECLS diff --git a/orte/mca/filem/raw/filem_raw.h b/orte/mca/filem/raw/filem_raw.h index 3cf5fc51fc..4a989c1b1a 100644 --- a/orte/mca/filem/raw/filem_raw.h +++ b/orte/mca/filem/raw/filem_raw.h @@ -13,7 +13,7 @@ #include "orte_config.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/class/opal_object.h" #include "opal/mca/event/event.h" diff --git a/orte/mca/grpcomm/base/base.h b/orte/mca/grpcomm/base/base.h index 08790f8569..db1b3264b1 100644 --- a/orte/mca/grpcomm/base/base.h +++ b/orte/mca/grpcomm/base/base.h @@ -32,7 +32,7 @@ #include "opal/class/opal_list.h" #include "opal/class/opal_hash_table.h" #include "opal/dss/dss_types.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/hwloc/hwloc.h" #include "orte/mca/odls/odls_types.h" diff --git a/orte/mca/grpcomm/base/grpcomm_base_frame.c b/orte/mca/grpcomm/base/grpcomm_base_frame.c index b25c17927c..147dfa9026 100644 --- a/orte/mca/grpcomm/base/grpcomm_base_frame.c +++ b/orte/mca/grpcomm/base/grpcomm_base_frame.c @@ -23,7 +23,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/grpcomm/base/grpcomm_base_select.c b/orte/mca/grpcomm/base/grpcomm_base_select.c index 8e14eb72a4..66d1cf223c 100644 --- a/orte/mca/grpcomm/base/grpcomm_base_select.c +++ b/orte/mca/grpcomm/base/grpcomm_base_select.c @@ -22,7 +22,7 @@ #include "orte_config.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "orte/util/name_fns.h" diff --git a/orte/mca/grpcomm/brks/grpcomm_brks_component.c b/orte/mca/grpcomm/brks/grpcomm_brks_component.c index 29f860b63e..918f338215 100644 --- a/orte/mca/grpcomm/brks/grpcomm_brks_component.c +++ b/orte/mca/grpcomm/brks/grpcomm_brks_component.c @@ -14,7 +14,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/runtime/opal_params.h" #include "orte/util/proc_info.h" diff --git a/orte/mca/grpcomm/direct/grpcomm_direct_component.c b/orte/mca/grpcomm/direct/grpcomm_direct_component.c index 1e6fe5ff86..eb8f563c53 100644 --- a/orte/mca/grpcomm/direct/grpcomm_direct_component.c +++ b/orte/mca/grpcomm/direct/grpcomm_direct_component.c @@ -14,7 +14,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/runtime/opal_params.h" #include "orte/util/proc_info.h" diff --git a/orte/mca/grpcomm/grpcomm.h b/orte/mca/grpcomm/grpcomm.h index 91ee540fb7..c464259caa 100644 --- a/orte/mca/grpcomm/grpcomm.h +++ b/orte/mca/grpcomm/grpcomm.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,8 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2011-2012 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -39,7 +40,7 @@ #include "orte/constants.h" #include "orte/types.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/class/opal_list.h" #include "opal/dss/dss_types.h" @@ -173,10 +174,8 @@ typedef orte_grpcomm_base_component_3_0_0_t orte_grpcomm_base_component_t; * Macro for use in components that are of type grpcomm v3.0.0 */ #define ORTE_GRPCOMM_BASE_VERSION_3_0_0 \ - /* grpcomm v3.0 is chained to MCA v2.0 */ \ - MCA_BASE_VERSION_2_0_0, \ - /* grpcomm v3.0 */ \ - "grpcomm", 3, 0, 0 + /* grpcomm v3.0 is chained to MCA v2.0 */ \ + ORTE_MCA_BASE_VERSION_2_1_0("grpcomm", 3, 0, 0) /* Global structure for accessing grpcomm functions */ ORTE_DECLSPEC extern orte_grpcomm_API_module_t orte_grpcomm; diff --git a/orte/mca/grpcomm/rcd/grpcomm_rcd_component.c b/orte/mca/grpcomm/rcd/grpcomm_rcd_component.c index 6a69750dfa..32f3d96504 100644 --- a/orte/mca/grpcomm/rcd/grpcomm_rcd_component.c +++ b/orte/mca/grpcomm/rcd/grpcomm_rcd_component.c @@ -14,7 +14,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/runtime/opal_params.h" #include "orte/util/proc_info.h" diff --git a/orte/mca/iof/base/base.h b/orte/mca/iof/base/base.h index 945e7b2030..013900a2a3 100644 --- a/orte/mca/iof/base/base.h +++ b/orte/mca/iof/base/base.h @@ -47,7 +47,7 @@ #include "opal/class/opal_list.h" #include "opal/class/opal_bitmap.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/event/event.h" #include "orte/mca/iof/iof.h" diff --git a/orte/mca/iof/base/iof_base_frame.c b/orte/mca/iof/base/iof_base_frame.c index 3f210ef76c..e193f520b5 100644 --- a/orte/mca/iof/base/iof_base_frame.c +++ b/orte/mca/iof/base/iof_base_frame.c @@ -30,7 +30,7 @@ #endif #include -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/util/os_dirpath.h" #include "opal/util/output.h" diff --git a/orte/mca/iof/base/iof_base_select.c b/orte/mca/iof/base/iof_base_select.c index d4df5769c5..f33e423da9 100644 --- a/orte/mca/iof/base/iof_base_select.c +++ b/orte/mca/iof/base/iof_base_select.c @@ -19,7 +19,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "orte/util/proc_info.h" diff --git a/orte/mca/iof/iof.h b/orte/mca/iof/iof.h index ad703c33df..a9e86b9679 100644 --- a/orte/mca/iof/iof.h +++ b/orte/mca/iof/iof.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,8 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2008 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2012 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights + * reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved. * $COPYRIGHT$ * @@ -117,7 +118,7 @@ #include "orte_config.h" #include "orte/types.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/crs/crs.h" #include "opal/mca/crs/base/base.h" @@ -230,7 +231,6 @@ END_C_DECLS * Macro for use in components that are of type iof */ #define ORTE_IOF_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "iof", 2, 0, 0 + ORTE_MCA_BASE_VERSION_2_1_0("iof", 2, 0, 0) #endif /* ORTE_IOF_H */ diff --git a/orte/mca/mca.h b/orte/mca/mca.h new file mode 100644 index 0000000000..dddc9f90e8 --- /dev/null +++ b/orte/mca/mca.h @@ -0,0 +1,39 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ +/* + * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana + * University Research and Technology + * Corporation. All rights reserved. + * Copyright (c) 2004-2005 The University of Tennessee and The University + * of Tennessee Research Foundation. All rights + * reserved. + * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, + * University of Stuttgart. All rights reserved. + * Copyright (c) 2004-2005 The Regents of the University of California. + * All rights reserved. + * Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ +/** + * @file + * + * Top-level interface for \em all orte MCA components. + */ + +#ifndef ORTE_MCA_H +#define ORTE_MCA_H + +#include "orte_config.h" +#include "opal/mca/mca.h" + +#define ORTE_MCA_BASE_VERSION_2_1_0(type, type_major, type_minor, type_release) \ + MCA_BASE_VERSION_2_1_0("orte", ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, \ + ORTE_RELEASE_VERSION, type, type_major, type_minor, \ + type_release) + +#endif /* ORTE_MCA_H */ diff --git a/orte/mca/notifier/base/notifier_base_frame.c b/orte/mca/notifier/base/notifier_base_frame.c index 7fb1358199..ee1d468a29 100644 --- a/orte/mca/notifier/base/notifier_base_frame.c +++ b/orte/mca/notifier/base/notifier_base_frame.c @@ -26,7 +26,7 @@ #include #endif -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/util/argv.h" #include "opal/util/fd.h" #include "opal/util/output.h" diff --git a/orte/mca/notifier/base/notifier_base_select.c b/orte/mca/notifier/base/notifier_base_select.c index 78ade18c9b..a0b1ef7add 100644 --- a/orte/mca/notifier/base/notifier_base_select.c +++ b/orte/mca/notifier/base/notifier_base_select.c @@ -25,7 +25,7 @@ #include #endif -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/util/argv.h" #include "opal/util/output.h" diff --git a/orte/mca/notifier/notifier.h b/orte/mca/notifier/notifier.h index 077512020a..b790f03477 100644 --- a/orte/mca/notifier/notifier.h +++ b/orte/mca/notifier/notifier.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,8 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2009 Cisco Systems, Inc. All Rights Reserved. - * Copyright (c) 2012 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights + * reserved. * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. * $COPYRIGHT$ * @@ -48,7 +49,7 @@ #include #endif -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/constants.h" #include "orte/types.h" @@ -210,10 +211,8 @@ typedef struct { * Macro for use in components that are of type notifier v1.0.0 */ #define ORTE_NOTIFIER_BASE_VERSION_1_0_0 \ - /* notifier v1.0 is chained to MCA v2.0 */ \ - MCA_BASE_VERSION_2_0_0, \ - /* notifier v1.0 */ \ - "notifier", 1, 0, 0 + /* notifier v1.0 is chained to MCA v2.0 */ \ + ORTE_MCA_BASE_VERSION_2_1_0("notifier", 1, 0, 0) END_C_DECLS diff --git a/orte/mca/odls/alps/odls_alps.h b/orte/mca/odls/alps/odls_alps.h index b1be0818e3..b465ec2994 100644 --- a/orte/mca/odls/alps/odls_alps.h +++ b/orte/mca/odls/alps/odls_alps.h @@ -25,7 +25,7 @@ #define ORTE_ODLS_ALPS_H #include "orte_config.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/mca/odls/odls.h" #include "alps/alps.h" diff --git a/orte/mca/odls/alps/odls_alps_component.c b/orte/mca/odls/alps/odls_alps_component.c index b5dc275879..24bacf6091 100644 --- a/orte/mca/odls/alps/odls_alps_component.c +++ b/orte/mca/odls/alps/odls_alps_component.c @@ -34,7 +34,7 @@ #include #include -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "orte/mca/common/alps/common_alps.h" diff --git a/orte/mca/odls/alps/odls_alps_utils.c b/orte/mca/odls/alps/odls_alps_utils.c index 2ffee054a2..3571399d03 100644 --- a/orte/mca/odls/alps/odls_alps_utils.c +++ b/orte/mca/odls/alps/odls_alps_utils.c @@ -34,7 +34,7 @@ #include #include -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/util/opal_environ.h" diff --git a/orte/mca/odls/base/base.h b/orte/mca/odls/base/base.h index cf60233e00..6e83bf7e9c 100644 --- a/orte/mca/odls/base/base.h +++ b/orte/mca/odls/base/base.h @@ -28,7 +28,7 @@ */ #include "orte_config.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/mca/odls/odls.h" diff --git a/orte/mca/odls/base/odls_base_frame.c b/orte/mca/odls/base/odls_base_frame.c index 51156f3896..cb207978d9 100644 --- a/orte/mca/odls/base/odls_base_frame.c +++ b/orte/mca/odls/base/odls_base_frame.c @@ -31,7 +31,7 @@ #endif #include "opal/class/opal_ring_buffer.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/hwloc/hwloc.h" #include "opal/util/output.h" diff --git a/orte/mca/odls/base/odls_base_select.c b/orte/mca/odls/base/odls_base_select.c index 0296dc039e..ef88ed254a 100644 --- a/orte/mca/odls/base/odls_base_select.c +++ b/orte/mca/odls/base/odls_base_select.c @@ -20,7 +20,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "orte/mca/odls/base/base.h" diff --git a/orte/mca/odls/default/odls_default.h b/orte/mca/odls/default/odls_default.h index ab646d5e52..0cbf62b3cf 100644 --- a/orte/mca/odls/default/odls_default.h +++ b/orte/mca/odls/default/odls_default.h @@ -24,7 +24,7 @@ #include "orte_config.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/mca/odls/odls.h" diff --git a/orte/mca/odls/default/odls_default_component.c b/orte/mca/odls/default/odls_default_component.c index 6c74816181..cc2a88c075 100644 --- a/orte/mca/odls/default/odls_default_component.c +++ b/orte/mca/odls/default/odls_default_component.c @@ -31,7 +31,7 @@ #endif #include -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "orte/mca/odls/odls.h" diff --git a/orte/mca/odls/odls.h b/orte/mca/odls/odls.h index 3fabd6bf6d..88b69c71bf 100644 --- a/orte/mca/odls/odls.h +++ b/orte/mca/odls/odls.h @@ -1,5 +1,5 @@ -/* -*- C -*- - * +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ +/* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. @@ -10,8 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2011-2012 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -31,7 +31,7 @@ #include "orte_config.h" #include "orte/types.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/class/opal_pointer_array.h" #include "opal/dss/dss_types.h" @@ -121,8 +121,7 @@ typedef orte_odls_base_component_2_0_0_t orte_odls_base_component_t; * Macro for use in modules that are of type odls */ #define ORTE_ODLS_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "odls", 2, 0, 0 + ORTE_MCA_BASE_VERSION_2_1_0("odls", 2, 0, 0) /* Global structure for accessing ODLS functions */ diff --git a/orte/mca/oob/base/base.h b/orte/mca/oob/base/base.h index bf28f5ce7b..2c6bde8fb2 100644 --- a/orte/mca/oob/base/base.h +++ b/orte/mca/oob/base/base.h @@ -41,7 +41,7 @@ #include "opal/class/opal_hash_table.h" #include "opal/class/opal_list.h" #include "opal/util/timings.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/event/event.h" #include "orte/mca/oob/oob.h" diff --git a/orte/mca/oob/base/oob_base_frame.c b/orte/mca/oob/base/oob_base_frame.c index 757e1d5340..1648521ae4 100644 --- a/orte/mca/oob/base/oob_base_frame.c +++ b/orte/mca/oob/base/oob_base_frame.c @@ -25,7 +25,7 @@ #include "orte/constants.h" #include "opal/class/opal_bitmap.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/oob/base/oob_base_select.c b/orte/mca/oob/base/oob_base_select.c index 0cb01b05e4..da73ba89dc 100644 --- a/orte/mca/oob/base/oob_base_select.c +++ b/orte/mca/oob/base/oob_base_select.c @@ -26,7 +26,7 @@ #include #include -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/oob/oob.h b/orte/mca/oob/oob.h index 5c85dafe05..cc3778e892 100644 --- a/orte/mca/oob/oob.h +++ b/orte/mca/oob/oob.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2012 Los Alamos National Security, LLC. All rights + * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ * @@ -40,7 +41,7 @@ #include "opal/class/opal_list.h" #include "opal/class/opal_pointer_array.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/mca/rml/base/base.h" @@ -80,8 +81,7 @@ typedef struct { * Macro for use in components that are of type oob */ #define MCA_OOB_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "oob", 2, 0, 0 + ORTE_MCA_BASE_VERSION_2_1_0("oob", 2, 0, 0) END_C_DECLS diff --git a/orte/mca/plm/alps/plm_alps.h b/orte/mca/plm/alps/plm_alps.h index 48092eb774..d837045aa9 100644 --- a/orte/mca/plm/alps/plm_alps.h +++ b/orte/mca/plm/alps/plm_alps.h @@ -21,7 +21,7 @@ #include "orte_config.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/mca/plm/plm.h" BEGIN_C_DECLS diff --git a/orte/mca/plm/base/base.h b/orte/mca/plm/base/base.h index 16ae73103c..de7f81e9af 100644 --- a/orte/mca/plm/base/base.h +++ b/orte/mca/plm/base/base.h @@ -27,7 +27,7 @@ */ #include "orte_config.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/class/opal_list.h" #include "orte/mca/plm/plm.h" diff --git a/orte/mca/plm/base/plm_base_frame.c b/orte/mca/plm/base/plm_base_frame.c index 0c505990d8..e0485a14f7 100644 --- a/orte/mca/plm/base/plm_base_frame.c +++ b/orte/mca/plm/base/plm_base_frame.c @@ -23,7 +23,7 @@ #include "orte/constants.h" #include "opal/util/output.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/mca/plm/base/plm_base_receive.c b/orte/mca/plm/base/plm_base_receive.c index ea543d26b5..a990d711b5 100644 --- a/orte/mca/plm/base/plm_base_receive.c +++ b/orte/mca/plm/base/plm_base_receive.c @@ -35,7 +35,7 @@ #include #endif -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/dss/dss.h" #include "opal/threads/threads.h" #include "opal/util/argv.h" diff --git a/orte/mca/plm/base/plm_base_select.c b/orte/mca/plm/base/plm_base_select.c index 6211a4ab2e..ea9b86729b 100644 --- a/orte/mca/plm/base/plm_base_select.c +++ b/orte/mca/plm/base/plm_base_select.c @@ -21,7 +21,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" diff --git a/orte/mca/plm/isolated/plm_isolated.h b/orte/mca/plm/isolated/plm_isolated.h index 91d050af8c..4333ce1074 100644 --- a/orte/mca/plm/isolated/plm_isolated.h +++ b/orte/mca/plm/isolated/plm_isolated.h @@ -26,7 +26,7 @@ #include "orte_config.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/mca/plm/plm.h" diff --git a/orte/mca/plm/lsf/plm_lsf.h b/orte/mca/plm/lsf/plm_lsf.h index d4791d19dd..4c5422ff0a 100644 --- a/orte/mca/plm/lsf/plm_lsf.h +++ b/orte/mca/plm/lsf/plm_lsf.h @@ -22,7 +22,7 @@ #include "orte_config.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/mca/plm/plm.h" diff --git a/orte/mca/plm/plm.h b/orte/mca/plm/plm.h index 4b1e3bbd52..3847c8f593 100644 --- a/orte/mca/plm/plm.h +++ b/orte/mca/plm/plm.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,8 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2011-2012 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -35,7 +36,7 @@ #include "orte_config.h" #include "orte/types.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/dss/dss_types.h" #include "opal/class/opal_pointer_array.h" @@ -137,8 +138,7 @@ typedef orte_plm_base_component_2_0_0_t orte_plm_base_component_t; * Macro for use in modules that are of type plm */ #define ORTE_PLM_BASE_VERSION_2_0_0 \ -MCA_BASE_VERSION_2_0_0, \ -"plm", 2, 0, 0 + ORTE_MCA_BASE_VERSION_2_1_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/rsh/plm_rsh.h b/orte/mca/plm/rsh/plm_rsh.h index 97adc92fb0..52fac1ba85 100644 --- a/orte/mca/plm/rsh/plm_rsh.h +++ b/orte/mca/plm/rsh/plm_rsh.h @@ -37,7 +37,7 @@ #endif #include "opal/threads/condition.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/mca/plm/plm.h" diff --git a/orte/mca/plm/slurm/plm_slurm.h b/orte/mca/plm/slurm/plm_slurm.h index 6e881b7d53..e8a3baaf5b 100644 --- a/orte/mca/plm/slurm/plm_slurm.h +++ b/orte/mca/plm/slurm/plm_slurm.h @@ -21,7 +21,7 @@ #include "orte_config.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/mca/plm/plm.h" BEGIN_C_DECLS diff --git a/orte/mca/plm/tm/plm_tm.h b/orte/mca/plm/tm/plm_tm.h index d20ceaf9fa..3b1d6eb347 100644 --- a/orte/mca/plm/tm/plm_tm.h +++ b/orte/mca/plm/tm/plm_tm.h @@ -22,7 +22,7 @@ #include "orte_config.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/mca/plm/plm.h" BEGIN_C_DECLS diff --git a/orte/mca/ras/base/ras_base_allocate.c b/orte/mca/ras/base/ras_base_allocate.c index 1d68234549..a0bc8e979b 100644 --- a/orte/mca/ras/base/ras_base_allocate.c +++ b/orte/mca/ras/base/ras_base_allocate.c @@ -28,7 +28,7 @@ #include "orte/constants.h" #include "orte/types.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/class/opal_list.h" #include "opal/util/output.h" diff --git a/orte/mca/ras/base/ras_base_close.c b/orte/mca/ras/base/ras_base_close.c index c6b74d9f9e..a5e9f46809 100644 --- a/orte/mca/ras/base/ras_base_close.c +++ b/orte/mca/ras/base/ras_base_close.c @@ -21,7 +21,7 @@ #include -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "orte/mca/ras/base/base.h" diff --git a/orte/mca/ras/base/ras_base_frame.c b/orte/mca/ras/base/ras_base_frame.c index 4f55447ee8..38d440c0d5 100644 --- a/orte/mca/ras/base/ras_base_frame.c +++ b/orte/mca/ras/base/ras_base_frame.c @@ -22,7 +22,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/event/event.h" diff --git a/orte/mca/ras/base/ras_base_select.c b/orte/mca/ras/base/ras_base_select.c index 15740abbf7..a1d2a4e369 100644 --- a/orte/mca/ras/base/ras_base_select.c +++ b/orte/mca/ras/base/ras_base_select.c @@ -21,7 +21,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/ras/ras.h b/orte/mca/ras/ras.h index 8b0d4fc2ec..00297fec46 100644 --- a/orte/mca/ras/ras.h +++ b/orte/mca/ras/ras.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2011-2012 Los Alamos National Security, LLC. All rights + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ * @@ -53,7 +54,7 @@ #include "orte/constants.h" #include "orte/types.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/event/event.h" #include "opal/class/opal_list.h" @@ -132,8 +133,7 @@ typedef orte_ras_base_component_2_0_0_t orte_ras_base_component_t; * Macro for use in components that are of type ras */ #define ORTE_RAS_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "ras", 2, 0, 0 + ORTE_MCA_BASE_VERSION_2_1_0("ras", 2, 0, 0) END_C_DECLS diff --git a/orte/mca/rmaps/base/base.h b/orte/mca/rmaps/base/base.h index dabcd03450..845139a1f0 100644 --- a/orte/mca/rmaps/base/base.h +++ b/orte/mca/rmaps/base/base.h @@ -33,7 +33,7 @@ #include "orte/types.h" #include "opal/class/opal_list.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/mca/rmaps/base/rmaps_base_binding.c b/orte/mca/rmaps/base/rmaps_base_binding.c index daac358862..f292a014f0 100644 --- a/orte/mca/rmaps/base/rmaps_base_binding.c +++ b/orte/mca/rmaps/base/rmaps_base_binding.c @@ -33,7 +33,7 @@ #include "opal/util/if.h" #include "opal/util/output.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/hwloc/base/base.h" #include "opal/threads/tsd.h" diff --git a/orte/mca/rmaps/base/rmaps_base_frame.c b/orte/mca/rmaps/base/rmaps_base_frame.c index e66037db70..9b08fb0828 100644 --- a/orte/mca/rmaps/base/rmaps_base_frame.c +++ b/orte/mca/rmaps/base/rmaps_base_frame.c @@ -29,7 +29,7 @@ #include #endif -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/util/argv.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/rmaps/base/rmaps_base_map_job.c b/orte/mca/rmaps/base/rmaps_base_map_job.c index 0a15737494..1b1bd1ce75 100644 --- a/orte/mca/rmaps/base/rmaps_base_map_job.c +++ b/orte/mca/rmaps/base/rmaps_base_map_job.c @@ -25,7 +25,7 @@ #include -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" #include "opal/mca/hwloc/base/base.h" diff --git a/orte/mca/rmaps/base/rmaps_base_print_fns.c b/orte/mca/rmaps/base/rmaps_base_print_fns.c index 3a57aa8b80..0bd3f86466 100644 --- a/orte/mca/rmaps/base/rmaps_base_print_fns.c +++ b/orte/mca/rmaps/base/rmaps_base_print_fns.c @@ -28,7 +28,7 @@ #include "opal/util/if.h" #include "opal/util/output.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/hwloc/base/base.h" #include "opal/threads/tsd.h" diff --git a/orte/mca/rmaps/base/rmaps_base_ranking.c b/orte/mca/rmaps/base/rmaps_base_ranking.c index d910555476..22d74c8ca0 100644 --- a/orte/mca/rmaps/base/rmaps_base_ranking.c +++ b/orte/mca/rmaps/base/rmaps_base_ranking.c @@ -30,7 +30,7 @@ #include "opal/class/opal_pointer_array.h" #include "opal/util/if.h" #include "opal/util/output.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/hwloc/base/base.h" #include "opal/threads/tsd.h" diff --git a/orte/mca/rmaps/base/rmaps_base_select.c b/orte/mca/rmaps/base/rmaps_base_select.c index 71685b17d3..c6feeeaec1 100644 --- a/orte/mca/rmaps/base/rmaps_base_select.c +++ b/orte/mca/rmaps/base/rmaps_base_select.c @@ -21,7 +21,7 @@ #include -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "orte/mca/rmaps/base/base.h" diff --git a/orte/mca/rmaps/base/rmaps_base_support_fns.c b/orte/mca/rmaps/base/rmaps_base_support_fns.c index 5aa84d022e..508aadb8ca 100644 --- a/orte/mca/rmaps/base/rmaps_base_support_fns.c +++ b/orte/mca/rmaps/base/rmaps_base_support_fns.c @@ -32,7 +32,7 @@ #include "opal/util/argv.h" #include "opal/util/if.h" #include "opal/util/output.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/hwloc/base/base.h" #include "opal/threads/tsd.h" diff --git a/orte/mca/rmaps/rmaps.h b/orte/mca/rmaps/rmaps.h index cfcb2df28e..a64fc78e2a 100644 --- a/orte/mca/rmaps/rmaps.h +++ b/orte/mca/rmaps/rmaps.h @@ -47,7 +47,7 @@ #include "orte_config.h" #include "orte/types.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/mca/rmaps/rmaps_types.h b/orte/mca/rmaps/rmaps_types.h index 33542656c6..2faf43572c 100644 --- a/orte/mca/rmaps/rmaps_types.h +++ b/orte/mca/rmaps/rmaps_types.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. @@ -9,8 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2012 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights + * reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved. * $COPYRIGHT$ * @@ -82,8 +83,7 @@ ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_job_map_t); * Macro for use in components that are of type rmaps */ #define ORTE_RMAPS_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "rmaps", 2, 0, 0 + ORTE_MCA_BASE_VERSION_2_1_0("rmaps", 2, 0, 0) /* define map-related directives */ #define ORTE_MAPPING_NO_USE_LOCAL 0x0100 diff --git a/orte/mca/rml/base/base.h b/orte/mca/rml/base/base.h index 4f98f1c59f..4eca6e45e1 100644 --- a/orte/mca/rml/base/base.h +++ b/orte/mca/rml/base/base.h @@ -41,7 +41,7 @@ #include "orte_config.h" #include "opal/dss/dss_types.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/util/timings.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/mca/rml/base/rml_base_frame.c b/orte/mca/rml/base/rml_base_frame.c index c973af8198..e4d14b0fc3 100644 --- a/orte/mca/rml/base/rml_base_frame.c +++ b/orte/mca/rml/base/rml_base_frame.c @@ -20,7 +20,7 @@ #endif #include "opal/dss/dss.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/mca_base_component_repository.h" #include "opal/util/output.h" diff --git a/orte/mca/rml/rml.h b/orte/mca/rml/rml.h index 7b5f4b0d23..012f5fef00 100644 --- a/orte/mca/rml/rml.h +++ b/orte/mca/rml/rml.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2011-2013 Los Alamos National Security, LLC. All rights + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ * @@ -39,7 +40,7 @@ #include #endif -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/crs/crs.h" #include "opal/mca/crs/base/base.h" @@ -489,8 +490,7 @@ ORTE_DECLSPEC extern orte_rml_module_t orte_rml; /** 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 + ORTE_MCA_BASE_VERSION_2_1_0("rml", 2, 0, 0) /* ******************************************************************** */ diff --git a/orte/mca/routed/base/base.h b/orte/mca/routed/base/base.h index 2ede3bc8c6..63bed7f370 100644 --- a/orte/mca/routed/base/base.h +++ b/orte/mca/routed/base/base.h @@ -14,7 +14,7 @@ #include "orte_config.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/class/opal_pointer_array.h" #include "opal/dss/dss_types.h" diff --git a/orte/mca/routed/base/routed_base_frame.c b/orte/mca/routed/base/routed_base_frame.c index 542c1efc7c..19d7a9d317 100644 --- a/orte/mca/routed/base/routed_base_frame.c +++ b/orte/mca/routed/base/routed_base_frame.c @@ -17,7 +17,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/class/opal_bitmap.h" #include "opal/dss/dss.h" #include "opal/util/output.h" diff --git a/orte/mca/routed/routed.h b/orte/mca/routed/routed.h index 613a3697c4..3ce914e524 100644 --- a/orte/mca/routed/routed.h +++ b/orte/mca/routed/routed.h @@ -1,6 +1,7 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2007 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2007-2015 Los Alamos National Security, LLC. All rights + * reserved. * Copyright (c) 2004-2008 The Trustees of Indiana University. * All rights reserved. * Copyright (c) 2004-2011 The University of Tennessee and The University @@ -34,7 +35,7 @@ #endif #include "orte/types.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/dss/dss_types.h" @@ -273,8 +274,7 @@ ORTE_DECLSPEC extern orte_routed_module_t orte_routed; /** 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 + ORTE_MCA_BASE_VERSION_2_1_0("routed", 2, 0, 0) /* ******************************************************************** */ diff --git a/orte/mca/rtc/base/base.h b/orte/mca/rtc/base/base.h index bab30b1f01..f884f44895 100644 --- a/orte/mca/rtc/base/base.h +++ b/orte/mca/rtc/base/base.h @@ -20,7 +20,7 @@ #include "orte/types.h" #include "opal/class/opal_list.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/mca/rtc/rtc.h" diff --git a/orte/mca/rtc/base/rtc_base_frame.c b/orte/mca/rtc/base/rtc_base_frame.c index 8624e7ec42..ade7df131e 100644 --- a/orte/mca/rtc/base/rtc_base_frame.c +++ b/orte/mca/rtc/base/rtc_base_frame.c @@ -14,7 +14,7 @@ #include #endif -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/class/opal_list.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/rtc/base/rtc_base_select.c b/orte/mca/rtc/base/rtc_base_select.c index a1716c1774..ea290483d2 100644 --- a/orte/mca/rtc/base/rtc_base_select.c +++ b/orte/mca/rtc/base/rtc_base_select.c @@ -12,7 +12,7 @@ #include -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "orte/mca/rtc/base/base.h" diff --git a/orte/mca/rtc/rtc.h b/orte/mca/rtc/rtc.h index c82b5aaf88..1f1465e089 100644 --- a/orte/mca/rtc/rtc.h +++ b/orte/mca/rtc/rtc.h @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014 Intel, Inc. All rights reserved + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -18,7 +21,7 @@ #include "orte_config.h" #include "orte/types.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/class/opal_list.h" #include "orte/runtime/orte_globals.h" @@ -105,8 +108,7 @@ ORTE_DECLSPEC extern orte_rtc_API_module_t orte_rtc; * Macro for use in components that are of type rtc */ #define ORTE_RTC_BASE_VERSION_1_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "rtc", 1, 0, 0 + ORTE_MCA_BASE_VERSION_2_1_0("rtc", 1, 0, 0) END_C_DECLS diff --git a/orte/mca/schizo/base/base.h b/orte/mca/schizo/base/base.h index d5ac38170c..6c4b611a53 100644 --- a/orte/mca/schizo/base/base.h +++ b/orte/mca/schizo/base/base.h @@ -20,7 +20,7 @@ #include "orte/types.h" #include "opal/class/opal_list.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/mca/schizo/base/schizo_base_frame.c b/orte/mca/schizo/base/schizo_base_frame.c index 8d231dc485..32bc722424 100644 --- a/orte/mca/schizo/base/schizo_base_frame.c +++ b/orte/mca/schizo/base/schizo_base_frame.c @@ -14,7 +14,7 @@ #include #endif -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/util/argv.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/schizo/base/schizo_base_select.c b/orte/mca/schizo/base/schizo_base_select.c index 77329d5c4c..ed12eaa576 100644 --- a/orte/mca/schizo/base/schizo_base_select.c +++ b/orte/mca/schizo/base/schizo_base_select.c @@ -13,7 +13,7 @@ #include #include -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/schizo/schizo.h b/orte/mca/schizo/schizo.h index 51b4af1b38..66b5efda69 100644 --- a/orte/mca/schizo/schizo.h +++ b/orte/mca/schizo/schizo.h @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2015 Intel, Inc. All rights reserved + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -21,7 +24,7 @@ #include "orte_config.h" #include "orte/types.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/runtime/orte_globals.h" @@ -84,8 +87,7 @@ typedef struct { * Macro for use in components that are of type schizo */ #define MCA_SCHIZO_BASE_VERSION_1_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "schizo", 1, 0, 0 + ORTE_MCA_BASE_VERSION_2_1_0("schizo", 1, 0, 0) END_C_DECLS diff --git a/orte/mca/snapc/base/snapc_base_fns.c b/orte/mca/snapc/base/snapc_base_fns.c index 3d523f8b49..45207d7919 100644 --- a/orte/mca/snapc/base/snapc_base_fns.c +++ b/orte/mca/snapc/base/snapc_base_fns.c @@ -39,7 +39,7 @@ #endif /* HAVE_DIRENT_H */ #include -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/util/os_dirpath.h" diff --git a/orte/mca/snapc/base/snapc_base_frame.c b/orte/mca/snapc/base/snapc_base_frame.c index edb8e6e3ff..191e8eb05a 100644 --- a/orte/mca/snapc/base/snapc_base_frame.c +++ b/orte/mca/snapc/base/snapc_base_frame.c @@ -31,7 +31,7 @@ #include #endif -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/util/opal_environ.h" #include "opal/util/output.h" diff --git a/orte/mca/snapc/base/snapc_base_select.c b/orte/mca/snapc/base/snapc_base_select.c index 467b63a277..368e2bcbed 100644 --- a/orte/mca/snapc/base/snapc_base_select.c +++ b/orte/mca/snapc/base/snapc_base_select.c @@ -23,7 +23,7 @@ #include "orte/constants.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/snapc/full/snapc_full.h b/orte/mca/snapc/full/snapc_full.h index 9eff5e4b71..653e4924bd 100644 --- a/orte/mca/snapc/full/snapc_full.h +++ b/orte/mca/snapc/full/snapc_full.h @@ -27,7 +27,7 @@ #include "orte_config.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/event/event.h" #include "orte/mca/sstore/sstore.h" diff --git a/orte/mca/snapc/full/snapc_full_app.c b/orte/mca/snapc/full/snapc_full_app.c index 6f51c09075..88e90ca7d6 100644 --- a/orte/mca/snapc/full/snapc_full_app.c +++ b/orte/mca/snapc/full/snapc_full_app.c @@ -44,7 +44,7 @@ #include "opal/util/output.h" #include "opal/mca/event/event.h" #include "opal/util/opal_environ.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/crs/crs.h" #include "opal/mca/crs/base/base.h" diff --git a/orte/mca/snapc/full/snapc_full_global.c b/orte/mca/snapc/full/snapc_full_global.c index c12781dfde..7f691062a4 100644 --- a/orte/mca/snapc/full/snapc_full_global.c +++ b/orte/mca/snapc/full/snapc_full_global.c @@ -30,7 +30,7 @@ #include "opal/util/opal_environ.h" #include "opal/util/basename.h" #include "opal/util/show_help.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/crs/crs.h" #include "opal/mca/crs/base/base.h" diff --git a/orte/mca/snapc/full/snapc_full_local.c b/orte/mca/snapc/full/snapc_full_local.c index 68401b2888..c2051708f7 100644 --- a/orte/mca/snapc/full/snapc_full_local.c +++ b/orte/mca/snapc/full/snapc_full_local.c @@ -47,7 +47,7 @@ #include "opal/util/opal_environ.h" #include "opal/util/os_dirpath.h" #include "opal/util/basename.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/crs/crs.h" #include "opal/mca/crs/base/base.h" diff --git a/orte/mca/snapc/full/snapc_full_module.c b/orte/mca/snapc/full/snapc_full_module.c index e75f93347e..850ba2f540 100644 --- a/orte/mca/snapc/full/snapc_full_module.c +++ b/orte/mca/snapc/full/snapc_full_module.c @@ -21,7 +21,7 @@ #include #endif /* HAVE_UNISTD_H */ -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/util/output.h" diff --git a/orte/mca/snapc/snapc.h b/orte/mca/snapc/snapc.h index 8095ba96f7..d7551f7199 100644 --- a/orte/mca/snapc/snapc.h +++ b/orte/mca/snapc/snapc.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -76,7 +79,7 @@ #include "orte/constants.h" #include "orte/types.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/crs/crs.h" #include "opal/mca/crs/base/base.h" @@ -394,8 +397,7 @@ ORTE_DECLSPEC extern orte_snapc_base_component_t orte_snapc_base_selected_compon * Macro for use in components that are of type SNAPC */ #define ORTE_SNAPC_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "snapc", 2, 0, 0 + ORTE_MCA_BASE_VERSION_2_1_0("snapc", 2, 0, 0) END_C_DECLS diff --git a/orte/mca/sstore/base/sstore_base_fns.c b/orte/mca/sstore/base/sstore_base_fns.c index 1f03abef2f..985bd3661c 100644 --- a/orte/mca/sstore/base/sstore_base_fns.c +++ b/orte/mca/sstore/base/sstore_base_fns.c @@ -32,7 +32,7 @@ #include "orte/constants.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/util/argv.h" #include "opal/mca/crs/base/base.h" diff --git a/orte/mca/sstore/base/sstore_base_frame.c b/orte/mca/sstore/base/sstore_base_frame.c index ee724dd4ba..ed6dab7c6e 100644 --- a/orte/mca/sstore/base/sstore_base_frame.c +++ b/orte/mca/sstore/base/sstore_base_frame.c @@ -15,7 +15,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/util/output.h" #include "opal/util/opal_environ.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/sstore/base/sstore_base_select.c b/orte/mca/sstore/base/sstore_base_select.c index 516bcd7853..27fb073398 100644 --- a/orte/mca/sstore/base/sstore_base_select.c +++ b/orte/mca/sstore/base/sstore_base_select.c @@ -16,7 +16,7 @@ #include "orte/constants.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/sstore/central/sstore_central.h b/orte/mca/sstore/central/sstore_central.h index 592c05a93d..80ae94ed64 100644 --- a/orte/mca/sstore/central/sstore_central.h +++ b/orte/mca/sstore/central/sstore_central.h @@ -20,7 +20,7 @@ #include "orte_config.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/mca/sstore/sstore.h" diff --git a/orte/mca/sstore/central/sstore_central_app.c b/orte/mca/sstore/central/sstore_central_app.c index ac1736ae83..06d2b0d335 100644 --- a/orte/mca/sstore/central/sstore_central_app.c +++ b/orte/mca/sstore/central/sstore_central_app.c @@ -25,7 +25,7 @@ #include #endif /* HAVE_UNISTD_H */ -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/event/event.h" diff --git a/orte/mca/sstore/central/sstore_central_global.c b/orte/mca/sstore/central/sstore_central_global.c index 40f9578ef6..8fbb24fa7b 100644 --- a/orte/mca/sstore/central/sstore_central_global.c +++ b/orte/mca/sstore/central/sstore_central_global.c @@ -28,7 +28,7 @@ #include #endif /* HAVE_UNISTD_H */ -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/event/event.h" diff --git a/orte/mca/sstore/central/sstore_central_local.c b/orte/mca/sstore/central/sstore_central_local.c index 8168a2dd75..fb927fa637 100644 --- a/orte/mca/sstore/central/sstore_central_local.c +++ b/orte/mca/sstore/central/sstore_central_local.c @@ -28,7 +28,7 @@ #include #endif /* HAVE_UNISTD_H */ -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/event/event.h" diff --git a/orte/mca/sstore/central/sstore_central_module.c b/orte/mca/sstore/central/sstore_central_module.c index 3e0bf052ac..493d9ecd1e 100644 --- a/orte/mca/sstore/central/sstore_central_module.c +++ b/orte/mca/sstore/central/sstore_central_module.c @@ -25,7 +25,7 @@ #include #endif /* HAVE_UNISTD_H */ -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/event/event.h" diff --git a/orte/mca/sstore/sstore.h b/orte/mca/sstore/sstore.h index d1ead7e939..72d9d344f0 100644 --- a/orte/mca/sstore/sstore.h +++ b/orte/mca/sstore/sstore.h @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2010 The Trustees of Indiana University and Indiana * University Research and Technology + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * Corporation. All rights reserved. * $COPYRIGHT$ * @@ -23,7 +26,7 @@ #include "orte/types.h" #include "orte/runtime/orte_globals.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/class/opal_object.h" @@ -395,8 +398,7 @@ ORTE_DECLSPEC extern orte_sstore_base_module_t orte_sstore; * Macro for use in components that are of type SSTORE */ #define ORTE_SSTORE_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "sstore", 2, 0, 0 + ORTE_MCA_BASE_VERSION_2_1_0("sstore", 2, 0, 0) END_C_DECLS diff --git a/orte/mca/sstore/stage/sstore_stage.h b/orte/mca/sstore/stage/sstore_stage.h index a0a3930fc7..8f4159054c 100644 --- a/orte/mca/sstore/stage/sstore_stage.h +++ b/orte/mca/sstore/stage/sstore_stage.h @@ -20,7 +20,7 @@ #include "orte_config.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/mca/sstore/sstore.h" diff --git a/orte/mca/sstore/stage/sstore_stage_app.c b/orte/mca/sstore/stage/sstore_stage_app.c index cecd5b05f8..e92013821b 100644 --- a/orte/mca/sstore/stage/sstore_stage_app.c +++ b/orte/mca/sstore/stage/sstore_stage_app.c @@ -25,7 +25,7 @@ #include #endif /* HAVE_UNISTD_H */ -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/event/event.h" diff --git a/orte/mca/sstore/stage/sstore_stage_global.c b/orte/mca/sstore/stage/sstore_stage_global.c index 00e7dbbfd9..d112388b88 100644 --- a/orte/mca/sstore/stage/sstore_stage_global.c +++ b/orte/mca/sstore/stage/sstore_stage_global.c @@ -28,7 +28,7 @@ #include #endif /* HAVE_UNISTD_H */ -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/event/event.h" diff --git a/orte/mca/sstore/stage/sstore_stage_local.c b/orte/mca/sstore/stage/sstore_stage_local.c index 1608f9ffef..1ae2260373 100644 --- a/orte/mca/sstore/stage/sstore_stage_local.c +++ b/orte/mca/sstore/stage/sstore_stage_local.c @@ -28,7 +28,7 @@ #include #endif /* HAVE_UNISTD_H */ -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/event/event.h" diff --git a/orte/mca/sstore/stage/sstore_stage_module.c b/orte/mca/sstore/stage/sstore_stage_module.c index 2b19bdfc22..6c77445de1 100644 --- a/orte/mca/sstore/stage/sstore_stage_module.c +++ b/orte/mca/sstore/stage/sstore_stage_module.c @@ -25,7 +25,7 @@ #include #endif /* HAVE_UNISTD_H */ -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/event/event.h" diff --git a/orte/mca/state/base/base.h b/orte/mca/state/base/base.h index 28391f30ab..0c1885dbbd 100644 --- a/orte/mca/state/base/base.h +++ b/orte/mca/state/base/base.h @@ -21,7 +21,7 @@ #include "opal/class/opal_list.h" -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "orte/mca/state/state.h" diff --git a/orte/mca/state/base/state_base_frame.c b/orte/mca/state/base/state_base_frame.c index 22af16d61a..cee80fa477 100644 --- a/orte/mca/state/base/state_base_frame.c +++ b/orte/mca/state/base/state_base_frame.c @@ -23,7 +23,7 @@ #include #endif -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/class/opal_list.h" diff --git a/orte/mca/state/base/state_base_select.c b/orte/mca/state/base/state_base_select.c index f3bf5c1df9..9c52b943b3 100644 --- a/orte/mca/state/base/state_base_select.c +++ b/orte/mca/state/base/state_base_select.c @@ -16,7 +16,7 @@ #include #endif -#include "opal/mca/mca.h" +#include "orte/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/util/output.h" diff --git a/orte/mca/state/state.h b/orte/mca/state/state.h index 7739e91da4..fcac123b9a 100644 --- a/orte/mca/state/state.h +++ b/orte/mca/state/state.h @@ -1,6 +1,7 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2011 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -279,8 +280,7 @@ typedef orte_state_base_component_1_0_0_t orte_state_base_component_t; * Macro for use in components that are of type state */ #define ORTE_STATE_BASE_VERSION_1_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "state", 1, 0, 0 + ORTE_MCA_BASE_VERSION_2_1_0("state", 1, 0, 0) END_C_DECLS #endif diff --git a/oshmem/Makefile.am b/oshmem/Makefile.am index 1aebdd5e89..036183907e 100644 --- a/oshmem/Makefile.am +++ b/oshmem/Makefile.am @@ -3,6 +3,8 @@ # All rights reserved. # Copyright (c) 2013-2014 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2014 Intel, Inc. All rights reserved. +# Copyright (c) 2015 Los Alamos National Security, LLC. All rights +# reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -92,5 +94,6 @@ include proc/Makefile.am include request/Makefile.am include runtime/Makefile.am include shmem/Makefile.am +include mca/Makefile.am include tools/Makefile.am include util/Makefile.am diff --git a/oshmem/mca/Makefile.am b/oshmem/mca/Makefile.am new file mode 100644 index 0000000000..8d3fca3fb4 --- /dev/null +++ b/oshmem/mca/Makefile.am @@ -0,0 +1,23 @@ +# +# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana +# University Research and Technology +# Corporation. All rights reserved. +# Copyright (c) 2004-2005 The University of Tennessee and The University +# of Tennessee Research Foundation. All rights +# reserved. +# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, +# University of Stuttgart. All rights reserved. +# Copyright (c) 2004-2005 The Regents of the University of California. +# All rights reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +# This makefile.am does not stand on its own - it is included from opal/Makefile.am + +# Source code files +headers += \ + mca/mca.h diff --git a/oshmem/mca/atomic/atomic.h b/oshmem/mca/atomic/atomic.h index 869e4cfbc8..d79fafa887 100644 --- a/oshmem/mca/atomic/atomic.h +++ b/oshmem/mca/atomic/atomic.h @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2013 Mellanox Technologies, Inc. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,7 +27,7 @@ #include "opal/util/output.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "opal/mca/base/base.h" #include "oshmem/mca/atomic/base/base.h" @@ -110,8 +113,7 @@ OSHMEM_DECLSPEC OBJ_CLASS_DECLARATION(mca_atomic_base_module_t); * Macro for use in components */ #define MCA_ATOMIC_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "atomic", 1, 0, 0 + OSHMEM_MCA_BASE_VERSION_2_1_0("atomic", 1, 0, 0) /* ******************************************************************** */ diff --git a/oshmem/mca/atomic/base/atomic_base_available.c b/oshmem/mca/atomic/base/atomic_base_available.c index 2e5a071bb4..464760b658 100644 --- a/oshmem/mca/atomic/base/atomic_base_available.c +++ b/oshmem/mca/atomic/base/atomic_base_available.c @@ -15,7 +15,7 @@ #include "oshmem_config.h" #include "opal/class/opal_list.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" diff --git a/oshmem/mca/atomic/base/atomic_base_frame.c b/oshmem/mca/atomic/base/atomic_base_frame.c index 3c5440f3e4..7d209fdc6c 100644 --- a/oshmem/mca/atomic/base/atomic_base_frame.c +++ b/oshmem/mca/atomic/base/atomic_base_frame.c @@ -14,7 +14,7 @@ #include "oshmem/constants.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/oshmem/mca/atomic/base/atomic_base_select.c b/oshmem/mca/atomic/base/atomic_base_select.c index b1db422883..59bb822c25 100644 --- a/oshmem/mca/atomic/base/atomic_base_select.c +++ b/oshmem/mca/atomic/base/atomic_base_select.c @@ -18,7 +18,7 @@ #include "opal/class/opal_list.h" #include "oshmem/util/oshmem_util.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" diff --git a/oshmem/mca/atomic/basic/atomic_basic.h b/oshmem/mca/atomic/basic/atomic_basic.h index b8657a2cad..7d809b34ae 100644 --- a/oshmem/mca/atomic/basic/atomic_basic.h +++ b/oshmem/mca/atomic/basic/atomic_basic.h @@ -13,7 +13,7 @@ #include "oshmem_config.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "oshmem/mca/atomic/atomic.h" #include "oshmem/util/oshmem_util.h" diff --git a/oshmem/mca/atomic/mxm/atomic_mxm.h b/oshmem/mca/atomic/mxm/atomic_mxm.h index ff4edd6eed..2dba480851 100644 --- a/oshmem/mca/atomic/mxm/atomic_mxm.h +++ b/oshmem/mca/atomic/mxm/atomic_mxm.h @@ -13,7 +13,7 @@ #include "oshmem_config.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "oshmem/mca/atomic/atomic.h" #include "oshmem/util/oshmem_util.h" diff --git a/oshmem/mca/mca.h b/oshmem/mca/mca.h new file mode 100644 index 0000000000..12b7bf81ae --- /dev/null +++ b/oshmem/mca/mca.h @@ -0,0 +1,39 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ +/* + * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana + * University Research and Technology + * Corporation. All rights reserved. + * Copyright (c) 2004-2005 The University of Tennessee and The University + * of Tennessee Research Foundation. All rights + * reserved. + * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, + * University of Stuttgart. All rights reserved. + * Copyright (c) 2004-2005 The Regents of the University of California. + * All rights reserved. + * Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ +/** + * @file + * + * Top-level interface for \em all orte MCA components. + */ + +#ifndef OSHMEM_MCA_H +#define OSHMEM_MCA_H + +#include "oshmem_config.h" +#include "opal/mca/mca.h" + +#define OSHMEM_MCA_BASE_VERSION_2_1_0(type, type_major, type_minor, type_release) \ + MCA_BASE_VERSION_2_1_0("oshmem", OSHMEM_MAJOR_VERSION, OSHMEM_MINOR_VERSION, \ + OSHMEM_RELEASE_VERSION, type, type_major, type_minor, \ + type_release) + +#endif /* OSHMEM_MCA_H */ diff --git a/oshmem/mca/memheap/base/base.h b/oshmem/mca/memheap/base/base.h index 71c99f976d..396b5f52b6 100644 --- a/oshmem/mca/memheap/base/base.h +++ b/oshmem/mca/memheap/base/base.h @@ -16,7 +16,7 @@ #include "oshmem_config.h" #include "opal/class/opal_list.h" #include "opal/class/opal_value_array.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "oshmem/mca/memheap/memheap.h" diff --git a/oshmem/mca/memheap/base/memheap_base_frame.c b/oshmem/mca/memheap/base/memheap_base_frame.c index 372193ad86..090a019abb 100644 --- a/oshmem/mca/memheap/base/memheap_base_frame.c +++ b/oshmem/mca/memheap/base/memheap_base_frame.c @@ -12,7 +12,7 @@ #include "oshmem_config.h" #include -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/oshmem/mca/memheap/base/memheap_base_select.c b/oshmem/mca/memheap/base/memheap_base_select.c index d0309ef842..810a90d543 100644 --- a/oshmem/mca/memheap/base/memheap_base_select.c +++ b/oshmem/mca/memheap/base/memheap_base_select.c @@ -12,7 +12,7 @@ #include "opal/util/argv.h" #include "opal/util/show_help.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" #include "oshmem/util/oshmem_util.h" diff --git a/oshmem/mca/memheap/buddy/memheap_buddy.h b/oshmem/mca/memheap/buddy/memheap_buddy.h index 57baea85aa..a887d76ccd 100644 --- a/oshmem/mca/memheap/buddy/memheap_buddy.h +++ b/oshmem/mca/memheap/buddy/memheap_buddy.h @@ -15,7 +15,7 @@ #define MCA_MEMHEAP_BUDDY_H #include "oshmem_config.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "opal/class/opal_list.h" #include "opal/threads/mutex.h" #include "oshmem/mca/memheap/memheap.h" diff --git a/oshmem/mca/memheap/memheap.h b/oshmem/mca/memheap/memheap.h index ce8f2d3ef1..79cd7e4ef6 100644 --- a/oshmem/mca/memheap/memheap.h +++ b/oshmem/mca/memheap/memheap.h @@ -1,6 +1,9 @@ -/** +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ +/* * Copyright (c) 2013 Mellanox Technologies, Inc. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -10,7 +13,7 @@ #ifndef MCA_MEMHEAP_H #define MCA_MEMHEAP_H -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "oshmem/constants.h" #include "oshmem/proc/proc.h" @@ -133,8 +136,7 @@ typedef struct mca_memheap_base_module_t mca_memheap_base_module_t; * Macro for use in components that are of type rcache */ #define MCA_MEMHEAP_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ -"memheap", 2, 0, 0 + OSHMEM_MCA_BASE_VERSION_2_1_0("memheap", 2, 0, 0) /* * macro for doing direct call / call through struct diff --git a/oshmem/mca/memheap/ptmalloc/memheap_ptmalloc.h b/oshmem/mca/memheap/ptmalloc/memheap_ptmalloc.h index d6370a6c5e..aa229ba6eb 100644 --- a/oshmem/mca/memheap/ptmalloc/memheap_ptmalloc.h +++ b/oshmem/mca/memheap/ptmalloc/memheap_ptmalloc.h @@ -15,7 +15,7 @@ #define MCA_MEMHEAP_PTMALLOC_H #include "oshmem_config.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "opal/class/opal_list.h" #include "opal/threads/mutex.h" #include "oshmem/mca/memheap/memheap.h" diff --git a/oshmem/mca/scoll/base/scoll_base_available.c b/oshmem/mca/scoll/base/scoll_base_available.c index 5f906c4e57..7d93343082 100644 --- a/oshmem/mca/scoll/base/scoll_base_available.c +++ b/oshmem/mca/scoll/base/scoll_base_available.c @@ -15,7 +15,7 @@ #include "oshmem_config.h" #include "opal/class/opal_list.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" diff --git a/oshmem/mca/scoll/base/scoll_base_frame.c b/oshmem/mca/scoll/base/scoll_base_frame.c index 59dcf380c5..b787eb393a 100644 --- a/oshmem/mca/scoll/base/scoll_base_frame.c +++ b/oshmem/mca/scoll/base/scoll_base_frame.c @@ -14,7 +14,7 @@ #include "oshmem/constants.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/oshmem/mca/scoll/base/scoll_base_select.c b/oshmem/mca/scoll/base/scoll_base_select.c index 06d55e3aa5..007e50c8af 100644 --- a/oshmem/mca/scoll/base/scoll_base_select.c +++ b/oshmem/mca/scoll/base/scoll_base_select.c @@ -17,7 +17,7 @@ #include "oshmem/constants.h" #include "opal/class/opal_list.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" diff --git a/oshmem/mca/scoll/basic/scoll_basic.h b/oshmem/mca/scoll/basic/scoll_basic.h index d48f7e3947..94fe987f68 100644 --- a/oshmem/mca/scoll/basic/scoll_basic.h +++ b/oshmem/mca/scoll/basic/scoll_basic.h @@ -13,7 +13,7 @@ #include "oshmem_config.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "oshmem/mca/scoll/scoll.h" #include "oshmem/util/oshmem_util.h" diff --git a/oshmem/mca/scoll/fca/scoll_fca.h b/oshmem/mca/scoll/fca/scoll_fca.h index 07b946b15f..41f06dbad8 100644 --- a/oshmem/mca/scoll/fca/scoll_fca.h +++ b/oshmem/mca/scoll/fca/scoll_fca.h @@ -15,7 +15,7 @@ #include "oshmem_config.h" #include "oshmem/constants.h" #include "shmem.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "oshmem/mca/scoll/scoll.h" #include "oshmem/util/oshmem_util.h" #include "scoll_fca_api.h" diff --git a/oshmem/mca/scoll/mpi/scoll_mpi.h b/oshmem/mca/scoll/mpi/scoll_mpi.h index f344ba947e..9938e27c15 100644 --- a/oshmem/mca/scoll/mpi/scoll_mpi.h +++ b/oshmem/mca/scoll/mpi/scoll_mpi.h @@ -13,7 +13,7 @@ #include "oshmem_config.h" #include "shmem.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "oshmem/mca/scoll/scoll.h" #include "oshmem/request/request.h" #include "oshmem/util/oshmem_util.h" diff --git a/oshmem/mca/scoll/scoll.h b/oshmem/mca/scoll/scoll.h index d0995e70b5..3433414d04 100644 --- a/oshmem/mca/scoll/scoll.h +++ b/oshmem/mca/scoll/scoll.h @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2013 Mellanox Technologies, Inc. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,7 +27,7 @@ #include "opal/util/output.h" #include "mpi.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "opal/mca/base/base.h" BEGIN_C_DECLS @@ -162,8 +165,7 @@ OSHMEM_DECLSPEC OBJ_CLASS_DECLARATION(mca_scoll_base_module_t); * Macro for use in components that are of type coll */ #define MCA_SCOLL_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "scoll", 1, 0, 0 + OSHMEM_MCA_BASE_VERSION_2_1_0("scoll", 1, 0, 0) /* ******************************************************************** */ /* diff --git a/oshmem/mca/spml/base/base.h b/oshmem/mca/spml/base/base.h index f3d8d738f6..2235dae09d 100644 --- a/oshmem/mca/spml/base/base.h +++ b/oshmem/mca/spml/base/base.h @@ -13,7 +13,7 @@ #include "oshmem_config.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "opal/mca/base/mca_base_framework.h" #include "opal/class/opal_list.h" #include "opal/class/opal_pointer_array.h" diff --git a/oshmem/mca/spml/base/spml_base_frame.c b/oshmem/mca/spml/base/spml_base_frame.c index 7cee996b65..b65e0aecb6 100644 --- a/oshmem/mca/spml/base/spml_base_frame.c +++ b/oshmem/mca/spml/base/spml_base_frame.c @@ -20,7 +20,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNIST_H */ -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/oshmem/mca/spml/spml.h b/oshmem/mca/spml/spml.h index 9f7c504fed..9dfe436ce6 100644 --- a/oshmem/mca/spml/spml.h +++ b/oshmem/mca/spml/spml.h @@ -1,7 +1,10 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2013 Mellanox Technologies, Inc. * All rights reserved. * Copyright (c) 2014 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -17,7 +20,7 @@ #include "oshmem/constants.h" #include "opal_stdint.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "opal/mca/btl/btl.h" #include "oshmem/proc/proc.h" @@ -274,8 +277,7 @@ typedef mca_spml_base_module_1_0_0_t mca_spml_base_module_t; * Macro for use in components that are of type spml */ #define MCA_SPML_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ -"spml", 2, 0, 0 + OSHMEM_MCA_BASE_VERSION_2_1_0("spml", 2, 0, 0) /* * macro for doing direct call / call through struct diff --git a/oshmem/mca/sshmem/base/sshmem_base_close.c b/oshmem/mca/sshmem/base/sshmem_base_close.c index 1bacf7ff56..abb2e31795 100644 --- a/oshmem/mca/sshmem/base/sshmem_base_close.c +++ b/oshmem/mca/sshmem/base/sshmem_base_close.c @@ -11,7 +11,7 @@ #include "oshmem_config.h" #include "opal/constants.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "opal/mca/base/base.h" #include "oshmem/mca/sshmem/sshmem.h" diff --git a/oshmem/mca/sshmem/base/sshmem_base_open.c b/oshmem/mca/sshmem/base/sshmem_base_open.c index 10f3510301..436c54c6d8 100644 --- a/oshmem/mca/sshmem/base/sshmem_base_open.c +++ b/oshmem/mca/sshmem/base/sshmem_base_open.c @@ -12,7 +12,7 @@ #include "opal/constants.h" #include "opal/util/output.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_var.h" diff --git a/oshmem/mca/sshmem/base/sshmem_base_select.c b/oshmem/mca/sshmem/base/sshmem_base_select.c index b42588bbad..f59fbdf511 100644 --- a/oshmem/mca/sshmem/base/sshmem_base_select.c +++ b/oshmem/mca/sshmem/base/sshmem_base_select.c @@ -16,7 +16,7 @@ #include "opal/constants.h" #include "opal/util/output.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "opal/mca/base/base.h" #include "oshmem/mca/sshmem/sshmem.h" diff --git a/oshmem/mca/sshmem/sshmem.h b/oshmem/mca/sshmem/sshmem.h index 140bdf0b33..2957c22281 100644 --- a/oshmem/mca/sshmem/sshmem.h +++ b/oshmem/mca/sshmem/sshmem.h @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014 Mellanox Technologies, Inc. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -32,7 +35,7 @@ #include "oshmem/types.h" #include "oshmem/constants.h" -#include "opal/mca/mca.h" +#include "oshmem/mca/mca.h" #include "opal/mca/base/base.h" #include "oshmem/mca/sshmem/sshmem_types.h" @@ -165,11 +168,10 @@ typedef struct mca_sshmem_base_module_2_0_0_t mca_sshmem_base_module_t; /** * macro for use in components that are of type sshmem - * see: opal/mca/mca.h for more information + * see: oshmem/mca/mca.h for more information */ #define MCA_SSHMEM_BASE_VERSION_2_0_0 \ - MCA_BASE_VERSION_2_0_0, \ - "sshmem", 2, 0, 0 + OSHMEM_MCA_BASE_VERSION_2_1_0("sshmem", 2, 0, 0) END_C_DECLS From de1e7d58e1cac4b3a211ee7e1f770419764c589c Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Thu, 5 Mar 2015 22:48:19 -0700 Subject: [PATCH 2/3] Add support setting variables from project_name environment variables Signed-off-by: Nathan Hjelm --- opal/mca/base/mca_base_var.c | 60 ++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 23 deletions(-) diff --git a/opal/mca/base/mca_base_var.c b/opal/mca/base/mca_base_var.c index 68e66e90d4..9444bca1e1 100644 --- a/opal/mca/base/mca_base_var.c +++ b/opal/mca/base/mca_base_var.c @@ -1274,9 +1274,6 @@ static int register_variable (const char *project_name, const char *framework_na mca_base_var_init(); } - /* XXX -- readd project name once it is available in the component structure */ - project_name = NULL; - /* See if this entry is already in the array */ var_index = var_find (project_name, framework_name, component_name, variable_name, true); @@ -1505,16 +1502,46 @@ int mca_base_var_register_synonym (int synonym_for, const char *project_name, synonym_for, NULL); } +static int var_get_env (mca_base_var_t *var, const char *name, char **source, char **value) +{ + char *source_env, *value_env; + int ret; + + ret = asprintf (&source_env, "%sSOURCE_%s", mca_prefix, name); + if (0 > ret) { + return OPAL_ERROR; + } + + ret = asprintf (&value_env, "%s%s", mca_prefix, name); + if (0 > ret) { + free (source_env); + return OPAL_ERROR; + } + + *source = getenv (source_env); + *value = getenv (value_env); + + free (source_env); + free (value_env); + + if (NULL == *value) { + *source = NULL; + return OPAL_ERR_NOT_FOUND; + } + + return OPAL_SUCCESS; +} + /* * Lookup a param in the environment */ static int var_set_from_env (mca_base_var_t *var) { const char *var_full_name = var->mbv_full_name; + const char *var_long_name = var->mbv_long_name; bool deprecated = VAR_IS_DEPRECATED(var[0]); bool is_synonym = VAR_IS_SYNONYM(var[0]); - char *source, *source_env; - char *value, *value_env; + char *source_env, *value_env; int ret; if (is_synonym) { @@ -1528,25 +1555,13 @@ static int var_set_from_env (mca_base_var_t *var) } } - ret = asprintf (&source, "%sSOURCE_%s", mca_prefix, var_full_name); - if (0 > ret) { - return OPAL_ERROR; + ret = var_get_env (var, var_long_name, &source_env, &value_env); + if (OPAL_SUCCESS != ret) { + ret = var_get_env (var, var_full_name, &source_env, &value_env); } - ret = asprintf (&value, "%s%s", mca_prefix, var_full_name); - if (0 > ret) { - free (source); - return OPAL_ERROR; - } - - source_env = getenv (source); - value_env = getenv (value); - - free (source); - free (value); - - if (NULL == value_env) { - return OPAL_ERR_NOT_FOUND; + if (OPAL_SUCCESS != ret) { + return ret; } /* we found an environment variable but this variable is default-only. print @@ -1616,7 +1631,6 @@ static int var_set_from_env (mca_base_var_t *var) return var_set_from_string (var, value_env); } - /* * Lookup a param in the files */ From 6d1a41611f14c55675ca9ed9ca14b8e248a32fe2 Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Thu, 5 Mar 2015 22:53:44 -0700 Subject: [PATCH 3/3] MCA/base: Detect overlapping variable names. Signed-off-by: Nathan Hjelm --- opal/mca/base/mca_base_var.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/opal/mca/base/mca_base_var.c b/opal/mca/base/mca_base_var.c index 9444bca1e1..0e627d6c82 100644 --- a/opal/mca/base/mca_base_var.c +++ b/opal/mca/base/mca_base_var.c @@ -1216,7 +1216,7 @@ static int register_variable (const char *project_name, const char *framework_na mca_base_var_scope_t scope, int synonym_for, void *storage) { - int ret, var_index, group_index; + int ret, var_index, group_index, tmp; mca_base_var_group_t *group; mca_base_var_t *var; @@ -1351,6 +1351,11 @@ static int register_variable (const char *project_name, const char *framework_na } mca_base_var_count++; + if (0 <= var_find_by_name (var->mbv_full_name, &tmp, 0)) { + /* XXX --- FIXME: variable overshadows an existing variable. this is difficult to support */ + assert (0); + } + opal_hash_table_set_value_ptr (&mca_base_var_index_hash, var->mbv_full_name, strlen (var->mbv_full_name), (void *)(uintptr_t) var_index); } else {