From cd736af844751d6085e5c170e07e770e11619950 Mon Sep 17 00:00:00 2001 From: "Kornev, Nikita" Date: Thu, 25 Jun 2026 19:07:38 +0200 Subject: [PATCH 1/2] [SYCL] Prepare to remove sycl_ext_oneapi_group_algorithms leftover Deprecated here - https://github.com/intel/llvm/pull/22320 But forgot to guard with the preview macro. --- sycl/include/sycl/ext/oneapi/functional.hpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sycl/include/sycl/ext/oneapi/functional.hpp b/sycl/include/sycl/ext/oneapi/functional.hpp index 18310ddd2f0e0..64f1d580fc5b6 100644 --- a/sycl/include/sycl/ext/oneapi/functional.hpp +++ b/sycl/include/sycl/ext/oneapi/functional.hpp @@ -16,6 +16,8 @@ namespace sycl { inline namespace _V1 { + +#ifndef __INTEL_PREVIEW_BREAKING_CHANGES namespace ext::oneapi { template @@ -38,9 +40,12 @@ using maximum template using minimum __SYCL2020_DEPRECATED("Use sycl::minimum<> instead") = sycl::minimum; +#endif // __INTEL_PREVIEW_BREAKING_CHANGES } // namespace ext::oneapi +// TODO: I guess that's not a part of extension anymore, but part of the core +// functional. Probably should be moved to the sycl dir. #ifdef __SYCL_DEVICE_ONLY__ namespace detail { From 5e8a1359f0d8607a2b967fcdb07928fce3217ab6 Mon Sep 17 00:00:00 2001 From: Nikita Kornev Date: Thu, 25 Jun 2026 19:30:51 +0200 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: Nikita Kornev --- sycl/include/sycl/ext/oneapi/functional.hpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sycl/include/sycl/ext/oneapi/functional.hpp b/sycl/include/sycl/ext/oneapi/functional.hpp index 64f1d580fc5b6..a5c8f7a8f424f 100644 --- a/sycl/include/sycl/ext/oneapi/functional.hpp +++ b/sycl/include/sycl/ext/oneapi/functional.hpp @@ -40,12 +40,11 @@ using maximum template using minimum __SYCL2020_DEPRECATED("Use sycl::minimum<> instead") = sycl::minimum; -#endif // __INTEL_PREVIEW_BREAKING_CHANGES - } // namespace ext::oneapi +#endif // __INTEL_PREVIEW_BREAKING_CHANGES -// TODO: I guess that's not a part of extension anymore, but part of the core -// functional. Probably should be moved to the sycl dir. +// TODO: The group operation helpers below are not extension-specific; consider +// moving them to a non-extension header (e.g. sycl/functional.hpp). #ifdef __SYCL_DEVICE_ONLY__ namespace detail {