Merge pull request #251 from Sichao25/yus/debug_gpu_warning

Resolve compiler warnings when building with CUDA

Author: jacobmerson

src/pcms/adapter/omega_h/omega_h_field2.cpp

@@ -33,8 +33,8 @@ class MeshFieldBackendImpl : public MeshFieldBackend
       "data_d", data.size());
     Kokkos::deep_copy(data_d, Kokkos::View<const Real*, HostMemorySpace>(
                                 data.data_handle(), data.size()));
-    Omega_h::parallel_for(
-      mesh_.nents(dim), OMEGA_H_LAMBDA(size_t ent) {
+    Kokkos::parallel_for(
+      mesh_.nents(dim), KOKKOS_CLASS_LAMBDA(size_t ent) {
         for (size_t n = 0; n < num_nodes; ++n) {
           for (size_t c = 0; c < num_components; ++c) {
             shape_field_(ent, n, c, topo) =
@@ -51,8 +51,8 @@ class MeshFieldBackendImpl : public MeshFieldBackend
     auto topo = static_cast<MeshField::Mesh_Topology>(dim);
     Kokkos::View<Real*, DefaultExecutionSpace::memory_space> data_d(
       "data_d", data.size());
-    Omega_h::parallel_for(
-      mesh_.nents(dim), OMEGA_H_LAMBDA(size_t ent) {
+    Kokkos::parallel_for(
+      mesh_.nents(dim), KOKKOS_CLASS_LAMBDA(size_t ent) {
         for (size_t n = 0; n < num_nodes; ++n) {
           for (size_t c = 0; c < num_components; ++c) {
             data_d[ent * stride + n * num_components + c] =
@@ -122,6 +122,7 @@ struct FillCoordinatesAndIndicesFunctor
   Kokkos::View<Real**> coordinates_;
   Kokkos::View<LO*> indices_;
   Kokkos::View<GridPointSearch::Result*> search_results_;
+  Omega_h::Int dim_;
 
   FillCoordinatesAndIndicesFunctor(
     Omega_h::Mesh& mesh, Kokkos::View<LO*> elem_counts,
@@ -133,21 +134,23 @@ struct FillCoordinatesAndIndicesFunctor
       offsets_(offsets),
       coordinates_(coordinates),
       indices_(indices),
-      search_results_(search_results)
+      search_results_(search_results),
+      dim_(mesh.dim())
   {
   }
 
   KOKKOS_INLINE_FUNCTION
   void operator()(LO i) const
   {
     auto [dim, elem_idx, coord] = search_results_(i);
+    // disable the host assertion macro for device code
     // currently don't handle case where point is on a boundary
-    PCMS_ALWAYS_ASSERT(static_cast<int>(dim) == mesh_.dim());
+    // PCMS_ALWAYS_ASSERT(static_cast<int>(dim) == mesh_.dim());
     // element should be inside the domain (positive)
-    PCMS_ALWAYS_ASSERT(elem_idx >= 0 && elem_idx < mesh_.nelems());
+    // PCMS_ALWAYS_ASSERT(elem_idx >= 0 && elem_idx < mesh_.nelems());
     LO count = Kokkos::atomic_sub_fetch(&elem_counts_(elem_idx), 1);
     LO index = offsets_(elem_idx) + count - 1;
-    for (int j = 0; j < (mesh_.dim() + 1); ++j) {
+    for (int j = 0; j < (dim_ + 1); ++j) {
       coordinates_(index, j) = coord[j];
     }
     indices_(index) = i;

src/pcms/adapter/point_cloud/point_cloud.cpp

@@ -58,7 +58,7 @@ void PointCloud::SetDOFHolderData(Rank1View<const Real, HostMemorySpace> data)
   PCMS_ALWAYS_ASSERT(data.size() == data_.size());
   Kokkos::parallel_for(
     Kokkos::RangePolicy<pcms::HostMemorySpace::execution_space>(0, data.size()),
-    KOKKOS_LAMBDA(int i) { data_host_(i) = data[i]; });
+    KOKKOS_CLASS_LAMBDA(int i) { data_host_(i) = data[i]; });
   Kokkos::deep_copy(data_, data_host_);
 }
 
@@ -100,7 +100,7 @@ int PointCloud::Serialize(
   if (buffer.size() > 0) {
     Kokkos::parallel_for(
       data_.size(),
-      KOKKOS_LAMBDA(int i) { buffer[permutation[i]] = data_(i); });
+      KOKKOS_CLASS_LAMBDA(int i) { buffer[permutation[i]] = data_(i); });
   }
   return data_.size();
 }
@@ -111,7 +111,8 @@ void PointCloud::Deserialize(
 {
   PCMS_FUNCTION_TIMER;
   Kokkos::parallel_for(
-    data_.size(), KOKKOS_LAMBDA(int i) { data_(i) = buffer[permutation[i]]; });
+    data_.size(),
+    KOKKOS_CLASS_LAMBDA(int i) { data_(i) = buffer[permutation[i]]; });
 }
 
 } // namespace pcms

src/pcms/field_layout_communicator.h

@@ -118,7 +118,6 @@ redev::LOs ConstructPermutation(GlobalIDView<HostMemorySpace> local_gids,
       break;
   }
 
-  LO local_index = 0;
   redev::LOs permutation;
   permutation.reserve(local_gids.size());
   for (int e = 0; e < ent_offsets.size() - 1; ++e) {

test/test_field_communication.cpp

@@ -74,7 +74,7 @@ void client1(MPI_Comm comm, Omega_h::Mesh& mesh, std::string comm_name,
   PCMS_ALWAYS_ASSERT(n == gids.size());
   Kokkos::parallel_for(
     "id gid", Kokkos::RangePolicy<pcms::HostMemorySpace::execution_space>(0, n),
-    KOKKOS_LAMBDA(int i) { ids[i] = gids[i]; });
+    [=](int i) { ids[i] = gids[i]; });
 
   auto field = layout->CreateField();
   field->SetDOFHolderData(pcms::make_const_array_view(ids));
@@ -159,7 +159,7 @@ void server(MPI_Comm comm, Omega_h::Mesh& mesh, std::string comm_name,
   Omega_h::HostWrite<Real> ids(n);
   Kokkos::parallel_for(
     "id 0", Kokkos::RangePolicy<pcms::HostMemorySpace::execution_space>(0, n),
-    KOKKOS_LAMBDA(int i) { ids[i] = 0; });
+    [=](int i) { ids[i] = 0; });
 
   auto field = layout->CreateField();
   pcms::FieldLayoutCommunicator<pcms::Real> layout_comm1(

test/test_field_copy.cpp

@@ -25,7 +25,7 @@ void test_copy(Omega_h::CommPtr world, int dim, int order, int num_components)
   Omega_h::HostWrite<Real> ids(ndata);
   Kokkos::parallel_for(
     Kokkos::RangePolicy<pcms::HostMemorySpace::execution_space>(0, ndata),
-    KOKKOS_LAMBDA(int i) { ids[i] = i; });
+    [=](int i) { ids[i] = i; });
 
   auto original = layout->CreateField();
   original->SetDOFHolderData(pcms::make_const_array_view(ids));
@@ -38,7 +38,7 @@ void test_copy(Omega_h::CommPtr world, int dim, int order, int num_components)
   int sum = 0;
   Kokkos::parallel_reduce(
     Kokkos::RangePolicy<pcms::HostMemorySpace::execution_space>(0, ndata),
-    KOKKOS_LAMBDA(int i, int& local_sum) {
+    [=](int i, int& local_sum) {
       local_sum += std::abs(ids[i] - copied_array[i]) < 1e-12;
     },
     sum);

test/test_interpolation_on_ltx_mesh.cpp

@@ -245,7 +245,7 @@ TEST_CASE("Test Interpolation on LTX Mesh", "[interpolation]")
          output_xgc_vtu_filename.c_str());
 
   // ------------------ Verification ------------------ //
-  double tol = 10.0 / 100.0; // 10 percent tolerance
+  // double tol = 10.0 / 100.0; // 10 percent tolerance
   // XGC Originated Values
   /*
   for (int i = 0; i < xgc_num_nodes; ++i) {