Skip to content

Commit d7fc316

Browse files
committed
oshmem: add some deprecated names in shmem.h.in
Per openshmem-org/tests-uh#17, add some deprecated constant names that we didn't previously support in Open MPI. Signed-off-by: Jeff Squyres <[email protected]> (cherry picked from commit e79e478)
1 parent f43aad6 commit d7fc316

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

oshmem/include/shmem.h.in

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* Copyright (c) 2014 Intel, Inc. All rights reserved
55
* Copyright (c) 2016 Research Organization for Information Science
66
* and Technology (RIST). All rights reserved.
7+
* Copyright (c) 2017 Cisco Systems, Inc. All rights reserved.
78
* $COPYRIGHT$
89
*
910
* Additional copyrights may follow
@@ -77,6 +78,13 @@ extern "C" {
7778
#define SHMEM_VENDOR_STRING "http://www.open-mpi.org/"
7879
#define SHMEM_MAX_NAME_LEN 256
7980

81+
/*
82+
* Deprecated (but still valid) names
83+
*/
84+
#define _SHMEM_MAJOR_VERSION SHMEM_MAJOR_VERSION
85+
#define _SHMEM_MINOR_VERSION SHMEM_MINOR_VERSION
86+
#define _SHMEM_MAX_NAME_LEN SHMEM_MAX_NAME_LEN
87+
8088
#ifndef OSHMEM_SPEC_VERSION
8189
#define OSHMEM_SPEC_VERSION (SHMEM_MAJOR_VERSION * 10000 + SHMEM_MINOR_VERSION * 100)
8290
#endif
@@ -90,6 +98,16 @@ enum shmem_wait_ops {
9098
SHMEM_CMP_GE
9199
};
92100

101+
/*
102+
* Deprecated (but still valid) names
103+
*/
104+
#define _SHMEM_CMP_EQ SHMEM_CMP_EQ
105+
#define _SHMEM_CMP_NE SHMEM_CMP_NE
106+
#define _SHMEM_CMP_GT SHMEM_CMP_GT
107+
#define _SHMEM_CMP_LE SHMEM_CMP_LE
108+
#define _SHMEM_CMP_LT SHMEM_CMP_LT
109+
#define _SHMEM_CMP_GE SHMEM_CMP_GE
110+
93111
#define _SHMEM_BARRIER_SYNC_SIZE (1)
94112
#define _SHMEM_BCAST_SYNC_SIZE (1 + _SHMEM_BARRIER_SYNC_SIZE)
95113
#define _SHMEM_COLLECT_SYNC_SIZE (1 + _SHMEM_BCAST_SYNC_SIZE)

0 commit comments

Comments
 (0)