Skip to content
This repository was archived by the owner on Sep 30, 2022. It is now read-only.

Commit 788a823

Browse files
committed
oshmem: remove #if OMPI_ENABLE_MPI_PROFILING
these bits were missing when open-mpi/ompi@291a464 was cherry-picked into 881e2dd
1 parent e7f909e commit 788a823

File tree

3 files changed

+3
-17
lines changed

3 files changed

+3
-17
lines changed

oshmem/runtime/oshmem_shmem_exchange.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (c) 2013 Mellanox Technologies, Inc.
33
* All rights reserved.
4-
* Copyright (c) 2015 Research Organization for Information Science
4+
* Copyright (c) 2015-2016 Research Organization for Information Science
55
* and Technology (RIST). All rights reserved.
66
* $COPYRIGHT$
77
*
@@ -16,12 +16,6 @@
1616
#include "oshmem/runtime/runtime.h"
1717
#include "oshmem/runtime/params.h"
1818

19-
#if OMPI_ENABLE_MPI_PROFILING
20-
#define MPI_Allgather PMPI_Allgather
21-
#define MPI_Allgatherv PMPI_Allgatherv
22-
#define MPI_Barrier PMPI_Barrier
23-
#endif
24-
2519
int oshmem_shmem_allgather(void *send_buf, void *rcv_buf, int elem_size)
2620
{
2721
int rc;

oshmem/runtime/oshmem_shmem_finalize.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (c) 2013 Mellanox Technologies, Inc.
33
* All rights reserved.
4-
* Copyright (c) 2015 Research Organization for Information Science
4+
* Copyright (c) 2015-2016 Research Organization for Information Science
55
* and Technology (RIST). All rights reserved.
66
* $COPYRIGHT$
77
*
@@ -58,10 +58,6 @@
5858
#include "oshmem/shmem/shmem_lock.h"
5959
#include "oshmem/runtime/oshmem_shmem_preconnect.h"
6060

61-
#if OMPI_ENABLE_MPI_PROFILING
62-
#define MPI_Comm_free PMPI_Comm_free
63-
#endif
64-
6561
static int _shmem_finalize(void);
6662

6763
int oshmem_shmem_finalize(void)

oshmem/runtime/oshmem_shmem_init.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (c) 2013 Mellanox Technologies, Inc.
33
* All rights reserved.
4-
* Copyright (c) 2015 Research Organization for Information Science
4+
* Copyright (c) 2015-2016 Research Organization for Information Science
55
* and Technology (RIST). All rights reserved.
66
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
77
* $COPYRIGHT$
@@ -82,10 +82,6 @@
8282
#ident OSHMEM_IDENT_STRING
8383
#endif
8484

85-
#if OMPI_ENABLE_MPI_PROFILING
86-
#define MPI_Comm_dup PMPI_Comm_dup
87-
#endif
88-
8985
/*
9086
* WHAT: add thread for invoking opal_progress() function
9187
* WHY: SHMEM based on current ompi/trunk (by the time of integrating into Open MPI)

0 commit comments

Comments
 (0)