Skip to content

Commit ef12c13

Browse files
committed
Merge pull request #1749 from hjelmn/enum_fix
btl: adjust values of new atomic flags
2 parents 9f43b23 + 6169d03 commit ef12c13

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

opal/mca/btl/btl.h

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -309,21 +309,20 @@ enum {
309309
/** The btl supports atomic min */
310310
MCA_BTL_ATOMIC_SUPPORTS_MAX = 0x00200000,
311311

312-
/** The btl supports atomic compare-and-swap */
313-
MCA_BTL_ATOMIC_SUPPORTS_CSWAP = 0x10000000,
314-
315-
/** The btl guarantees global atomicity (can mix btl atomics with cpu atomics) */
316-
MCA_BTL_ATOMIC_SUPPORTS_GLOB = 0x20000000,
317-
318-
319312
/** The btl supports 32-bit integer operations. Keep in mind the btl may
320313
* support only a subset of the available atomics. */
321-
MCA_BTL_ATOMIC_SUPPORTS_32BIT = 0x40000000,
314+
MCA_BTL_ATOMIC_SUPPORTS_32BIT = 0x01000000,
322315

323316
/** The btl supports floating-point operations. Keep in mind the btl may
324317
* support only a subset of the available atomics and may not support
325318
* both 64 or 32-bit floating point. */
326-
MCA_BTL_ATOMIC_SUPPORTS_FLOAT = 0x80000000,
319+
MCA_BTL_ATOMIC_SUPPORTS_FLOAT = 0x02000000,
320+
321+
/** The btl supports atomic compare-and-swap */
322+
MCA_BTL_ATOMIC_SUPPORTS_CSWAP = 0x10000000,
323+
324+
/** The btl guarantees global atomicity (can mix btl atomics with cpu atomics) */
325+
MCA_BTL_ATOMIC_SUPPORTS_GLOB = 0x20000000,
327326
};
328327

329328
enum {

0 commit comments

Comments
 (0)