From 705ec670f8b34641458e6963c2f2855008f9fbe8 Mon Sep 17 00:00:00 2001
From: "Fedorov, Andrey" <andrey.fedorov@intel.com>
Date: Fri, 17 Dec 2021 14:29:46 +0300
Subject: [PATCH 1/5] moved to experimental

Signed-off-by: Fedorov, Andrey <andrey.fedorov@intel.com>
---
 sycl/include/sycl/ext/oneapi/{ => experimental}/group_sort.hpp | 2 ++
 1 file changed, 2 insertions(+)
 rename sycl/include/sycl/ext/oneapi/{ => experimental}/group_sort.hpp (98%)

diff --git a/sycl/include/sycl/ext/oneapi/group_sort.hpp b/sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp
similarity index 98%
rename from sycl/include/sycl/ext/oneapi/group_sort.hpp
rename to sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp
index 775d988917aa0..c065f7ad3d090 100644
--- a/sycl/include/sycl/ext/oneapi/group_sort.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp
@@ -20,6 +20,7 @@ __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {
 namespace ext {
 namespace oneapi {
+namespace experimental {
 namespace detail {
 
 // ---- traits
@@ -135,6 +136,7 @@ joint_sort(experimental::group_with_scratchpad<Group, Extent> exec, Iter first,
              experimental::default_sorter<>(exec.get_memory()));
 }
 
+} // namespace experimental
 } // namespace oneapi
 } // namespace ext
 } // namespace sycl

From 40e8966cfd7a0268b0d844ae1d3efce80d5cf3d6 Mon Sep 17 00:00:00 2001
From: "Fedorov, Andrey" <andrey.fedorov@intel.com>
Date: Fri, 17 Dec 2021 14:39:26 +0300
Subject: [PATCH 2/5] clang-formatted

Signed-off-by: Fedorov, Andrey <andrey.fedorov@intel.com>
---
 sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp b/sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp
index c065f7ad3d090..bb0854a12cc7d 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp
@@ -42,8 +42,7 @@ struct is_sorter_impl {
   template <typename G = Group>
   static decltype(
       std::integral_constant<bool, is_expected_return_type<G>::value &&
-                                       sycl::is_group_v<G>>{})
-  test(int);
+                                       sycl::is_group_v<G>>{}) test(int);
 
   template <typename = Group> static std::false_type test(...);
 };
@@ -57,8 +56,7 @@ struct is_sorter_impl<
   template <typename G = Group>
   static decltype(std::declval<Sorter>()(std::declval<G>(), std::declval<Ptr>(),
                                          std::declval<Ptr>()),
-                  sycl::detail::is_generic_group<G>{})
-  test(int);
+                  sycl::detail::is_generic_group<G>{}) test(int);
 
   template <typename = Group> static std::false_type test(...);
 };

From a6ecb47df001d8e211c66aa31354699f14d6977d Mon Sep 17 00:00:00 2001
From: "Fedorov, Andrey" <andrey.fedorov@intel.com>
Date: Fri, 17 Dec 2021 14:53:37 +0300
Subject: [PATCH 3/5] added correct path to header

Signed-off-by: Fedorov, Andrey <andrey.fedorov@intel.com>
---
 sycl/include/CL/sycl/group_algorithm.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sycl/include/CL/sycl/group_algorithm.hpp b/sycl/include/CL/sycl/group_algorithm.hpp
index a838d2011cff2..45942a6f1ecaf 100644
--- a/sycl/include/CL/sycl/group_algorithm.hpp
+++ b/sycl/include/CL/sycl/group_algorithm.hpp
@@ -18,7 +18,7 @@
 #include <CL/sycl/nd_item.hpp>
 #include <CL/sycl/sub_group.hpp>
 #include <sycl/ext/oneapi/functional.hpp>
-#include <sycl/ext/oneapi/group_sort.hpp>
+#include <sycl/ext/oneapi/experimental/group_sort.hpp>
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {

From f55dfe15548a6c79211c20e5e0c3305f983668e3 Mon Sep 17 00:00:00 2001
From: "Fedorov, Andrey" <andrey.fedorov@intel.com>
Date: Fri, 17 Dec 2021 15:06:15 +0300
Subject: [PATCH 4/5] clang-formatted

Signed-off-by: Fedorov, Andrey <andrey.fedorov@intel.com>
---
 sycl/include/CL/sycl/group_algorithm.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sycl/include/CL/sycl/group_algorithm.hpp b/sycl/include/CL/sycl/group_algorithm.hpp
index 45942a6f1ecaf..6ede3ff23b68f 100644
--- a/sycl/include/CL/sycl/group_algorithm.hpp
+++ b/sycl/include/CL/sycl/group_algorithm.hpp
@@ -17,8 +17,8 @@
 #include <CL/sycl/known_identity.hpp>
 #include <CL/sycl/nd_item.hpp>
 #include <CL/sycl/sub_group.hpp>
-#include <sycl/ext/oneapi/functional.hpp>
 #include <sycl/ext/oneapi/experimental/group_sort.hpp>
+#include <sycl/ext/oneapi/functional.hpp>
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {

From 594e9294c40ab9dee2fbb1ef54acfeec287de9fd Mon Sep 17 00:00:00 2001
From: "Fedorov, Andrey" <andrey.fedorov@intel.com>
Date: Fri, 17 Dec 2021 15:16:18 +0300
Subject: [PATCH 5/5] remove extra word

Signed-off-by: Fedorov, Andrey <andrey.fedorov@intel.com>
---
 sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp b/sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp
index bb0854a12cc7d..df29ab840f7ff 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp
@@ -14,7 +14,7 @@
 #include <CL/sycl/detail/type_traits.hpp>
 #include <type_traits>
 
-#include "experimental/group_helpers_sorters.hpp"
+#include "group_helpers_sorters.hpp"
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {