Skip to content

[SYCL] Simplify check whether a header file is available for inclusion #19759

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 5 commits into from
Sep 4, 2025
Merged

[SYCL] Simplify check whether a header file is available for inclusion #19759

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5367a8e
Simplify check whether a mdspan header file is available for inclusion
dyniols Aug 11, 2025
973de72
remove defined(__has_include) from sycl files
dyniols Aug 12, 2025
448bbaa
Merge remote-tracking branch 'intel/sycl' into update_group_interface
dyniols Sep 4, 2025
f6054ce
fix
dyniols Sep 4, 2025
64e6c1e
fix
dyniols Sep 4, 2025
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
2 changes: 0 additions & 2 deletions sycl/include/sycl/khr/group_interface.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,9 @@
#define SYCL_KHR_GROUP_INTERFACE 1
#endif

#if __cplusplus >= 202302L && defined(__has_include)
#if __has_include(<mdspan>)
#include <mdspan>
#endif
#endif

namespace sycl {
inline namespace _V1 {
Expand Down
6 changes: 3 additions & 3 deletions sycl/include/syclcompat/kernel.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
#include <dlfcn.h>
#endif

#if defined(__has_include) && __has_include(<filesystem>)
#if __has_include(<filesystem>)
#include <filesystem>
#elif defined(__has_include) && __has_include(<experimental/filesystem>)
#elif __has_include(<experimental/filesystem>)
#include <experimental/filesystem>
#else
#error "SYCLomatic runtime requires C++ filesystem support"
Expand Down Expand Up @@ -83,7 +83,7 @@ get_kernel_function_info(const void *function) {

namespace detail {

#if defined(__has_include) && __has_include(<filesystem>)
#if __has_include(<filesystem>)
namespace fs = std::filesystem;
#else
namespace fs = std::experimental::filesystem;
Expand Down
4 changes: 2 additions & 2 deletions sycl/source/detail/os_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
#include <limits>

// For GCC versions less than 8, use experimental/filesystem.
#if defined(__has_include) && __has_include(<filesystem>)
#if __has_include(<filesystem>)
#include <filesystem>
namespace fs = std::filesystem;
#elif defined(__has_include) && __has_include(<experimental/filesystem>)
#elif __has_include(<experimental/filesystem>)
#include <experimental/filesystem>
namespace fs = std::experimental::filesystem;
#else
Expand Down
Loading