Skip to content

Commit 20a197a

Browse files
jjhurseyjjhursey
authored
Merge pull request #10859 from drwootton/symbol_pollution_rename
Part 2 of resolving global symbol name pollution issue #10708
2 parents fb66617 + 8919140 commit 20a197a

Some content is hidden

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

62 files changed

+479
-433
lines changed

‎ompi/mca/coll/adapt/coll_adapt_ibcast.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright (c) 2014-2020 The University of Tennessee and The University
33
* of Tennessee Research Foundation. All rights
44
* reserved.
5+
* Copyright (c) 2022 IBM Corporation. All rights reserved
56
* $COPYRIGHT$
67
*
78
* Additional copyrights may follow
@@ -335,7 +336,7 @@ int ompi_coll_adapt_ibcast(void *buff, int count, struct ompi_datatype_t *dataty
335336
}
336337

337338
return ompi_coll_adapt_ibcast_generic(buff, count, datatype, root, comm, request, module,
338-
adapt_module_cached_topology(module, comm, root, mca_coll_adapt_component.adapt_ibcast_algorithm),
339+
ompi_coll_adapt_module_cached_topology(module, comm, root, mca_coll_adapt_component.adapt_ibcast_algorithm),
339340
mca_coll_adapt_component.adapt_ibcast_segment_size);
340341
}
341342

‎ompi/mca/coll/adapt/coll_adapt_ireduce.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* of Tennessee Research Foundation. All rights
44
* reserved.
55
* Copyright (c) 2020 Cisco Systems, Inc. All rights reserved.
6+
* Copyright (c) 2022 IBM Corporation. All rights reserved
67
* $COPYRIGHT$
78
*
89
* Additional copyrights may follow
@@ -504,7 +505,8 @@ int ompi_coll_adapt_ireduce(const void *sbuf, void *rbuf, int count, struct ompi
504505

505506

506507
return ompi_coll_adapt_ireduce_generic(sbuf, rbuf, count, dtype, op, root, comm, request, module,
507-
adapt_module_cached_topology(module, comm, root, mca_coll_adapt_component.adapt_ireduce_algorithm),
508+
ompi_coll_adapt_module_cached_topology(module, comm, root,
509+
mca_coll_adapt_component.adapt_ireduce_algorithm),
508510
mca_coll_adapt_component.adapt_ireduce_segment_size);
509511

510512
}

‎ompi/mca/coll/adapt/coll_adapt_module.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* reserved.
55
* Copyright (c) 2021 Triad National Security, LLC. All rights
66
* reserved.
7+
* Copyright (c) 2022 IBM Corporation. All rights reserved
78
*
89
* $COPYRIGHT$
910
*
@@ -66,8 +67,8 @@ static void adapt_module_construct(mca_coll_adapt_module_t * module)
6667
static void adapt_module_destruct(mca_coll_adapt_module_t * module)
6768
{
6869
if (NULL != module->topo_cache) {
69-
adapt_topology_cache_item_t *item;
70-
while (NULL != (item = (adapt_topology_cache_item_t*)opal_list_remove_first(module->topo_cache))) {
70+
ompi_coll_adapt_topology_cache_item_t *item;
71+
while (NULL != (item = (ompi_coll_adapt_topology_cache_item_t*)opal_list_remove_first(module->topo_cache))) {
7172
OBJ_RELEASE(item);
7273
}
7374
OBJ_RELEASE(module->topo_cache);

‎ompi/mca/coll/adapt/coll_adapt_topocache.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright (c) 2014-2020 The University of Tennessee and The University
33
* of Tennessee Research Foundation. All rights
44
* reserved.
5+
* Copyright (c) 2022 IBM Corporation. All rights reserved
56
* $COPYRIGHT$
67
*
78
* Additional copyrights may follow
@@ -14,14 +15,14 @@
1415

1516
#include "ompi/communicator/communicator.h"
1617

17-
static void destruct_topology_cache(adapt_topology_cache_item_t *item)
18+
static void destruct_topology_cache(ompi_coll_adapt_topology_cache_item_t *item)
1819
{
1920
if (NULL != item->tree) {
2021
ompi_coll_base_topo_destroy_tree(&item->tree);
2122
}
2223
}
2324

24-
OBJ_CLASS_INSTANCE(adapt_topology_cache_item_t, opal_list_item_t,
25+
OBJ_CLASS_INSTANCE(ompi_coll_adapt_topology_cache_item_t, opal_list_item_t,
2526
NULL, &destruct_topology_cache);
2627

2728
static ompi_coll_tree_t *create_topology(
@@ -73,17 +74,17 @@ static ompi_coll_tree_t *create_topology(
7374
}
7475
}
7576

76-
ompi_coll_tree_t* adapt_module_cached_topology(
77+
ompi_coll_tree_t* ompi_coll_adapt_module_cached_topology(
7778
mca_coll_base_module_t *module,
7879
struct ompi_communicator_t *comm,
7980
int root,
8081
ompi_coll_adapt_algorithm_t algorithm)
8182
{
8283
mca_coll_adapt_module_t *adapt_module = (mca_coll_adapt_module_t*)module;
83-
adapt_topology_cache_item_t *item;
84+
ompi_coll_adapt_topology_cache_item_t *item;
8485
ompi_coll_tree_t * tree;
8586
if (NULL != adapt_module->topo_cache) {
86-
OPAL_LIST_FOREACH(item, adapt_module->topo_cache, adapt_topology_cache_item_t) {
87+
OPAL_LIST_FOREACH(item, adapt_module->topo_cache, ompi_coll_adapt_topology_cache_item_t) {
8788
if (item->root == root && item->algorithm == algorithm) {
8889
return item->tree;
8990
}
@@ -95,7 +96,7 @@ ompi_coll_tree_t* adapt_module_cached_topology(
9596
/* topology not found, create one */
9697
tree = create_topology(algorithm, root, comm);
9798

98-
item = OBJ_NEW(adapt_topology_cache_item_t);
99+
item = OBJ_NEW(ompi_coll_adapt_topology_cache_item_t);
99100
item->tree = tree;
100101
item->root = root;
101102
item->algorithm = algorithm;

‎ompi/mca/coll/adapt/coll_adapt_topocache.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* of Tennessee Research Foundation. All rights
44
* reserved.
55
* Copyright (c) 2020 Cisco Systems, Inc. All rights reserved.
6+
* Copyright (c) 2022 IBM Corporation. All rights reserved
67
* $COPYRIGHT$
78
*
89
* Additional copyrights may follow
@@ -24,12 +25,12 @@ typedef struct adapt_topology_cache_item_t {
2425
ompi_coll_tree_t *tree;
2526
int root;
2627
ompi_coll_adapt_algorithm_t algorithm;
27-
} adapt_topology_cache_item_t;
28+
} ompi_coll_adapt_topology_cache_item_t;
2829

29-
OBJ_CLASS_DECLARATION(adapt_topology_cache_item_t);
30+
OBJ_CLASS_DECLARATION(ompi_coll_adapt_topology_cache_item_t);
3031

3132

32-
OMPI_DECLSPEC ompi_coll_tree_t* adapt_module_cached_topology(
33+
OMPI_DECLSPEC ompi_coll_tree_t* ompi_coll_adapt_module_cached_topology(
3334
mca_coll_base_module_t *module,
3435
struct ompi_communicator_t *comm,
3536
int root,

0 commit comments

Comments
 (0)