Merge pull request #449 from hjelmn/mca_base_update

mca/base update

Author: hjelmn

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

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

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"
 

ompi/mca/bcol/base/bcol_base_frame.c

@@ -22,7 +22,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #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"
 

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"

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"

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

ompi/mca/bcol/iboffload/bcol_iboffload.h

@@ -22,7 +22,7 @@
 #include <infiniband/verbs.h>
 #include <infiniband/mverbs.h>
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 
 #include "ompi/op/op.h"
 #include "ompi/datatype/ompi_datatype.h"

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"

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"
 

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"
 
 
 /*

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 = {

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 */

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

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"

ompi/mca/coll/base/coll_base_comm_unselect.c

@@ -27,7 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 
 #include "ompi/communicator/communicator.h"

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"
 

ompi/mca/coll/base/coll_base_frame.c

@@ -26,7 +26,7 @@
 #include <stdio.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"
 

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"
 

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"

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"

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)
 
 
 /* ******************************************************************** */

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"

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

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"

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"

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"
 

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"

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"

ompi/mca/coll/portals4/coll_portals4.h

@@ -18,7 +18,7 @@
 #include <portals4.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"

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"
 

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"

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"
 

ompi/mca/coll/tuned/coll_tuned_dynamic_file.c

@@ -23,7 +23,7 @@
 #include <stdio.h>
 
 #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 */

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"
 

ompi/mca/crcp/base/crcp_base_fns.c

@@ -29,7 +29,7 @@
 #include <ctype.h>
 
 #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"