Cleanup BOUT_HOST_DEVICE qualifiers

boutproject · Dec 8, 2024 · e7d5b1c · e7d5b1c
1 parent a3c3a50
commit e7d5b1c
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 29 deletions.
diff --git a/include/bout/field2d.hxx b/include/bout/field2d.hxx
@@ -183,14 +183,12 @@ public:
     return std::end(getRegion("RGN_ALL"));
   };
 
-  BoutReal& BOUT_HOST_DEVICE operator[](const Ind2D& d) { return data[d.ind]; }
-  const BoutReal& BOUT_HOST_DEVICE operator[](const Ind2D& d) const {
-    return data[d.ind];
-  }
-  BoutReal& BOUT_HOST_DEVICE operator[](const Ind3D& d);
+  BoutReal& operator[](const Ind2D& d) { return data[d.ind]; }
+  const BoutReal& operator[](const Ind2D& d) const { return data[d.ind]; }
+  BoutReal& operator[](const Ind3D& d);
   // const BoutReal&  operator[](const Ind3D &d) const;
 
-  const BoutReal& BOUT_HOST_DEVICE operator[](const Ind3D& d) const;
+  const BoutReal& operator[](const Ind3D& d) const;
   /*!
    * Access to the underlying data array.
    *
@@ -199,7 +197,7 @@ public:
    * If CHECK > 2 then both \p jx and \p jy are bounds checked. This will
    * significantly reduce performance.
    */
