Skip to content

[NFC][SYCL] Minor includes cleanup #20178

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 24, 2025
+6 −17
Merged

[NFC][SYCL] Minor includes cleanup #20178

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
5 changes: 0 additions & 5 deletions sycl/include/sycl/detail/common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include <cassert> // for assert
#include <cstddef> // for size_t
#include <cstdint>
#include <string> // for allocator, operator+
#include <type_traits> // for enable_if_t
#include <utility> // for index_sequence, make_i...

Expand Down Expand Up @@ -200,10 +199,6 @@ class __SYCL_EXPORT tls_code_loc_t {
#define __SYCL_ASSERT(x) assert(x)
#endif // #ifdef __SYCL_DEVICE_ONLY__

#define __SYCL_UR_ERROR_REPORT(backend) \
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Only used under sycl/source, so moved there.

std::string(sycl::detail::get_backend_name_no_vendor(backend)) + \
" backend failed with error: "

namespace sycl {
inline namespace _V1 {
namespace detail {
Expand Down
8 changes: 1 addition & 7 deletions sycl/include/sycl/ext/oneapi/properties/properties.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,7 @@
#pragma once

#include <sycl/detail/type_traits.hpp>
#include <sycl/ext/oneapi/properties/property.hpp> // for IsRuntimePr...
#include <sycl/ext/oneapi/properties/property_utils.hpp> // for Sorted, Mer...
#include <sycl/ext/oneapi/properties/property_value.hpp> // for property_value

#include <tuple> // for tuple, tupl...
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think we've stopped using std::tuple during the refactoring around
#16024, #16126 timeframe.

#include <type_traits> // for enable_if_t
#include <variant> // for tuple
#include <sycl/ext/oneapi/properties/property_utils.hpp>

namespace sycl {
inline namespace _V1 {
Expand Down
3 changes: 0 additions & 3 deletions sycl/include/sycl/ext/oneapi/properties/property_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,8 @@
#include <sycl/ext/oneapi/properties/property.hpp>
#include <sycl/ext/oneapi/properties/property_value.hpp>

#include <array> // for tuple_element
#include <stddef.h> // for size_t
#include <tuple> // for tuple
#include <type_traits> // for false_type, true_...
#include <variant> // for tuple

namespace sycl {
inline namespace _V1 {
Expand Down
2 changes: 0 additions & 2 deletions sycl/include/sycl/ext/oneapi/properties/property_value.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

#include <sycl/ext/oneapi/properties/property.hpp>

#include <type_traits> // for enable_if_t

namespace sycl {
inline namespace _V1 {
namespace ext::oneapi::experimental {
Expand Down
4 changes: 4 additions & 0 deletions sycl/source/detail/adapter_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
#include <memory>
#include <mutex>

#define __SYCL_UR_ERROR_REPORT(backend) \
std::string(sycl::detail::get_backend_name_no_vendor(backend)) + \
" backend failed with error: "

#define __SYCL_CHECK_UR_CODE_NO_EXC(expr, backend) \
{ \
auto code = expr; \
Expand Down
1 change: 1 addition & 0 deletions sycl/unittests/helpers/ScopedEnvVar.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <cstdlib>
#include <functional>
#include <stdlib.h>
#include <string>

namespace sycl {
inline namespace _V1 {
Expand Down