Merge pull request #137 from yfguo/team-coll

Add team-based collective

autogen.sh

@@ -140,21 +140,44 @@ insert_file_by_key "SHMEM_AMO_BITWS_TYPED_H start" ./include/shmem_amo_bitws_typ
 echo "-- inserted SHMEM_AMO_BITWS_TYPED_H in include/shmem.h.in"
 echo ""
 
-echo "Generating Collective reduction typed APIs header file..."
-./maint/build_typed_api.pl --typefile ./maint/reduce_maxmin_typedef.txt \
-    --tplfile ./include/shmem_reduce_minmax_typed.h.tpl --outfile ./include/shmem_reduce_minmax_typed.h
-insert_file_by_key "SHMEM_REDUCE_MINMAX_TYPED_H start" ./include/shmem_reduce_minmax_typed.h include/shmem.h.in
-echo "-- inserted SHMEM_REDUCE_MINMAX_TYPED_H in include/shmem.h.in"
-
-./maint/build_typed_api.pl --typefile ./maint/reduce_sumprod_typedef.txt \
-    --tplfile ./include/shmem_reduce_sumprod_typed.h.tpl --outfile ./include/shmem_reduce_sumprod_typed.h
-insert_file_by_key "SHMEM_REDUCE_SUMPROD_TYPED_H start" ./include/shmem_reduce_sumprod_typed.h include/shmem.h.in
-echo "-- inserted SHMEM_REDUCE_SUMPROD_TYPED_H in include/shmem.h.in"
-
-./maint/build_typed_api.pl --typefile ./maint/reduce_bitws_typedef.txt \
-    --tplfile ./include/shmem_reduce_bitws_typed.h.tpl --outfile ./include/shmem_reduce_bitws_typed.h
-insert_file_by_key "SHMEM_REDUCE_BITWS_TYPED_H start" ./include/shmem_reduce_bitws_typed.h include/shmem.h.in
-echo "-- inserted SHMEM_REDUCE_BITWS_TYPED_H in include/shmem.h.in"
+echo "Generating Collective typed APIs header file..."
+./maint/build_typed_api.pl --typefile ./maint/coll_typedef.txt \
+    --tplfile ./include/shmem_coll_typed.h.tpl --outfile ./include/shmem_coll_typed.h
+insert_file_by_key "SHMEM_COLL_TYPED_H start" ./include/shmem_coll_typed.h include/shmem.h.in
+echo "-- inserted SHMEM_COLL_TYPED_H in include/shmem.h.in"
+
+echo "Generating Collective reduction active-set-based typed APIs header file..."
+./maint/build_typed_api.pl --typefile ./maint/reduce_minmax_aset_typedef.txt \
+    --tplfile ./include/shmem_reduce_minmax_aset_typed.h.tpl --outfile ./include/shmem_reduce_minmax_aset_typed.h
+insert_file_by_key "SHMEM_REDUCE_MINMAX_ASET_TYPED_H start" ./include/shmem_reduce_minmax_aset_typed.h include/shmem.h.in
+echo "-- inserted SHMEM_REDUCE_MINMAX_ASET_TYPED_H in include/shmem.h.in"
+
+./maint/build_typed_api.pl --typefile ./maint/reduce_sumprod_aset_typedef.txt \
+    --tplfile ./include/shmem_reduce_sumprod_aset_typed.h.tpl --outfile ./include/shmem_reduce_sumprod_aset_typed.h
+insert_file_by_key "SHMEM_REDUCE_SUMPROD_ASET_TYPED_H start" ./include/shmem_reduce_sumprod_aset_typed.h include/shmem.h.in
+echo "-- inserted SHMEM_REDUCE_SUMPROD_ASET_TYPED_H in include/shmem.h.in"
+
+./maint/build_typed_api.pl --typefile ./maint/reduce_bitws_aset_typedef.txt \
+    --tplfile ./include/shmem_reduce_bitws_aset_typed.h.tpl --outfile ./include/shmem_reduce_bitws_aset_typed.h
+insert_file_by_key "SHMEM_REDUCE_BITWS_ASET_TYPED_H start" ./include/shmem_reduce_bitws_aset_typed.h include/shmem.h.in
+echo "-- inserted SHMEM_REDUCE_BITWS_ASET_TYPED_H in include/shmem.h.in"
+echo ""
+
+echo "Generating Collective reduction active-set-based typed APIs header file..."
+./maint/build_typed_api.pl --typefile ./maint/reduce_minmax_team_typedef.txt \
+    --tplfile ./include/shmem_reduce_minmax_team_typed.h.tpl --outfile ./include/shmem_reduce_minmax_team_typed.h
+insert_file_by_key "SHMEM_REDUCE_MINMAX_TEAM_TYPED_H start" ./include/shmem_reduce_minmax_team_typed.h include/shmem.h.in
+echo "-- inserted SHMEM_REDUCE_MINMAX_TEAM_TYPED_H in include/shmem.h.in"
+
+./maint/build_typed_api.pl --typefile ./maint/reduce_sumprod_team_typedef.txt \
+    --tplfile ./include/shmem_reduce_sumprod_team_typed.h.tpl --outfile ./include/shmem_reduce_sumprod_team_typed.h
+insert_file_by_key "SHMEM_REDUCE_SUMPROD_TEAM_TYPED_H start" ./include/shmem_reduce_sumprod_team_typed.h include/shmem.h.in
+echo "-- inserted SHMEM_REDUCE_SUMPROD_TEAM_TYPED_H in include/shmem.h.in"
+
+./maint/build_typed_api.pl --typefile ./maint/reduce_bitws_team_typedef.txt \
+    --tplfile ./include/shmem_reduce_bitws_team_typed.h.tpl --outfile ./include/shmem_reduce_bitws_team_typed.h
+insert_file_by_key "SHMEM_REDUCE_BITWS_TEAM_TYPED_H start" ./include/shmem_reduce_bitws_team_typed.h include/shmem.h.in
+echo "-- inserted SHMEM_REDUCE_BITWS_TEAM_TYPED_H in include/shmem.h.in"
 echo ""
 
 echo "Generating Signal APIs header file..."
