remove KOKKOS_LAMBDA

Author: Sichao25

src/pcms/adapter/omega_h/omega_h_field2.cpp

@@ -33,7 +33,7 @@ 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(
+    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) {
@@ -51,7 +51,7 @@ 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(
+    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) {

test/test_field_communication.cpp

@@ -72,9 +72,9 @@ void client1(MPI_Comm comm, Omega_h::Mesh& mesh, std::string comm_name,
   const auto n = layout->GetNumOwnedDofHolder();
   Omega_h::HostWrite<Real> ids(n);
   PCMS_ALWAYS_ASSERT(n == gids.size());
-  for (size_t i = 0; i < static_cast<size_t>(n); ++i) {
-    ids[i] = gids[i];
-  }
+  Kokkos::parallel_for(
+    "id gid", Kokkos::RangePolicy<pcms::HostMemorySpace::execution_space>(0, n),
+    [=](int i) { ids[i] = gids[i]; });
 
   auto field = layout->CreateField();
   field->SetDOFHolderData(pcms::make_const_array_view(ids));
@@ -157,9 +157,9 @@ void server(MPI_Comm comm, Omega_h::Mesh& mesh, std::string comm_name,
                                            pcms::CoordinateSystem::Cartesian);
   const auto n = layout->GetNumOwnedDofHolder();
   Omega_h::HostWrite<Real> ids(n);
-  for (size_t i = 0; i < static_cast<size_t>(n); ++i) {
-    ids[i] = 0;
-  }
+  Kokkos::parallel_for(
+    "id 0", Kokkos::RangePolicy<pcms::HostMemorySpace::execution_space>(0, n),
+    [=](int i) { ids[i] = 0; });
 
   auto field = layout->CreateField();
   pcms::FieldLayoutCommunicator<pcms::Real> layout_comm1(

test/test_field_copy.cpp

@@ -23,9 +23,9 @@ void test_copy(Omega_h::CommPtr world, int dim, int order, int num_components)
                                            pcms::CoordinateSystem::Cartesian);
   int ndata = layout->GetNumOwnedDofHolder() * num_components;
   Omega_h::HostWrite<Real> ids(ndata);
-  for (size_t i = 0; i < static_cast<size_t>(ndata); ++i) {
-    ids[i] = i;
-  }
+  Kokkos::parallel_for(
+    Kokkos::RangePolicy<pcms::HostMemorySpace::execution_space>(0, ndata),
+    [=](int i) { ids[i] = i; });
 
   auto original = layout->CreateField();
   original->SetDOFHolderData(pcms::make_const_array_view(ids));
@@ -36,11 +36,12 @@ void test_copy(Omega_h::CommPtr world, int dim, int order, int num_components)
 
   REQUIRE(copied_array.size() == ndata);
   int sum = 0;
-  for (size_t i = 0; i < static_cast<size_t>(ndata); ++i) {
-    if (std::abs(ids[i] - copied_array[i]) < 1e-12) {
-      sum++;
-    }
-  }
+  Kokkos::parallel_reduce(
+    Kokkos::RangePolicy<pcms::HostMemorySpace::execution_space>(0, ndata),
+    [=](int i, int& local_sum) {
+      local_sum += std::abs(ids[i] - copied_array[i]) < 1e-12;
+    },
+    sum);
   REQUIRE(sum == ndata);
 }