Apply code review comments: use namespace alias instead of importing.

Author: bader

SYCL/GroupAlgorithm/SYCL2020/sort.cpp

@@ -11,7 +11,7 @@
 #include <random>
 #include <vector>
 
-using namespace sycl::ext::oneapi::experimental;
+namespace oneapi_exp = sycl::ext::oneapi::experimental;
 
 auto async_handler_ = [](sycl::exception_list ex_list) {
   for (auto &ex : ex_list) {
@@ -100,8 +100,9 @@ int test_sort_over_group(sycl::queue &q, std::size_t local,
 
   sycl::range<dim> local_range = get_range<dim>(local);
 
-  std::size_t local_memory_size = default_sorter<>::memory_required<T>(
-      sycl::memory_scope::work_group, local_range);
+  std::size_t local_memory_size =
+      oneapi_exp::default_sorter<>::memory_required<T>(
+          sycl::memory_scope::work_group, local_range);
 
   if (local_memory_size >
       q.get_device().template get_info<sycl::info::device::local_mem_size>())
@@ -124,24 +125,24 @@ int test_sort_over_group(sycl::queue &q, std::size_t local,
            case 0:
              if constexpr (std::is_same_v<Compare, std::less<T>> &&
                            !std::is_same_v<T, CustomType>)
-               aI1[local_id] = sort_over_group(
-                   group_with_scratchpad(
+               aI1[local_id] = oneapi_exp::sort_over_group(
+                   oneapi_exp::group_with_scratchpad(
                        id.get_group(),
                        sycl::span{&scratch[0], local_memory_size}),
                    aI1[local_id]);
              break;
            case 1:
-             aI1[local_id] = sort_over_group(
-                 group_with_scratchpad(
+             aI1[local_id] = oneapi_exp::sort_over_group(
+                 oneapi_exp::group_with_scratchpad(
                      id.get_group(),
                      sycl::span{&scratch[0], local_memory_size}),
                  aI1[local_id], comp);
              break;
            case 2:
-             aI1[local_id] =
-                 sort_over_group(id.get_group(), aI1[local_id],
-                                 default_sorter<Compare>(sycl::span{
-                                     &scratch[0], local_memory_size}));
+             aI1[local_id] = oneapi_exp::sort_over_group(
+                 id.get_group(), aI1[local_id],
+                 oneapi_exp::default_sorter<Compare>(
+                     sycl::span{&scratch[0], local_memory_size}));
              break;
            }
          });
@@ -156,7 +157,8 @@ int test_joint_sort(sycl::queue &q, std::size_t n_items, std::size_t local,
   auto n_groups = (n - 1) / n_items + 1;
 
   std::size_t local_memory_size =
-      default_sorter<>::memory_required<T>(sycl::memory_scope::work_group, n);
+      oneapi_exp::default_sorter<>::memory_required<T>(
+          sycl::memory_scope::work_group, n);
   if (local_memory_size >
       q.get_device().template get_info<sycl::info::device::local_mem_size>())
     std::cout << "local_memory_size = " << local_memory_size << ", available = "
@@ -182,26 +184,27 @@ int test_joint_sort(sycl::queue &q, std::size_t n_items, std::size_t local,
            case 0:
              if constexpr (std::is_same_v<Compare, std::less<T>> &&
                            !std::is_same_v<T, CustomType>)
-               joint_sort(group_with_scratchpad(
-                              id.get_group(),
-                              sycl::span{&scratch[0], local_memory_size}),
-                          ptr_keys,
-                          ptr_keys +
-                              sycl::min(n_items, n - group_id * n_items));
+               oneapi_exp::joint_sort(
+                   oneapi_exp::group_with_scratchpad(
+                       id.get_group(),
+                       sycl::span{&scratch[0], local_memory_size}),
+                   ptr_keys,
+                   ptr_keys + sycl::min(n_items, n - group_id * n_items));
              break;
            case 1:
-             joint_sort(group_with_scratchpad(
-                            id.get_group(),
-                            sycl::span{&scratch[0], local_memory_size}),
-                        ptr_keys,
-                        ptr_keys + sycl::min(n_items, n - group_id * n_items),
-                        comp);
+             oneapi_exp::joint_sort(
+                 oneapi_exp::group_with_scratchpad(
+                     id.get_group(),
+                     sycl::span{&scratch[0], local_memory_size}),
+                 ptr_keys,
+                 ptr_keys + sycl::min(n_items, n - group_id * n_items), comp);
              break;
            case 2:
-             joint_sort(id.get_group(), ptr_keys,
-                        ptr_keys + sycl::min(n_items, n - group_id * n_items),
-                        default_sorter<Compare>(
-                            sycl::span{&scratch[0], local_memory_size}));
+             oneapi_exp::joint_sort(
+                 id.get_group(), ptr_keys,
+                 ptr_keys + sycl::min(n_items, n - group_id * n_items),
+                 oneapi_exp::default_sorter<Compare>(
+                     sycl::span{&scratch[0], local_memory_size}));
              break;
            }
          });
@@ -224,8 +227,9 @@ int test_custom_sorter(sycl::queue &q, sycl::buffer<T> &bufI1, Compare comp) {
          sycl::nd_range<2>({local, 1}, {local, 1}), [=](sycl::nd_item<2> id) {
            auto ptr = aI1.get_pointer();
 
-           joint_sort(id.get_group(), ptr, ptr + n,
-                      bubble_sorter<Compare>{comp, id.get_local_linear_id()});
+           oneapi_exp::joint_sort(
+               id.get_group(), ptr, ptr + n,
+               bubble_sorter<Compare>{comp, id.get_local_linear_id()});
          });
    }).wait_and_throw();
   return 1;