@@ -215,24 +238,51 @@ echo "-- ./src/shmem/amo_bitws_typed.c done"
 echo "-- ./src/shmem/amo_bitws_typed.c format cleaned"
 echo ""
 
-echo "Generating Collective reduction typed APIs source files..."
-./maint/build_typed_api.pl --typefile ./maint/reduce_maxmin_typedef.txt \
-    --tplfile ./src/shmem/reduce_minmax_typed.c.tpl --outfile ./src/shmem/reduce_minmax_typed.c
-echo "-- ./src/shmem/reduce_minmax_typed.c done"
-./maint/code-cleanup.sh ./src/shmem/reduce_minmax_typed.c
-echo "-- ./src/shmem/reduce_minmax_typed.c format cleaned"
-
-./maint/build_typed_api.pl --typefile ./maint/reduce_sumprod_typedef.txt \
-    --tplfile ./src/shmem/reduce_sumprod_typed.c.tpl --outfile ./src/shmem/reduce_sumprod_typed.c
-echo "-- ./src/shmem/reduce_sumprod_typed.c done"
-./maint/code-cleanup.sh ./src/shmem/reduce_sumprod_typed.c
-echo "-- ./src/shmem/reduce_sumprod_typed.c format cleaned"
-
-./maint/build_typed_api.pl --typefile ./maint/reduce_bitws_typedef.txt \
-    --tplfile ./src/shmem/reduce_bitws_typed.c.tpl --outfile ./src/shmem/reduce_bitws_typed.c
-echo "-- ./src/shmem/reduce_bitws_typed.c done"
-./maint/code-cleanup.sh ./src/shmem/reduce_bitws_typed.c
-echo "-- ./src/shmem/reduce_bitws_typed.c format cleaned"
+echo "Generating Collective typed APIs source files..."
+./maint/build_typed_api.pl --typefile ./maint/coll_typedef.txt \
+    --tplfile ./src/shmem/coll_typed.c.tpl --outfile ./src/shmem/coll_typed.c
+echo "-- ./src/shmem/coll_typed.c done"
+./maint/code-cleanup.sh ./src/shmem/coll_typed.c
+echo "-- ./src/shmem/coll_typed.c format cleaned"
+
+echo "Generating Collective reduction active-set-based typed APIs source files..."
+./maint/build_typed_api.pl --typefile ./maint/reduce_minmax_aset_typedef.txt \
+    --tplfile ./src/shmem/reduce_minmax_aset_typed.c.tpl --outfile ./src/shmem/reduce_minmax_aset_typed.c
+echo "-- ./src/shmem/reduce_minmax_aset_typed.c done"
+./maint/code-cleanup.sh ./src/shmem/reduce_minmax_aset_typed.c
+echo "-- ./src/shmem/reduce_minmax_aset_typed.c format cleaned"
+
+./maint/build_typed_api.pl --typefile ./maint/reduce_sumprod_aset_typedef.txt \
+    --tplfile ./src/shmem/reduce_sumprod_aset_typed.c.tpl --outfile ./src/shmem/reduce_sumprod_aset_typed.c
+echo "-- ./src/shmem/reduce_sumprod_aset_typed.c done"
+./maint/code-cleanup.sh ./src/shmem/reduce_sumprod_aset_typed.c
+echo "-- ./src/shmem/reduce_sumprod_aset_typed.c format cleaned"
+
+./maint/build_typed_api.pl --typefile ./maint/reduce_bitws_aset_typedef.txt \
+    --tplfile ./src/shmem/reduce_bitws_aset_typed.c.tpl --outfile ./src/shmem/reduce_bitws_aset_typed.c
+echo "-- ./src/shmem/reduce_bitws_aset_typed.c done"
+./maint/code-cleanup.sh ./src/shmem/reduce_bitws_aset_typed.c
+echo "-- ./src/shmem/reduce_bitws_aset_typed.c format cleaned"
+echo ""
+
+echo "Generating Collective reduction team-based typed APIs source files..."
+./maint/build_typed_api.pl --typefile ./maint/reduce_minmax_team_typedef.txt \
+    --tplfile ./src/shmem/reduce_minmax_team_typed.c.tpl --outfile ./src/shmem/reduce_minmax_team_typed.c
+echo "-- ./src/shmem/reduce_minmax_team_typed.c done"
+./maint/code-cleanup.sh ./src/shmem/reduce_minmax_team_typed.c
+echo "-- ./src/shmem/reduce_minmax_team_typed.c format cleaned"
+
+./maint/build_typed_api.pl --typefile ./maint/reduce_sumprod_team_typedef.txt \
+    --tplfile ./src/shmem/reduce_sumprod_team_typed.c.tpl --outfile ./src/shmem/reduce_sumprod_team_typed.c
+echo "-- ./src/shmem/reduce_sumprod_team_typed.c done"
+./maint/code-cleanup.sh ./src/shmem/reduce_sumprod_team_typed.c
+echo "-- ./src/shmem/reduce_sumprod_team_typed.c format cleaned"
+
+./maint/build_typed_api.pl --typefile ./maint/reduce_bitws_team_typedef.txt \
+    --tplfile ./src/shmem/reduce_bitws_team_typed.c.tpl --outfile ./src/shmem/reduce_bitws_team_typed.c
+echo "-- ./src/shmem/reduce_bitws_team_typed.c done"
+./maint/code-cleanup.sh ./src/shmem/reduce_bitws_team_typed.c
+echo "-- ./src/shmem/reduce_bitws_team_typed.c format cleaned"
 echo ""
 
 echo "Generating Signaling APIs source files..."

