Changeset 2643 for XIOS3

Timestamp:

07/23/24 11:24:10 (7 months ago)

Author:

jderouillat

Message:

Introduce Kokkos::parallel_for in average temporal filter

File:

• XIOS3/dev/XIOS_KOKKOS/src/functor/average.cpp (modified) (3 diffs)

XIOS3/dev/XIOS_KOKKOS/src/functor/average.cpp

@@ -39 +39 @@
           if (hasMissingValue) 
           {
-            int i, n =_dinput.numElements() ;
-            const double * in=_dinput.dataFirst() ;
-            int* nc=nbcalls.dataFirst() ;
-            for (i=0; i<n; ++i,++nc,++in) 
-              if (!NumTraits<double>::isNan(*in)) (*nc) ++;
+            int nElements = _dinput.numElements() ;
+            Kokkos::parallel_for( "init_avg", nElements, KOKKOS_LAMBDA( const size_t i )
+            {
+              if (!NumTraits<double>::isNan(_dinput(i))) (nbcalls(i)) ++;
+            });
+            Kokkos::fence();
           }
         }
@@ -50 +51 @@
           if (hasMissingValue)
           {
-            int i, n =_dinput.numElements() ;
-            const double * in=_dinput.dataFirst() ;
-            double* out=_doutput.dataFirst();
-            int* nc=nbcalls.dataFirst() ;
-            for (i=0; i<n; ++i,++in,++out,++nc) 
-              if (!NumTraits<double>::isNan(*in)) 
+            int nElements = _dinput.numElements() ;
+            Kokkos::parallel_for( "increment_avg", nElements, KOKKOS_LAMBDA( const size_t i )
+            {
+              if (!NumTraits<double>::isNan(_dinput(i))) 
               {
-                if (*nc != 0) (*out)  += *in;
-                else *out = *in ;
-                (*nc) ++;
+                if (nbcalls(i) != 0) _doutput(i)  += _dinput(i);
+                else _doutput(i) = _dinput(i) ;
+                (nbcalls(i)) ++;
               } 
+            });
+            Kokkos::fence();
           }
           else _doutput+=_dinput ;
@@ -71 +72 @@
         if (hasMissingValue)
         {
-          int i, n = nbcalls.numElements() ;
-          double* out= doutput.dataFirst();
-          int* nc=nbcalls.dataFirst() ;
-          for (i=0; i<n; ++i, ++out,++nc) 
-            if (*nc!=0) 
+          int nElements = nbcalls.numElements() ;
+          Kokkos::parallel_for( "divide_avg", nElements, KOKKOS_LAMBDA( const size_t i )
+          {
+            if (nbcalls(i)!=0) 
             {
-              *out  /= *nc;
-              *nc = 0 ;
+              doutput(i) /= nbcalls(i);
+              nbcalls(i) = 0 ;
             }
-        
+          });
         }  
         else doutput/=this->nbcall;