Changeset 2639

Timestamp:

07/19/24 08:25:26 (7 months ago)

Author:

jderouillat

Message:

Use shallow kokkos copy constructor and assignment when it is possible (not from unmanaged views).

Location:

XIOS3/dev/XIOS_KOKKOS/src

Files:

• array_workflow.hpp (modified) (12 diffs)
• functor.cpp (modified) (1 diff)
• functor.hpp (modified) (1 diff)

XIOS3/dev/XIOS_KOKKOS/src/array_workflow.hpp

@@ -59 +59 @@
     
     CArray_WF(const xios::CArray_WF<T_numtype,N_rank>& array)
-    {
-      this->resize(array.numElements());
-      for (int i=0;i<array.numElements();i++) (*this)(i) = array(i);
+        : Kokkos::View<T_numtype*,Kokkos::DefaultExecutionSpace::memory_space>( array )
+    {
     }
 
     CArray_WF(xios::CArray_WF<T_numtype,N_rank>& array)
-    {
-      this->resize(array.numElements());
-      for (int i=0;i<array.numElements();i++) (*this)(i) = array(i);
+        : Kokkos::View<T_numtype*,Kokkos::DefaultExecutionSpace::memory_space>( array )
+    {
     }
 
@@ -107 +105 @@
       : initialized(true) { this->resize(length0*length1*length2*length3*length4*length5*length6*length7); }
 
-    T_numtype* dataFirst() {return this->data();}
-    const T_numtype* dataFirst() const {return this->data();}
-    
-    void resize( int sizeIn ) {Kokkos::resize(*this,sizeIn); } // mdspan ?
-    
-    int shape() {return this->extent(0);}
-    int shape() const {return this->extent(0);}
-
-    size_t numElements() {return this->extent(0);}
-    size_t numElements() const {return this->extent(0);}
+    inline T_numtype* dataFirst() {return this->data();}
+    inline const T_numtype* dataFirst() const {return this->data();}
+    
+    inline void resize( int sizeIn )
+    {
+      if (this->numElements()!=sizeIn)
+        Kokkos::resize(*this,sizeIn);
+    } // mdspan ?
+    
+    inline int shape() {return this->extent(0);}
+    inline int shape() const {return this->extent(0);}
+
+    inline size_t numElements() {return this->extent(0);}
+    inline size_t numElements() const {return this->extent(0);}
 
     //inline T_numtype& operator()(int index)
@@ -132 +134 @@
       this->resize( array.numElements() );
       for (int i=0;i<array.numElements();i++) (*this)(i) = (array(i));
-
       initialized = array.initialized;
     }
@@ -190 +191 @@
     inline CArray_WF<T_numtype,N_rank>& operator=(const T_numtype& value)
     {
-      for (int i=0;i<this->numElements();i++) (*this)[i] = value;
+      for (int i=0;i<this->numElements();i++) (*this)(i) = value;
       return *this;
     }
@@ -196 +197 @@
     inline CArray_WF<T_numtype,N_rank>& operator+=(const CArray_WF<T_numtype,N_rank>& array)
     {
-      for (int i=0;i<this->numElements();i++) (*this)[i] += array[i];
+      for (int i=0;i<this->numElements();i++) (*this)(i) += array(i);
       return *this;
     }
@@ -202 +203 @@
     inline CArray_WF<T_numtype,N_rank>& operator/=(const int& val)
     {
-      for (int i=0;i<this->numElements();i++) (*this)[i] /= (T_numtype)val;
+      for (int i=0;i<this->numElements();i++) (*this)(i) /= (T_numtype)val;
       return *this;
     }
@@ -208 +209 @@
     inline CArray_WF<T_numtype,N_rank>& operator-( const T_numtype& val)
     {
-      for (int i=0;i<this->numElements();i++) (*this)[i] -= (T_numtype)val;
+      for (int i=0;i<this->numElements();i++) (*this)(i) -= (T_numtype)val;
       return *this;
     }
@@ -214 +215 @@
     inline CArray_WF<T_numtype,N_rank>& operator/( const T_numtype& val)
     {
-      for (int i=0;i<this->numElements();i++) (*this)[i] /= (T_numtype)val;
+      for (int i=0;i<this->numElements();i++) (*this)(i) /= (T_numtype)val;
       return *this;
     }
@@ -220 +221 @@
     inline CArray_WF<T_numtype,N_rank>& operator*( const T_numtype& val)
     {
-      for (int i=0;i<this->numElements();i++) (*this)[i] *= (T_numtype)val;
+      for (int i=0;i<this->numElements();i++) (*this)(i) *= (T_numtype)val;
       return *this;
     }
@@ -226 +227 @@
     inline CArray_WF<T_numtype,N_rank>& operator+( const T_numtype& val)
     {
-      for (int i=0;i<this->numElements();i++) (*this)[i] += (T_numtype)val;
+      for (int i=0;i<this->numElements();i++) (*this)(i) += (T_numtype)val;
       return *this;
     }
@@ -245 +246 @@
     }
 
-
-    inline CArray_WF<T_numtype,N_rank>& operator=( const CArray_WF<T_numtype,N_rank>& array)
-    {
-      this->resize( array.numElements() );
-      for (int i=0;i<array.numElements();i++) (*this)(i) = array(i);
-      return *this;
-    }
   
   };
@@ -272 +266 @@
   template <typename T_numtype,int N_rank> inline CArray_WF<T_numtype,N_rank>& round( CArray_WF<T_numtype,N_rank>& array )
   {
-    for (int i=0;i<array.numElements();i++) (array)[i] = std::round( array[i] );
+    for (int i=0;i<array.numElements();i++) (array)(i) = std::round( array(i) );
     if (!array.numElements()) ERROR("inline CArray_WF<>& operator<=(const double& value)", << "Size = 0.");
     return array;

XIOS3/dev/XIOS_KOKKOS/src/functor.cpp

@@ -44 +44 @@
       //---------------------------------------------------------------
 
-      CArray_WF<double,1> CFunctor::operator ()(const CArray_WF<double,1>& dinput)
+      CArray_WF<double,1>& CFunctor::operator ()(const CArray_WF<double,1>& dinput)
       {
          this->nbcall++;

XIOS3/dev/XIOS_KOKKOS/src/functor.hpp

@@ -22 +22 @@
             CArray_WF<double,1> getDataOutput(void) const;
             /// Opérateur ///
-            CArray_WF<double,1> operator ()(const CArray_WF<double,1>& dinput);
+            CArray_WF<double,1>& operator ()(const CArray_WF<double,1>& dinput);
             virtual ETimeType timeType(void) = 0 ;