Skip to content

Commit 552216f

Browse files
markallemarkalle
committed
scripted symbol name change (ompi_ prefix)
Passed the below set of symbols into a script that added ompi_ to them all. Note that if processing a symbol named "foo" the script turns foo into ompi_foo but doesn't turn foobar into ompi_foobar But beyond that the script is blind to C syntax, so it hits strings and comments etc as well as vars/functions. coll_base_comm_get_reqs comm_allgather_pml comm_allreduce_pml comm_bcast_pml fcoll_base_coll_allgather_array fcoll_base_coll_allgatherv_array fcoll_base_coll_bcast_array fcoll_base_coll_gather_array fcoll_base_coll_gatherv_array fcoll_base_coll_scatterv_array fcoll_base_sort_iovec mpit_big_lock mpit_init_count mpit_lock mpit_unlock netpatterns_base_err netpatterns_base_verbose netpatterns_cleanup_narray_knomial_tree netpatterns_cleanup_recursive_doubling_tree_node netpatterns_cleanup_recursive_knomial_allgather_tree_node netpatterns_cleanup_recursive_knomial_tree_node netpatterns_init netpatterns_register_mca_params netpatterns_setup_multinomial_tree netpatterns_setup_narray_knomial_tree netpatterns_setup_narray_tree netpatterns_setup_narray_tree_contigous_ranks netpatterns_setup_recursive_doubling_n_tree_node netpatterns_setup_recursive_doubling_tree_node netpatterns_setup_recursive_knomial_allgather_tree_node netpatterns_setup_recursive_knomial_tree_node pml_v_output_close pml_v_output_open intercept_extra_state_t odls_base_default_wait_local_proc _event_debug_mode_on _evthread_cond_fns _evthread_id_fn _evthread_lock_debugging_enabled _evthread_lock_fns cmd_line_option_t cmd_line_param_t crs_base_self_checkpoint_fn crs_base_self_continue_fn crs_base_self_restart_fn event_enable_debug_output event_global_current_base_ event_module_include eventops sync_wait_mt trigger_user_inc_callback var_type_names var_type_sizes Signed-off-by: Mark Allen <markalle@us.ibm.com>
1 parent c5cb07c commit 552216f

File tree

107 files changed

+546
-454
lines changed

Some content is hidden

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

107 files changed

+546
-454
lines changed

‎ompi/mca/coll/base/coll_base_alltoall.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* reserved.
1515
* Copyright (c) 2014-2017 Research Organization for Information Science
1616
* and Technology (RIST). All rights reserved.
17+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1718
* $COPYRIGHT$
1819
*
1920
* Additional copyrights may follow
@@ -390,7 +391,7 @@ int ompi_coll_base_alltoall_intra_linear_sync(const void *sbuf, int scount,
390391
(max_outstanding_reqs <= 0)) ?
391392
(size - 1) : (max_outstanding_reqs));
392393
if (0 < total_reqs) {
393-
reqs = coll_base_comm_get_reqs(module->base_data, 2 * total_reqs);
394+
reqs = ompi_coll_base_comm_get_reqs(module->base_data, 2 * total_reqs);
394395
if (NULL == reqs) { error = -1; line = __LINE__; goto error_hndl; }
395396
}
396397

