Fix include hell and a dangling namespace

Signed-off-by: James Brodman <[email protected]>

Author: jbrodman

sycl/include/CL/sycl/ONEAPI/atomic_accessor.hpp

@@ -11,6 +11,7 @@
 #include <CL/sycl/ONEAPI/atomic_enums.hpp>
 #include <CL/sycl/ONEAPI/atomic_ref.hpp>
 #include <CL/sycl/access/access.hpp>
+#include <CL/sycl/accessor.hpp>
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {

sycl/include/CL/sycl/ONEAPI/atomic_ref.hpp

@@ -13,7 +13,7 @@
 #include <CL/sycl/access/access.hpp>
 #include <CL/sycl/atomic.hpp>
 #include <CL/sycl/detail/defines.hpp>
-#include <CL/sycl/detail/helpers.hpp>
+#include <CL/sycl/detail/spirv.hpp>
 
 #ifndef __SYCL_DEVICE_ONLY__
 #include <atomic>

sycl/include/CL/sycl/ONEAPI/group_algorithm.hpp

@@ -15,6 +15,7 @@
 #include <CL/sycl/detail/spirv.hpp>
 #include <CL/sycl/detail/type_traits.hpp>
 #include <CL/sycl/group.hpp>
+#include <CL/sycl/nd_item.hpp>
 
 #ifndef __DISABLE_SYCL_ONEAPI_GROUP_ALGORITHMS__
 __SYCL_INLINE_NAMESPACE(cl) {

sycl/include/CL/sycl/detail/spirv.hpp

@@ -12,7 +12,9 @@
 #include <CL/__spirv/spirv_vars.hpp>
 #include <CL/sycl/ONEAPI/atomic_enums.hpp>
 #include <CL/sycl/detail/generic_type_traits.hpp>
+#include <CL/sycl/detail/helpers.hpp>
 #include <CL/sycl/detail/type_traits.hpp>
+#include <CL/sycl/id.hpp>
 
 #ifdef __SYCL_DEVICE_ONLY__
 __SYCL_INLINE_NAMESPACE(cl) {
@@ -107,7 +109,7 @@ using EnableIfGenericBroadcast = detail::enable_if_t<
 // Work-group supports any integral type
 // Sub-group currently supports only uint32_t
 template <typename Group> struct GroupId { using type = size_t; };
-template <> struct GroupId<::cl::sycl::intel::sub_group> {
+template <> struct GroupId<::cl::sycl::ONEAPI::sub_group> {
   using type = uint32_t;
 };
 template <typename Group, typename T, typename IdT>