include/Makefile.mk

@@ -10,6 +10,10 @@ EXTRA_DIST += include/shmem.h.in.tpl                   \
               include/shmem_amo_std_typed.h.tpl        \
               include/shmem_amo_ext_typed.h.tpl        \
               include/shmem_amo_bitws_typed.h.tpl      \
-              include/shmem_reduce_minmax_typed.h.tpl  \
-              include/shmem_reduce_sumprod_typed.h.tpl \
-              include/shmem_reduce_bitws_typed.h.tpl
+              include/shmem_coll_typed.h.tpl           \
+              include/shmem_reduce_minmax_aset_typed.h.tpl  \
+              include/shmem_reduce_sumprod_aset_typed.h.tpl \
+              include/shmem_reduce_bitws_aset_typed.h.tpl   \
+              include/shmem_reduce_minmax_team_typed.h.tpl  \
+              include/shmem_reduce_sumprod_team_typed.h.tpl \
+              include/shmem_reduce_bitws_team_typed.h.tpl

include/shmem.h.in.tpl

@@ -32,6 +32,7 @@ extern "C" {
 #define OSHMPI_C11_ARG1_HELPER(second, ...) second
 #define OSHMPI_C11_ARG1(first, ...) OSHMPI_C11_ARG1_HELPER(__VA_ARGS__, extra)
 #define OSHMPI_C11_CTX_VAL(ctx) (ctx)
+#define OSHMPI_C11_TEAM_VAL(team) (team)
 static inline void shmem_c11_type_ignore(void) {}
 #endif
 
@@ -91,6 +92,8 @@ typedef struct {
 #define SHMEM_TEAM_SHARED (shmem_team_t) 0x90001
 #define SHMEM_TEAM_INVALID NULL
 
+#define SHMEM_TEAM_NUM_CONTEXTS 0x091001L
+
 /* SHMEM malloc hints */
 #define SHMEM_MALLOC_ATOMICS_REMOTE 0x002001L
 #define SHMEM_MALLOC_SIGNAL_REMOTE 0x002002L
@@ -99,6 +102,7 @@ typedef struct {
 #define SHMEM_CTX_SERIALIZED 0x001001L
 #define SHMEM_CTX_PRIVATE 0x001002L
 #define SHMEM_CTX_NOSTORE 0x001003L
+#define SHMEM_CTX_INVALID (-1L)
 
 typedef void* shmem_ctx_t;
 #define SHMEM_CTX_DEFAULT (shmem_ctx_t) 0x80000
@@ -241,9 +245,19 @@ uint64_t shmem_signal_fetch(const uint64_t *sig_addr);
 
 /* -- Collectives -- */
 void shmem_barrier_all(void);
-void shmem_barrier(int PE_start, int logPE_stride, int PE_size, long *pSync);
 int shmem_team_sync(shmem_team_t team);
 void shmem_sync_all(void);
+int shmem_broadcastmem(shmem_team_t team, void *dest, const void *source, size_t nelems,
+                       int PE_root);
+int shmem_collectmem(shmem_team_t team, void *dest, const void *source, size_t nelems);
+int shmem_fcollectmem(shmem_team_t team, void *dest, const void *source, size_t nelems);
+int shmem_alltoallmem(shmem_team_t team, void *dest, const void *source, size_t nelems);
+int shmem_alltoallsmem(shmem_team_t team, void *dest, const void *source, ptrdiff_t dst,
+                       ptrdiff_t sst, size_t nelems);
+
+/* (deprecated APIs) */
+void shmem_sync_aset(int PE_start, int logPE_stride, int PE_size, long *pSync);
+void shmem_barrier(int PE_start, int logPE_stride, int PE_size, long *pSync);
 void shmem_broadcast32(void *dest, const void *source, size_t nelems, int PE_root, int PE_start,
                        int logPE_stride, int PE_size, long *pSync);
 void shmem_broadcast64(void *dest, const void *source, size_t nelems, int PE_root, int PE_start,
@@ -264,17 +278,40 @@ void shmem_alltoalls32(void *dest, const void *source, ptrdiff_t dst, ptrdiff_t
                        int PE_start, int logPE_stride, int PE_size, long *pSync);
 void shmem_alltoalls64(void *dest, const void *source, ptrdiff_t dst, ptrdiff_t sst, size_t nelems,
                        int PE_start, int logPE_stride, int PE_size, long *pSync);
-/* (deprecated APIs) */
-void shmem_sync(int PE_start, int logPE_stride, int PE_size, long *pSync);
 
-/* SHMEM_REDUCE_MINMAX_TYPED_H start */
-/* SHMEM_REDUCE_MINMAX_TYPED_H end */
+/* *INDENT-OFF* */
+#if OSHMPI_HAVE_C11
+#define shmem_sync(...)  \
+    _Generic(OSHMPI_C11_TEAM_VAL(OSHMPI_C11_ARG0(__VA_ARGS__)), \
+        shmem_team_t: shmem_team_sync, \
+        int: shmem_sync_aset, \
+        default: shmem_c11_type_ignore     \
+    )(__VA_ARGS__)
+#else
+#define shmem_sync(...) shmem_sync_aset(__VA_ARGS__)
+#endif /* OSHMPI_HAVE_C11 */
+/* *INDENT-ON* */
+
+/* SHMEM_COLL_TYPED_H start */
+/* SHMEM_COLL_TYPED_H end */
+
+/* SHMEM_REDUCE_MINMAX_TEAM_TYPED_H start */
+/* SHMEM_REDUCE_MINMAX_TEAM_TYPED_H end */
+
+/* SHMEM_REDUCE_SUMPROD_TEAM_TYPED_H start */
+/* SHMEM_REDUCE_SUMPROD_TEAM_TYPED_H end */
+
+/* SHMEM_REDUCE_BITWS_TEAM_TYPED_H start */
+/* SHMEM_REDUCE_BITWS_TEAM_TYPED_H end */
+
+/* SHMEM_REDUCE_MINMAX_ASET_TYPED_H start */
+/* SHMEM_REDUCE_MINMAX_ASET_TYPED_H end */
 
-/* SHMEM_REDUCE_SUMPROD_TYPED_H start */
-/* SHMEM_REDUCE_SUMPROD_TYPED_H end */
+/* SHMEM_REDUCE_SUMPROD_ASET_TYPED_H start */
+/* SHMEM_REDUCE_SUMPROD_ASET_TYPED_H end */
 
-/* SHMEM_REDUCE_BITWS_TYPED_H start */
-/* SHMEM_REDUCE_BITWS_TYPED_H end */
+/* SHMEM_REDUCE_BITWS_ASET_TYPED_H start */
+/* SHMEM_REDUCE_BITWS_ASET_TYPED_H end */
 
 /* -- Point-To-Point Synchronization -- */
 /* SHMEM_P2P_TYPED_H start */

include/shmem_coll_typed.h.tpl

@@ -0,0 +1,69 @@
+/* The following lines are automatically generated. DO NOT EDIT. */
+/* TPL_BLOCK_START */
+int shmem_TYPENAME_broadcast(shmem_team_t team, TYPE * dest, const TYPE * source, size_t nelems,
+                             int PE_root);
+int shmem_TYPENAME_collect(shmem_team_t team, TYPE * dest, const TYPE * source, size_t nelems);
+int shmem_TYPENAME_fcollect(shmem_team_t team, TYPE * dest, const TYPE * source, size_t nelems);
+int shmem_TYPENAME_alltoall(shmem_team_t team, TYPE * dest, const TYPE * source, size_t nelems);
+int shmem_TYPENAME_alltoalls(shmem_team_t team, TYPE * dest, const TYPE * source, ptrdiff_t dst,
+                             ptrdiff_t sst, size_t nelems);
+/* TPL_BLOCK_END */
+
+/* *INDENT-OFF* */
+#if OSHMPI_HAVE_C11
+#define shmem_broadcast(...)  \
+    _Generic(OSHMPI_C11_TEAM_VAL(OSHMPI_C11_ARG0(__VA_ARGS__)), \
+        shmem_team_t:  _Generic((OSHMPI_C11_ARG1(__VA_ARGS__)), \
+/* TPL_C11_BLOCK_START */
+            TYPE*: shmem_TYPENAME_broadcast,   \
+/* TPL_C11_BLOCK_END */
+            default: shmem_c11_type_ignore \
+        ), \
+        default: shmem_c11_type_ignore     \
+    )(__VA_ARGS__)
+
+#define shmem_collect(...)  \
+    _Generic(OSHMPI_C11_TEAM_VAL(OSHMPI_C11_ARG0(__VA_ARGS__)), \
+        shmem_team_t:  _Generic((OSHMPI_C11_ARG1(__VA_ARGS__)), \
+/* TPL_C11_BLOCK_START */
+            TYPE*: shmem_TYPENAME_collect,   \
+/* TPL_C11_BLOCK_END */
+            default: shmem_c11_type_ignore \
+        ), \
+        default: shmem_c11_type_ignore     \
+    )(__VA_ARGS__)
+
+#define shmem_fcollect(...)  \
+    _Generic(OSHMPI_C11_TEAM_VAL(OSHMPI_C11_ARG0(__VA_ARGS__)), \
+        shmem_team_t:  _Generic((OSHMPI_C11_ARG1(__VA_ARGS__)), \
+/* TPL_C11_BLOCK_START */
+            TYPE*: shmem_TYPENAME_fcollect,   \
+/* TPL_C11_BLOCK_END */
+            default: shmem_c11_type_ignore \
+        ), \
+        default: shmem_c11_type_ignore     \
+    )(__VA_ARGS__)
+
+#define shmem_alltoall(...)  \
+    _Generic(OSHMPI_C11_TEAM_VAL(OSHMPI_C11_ARG0(__VA_ARGS__)), \
+        shmem_team_t:  _Generic((OSHMPI_C11_ARG1(__VA_ARGS__)), \
+/* TPL_C11_BLOCK_START */
+            TYPE*: shmem_TYPENAME_alltoall,   \
+/* TPL_C11_BLOCK_END */
+            default: shmem_c11_type_ignore \
+        ), \
+        default: shmem_c11_type_ignore     \
+    )(__VA_ARGS__)
+
+#define shmem_alltoalls(...)  \
+    _Generic(OSHMPI_C11_TEAM_VAL(OSHMPI_C11_ARG0(__VA_ARGS__)), \
+        shmem_team_t:  _Generic((OSHMPI_C11_ARG1(__VA_ARGS__)), \
+/* TPL_C11_BLOCK_START */
+            TYPE*: shmem_TYPENAME_alltoalls,   \
+/* TPL_C11_BLOCK_END */
+            default: shmem_c11_type_ignore \
+        ), \
+        default: shmem_c11_type_ignore     \
+    )(__VA_ARGS__)
+#endif /* OSHMPI_HAVE_C11 */
+/* *INDENT-ON* */

include/shmem_reduce_bitws_typed.h.tpl → include/shmem_reduce_bitws_aset_typed.h.tpl

@@ -1,9 +1,10 @@
 /* The following lines are automatically generated. DO NOT EDIT. */
 /* TPL_BLOCK_START */
+/* depreciated APIs */
 void shmem_TYPENAME_and_to_all(TYPE * dest, const TYPE * source, int nreduce, int PE_start,
                                int logPE_stride, int PE_size, TYPE * pWrk, long *pSync);
 void shmem_TYPENAME_or_to_all(TYPE * dest, const TYPE * source, int nreduce, int PE_start,
                               int logPE_stride, int PE_size, TYPE * pWrk, long *pSync);
 void shmem_TYPENAME_xor_to_all(TYPE * dest, const TYPE * source, int nreduce, int PE_start,
                                int logPE_stride, int PE_size, TYPE * pWrk, long *pSync);
-/* TPL_BLOCK_END */
+/* TPL_BLOCK_END */

include/shmem_reduce_bitws_team_typed.h.tpl

@@ -0,0 +1,43 @@
+/* The following lines are automatically generated. DO NOT EDIT. */
+/* TPL_BLOCK_START */
+int shmem_TYPENAME_and_reduce(shmem_team_t team, TYPE * dest, const TYPE * source, int nreduce);
+int shmem_TYPENAME_or_reduce(shmem_team_t team, TYPE * dest, const TYPE * source, int nreduce);
+int shmem_TYPENAME_xor_reduce(shmem_team_t team, TYPE * dest, const TYPE * source, int nreduce);
+/* TPL_BLOCK_END */
+
+/* *INDENT-OFF* */
+#if OSHMPI_HAVE_C11
+#define shmem_and_reduce(...)  \
+    _Generic(OSHMPI_C11_TEAM_VAL(OSHMPI_C11_ARG0(__VA_ARGS__)), \
+        shmem_team_t:  _Generic((OSHMPI_C11_ARG1(__VA_ARGS__)), \
+/* TPL_C11_BLOCK_START */
+            TYPE*: shmem_TYPENAME_and_reduce,   \
+/* TPL_C11_BLOCK_END */
+            default: shmem_c11_type_ignore \
+        ), \
+        default: shmem_c11_type_ignore     \
+    )(__VA_ARGS__)
+
+#define shmem_or_reduce(...)  \
+    _Generic(OSHMPI_C11_TEAM_VAL(OSHMPI_C11_ARG0(__VA_ARGS__)), \
+        shmem_team_t:  _Generic((OSHMPI_C11_ARG1(__VA_ARGS__)), \
+/* TPL_C11_BLOCK_START */
+            TYPE*: shmem_TYPENAME_or_reduce,   \
+/* TPL_C11_BLOCK_END */
+            default: shmem_c11_type_ignore \
+        ), \
+        default: shmem_c11_type_ignore     \
+    )(__VA_ARGS__)
+
+#define shmem_xor_reduce(...)  \
+    _Generic(OSHMPI_C11_TEAM_VAL(OSHMPI_C11_ARG0(__VA_ARGS__)), \
+        shmem_team_t:  _Generic((OSHMPI_C11_ARG1(__VA_ARGS__)), \
+/* TPL_C11_BLOCK_START */
+            TYPE*: shmem_TYPENAME_xor_reduce,   \
+/* TPL_C11_BLOCK_END */
+            default: shmem_c11_type_ignore \
+        ), \
+        default: shmem_c11_type_ignore     \
+    )(__VA_ARGS__)
+#endif /* OSHMPI_HAVE_C11 */
+/* *INDENT-ON* */

include/shmem_reduce_minmax_typed.h.tpl → include/shmem_reduce_minmax_aset_typed.h.tpl

@@ -1,7 +1,8 @@
 /* The following lines are automatically generated. DO NOT EDIT. */
 /* TPL_BLOCK_START */
+/* deprecated APIs */
 void shmem_TYPENAME_min_to_all(TYPE * dest, const TYPE * source, int nreduce, int PE_start,
                                int logPE_stride, int PE_size, TYPE * pWrk, long *pSync);
 void shmem_TYPENAME_max_to_all(TYPE * dest, const TYPE * source, int nreduce, int PE_start,
                                int logPE_stride, int PE_size, TYPE * pWrk, long *pSync);
-/* TPL_BLOCK_END */
+/* TPL_BLOCK_END */