Modernize declaration of custom reductions.

Author: jblueh

include/opdi/backend/macro/macros.hpp

@@ -235,15 +235,28 @@
 
 // reduction macros
 
-#define OPDI_INTERNAL_DECLARE_REDUCTION(OP_NAME, TYPE, OP, INIT, ID) \
-  TYPE operator OP (opdi::Reducer<TYPE, ID> const& lhs, \
-                    opdi::Reducer<TYPE, ID> const& rhs) { \
-    return lhs.value OP rhs.value; \
-  } \
-  \
-  OPDI_PRAGMA(omp declare reduction(OP_NAME : TYPE : \
-      opdi::Reducer<TYPE, ID>(omp_out) = opdi::Reducer<TYPE, ID>(omp_out) OP opdi::Reducer<TYPE, ID>(omp_in)) \
-      initializer(omp_priv = INIT))
+#if _OPENMP >= 202411
+  #define OPDI_INTERNAL_DECLARE_REDUCTION(OP_NAME, TYPE, OP, INIT, ID) \
+    TYPE operator OP (opdi::Reducer<TYPE, ID> const& lhs, \
+                     opdi::Reducer<TYPE, ID> const& rhs) { \
+          return lhs.value OP rhs.value; \
+    } \
+    \
+    OPDI_PRAGMA(omp declare_reduction(OP_NAME : TYPE) \
+        combiner(opdi::Reducer<TYPE, ID>(omp_out) = \
+            opdi::Reducer<TYPE, ID>(omp_out) OP opdi::Reducer<TYPE, ID>(omp_in)) \
+        initializer(omp_priv = INIT))
+#else
+  #define OPDI_INTERNAL_DECLARE_REDUCTION(OP_NAME, TYPE, OP, INIT, ID) \
+    TYPE operator OP (opdi::Reducer<TYPE, ID> const& lhs, \
+                      opdi::Reducer<TYPE, ID> const& rhs) { \
+      return lhs.value OP rhs.value; \
+    } \
+    \
+    OPDI_PRAGMA(omp declare reduction(OP_NAME : TYPE : \
+        opdi::Reducer<TYPE, ID>(omp_out) = opdi::Reducer<TYPE, ID>(omp_out) OP opdi::Reducer<TYPE, ID>(omp_in)) \
+        initializer(omp_priv = INIT))
+#endif
 
 #define OPDI_DECLARE_REDUCTION(OP_NAME, TYPE, OP, INIT) \
   OPDI_INTERNAL_DECLARE_REDUCTION(OP_NAME, TYPE, OP, INIT, __COUNTER__)

include/opdi/backend/ompt/macros.hpp

@@ -92,7 +92,13 @@
 #define OPDI_BARRIER(...) \
   OPDI_PRAGMA(omp barrier __VA_ARGS__)
 
-#define OPDI_DECLARE_REDUCTION(OP_NAME, TYPE, OP, INIT) \
-  OPDI_PRAGMA(omp declare reduction(OP_NAME : TYPE : omp_out = omp_out OP omp_in) initializer(omp_priv = INIT))
+#if _OPENMP >= 202411
+  #define OPDI_DECLARE_REDUCTION(OP_NAME, TYPE, OP, INIT) \
+    OPDI_PRAGMA(omp declare_reduction(OP_NAME : TYPE) combiner(omp_out = omp_out OP omp_in) \
+                initializer(omp_priv = INIT))
+#else
+  #define OPDI_DECLARE_REDUCTION(OP_NAME, TYPE, OP, INIT) \
+    OPDI_PRAGMA(omp declare reduction(OP_NAME : TYPE : omp_out = omp_out OP omp_in) initializer(omp_priv = INIT))
+#endif
 
 #define OPDI_REDUCTION