From 91a1f6e86e294c95f86fe8a3d8727254bc45df52 Mon Sep 17 00:00:00 2001 From: Paulius Velesko Date: Thu, 30 Apr 2026 02:16:45 +0300 Subject: [PATCH 1/3] dpcpp: update to SYCL 2020 include path sycl/sycl.hpp --- src/occa/internal/lang/modes/dpcpp.cpp | 3 +-- src/occa/internal/modes/dpcpp/polyfill.hpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/occa/internal/lang/modes/dpcpp.cpp b/src/occa/internal/lang/modes/dpcpp.cpp index eea56cd79..3a0bf751f 100644 --- a/src/occa/internal/lang/modes/dpcpp.cpp +++ b/src/occa/internal/lang/modes/dpcpp.cpp @@ -154,13 +154,12 @@ namespace occa return ""; } - // @note: As of SYCL 2020 this will need to change from `CL/sycl.hpp` to `sycl.hpp` void dpcppParser::setupHeaders() { root.addFirst( *(new directiveStatement( &root, - directiveToken(root.source->origin, "include \n using namespace sycl;\n")))); + directiveToken(root.source->origin, "include \n using namespace sycl;\n")))); } void dpcppParser::addExtensions() diff --git a/src/occa/internal/modes/dpcpp/polyfill.hpp b/src/occa/internal/modes/dpcpp/polyfill.hpp index 68280e6ac..a2766af87 100644 --- a/src/occa/internal/modes/dpcpp/polyfill.hpp +++ b/src/occa/internal/modes/dpcpp/polyfill.hpp @@ -4,7 +4,7 @@ #define OCCA_MODES_DPCPP_POLYFILL_HEADER #if OCCA_DPCPP_ENABLED -#include +#include #else #include #include From ce12e4f0ffa8a4360dcaf23762a8277cf215e176 Mon Sep 17 00:00:00 2001 From: Paulius Velesko Date: Sat, 31 Oct 2026 08:27:02 +0200 Subject: [PATCH 2/3] FindDPCPP: search for sycl/sycl.hpp so SYCL_INCLUDE_DIRS matches the new include The old search returned /include/sycl, which only worked for the old bare include; needs /include. --- cmake/FindDPCPP.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cmake/FindDPCPP.cmake b/cmake/FindDPCPP.cmake index a0867231f..f0b0c25c7 100644 --- a/cmake/FindDPCPP.cmake +++ b/cmake/FindDPCPP.cmake @@ -9,15 +9,13 @@ unset(missingDpcppComponents) find_path( SYCL_INCLUDE_DIRS NAMES - sycl.hpp + sycl/sycl.hpp PATHS ENV SYCL_ROOT /opt/intel/oneapi/compiler/latest/linux ${SYCL_ROOT} PATH_SUFFIXES - include/sycl - include/CL - include/sycl/CL + include ) find_library( From b5f30a11519c449df29a39db16b4ba35cfa33e13 Mon Sep 17 00:00:00 2001 From: Paulius Velesko Date: Sun, 1 Nov 2026 06:26:28 +0200 Subject: [PATCH 3/3] examples: use sycl/sycl.hpp in native DPC++ kernel is deprecated in SYCL 2020 and icpx warns on it. --- examples/cpp/20_native_dpcpp_kernel/addVectors.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/cpp/20_native_dpcpp_kernel/addVectors.cpp b/examples/cpp/20_native_dpcpp_kernel/addVectors.cpp index 6d6475160..92a201369 100644 --- a/examples/cpp/20_native_dpcpp_kernel/addVectors.cpp +++ b/examples/cpp/20_native_dpcpp_kernel/addVectors.cpp @@ -1,4 +1,4 @@ -#include +#include extern "C" void addVectors(::sycl::queue *q, ::sycl::nd_range<3> *ndrange,