@@ -613,7 +614,7 @@ int ompi_coll_base_alltoall_intra_basic_linear(const void *sbuf, int scount,
613614

614615
/* Initiate all send/recv to/from others. */
615616

616-
req = rreq = coll_base_comm_get_reqs(data, (size - 1) * 2);
617+
req = rreq = ompi_coll_base_comm_get_reqs(data, (size - 1) * 2);
617618
if (NULL == req) { err = OMPI_ERR_OUT_OF_RESOURCE; line = __LINE__; goto err_hndl; }
618619

619620
prcv = (char *) rbuf;

‎ompi/mca/coll/base/coll_base_alltoallv.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* Copyright (c) 2013 FUJITSU LIMITED. All rights reserved.
1717
* Copyright (c) 2014-2017 Research Organization for Information Science
1818
* and Technology (RIST). All rights reserved.
19+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1920
* $COPYRIGHT$
2021
*
2122
* Additional copyrights may follow
@@ -231,7 +232,7 @@ ompi_coll_base_alltoallv_intra_basic_linear(const void *sbuf, const int *scounts
231232

232233
/* Now, initiate all send/recv to/from others. */
233234
nreqs = 0;
234-
reqs = preq = coll_base_comm_get_reqs(data, 2 * size);
235+
reqs = preq = ompi_coll_base_comm_get_reqs(data, 2 * size);
235236
if( NULL == reqs ) { err = OMPI_ERR_OUT_OF_RESOURCE; goto err_hndl; }
236237

237238
/* Post all receives first */

‎ompi/mca/coll/base/coll_base_barrier.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* reserved.
1616
* Copyright (c) 2015-2016 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
18+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1819
* $COPYRIGHT$
1920
*
2021
* Additional copyrights may follow
@@ -342,7 +343,7 @@ int ompi_coll_base_barrier_intra_basic_linear(struct ompi_communicator_t *comm,
342343
/* The root collects and broadcasts the messages. */
343344

344345
else {
345-
requests = coll_base_comm_get_reqs(module->base_data, size);
346+
requests = ompi_coll_base_comm_get_reqs(module->base_data, size);
346347
if( NULL == requests ) { err = OMPI_ERR_OUT_OF_RESOURCE; line = __LINE__; goto err_hndl; }
347348

348349
for (i = 1; i < size; ++i) {

‎ompi/mca/coll/base/coll_base_bcast.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2016 Research Organization for Information Science
1515
* and Technology (RIST). All rights reserved.
16+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1617
* $COPYRIGHT$
1718
*
1819
* Additional copyrights may follow
@@ -68,7 +69,7 @@ ompi_coll_base_bcast_intra_generic( void* buffer,
6869
tmpbuf = (char *) buffer;
6970

7071
if( tree->tree_nextsize != 0 ) {
71-
send_reqs = coll_base_comm_get_reqs(module->base_data, tree->tree_nextsize);
72+
send_reqs = ompi_coll_base_comm_get_reqs(module->base_data, tree->tree_nextsize);
7273
if( NULL == send_reqs ) { err = OMPI_ERR_OUT_OF_RESOURCE; line = __LINE__; goto error_hndl; }
7374
}
7475

@@ -628,7 +629,7 @@ ompi_coll_base_bcast_intra_basic_linear(void *buff, int count,
628629
}
629630

630631
/* Root sends data to all others. */
631-
preq = reqs = coll_base_comm_get_reqs(module->base_data, size-1);
632+
preq = reqs = ompi_coll_base_comm_get_reqs(module->base_data, size-1);
632633
if( NULL == reqs ) { err = OMPI_ERR_OUT_OF_RESOURCE; goto err_hndl; }
633634

634635
for (i = 0; i < size; ++i) {

‎ompi/mca/coll/base/coll_base_frame.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* reserved.
1515
* Copyright (c) 2014 Research Organization for Information Science
1616
* and Technology (RIST). All rights reserved.
17+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1718
* $COPYRIGHT$
1819
*
1920
* Additional copyrights may follow
@@ -109,7 +110,7 @@ coll_base_comm_destruct(mca_coll_base_comm_t *data)
109110
OBJ_CLASS_INSTANCE(mca_coll_base_comm_t, opal_object_t,
110111
coll_base_comm_construct, coll_base_comm_destruct);
111112

112-
ompi_request_t** coll_base_comm_get_reqs(mca_coll_base_comm_t* data, int nreqs)
113+
ompi_request_t** ompi_coll_base_comm_get_reqs(mca_coll_base_comm_t* data, int nreqs)
113114
{
114115
if( 0 == nreqs ) return NULL;
115116

‎ompi/mca/coll/base/coll_base_functions.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,6 @@ static inline void ompi_coll_base_free_reqs(ompi_request_t **reqs, int count)
455455
* Return the array of requests on the data. If the array was not initialized
456456
* or if it's size was too small, allocate it to fit the requested size.
457457
*/
458-
ompi_request_t** coll_base_comm_get_reqs(mca_coll_base_comm_t* data, int nreqs);
458+
ompi_request_t** ompi_coll_base_comm_get_reqs(mca_coll_base_comm_t* data, int nreqs);
459459

460460
#endif /* MCA_COLL_BASE_EXPORT_H */

‎ompi/mca/coll/base/coll_base_gather.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* reserved.
1515
* Copyright (c) 2015-2016 Research Organization for Information Science
1616
* and Technology (RIST). All rights reserved.
17+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1718
* $COPYRIGHT$
1819
*
1920
* Additional copyrights may follow
@@ -267,7 +268,7 @@ ompi_coll_base_gather_intra_linear_sync(const void *sbuf, int scount,
267268
*/
268269
char *ptmp;
269270
ompi_request_t *first_segment_req;
270-
reqs = coll_base_comm_get_reqs(module->base_data, size);
271+
reqs = ompi_coll_base_comm_get_reqs(module->base_data, size);
271272
if (NULL == reqs) { ret = -1; line = __LINE__; goto error_hndl; }
272273

273274
ompi_datatype_type_size(rdtype, &typelng);

‎ompi/mca/coll/base/coll_base_reduce.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ int ompi_coll_base_reduce_generic( const void* sendbuf, void* recvbuf, int origi
287287

288288
int creq = 0;
289289

290-
sreq = coll_base_comm_get_reqs(module->base_data, max_outstanding_reqs);
290+
sreq = ompi_coll_base_comm_get_reqs(module->base_data, max_outstanding_reqs);
291291
if (NULL == sreq) { line = __LINE__; ret = -1; goto error_hndl; }
292292

293293
/* post first group of requests */

‎ompi/mca/coll/basic/coll_basic_allgather.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* All rights reserved.
1212
* Copyright (c) 2014-2016 Research Organization for Information Science
1313
* and Technology (RIST). All rights reserved.
14+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1415
* $COPYRIGHT$
1516
*
1617
* Additional copyrights may follow
@@ -78,7 +79,7 @@ mca_coll_basic_allgather_inter(const void *sbuf, int scount,
7879
if (OMPI_SUCCESS != err) { line = __LINE__; goto exit; }
7980

8081
/* Get a requests arrays of the right size */
81-
reqs = coll_base_comm_get_reqs(module->base_data, rsize + 1);
82+
reqs = ompi_coll_base_comm_get_reqs(module->base_data, rsize + 1);
8283
if( NULL == reqs ) { line = __LINE__; err = OMPI_ERR_OUT_OF_RESOURCE; goto exit; }
8384

8485
/* Do a send-recv between the two root procs. to avoid deadlock */

‎ompi/mca/coll/basic/coll_basic_allreduce.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* All rights reserved.
1212
* Copyright (c) 2015-2017 Research Organization for Information Science
1313
* and Technology (RIST). All rights reserved.
14+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1415
* $COPYRIGHT$
1516
*
1617
* Additional copyrights may follow
@@ -109,7 +110,7 @@ mca_coll_basic_allreduce_inter(const void *sbuf, void *rbuf, int count,
109110
pml_buffer = tmpbuf - gap;
110111

111112
if (rsize > 1) {
112-
reqs = coll_base_comm_get_reqs(module->base_data, rsize - 1);
113+
reqs = ompi_coll_base_comm_get_reqs(module->base_data, rsize - 1);
113114
if( NULL == reqs ) { err = OMPI_ERR_OUT_OF_RESOURCE; line = __LINE__; goto exit; }
114115
}
115116

0 commit comments

Comments
 (0)