hwloc: rename the hwloc framework into hwlocxxx

Refs. #2616

Signed-off-by: Gilles Gouaillardet <[email protected]>

ompi/communicator/comm.c

@@ -18,7 +18,7 @@
  * Copyright (c) 2012      Oak Ridge National Labs.  All rights reserved.
  * Copyright (c) 2012-2016 Los Alamos National Security, LLC.
  *                         All rights reserved.
- * Copyright (c) 2014-2016 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
  * Copyright (c) 2015      Mellanox Technologies. All rights reserved.
@@ -34,7 +34,7 @@
 #include <stdio.h>
 
 #include "ompi/constants.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/dss/dss.h"
 #include "opal/mca/pmix/pmix.h"
 

ompi/dpm/dpm.c

@@ -41,7 +41,7 @@
 #include "opal/util/opal_getcwd.h"
 #include "opal/util/proc.h"
 #include "opal/dss/dss.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/mca/pmix/pmix.h"
 
 #include "ompi/communicator/communicator.h"

ompi/mca/coll/sm/coll_sm_module.c

@@ -13,7 +13,7 @@
  * Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2010-2012 Los Alamos National Security, LLC.
  *                         All rights reserved.
- * Copyright (c) 2014-2015 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2015      Intel, Inc. All rights reserved.
  * $COPYRIGHT$
@@ -49,7 +49,7 @@
 
 #include "mpi.h"
 #include "opal_stdint.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/util/os_path.h"
 
 #include "ompi/communicator/communicator.h"

ompi/mca/topo/treematch/configure.m4

@@ -6,7 +6,9 @@
 # Copyright (c) 2011-2015 INRIA.  All rights reserved.
 # Copyright (c) 2011-2015 Universite Bordeaux 1
 # Copyright (c) 2015      Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2015       Intel, Inc. All rights reserved.
