Skip to content

[NFCI][SYCL] Don't include <sycl/exception.hpp> in sycl/detail/array.hpp on device #20046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 11, 2025
Merged

[NFCI][SYCL] Don't include <sycl/exception.hpp> in sycl/detail/array.hpp on device #20046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions sycl/include/sycl/detail/array.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
#pragma once

#include <sycl/detail/defines_elementary.hpp> // for __SYCL_ALWAYS_INLINE

#ifndef __SYCL_DEVICE_ONLY__
Copy link
Contributor Author

@aelovikov-intel aelovikov-intel Sep 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not necessary because the use is guarded already:

llvm/sycl/include/sycl/detail/array.hpp

Lines 107 to 116 in 6272def

size_t common_array[dimensions];
__SYCL_ALWAYS_INLINE void check_dimension(int dimension) const {
#ifndef __SYCL_DEVICE_ONLY__
if (dimension >= dimensions || dimension < 0) {
throw sycl::exception(make_error_code(errc::invalid),
"Index out of range");
}
#endif
(void)dimension;
}

#include <sycl/exception.hpp>
#endif

#include <stddef.h> // for size_t
#include <type_traits> // for enable_if_t
Expand Down
1 change: 1 addition & 0 deletions sycl/include/sycl/info/info_desc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
namespace sycl {
inline namespace _V1 {

class context;
class device;
class platform;
class kernel_id;
Expand Down
1 change: 1 addition & 0 deletions sycl/include/syclcompat/dims.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

#pragma once

#include <stdexcept>
#include <tuple>

#include <sycl/range.hpp>
Expand Down
2 changes: 1 addition & 1 deletion sycl/test/include_deps/sycl_accessor.hpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
// CHECK-NEXT: backend_types.hpp
// CHECK-NEXT: stl_wrappers/cstdlib
// CHECK-NEXT: detail/array.hpp
// CHECK-NEXT: detail/common.hpp
// CHECK-NEXT: exception.hpp
// CHECK-NEXT: detail/export.hpp
// CHECK-NEXT: detail/string.hpp
// CHECK-NEXT: detail/common.hpp
// CHECK-NEXT: stl_wrappers/cassert
// CHECK-NEXT: stl_wrappers/assert.h
// CHECK-NEXT: __spirv/spirv_vars.hpp
Expand Down
2 changes: 1 addition & 1 deletion sycl/test/include_deps/sycl_buffer.hpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
// CHECK-NEXT: backend_types.hpp
// CHECK-NEXT: stl_wrappers/cstdlib
// CHECK-NEXT: detail/array.hpp
// CHECK-NEXT: detail/common.hpp
// CHECK-NEXT: exception.hpp
// CHECK-NEXT: detail/export.hpp
// CHECK-NEXT: detail/string.hpp
// CHECK-NEXT: detail/common.hpp
// CHECK-NEXT: stl_wrappers/cassert
// CHECK-NEXT: stl_wrappers/assert.h
// CHECK-NEXT: __spirv/spirv_vars.hpp
Expand Down
2 changes: 1 addition & 1 deletion sycl/test/include_deps/sycl_detail_core.hpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
// CHECK-NEXT: backend_types.hpp
// CHECK-NEXT: stl_wrappers/cstdlib
// CHECK-NEXT: detail/array.hpp
// CHECK-NEXT: detail/common.hpp
// CHECK-NEXT: exception.hpp
// CHECK-NEXT: detail/export.hpp
// CHECK-NEXT: detail/string.hpp
// CHECK-NEXT: detail/common.hpp
// CHECK-NEXT: stl_wrappers/cassert
// CHECK-NEXT: stl_wrappers/assert.h
// CHECK-NEXT: __spirv/spirv_vars.hpp
Expand Down