Skip to content

Commit 944980f

Browse files
ggouaillardetggouaillardet
committed
hwloc: rename the hwloc framework into hwlocxxx
Refs. #2616 Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
1 parent a8247a7 commit 944980f

File tree

191 files changed

+479
-424
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+479
-424
lines changed

‎ompi/communicator/comm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* Copyright (c) 2012 Oak Ridge National Labs. All rights reserved.
1919
* Copyright (c) 2012-2016 Los Alamos National Security, LLC.
2020
* All rights reserved.
21-
* Copyright (c) 2014-2016 Research Organization for Information Science
21+
* Copyright (c) 2014-2017 Research Organization for Information Science
2222
* and Technology (RIST). All rights reserved.
2323
* Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
2424
* Copyright (c) 2015 Mellanox Technologies. All rights reserved.
@@ -34,7 +34,7 @@
3434
#include <stdio.h>
3535

3636
#include "ompi/constants.h"
37-
#include "opal/mca/hwloc/base/base.h"
37+
#include "opal/mca/hwlocxxx/base/base.h"
3838
#include "opal/dss/dss.h"
3939
#include "opal/mca/pmix/pmix.h"
4040

‎ompi/dpm/dpm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#include "opal/util/opal_getcwd.h"
4242
#include "opal/util/proc.h"
4343
#include "opal/dss/dss.h"
44-
#include "opal/mca/hwloc/base/base.h"
44+
#include "opal/mca/hwlocxxx/base/base.h"
4545
#include "opal/mca/pmix/pmix.h"
4646

4747
#include "ompi/communicator/communicator.h"

‎ompi/mca/coll/sm/coll_sm_module.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Copyright (c) 2009-2013 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2010-2012 Los Alamos National Security, LLC.
1515
* All rights reserved.
16-
* Copyright (c) 2014-2015 Research Organization for Information Science
16+
* Copyright (c) 2014-2017 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
1818
* Copyright (c) 2015 Intel, Inc. All rights reserved.
1919
* $COPYRIGHT$
@@ -49,7 +49,7 @@
4949

5050
#include "mpi.h"
5151
#include "opal_stdint.h"
52-
#include "opal/mca/hwloc/base/base.h"
52+
#include "opal/mca/hwlocxxx/base/base.h"
5353
#include "opal/util/os_path.h"
5454

5555
#include "ompi/communicator/communicator.h"