-  BOUT_HOST_DEVICE inline BoutReal& operator()(int jx, int jy) {
+  inline BoutReal& operator()(int jx, int jy) {
 #if CHECK > 2 && !BOUT_HAS_CUDA
     if (!isAllocated()) {
       throw BoutException("Field2D: () operator on empty data");
@@ -213,7 +211,7 @@ public:
 
     return data[jx * ny + jy];
   }
-  BOUT_HOST_DEVICE inline const BoutReal& operator()(int jx, int jy) const {
+  inline const BoutReal& operator()(int jx, int jy) const {
 #if CHECK > 2 && !BOUT_HAS_CUDA
     if (!isAllocated()) {
       throw BoutException("Field2D: () operator on empty data");
@@ -232,10 +230,8 @@ public:
    * DIrect access to underlying array. This version is for compatibility
    * with Field3D objects
    */
-  BOUT_HOST_DEVICE BoutReal& operator()(int jx, int jy, int UNUSED(jz)) {
-    return operator()(jx, jy);
-  }
-  BOUT_HOST_DEVICE const BoutReal& operator()(int jx, int jy, int UNUSED(jz)) const {
+  BoutReal& operator()(int jx, int jy, int UNUSED(jz)) { return operator()(jx, jy); }
+  const BoutReal& operator()(int jx, int jy, int UNUSED(jz)) const {
     return operator()(jx, jy);
   }
 
@@ -357,7 +353,7 @@ inline Field2D DC(const Field2D& f) { return f; }
 /// Returns a reference to the time-derivative of a field \p f
 ///
 /// Wrapper around member function f.timeDeriv()
-BOUT_HOST_DEVICE inline Field2D& ddt(Field2D& f) { return *(f.timeDeriv()); }
+inline Field2D& ddt(Field2D& f) { return *(f.timeDeriv()); }
 
 /// toString template specialisation
 /// Defined in utils.hxx

diff --git a/include/bout/field3d.hxx b/include/bout/field3d.hxx
@@ -205,7 +205,7 @@ public:
    * The first time this is called, a new field will be
    * allocated. Subsequent calls return the same field
    */
-  BOUT_HOST_DEVICE Field3D* timeDeriv();
+  Field3D* timeDeriv();
 
   /*!
    * Return the number of nx points
@@ -330,16 +330,16 @@ public:
     return std::end(getRegion("RGN_ALL"));
   };
 
-  BoutReal& BOUT_HOST_DEVICE operator[](const Ind3D& d) { return data[d.ind]; }
-  const BoutReal& BOUT_HOST_DEVICE operator[](const Ind3D& d) const {
+  BoutReal& operator[](const Ind3D& d) { return data[d.ind]; }
+  const BoutReal& operator[](const Ind3D& d) const {
     return data[d.ind];
   }
 
-  BoutReal& BOUT_HOST_DEVICE operator()(const IndPerp& d, int jy);
-  const BoutReal& BOUT_HOST_DEVICE operator()(const IndPerp& d, int jy) const;
+  BoutReal& operator()(const IndPerp& d, int jy);
+  const BoutReal& operator()(const IndPerp& d, int jy) const;
 
-  BoutReal& BOUT_HOST_DEVICE operator()(const Ind2D& d, int jz);
-  const BoutReal& BOUT_HOST_DEVICE operator()(const Ind2D& d, int jz) const;
+  BoutReal& operator()(const Ind2D& d, int jz);
+  const BoutReal& operator()(const Ind2D& d, int jz) const;
 
   /*!
    * Direct access to the underlying data array
@@ -636,7 +636,7 @@ inline void invalidateGuards(Field3D& UNUSED(var)) {}
 /// Returns a reference to the time-derivative of a field \p f
 ///
 /// Wrapper around member function f.timeDeriv()
-BOUT_HOST_DEVICE inline Field3D& ddt(Field3D& f) { return *(f.timeDeriv()); }
+inline Field3D& ddt(Field3D& f) { return *(f.timeDeriv()); }
 
 /// toString template specialisation
 /// Defined in utils.hxx

diff --git a/include/bout/mesh.hxx b/include/bout/mesh.hxx
@@ -763,7 +763,7 @@ public:
   }
 
   /// Converts an Ind3D to an Ind2D representing a 2D index using a lookup -- to be used with care
-  BOUT_HOST_DEVICE Ind2D map3Dto2D(const Ind3D& ind3D) {
+  Ind2D map3Dto2D(const Ind3D& ind3D) {
     return {indexLookup3Dto2D[ind3D.ind], LocalNy, 1};
   }
 

diff --git a/include/bout/utils.hxx b/include/bout/utils.hxx
@@ -422,7 +422,12 @@ inline BoutReal randomu() {
  * i.e. t * t
  */
 template <typename T>
-BOUT_HOST_DEVICE inline T SQ(const T& t) {
+inline T SQ(const T& t) {
+  return t * t;
+}
+
+template<>
+BOUT_HOST_DEVICE inline BoutReal SQ(const BoutReal& t) {
   return t * t;
 }
 

diff --git a/src/field/field2d.cxx b/src/field/field2d.cxx
@@ -112,7 +112,7 @@ Field2D& Field2D::allocate() {
   return *this;
 }
 
-BOUT_HOST_DEVICE Field2D* Field2D::timeDeriv() {
+Field2D* Field2D::timeDeriv() {
   if (deriv == nullptr) {
     deriv = new Field2D{emptyFrom(*this)};
   }
@@ -129,11 +129,11 @@ const Region<Ind2D>& Field2D::getRegion(const std::string& region_name) const {
 }
 
 // Not in header because we need to access fieldmesh
-BOUT_HOST_DEVICE BoutReal& Field2D::operator[](const Ind3D& d) {
+BoutReal& Field2D::operator[](const Ind3D& d) {
   return operator[](fieldmesh->map3Dto2D(d));
 }
 
-BOUT_HOST_DEVICE const BoutReal& Field2D::operator[](const Ind3D& d) const {
+const BoutReal& Field2D::operator[](const Ind3D& d) const {
   return operator[](fieldmesh->map3Dto2D(d));
 }
 

diff --git a/src/field/field3d.cxx b/src/field/field3d.cxx
@@ -129,7 +129,7 @@ Field3D& Field3D::allocate() {
   return *this;
 }
 
-BOUT_HOST_DEVICE Field3D* Field3D::timeDeriv() {
+Field3D* Field3D::timeDeriv() {
   if (deriv == nullptr) {
     deriv = new Field3D{emptyFrom(*this)};
   }

diff --git a/src/field/field_data.cxx b/src/field/field_data.cxx
@@ -233,7 +233,7 @@ CELL_LOC FieldData::getLocation() const {
   return location;
 }
 
-BOUT_HOST_DEVICE Coordinates* FieldData::getCoordinates() const {
+Coordinates* FieldData::getCoordinates() const {
   auto fieldCoordinates_shared = fieldCoordinates.lock();
   if (fieldCoordinates_shared) {
     return fieldCoordinates_shared.get();
@@ -242,7 +242,7 @@ BOUT_HOST_DEVICE Coordinates* FieldData::getCoordinates() const {
   return fieldCoordinates.lock().get();
 }
 
-BOUT_HOST_DEVICE Coordinates* FieldData::getCoordinates(CELL_LOC loc) const {
+Coordinates* FieldData::getCoordinates(CELL_LOC loc) const {
   if (loc == CELL_DEFAULT) {
     return getCoordinates();
   }