fix icpx atomic OpenMP methods

fix alpaka-group#2205 The compiler requires that the atomics are written in a very specific syntax else the code is not compiling.
psychocoderHPC · Dec 22, 2023 · 74ac3d7 · 74ac3d7
1 parent 1cdf4f9
commit 74ac3d7
Showing 1 changed file with 17 additions and 8 deletions.
diff --git a/include/alpaka/atomic/AtomicOmpBuiltIn.hpp b/include/alpaka/atomic/AtomicOmpBuiltIn.hpp
@@ -179,16 +179,20 @@ namespace alpaka
         template<typename T, typename THierarchy>
         struct AtomicOp<AtomicMin, AtomicOmpBuiltIn, T, THierarchy>
         {
-            ALPAKA_FN_HOST static auto atomicOp(AtomicOmpBuiltIn const&, T* const addr, T const& value) -> T
+            ALPAKA_FN_HOST static auto atomicOp(AtomicOmpBuiltIn const&, T* const addr, T value) -> T
             {
                 T old;
                 auto& ref(*addr);
 // atomically update ref, but capture the original value in old
 #        pragma omp atomic capture compare
                 {
                     old = ref;
+                    // Do not remove the curly brackets of the if body else
+                    // icpx 2024.0 is not able to compile the atomics.
                     if(value < ref)
+                    {
                         ref = value;
+                    }
                 }
                 return old;
             }
@@ -198,16 +202,20 @@ namespace alpaka
         template<typename T, typename THierarchy>
         struct AtomicOp<AtomicMax, AtomicOmpBuiltIn, T, THierarchy>
         {
-            ALPAKA_FN_HOST static auto atomicOp(AtomicOmpBuiltIn const&, T* const addr, T const& value) -> T
+            ALPAKA_FN_HOST static auto atomicOp(AtomicOmpBuiltIn const&, T* const addr, T value) -> T
             {
                 T old;
                 auto& ref(*addr);
 // atomically update ref, but capture the original value in old
 #        pragma omp atomic capture compare
                 {
                     old = ref;
+                    // Do not remove the curly brackets of the if body else
+                    // icpx 2024.0 is not able to compile the atomics.
                     if(value > ref)
+                    {
                         ref = value;
+                    }
                 }
                 return old;
             }
@@ -249,19 +257,20 @@ namespace alpaka
         template<typename T, typename THierarchy>
         struct AtomicOp<AtomicCas, AtomicOmpBuiltIn, T, THierarchy>
         {
-            ALPAKA_FN_HOST static auto atomicOp(
-                AtomicOmpBuiltIn const&,
-                T* const addr,
-                T const& compare,
-                T const& value) -> T
+            ALPAKA_FN_HOST static auto atomicOp(AtomicOmpBuiltIn const&, T* const addr, T compare, T value) -> T
             {
                 T old;
                 auto& ref(*addr);
 // atomically update ref, but capture the original value in old
 #        pragma omp atomic capture compare
                 {
                     old = ref;
-                    ref = (ref == compare ? value : ref);
+                    // Do not remove the curly brackets of the if body else
+                    // icpx 2024.0 is not able to compile the atomics.
+                    if(ref == compare)
+                    {
+                        ref = value;
+                    }
                 }
                 return old;
             }