‎ompi/mca/topo/treematch/configure.m4

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
# Copyright (c) 2011-2015 INRIA. All rights reserved.
77
# Copyright (c) 2011-2015 Universite Bordeaux 1
88
# Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
9-
# Copyright (c) 2015 Intel, Inc. All rights reserved.
9+
# Copyright (c) 2015 Intel, Inc. All rights reserved.
10+
# Copyright (c) 2017 Research Organization for Information Science
11+
# and Technology (RIST). All rights reserved.
1012
# $COPYRIGHT$
1113
#
1214
# Additional copyrights may follow
@@ -18,7 +20,7 @@
1820
# [action-if-cant-compile])
1921
# -------------------------------------------
2022
AC_DEFUN([MCA_ompi_topo_treematch_CONFIG], [
21-
AC_REQUIRE([MCA_opal_hwloc_CONFIG_REQUIRE])
23+
AC_REQUIRE([MCA_opal_hwlocxxx_CONFIG_REQUIRE])
2224

2325
AC_ARG_WITH([treematch],
2426
[AC_HELP_STRING([--with-treematch(=DIR)],

‎ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2011-2015 INRIA. All rights reserved.
77
* Copyright (c) 2012-2015 Bordeaux Poytechnic Institute
88
* Copyright (c) 2015-2016 Intel, Inc. All rights reserved.
9-
* Copyright (c) 2015-2016 Research Organization for Information Science
9+
* Copyright (c) 2015-2017 Research Organization for Information Science
1010
* and Technology (RIST). All rights reserved.
1111
* Copyright (c) 2016 Los Alamos National Security, LLC. All rights
1212
* reserved.
@@ -20,7 +20,7 @@
2020
#include "ompi_config.h"
2121

2222
#include "opal/constants.h"
23-
#include "opal/mca/hwloc/hwloc.h"
23+
#include "opal/mca/hwlocxxx/hwlocxxx.h"
2424

2525
#include "ompi/mca/topo/treematch/topo_treematch.h"
2626
#include "ompi/mca/topo/treematch/treematch/tm_mapping.h"

‎ompi/mpiext/affinity/c/mpiext_affinity_str.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <stdio.h>
3030
#include <string.h>
3131

32-
#include "opal/mca/hwloc/base/base.h"
32+
#include "opal/mca/hwlocxxx/base/base.h"
3333
#include "opal/runtime/opal.h"
3434

3535
#include "ompi/communicator/communicator.h"

‎ompi/proc/proc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "opal/dss/dss.h"
3737
#include "opal/util/arch.h"
3838
#include "opal/util/show_help.h"
39-
#include "opal/mca/hwloc/base/base.h"
39+
#include "opal/mca/hwlocxxx/base/base.h"
4040
#include "opal/mca/pmix/pmix.h"
4141

4242
#include "ompi/proc/proc.h"

‎ompi/runtime/ompi_mpi_init.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* Copyright (c) 2011 Sandia National Laboratories. All rights reserved.
1919
* Copyright (c) 2012-2013 Inria. All rights reserved.
2020
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
21-
* Copyright (c) 2014-2016 Research Organization for Information Science
21+
* Copyright (c) 2014-2017 Research Organization for Information Science
2222
* and Technology (RIST). All rights reserved.
2323
* Copyright (c) 2016 Mellanox Technologies Ltd. All rights reserved.
2424
*
@@ -42,7 +42,7 @@
4242
#include "mpi.h"
4343
#include "opal/class/opal_list.h"
4444
#include "opal/mca/base/base.h"
45-
#include "opal/mca/hwloc/base/base.h"
45+
#include "opal/mca/hwlocxxx/base/base.h"
4646
#include "opal/runtime/opal_progress.h"
4747
#include "opal/threads/threads.h"
4848
#include "opal/util/arch.h"

‎opal/mca/btl/openib/btl_openib.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* Copyright (c) 2009 IBM Corporation. All rights reserved.
2020
* Copyright (c) 2013-2015 Intel, Inc. All rights reserved
2121
* Copyright (c) 2013-2015 NVIDIA Corporation. All rights reserved.
22-
* Copyright (c) 2014-2015 Research Organization for Information Science
22+
* Copyright (c) 2014-2017 Research Organization for Information Science
2323
* and Technology (RIST). All rights reserved.
2424
* Copyright (c) 2014 Bull SAS. All rights reserved
2525
* $COPYRIGHT$
@@ -84,7 +84,7 @@
8484
#ifdef HAVE_UNISTD_H
8585
#include <unistd.h>
8686
#endif
87-
#include "opal/mca/hwloc/hwloc.h"
87+
#include "opal/mca/hwlocxxx/hwlocxxx.h"
8888

8989
#ifndef MIN
9090
#define MIN(a,b) ((a)<(b)?(a):(b))

‎opal/mca/btl/openib/btl_openib_component.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* Copyright (c) 2011-2015 NVIDIA Corporation. All rights reserved.
2020
* Copyright (c) 2012 Oak Ridge National Laboratory. All rights reserved
2121
* Copyright (c) 2013-2016 Intel, Inc. All rights reserved.
22-
* Copyright (c) 2014-2016 Research Organization for Information Science
22+
* Copyright (c) 2014-2017 Research Organization for Information Science
2323
* and Technology (RIST). All rights reserved.
2424
* Copyright (c) 2014 Bull SAS. All rights reserved.
2525
* $COPYRIGHT$
@@ -53,14 +53,14 @@
5353
#include "opal/util/sys_limits.h"
5454
#include "opal/util/argv.h"
5555
#include "opal/memoryhooks/memory.h"
56-
/* Define this before including hwloc.h so that we also get the hwloc
56+
/* Define this before including hwlocxxx.h so that we also get the hwlocxxx
5757
verbs helper header file, too. We have to do this level of
58-
indirection because the hwloc subsystem is a component -- we don't
58+
indirection because the hwlocxxx subsystem is a component -- we don't
5959
know its exact path. We have to rely on the framework header files
60-
to find the right hwloc verbs helper file for us. */
60+
to find the right hwlocxxx verbs helper file for us. */
6161
#define OPAL_HWLOC_WANT_VERBS_HELPER 1
62-
#include "opal/mca/hwloc/hwloc.h"
63-
#include "opal/mca/hwloc/base/base.h"
62+
#include "opal/mca/hwlocxxx/hwlocxxx.h"
63+
#include "opal/mca/hwlocxxx/base/base.h"
6464
#include "opal/mca/installdirs/installdirs.h"
6565
#include "opal_stdint.h"
6666
#include "opal/util/show_help.h"

‎opal/mca/btl/sm/btl_sm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
#include "opal/util/output.h"
5252
#include "opal/util/show_help.h"
5353
#include "opal/util/printf.h"
54-
#include "opal/mca/hwloc/base/base.h"
54+
#include "opal/mca/hwlocxxx/base/base.h"
5555
#include "opal/mca/pmix/base/base.h"
5656
#include "opal/mca/shmem/base/base.h"
5757
#include "opal/mca/shmem/shmem.h"

‎opal/mca/btl/smcuda/btl_smcuda.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* reserved.
1717
* Copyright (c) 2012-2015 NVIDIA Corporation. All rights reserved.
1818
* Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
19-
* Copyright (c) 2014 Research Organization for Information Science
19+
* Copyright (c) 2014 -2017 Research Organization for Information Science
2020
* and Technology (RIST). All rights reserved.
2121
* Copyright (c) 2015-2016 Intel, Inc. All rights reserved.
2222
* $COPYRIGHT$
@@ -47,7 +47,7 @@
4747
#include "opal/util/output.h"
4848
#include "opal/util/show_help.h"
4949
#include "opal/util/printf.h"
50-
#include "opal/mca/hwloc/base/base.h"
50+
#include "opal/mca/hwlocxxx/base/base.h"
5151
#include "opal/mca/pmix/base/base.h"
5252
#include "opal/mca/shmem/base/base.h"
5353
#include "opal/mca/shmem/shmem.h"

‎opal/mca/btl/usnic/btl_usnic_hwloc.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*
22
* Copyright (c) 2013-2016 Cisco Systems, Inc. All rights reserved.
33
* Copyright (c) 2016 Intel, Inc. All rights reserved.
4+
* Copyright (c) 2017 Research Organization for Information Science
5+
* and Technology (RIST). All rights reserved.
46
* $COPYRIGHT$
57
*
68
* Additional copyrights may follow
@@ -10,7 +12,7 @@
1012

1113
#include "opal_config.h"
1214

13-
#include "opal/mca/hwloc/base/base.h"
15+
#include "opal/mca/hwlocxxx/base/base.h"
1416
#include "opal/constants.h"
1517

1618
#if BTL_IN_OPAL

‎opal/mca/common/sm/common_sm_mpool.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* All rights reserved.
1515
* Copyright (c) 2011-2014 NVIDIA Corporation. All rights reserved.
1616
* Copyright (c) 2015 Intel, Inc. All rights reserved
17+
* Copyright (c) 2017 Research Organization for Information Science
18+
* and Technology (RIST). All rights reserved.
1719
* $COPYRIGHT$
1820
*
1921
* Additional copyrights may follow
@@ -30,7 +32,7 @@
3032
#ifdef HAVE_UNISTD_H
3133
#include <unistd.h>
3234
#endif
33-
#include "opal/mca/hwloc/base/base.h"
35+
#include "opal/mca/hwlocxxx/base/base.h"
3436

3537
#if OPAL_ENABLE_FT_CR == 1
3638
#include "orte/mca/sstore/sstore.h"

0 commit comments

Comments
 (0)