+# Copyright (c) 2015      Intel, Inc. All rights reserved.
+# Copyright (c) 2017      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -18,7 +20,7 @@
 #                                [action-if-cant-compile])
 # -------------------------------------------
 AC_DEFUN([MCA_ompi_topo_treematch_CONFIG], [
-    AC_REQUIRE([MCA_opal_hwloc_CONFIG_REQUIRE])
+    AC_REQUIRE([MCA_opal_hwlocxxx_CONFIG_REQUIRE])
 
     AC_ARG_WITH([treematch],
           [AC_HELP_STRING([--with-treematch(=DIR)],

ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c

@@ -6,7 +6,7 @@
  * Copyright (c) 2011-2015 INRIA.  All rights reserved.
  * Copyright (c) 2012-2015 Bordeaux Poytechnic Institute
  * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
- * Copyright (c) 2015-2016 Research Organization for Information Science
+ * Copyright (c) 2015-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2016      Los Alamos National Security, LLC. All rights
  *                         reserved.
@@ -20,7 +20,7 @@
 #include "ompi_config.h"
 
 #include "opal/constants.h"
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 
 #include "ompi/mca/topo/treematch/topo_treematch.h"
 #include "ompi/mca/topo/treematch/treematch/tm_mapping.h"

ompi/mpiext/affinity/c/mpiext_affinity_str.c

@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/runtime/opal.h"
 
 #include "ompi/communicator/communicator.h"

ompi/proc/proc.c

@@ -36,7 +36,7 @@
 #include "opal/dss/dss.h"
 #include "opal/util/arch.h"
 #include "opal/util/show_help.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/mca/pmix/pmix.h"
 
 #include "ompi/proc/proc.h"

ompi/runtime/ompi_mpi_init.c

@@ -18,7 +18,7 @@
  * Copyright (c) 2011      Sandia National Laboratories. All rights reserved.
  * Copyright (c) 2012-2013 Inria.  All rights reserved.
  * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014-2016 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2016      Mellanox Technologies Ltd. All rights reserved.
  *
@@ -42,7 +42,7 @@
 #include "mpi.h"
 #include "opal/class/opal_list.h"
 #include "opal/mca/base/base.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/runtime/opal_progress.h"
 #include "opal/threads/threads.h"
 #include "opal/util/arch.h"

opal/mca/btl/openib/btl_openib.c

@@ -19,7 +19,7 @@
  * Copyright (c) 2009      IBM Corporation.  All rights reserved.
  * Copyright (c) 2013-2015 Intel, Inc. All rights reserved
  * Copyright (c) 2013-2015 NVIDIA Corporation.  All rights reserved.
- * Copyright (c) 2014-2015 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2014      Bull SAS.  All rights reserved
  * $COPYRIGHT$
@@ -84,7 +84,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 
 #ifndef MIN
 #define MIN(a,b) ((a)<(b)?(a):(b))

opal/mca/btl/openib/btl_openib_component.c

@@ -19,7 +19,7 @@
  * Copyright (c) 2011-2015 NVIDIA Corporation.  All rights reserved.
  * Copyright (c) 2012      Oak Ridge National Laboratory.  All rights reserved
  * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014-2016 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2014      Bull SAS.  All rights reserved.
  * $COPYRIGHT$
@@ -53,14 +53,14 @@
 #include "opal/util/sys_limits.h"
 #include "opal/util/argv.h"
 #include "opal/memoryhooks/memory.h"
-/* Define this before including hwloc.h so that we also get the hwloc
+/* Define this before including hwlocxxx.h so that we also get the hwlocxxx
    verbs helper header file, too.  We have to do this level of
-   indirection because the hwloc subsystem is a component -- we don't
+   indirection because the hwlocxxx subsystem is a component -- we don't
    know its exact path.  We have to rely on the framework header files
-   to find the right hwloc verbs helper file for us. */
+   to find the right hwlocxxx verbs helper file for us. */
 #define OPAL_HWLOC_WANT_VERBS_HELPER 1
-#include "opal/mca/hwloc/hwloc.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/mca/installdirs/installdirs.h"
 #include "opal_stdint.h"
 #include "opal/util/show_help.h"

opal/mca/btl/sm/btl_sm.c

@@ -51,7 +51,7 @@
 #include "opal/util/output.h"
 #include "opal/util/show_help.h"
 #include "opal/util/printf.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/mca/pmix/base/base.h"
 #include "opal/mca/shmem/base/base.h"
 #include "opal/mca/shmem/shmem.h"

opal/mca/btl/smcuda/btl_smcuda.c

@@ -16,7 +16,7 @@
  *                         reserved.
  * Copyright (c) 2012-2015 NVIDIA Corporation.  All rights reserved.
  * Copyright (c) 2012      Oracle and/or its affiliates.  All rights reserved.
- * Copyright (c) 2014      Research Organization for Information Science
+ * Copyright (c) 2014 -2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
  * $COPYRIGHT$
@@ -47,7 +47,7 @@
 #include "opal/util/output.h"
 #include "opal/util/show_help.h"
 #include "opal/util/printf.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/mca/pmix/base/base.h"
 #include "opal/mca/shmem/base/base.h"
 #include "opal/mca/shmem/shmem.h"

opal/mca/btl/usnic/btl_usnic_hwloc.c

@@ -1,6 +1,8 @@
 /*
  * Copyright (c) 2013-2016 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2016      Intel, Inc.  All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -10,7 +12,7 @@
 
 #include "opal_config.h"
 
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/constants.h"
 
 #if BTL_IN_OPAL

opal/mca/common/sm/common_sm_mpool.c

@@ -14,6 +14,8 @@
  *                         All rights reserved.
  * Copyright (c) 2011-2014 NVIDIA Corporation.  All rights reserved.
  * Copyright (c) 2015      Intel, Inc. All rights reserved
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -30,7 +32,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 
 #if OPAL_ENABLE_FT_CR    == 1
 #include "orte/mca/sstore/sstore.h"