fix issues after rebase

Author: upsj

omp/distributed/index_map_kernels.cpp

@@ -58,16 +58,15 @@ void build_mapping(
     auto sort_it = detail::make_zip_iterator(
         full_remote_part_ids.begin(), recv_connections_ptr, range_ids.begin());
     std::sort(sort_it, sort_it + input_size, [](const auto& a, const auto& b) {
-        return std::tie(std::get<0>(a), std::get<1>(a)) <
-               std::tie(std::get<0>(b), std::get<1>(b));
+        return std::tie(get<0>(a), get<1>(a)) < std::tie(get<0>(b), get<1>(b));
     });
 
     // get only unique connections
-    auto unique_end = std::unique(
-        sort_it, sort_it + input_size, [](const auto& a, const auto& b) {
-            return std::tie(std::get<0>(a), std::get<1>(a)) ==
-                   std::tie(std::get<0>(b), std::get<1>(b));
-        });
+    auto unique_end = std::unique(sort_it, sort_it + input_size,
+                                  [](const auto& a, const auto& b) {
+                                      return std::tie(get<0>(a), get<1>(a)) ==
+                                             std::tie(get<0>(b), get<1>(b));
+                                  });
     auto unique_size = std::distance(sort_it, unique_end);
 
     remote_global_idxs.resize_and_reset(unique_size);

test/base/iterator_factory.cpp

@@ -12,7 +12,7 @@
 
 #include "common/unified/base/kernel_launch.hpp"
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 class IteratorFactory : public CommonTestFixture {
@@ -35,7 +35,7 @@ class IteratorFactory : public CommonTestFixture {
 void run_zip_iterator(std::shared_ptr<gko::EXEC_TYPE> exec,
                       gko::array<int>& key_array, gko::array<int>& value_array)
 {
-    gko::kernels::EXEC_NAMESPACE::run_kernel(
+    gko::kernels::GKO_DEVICE_NAMESPACE::run_kernel(
         exec,
         [] GKO_KERNEL(auto i, auto keys, auto values, auto size) {
             auto begin = gko::detail::make_zip_iterator(keys, values);