Merge pull request #4635 from karasevb/oshmem/spec_1.3/broadcast

oshmem: remove "shmem_broadcast" in accordance with the spec v1.3
open-mpi · Jan 17, 2018 · dbefb35 · dbefb35
2 parents f2851fd + f6818af
commit dbefb35
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/oshmem/include/pshmem.h b/oshmem/include/pshmem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016 Mellanox Technologies, Inc.
+ * Copyright (c) 2014-2017 Mellanox Technologies, Inc.
  *                         All rights reserved.
  * Copyright (c) 2014      Intel, Inc. All rights reserved
  * Copyright (c) 2016      Research Organization for Information Science
@@ -464,7 +464,6 @@ OSHMEM_DECLSPEC  void pshmem_quiet(void);
  */
 OSHMEM_DECLSPEC void pshmem_broadcast32(void *target, const void *source, size_t nlong, int PE_root, int PE_start, int logPE_stride, int PE_size, long *pSync);
 OSHMEM_DECLSPEC void pshmem_broadcast64(void *target, const void *source, size_t nlong, int PE_root, int PE_start, int logPE_stride, int PE_size, long *pSync);
-OSHMEM_DECLSPEC void pshmem_broadcast(void *target, const void *source, size_t nlong, int PE_root, int PE_start, int logPE_stride, int PE_size, long *pSync);
 OSHMEM_DECLSPEC void pshmem_collect32(void *target, const void *source, size_t nlong, int PE_start, int logPE_stride, int PE_size, long *pSync);
 OSHMEM_DECLSPEC void pshmem_collect64(void *target, const void *source, size_t nlong, int PE_start, int logPE_stride, int PE_size, long *pSync);
 OSHMEM_DECLSPEC void pshmem_fcollect32(void *target, const void *source, size_t nlong, int PE_start, int logPE_stride, int PE_size, long *pSync);

diff --git a/oshmem/shmem/c/profile/defines.h b/oshmem/shmem/c/profile/defines.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Mellanox Technologies, Inc.
+ * Copyright (c) 2013-2017 Mellanox Technologies, Inc.
  *                         All rights reserved.
  * $COPYRIGHT$
  *
@@ -305,7 +305,6 @@
  */
 #define shmem_broadcast32            pshmem_broadcast32
 #define shmem_broadcast64            pshmem_broadcast64
-#define shmem_broadcast              pshmem_broadcast
 #define shmem_collect32              pshmem_collect32
 #define shmem_collect64              pshmem_collect64
 #define shmem_fcollect32             pshmem_fcollect32

diff --git a/oshmem/shmem/c/shmem_broadcast.c b/oshmem/shmem/c/shmem_broadcast.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013      Mellanox Technologies, Inc.
+ * Copyright (c) 2013-2017 Mellanox Technologies, Inc.
  *                         All rights reserved.
  * $COPYRIGHT$
  *
@@ -108,12 +108,10 @@ static void _shmem_broadcast(void *target,
 
 #if OSHMEM_PROFILING
 #include "oshmem/include/pshmem.h"
-#pragma weak shmem_broadcast = pshmem_broadcast
 #pragma weak shmem_broadcast32 = pshmem_broadcast32
 #pragma weak shmem_broadcast64 = pshmem_broadcast64
 #include "oshmem/shmem/c/profile/defines.h"
 #endif
 
 SHMEM_TYPE_BROADCAST(_broadcast32, sizeof(uint32_t))
 SHMEM_TYPE_BROADCAST(_broadcast64, sizeof(uint64_t))
-SHMEM_TYPE_BROADCAST(_broadcast, sizeof(uint64_t))