include CL/sycl.hpp -> include sycl/sycl.hpp

oleksandr-pavlyk · oleksandr-pavlyk · commit 71b85aba1611 · 2023-10-14T15:23:49.000-05:00
diff --git a/libsyclinterface/helper/include/dpctl_error_handlers.h b/libsyclinterface/helper/include/dpctl_error_handlers.h
@@ -27,7 +27,7 @@
 
 #include "Support/DllExport.h"
 #include "dpctl_error_handler_type.h"
-#include <CL/sycl.hpp>
+#include <sycl/sycl.hpp>
 
 /*!
  * @brief Functor class used by DPCTL to handle SYCL asynchronous errors.
diff --git a/libsyclinterface/helper/include/dpctl_utils_helper.h b/libsyclinterface/helper/include/dpctl_utils_helper.h
@@ -26,7 +26,7 @@
 
 #include "Support/DllExport.h"
 #include "dpctl_sycl_enum_types.h"
-#include <CL/sycl.hpp>
+#include <sycl/sycl.hpp>
 
 /*!
  * @brief Converts a sycl::info::device_type input value to a string.
diff --git a/libsyclinterface/include/dpctl_device_selection.hpp b/libsyclinterface/include/dpctl_device_selection.hpp
@@ -28,7 +28,7 @@
 #pragma once
 
 #include "Support/DllExport.h"
-#include <CL/sycl.hpp>
+#include <sycl/sycl.hpp>
 
 namespace dpctl
 {
diff --git a/libsyclinterface/include/dpctl_sycl_type_casters.hpp b/libsyclinterface/include/dpctl_sycl_type_casters.hpp
@@ -30,7 +30,7 @@
 
 #include "dpctl_device_selection.hpp"
 #include "dpctl_sycl_types.h"
-#include <CL/sycl.hpp>
+#include <sycl/sycl.hpp>
 #include <vector>
 
 namespace dpctl::syclinterface
diff --git a/libsyclinterface/source/dpctl_device_selection.cpp b/libsyclinterface/source/dpctl_device_selection.cpp
@@ -27,7 +27,7 @@
 
 #include "dpctl_device_selection.hpp"
 #include "Config/dpctl_config.h"
-#include <CL/sycl.hpp>
+#include <sycl/sycl.hpp>
 
 namespace
 {
diff --git a/libsyclinterface/source/dpctl_sycl_context_interface.cpp b/libsyclinterface/source/dpctl_sycl_context_interface.cpp
@@ -28,7 +28,7 @@
 #include "Config/dpctl_config.h"
 #include "dpctl_error_handlers.h"
 #include "dpctl_sycl_type_casters.hpp"
-#include <CL/sycl.hpp>
+#include <sycl/sycl.hpp>
 #include <utility>
 #include <vector>
 
diff --git a/libsyclinterface/source/dpctl_sycl_device_interface.cpp b/libsyclinterface/source/dpctl_sycl_device_interface.cpp
@@ -32,9 +32,9 @@
 #include "dpctl_sycl_device_manager.h"
 #include "dpctl_sycl_type_casters.hpp"
 #include "dpctl_utils_helper.h"
-#include <CL/sycl.hpp> /* SYCL headers   */
 #include <algorithm>
 #include <cstring>
+#include <sycl/sycl.hpp> /* SYCL headers   */
 #include <utility>
 #include <vector>
 
diff --git a/libsyclinterface/source/dpctl_sycl_device_manager.cpp b/libsyclinterface/source/dpctl_sycl_device_manager.cpp
@@ -29,10 +29,10 @@
 #include "dpctl_sycl_enum_types.h"
 #include "dpctl_sycl_type_casters.hpp"
 #include "dpctl_utils_helper.h"
-#include <CL/sycl.hpp>           /* SYCL headers   */
 #include <Config/dpctl_config.h> /* Config */
 #include <iomanip>
 #include <iostream>
+#include <sycl/sycl.hpp> /* SYCL headers   */
 #include <unordered_map>
 #include <utility>
 #include <vector>
diff --git a/libsyclinterface/source/dpctl_sycl_device_selector_interface.cpp b/libsyclinterface/source/dpctl_sycl_device_selector_interface.cpp
@@ -28,7 +28,7 @@
 #include "dpctl_device_selection.hpp"
 #include "dpctl_error_handlers.h"
 #include "dpctl_sycl_type_casters.hpp"
-#include <CL/sycl.hpp> /* SYCL headers   */
+#include <sycl/sycl.hpp> /* SYCL headers   */
 
 using namespace sycl;
 
diff --git a/libsyclinterface/source/dpctl_sycl_event_interface.cpp b/libsyclinterface/source/dpctl_sycl_event_interface.cpp
@@ -29,7 +29,7 @@
 #include "dpctl_error_handlers.h"
 #include "dpctl_sycl_type_casters.hpp"
 #include "dpctl_utils_helper.h"
-#include <CL/sycl.hpp> /* SYCL headers   */
+#include <sycl/sycl.hpp> /* SYCL headers   */
 #include <vector>
 
 using namespace sycl;
diff --git a/libsyclinterface/source/dpctl_sycl_kernel_bundle_interface.cpp b/libsyclinterface/source/dpctl_sycl_kernel_bundle_interface.cpp
@@ -30,26 +30,18 @@
 #include "dpctl_dynamic_lib_helper.h"
 #include "dpctl_error_handlers.h"
 #include "dpctl_sycl_type_casters.hpp"
-#include <CL/cl.h>     /* OpenCL headers     */
-#include <CL/sycl.hpp> /* Sycl headers       */
-#if __has_include(<sycl/backend/opencl.hpp>)
-#include <sycl/backend/opencl.hpp>
-#else
-#include <CL/sycl/backend/opencl.hpp>
-#endif
+#include <CL/cl.h> /* OpenCL headers     */
 #include <sstream>
+#include <sycl/backend/opencl.hpp>
+#include <sycl/sycl.hpp> /* Sycl headers       */
 #include <utility>
 
 #ifdef DPCTL_ENABLE_L0_PROGRAM_CREATION
 // Note: include ze_api.h before level_zero.hpp. Make sure clang-format does
 // not reorder the includes.
 // clang-format off
 #include "ze_api.h" /* Level Zero headers */
-#if __has_include(<sycl/ext/oneapi/backend/level_zero.hpp>)
 #include <sycl/ext/oneapi/backend/level_zero.hpp>
-#else
-#include <CL/sycl/backend/level_zero.hpp>
-#endif
 // clang-format on
 #endif
 
diff --git a/libsyclinterface/source/dpctl_sycl_kernel_interface.cpp b/libsyclinterface/source/dpctl_sycl_kernel_interface.cpp
@@ -29,8 +29,8 @@
 #include "dpctl_error_handlers.h"
 #include "dpctl_string_utils.hpp"
 #include "dpctl_sycl_type_casters.hpp"
-#include <CL/sycl.hpp> /* Sycl headers */
 #include <cstdint>
+#include <sycl/sycl.hpp> /* Sycl headers */
 
 using namespace sycl;
 
diff --git a/libsyclinterface/source/dpctl_sycl_platform_interface.cpp b/libsyclinterface/source/dpctl_sycl_platform_interface.cpp
@@ -31,11 +31,11 @@
 #include "dpctl_string_utils.hpp"
 #include "dpctl_sycl_type_casters.hpp"
 #include "dpctl_utils_helper.h"
-#include <CL/sycl.hpp>
 #include <iomanip>
 #include <iostream>
 #include <set>
 #include <sstream>
+#include <sycl/sycl.hpp>
 #include <utility>
 #include <vector>
 
diff --git a/libsyclinterface/source/dpctl_sycl_platform_manager.cpp b/libsyclinterface/source/dpctl_sycl_platform_manager.cpp
@@ -31,11 +31,11 @@
 #include "dpctl_sycl_platform_interface.h"
 #include "dpctl_sycl_type_casters.hpp"
 #include "dpctl_utils_helper.h"
-#include <CL/sycl.hpp>
 #include <iomanip>
 #include <iostream>
 #include <set>
 #include <sstream>
+#include <sycl/sycl.hpp>
 
 using namespace sycl;
 
diff --git a/libsyclinterface/source/dpctl_sycl_queue_interface.cpp b/libsyclinterface/source/dpctl_sycl_queue_interface.cpp
@@ -31,9 +31,9 @@
 #include "dpctl_sycl_device_interface.h"
 #include "dpctl_sycl_device_manager.h"
 #include "dpctl_sycl_type_casters.hpp"
-#include <CL/sycl.hpp> /* SYCL headers   */
 #include <exception>
 #include <stdexcept>
+#include <sycl/sycl.hpp> /* SYCL headers   */
 #include <utility>
 
 using namespace sycl;
diff --git a/libsyclinterface/source/dpctl_sycl_queue_manager.cpp b/libsyclinterface/source/dpctl_sycl_queue_manager.cpp
@@ -28,7 +28,7 @@
 #include "dpctl_error_handlers.h"
 #include "dpctl_sycl_device_manager.h"
 #include "dpctl_sycl_type_casters.hpp"
-#include <CL/sycl.hpp> /* SYCL headers   */
+#include <sycl/sycl.hpp> /* SYCL headers   */
 #include <vector>
 
 using namespace sycl;
diff --git a/libsyclinterface/source/dpctl_sycl_usm_interface.cpp b/libsyclinterface/source/dpctl_sycl_usm_interface.cpp
@@ -29,7 +29,7 @@
 #include "dpctl_error_handlers.h"
 #include "dpctl_sycl_device_interface.h"
 #include "dpctl_sycl_type_casters.hpp"
-#include <CL/sycl.hpp> /* SYCL headers   */
+#include <sycl/sycl.hpp> /* SYCL headers   */
 #include <utility>
 
 using namespace sycl;
diff --git a/libsyclinterface/tests/test_helper.cpp b/libsyclinterface/tests/test_helper.cpp
@@ -26,9 +26,9 @@
 
 #include "Config/dpctl_config.h"
 #include "dpctl_utils_helper.h"
-#include <CL/sycl.hpp>
 #include <gtest/gtest.h>
 #include <string>
+#include <sycl/sycl.hpp>
 
 struct TestHelperFns : public ::testing::Test
 {
diff --git a/libsyclinterface/tests/test_sycl_context_interface.cpp b/libsyclinterface/tests/test_sycl_context_interface.cpp
@@ -29,8 +29,8 @@
 #include "dpctl_sycl_device_interface.h"
 #include "dpctl_sycl_device_selector_interface.h"
 #include "dpctl_sycl_types.h"
-#include <CL/sycl.hpp>
 #include <gtest/gtest.h>
+#include <sycl/sycl.hpp>
 #include <vector>
 
 using namespace sycl;
diff --git a/libsyclinterface/tests/test_sycl_device_aspects.cpp b/libsyclinterface/tests/test_sycl_device_aspects.cpp
@@ -30,8 +30,8 @@
 #include "dpctl_sycl_enum_types.h"
 #include "dpctl_sycl_type_casters.hpp"
 #include "dpctl_utils_helper.h"
-#include <CL/sycl.hpp>
 #include <gtest/gtest.h>
+#include <sycl/sycl.hpp>
 #include <utility>
 
 namespace
diff --git a/libsyclinterface/tests/test_sycl_device_interface.cpp b/libsyclinterface/tests/test_sycl_device_interface.cpp
@@ -29,8 +29,8 @@
 #include "dpctl_sycl_platform_interface.h"
 #include "dpctl_utils.h"
 #include "dpctl_utils_helper.h"
-#include <CL/sycl.hpp>
 #include <gtest/gtest.h>
+#include <sycl/sycl.hpp>
 
 using namespace sycl;
 
diff --git a/libsyclinterface/tests/test_sycl_device_invalid_filters.cpp b/libsyclinterface/tests/test_sycl_device_invalid_filters.cpp
@@ -25,8 +25,8 @@
 
 #include "dpctl_sycl_device_interface.h"
 #include "dpctl_sycl_device_selector_interface.h"
-#include <CL/sycl.hpp>
 #include <gtest/gtest.h>
+#include <sycl/sycl.hpp>
 
 using namespace sycl;
 
diff --git a/libsyclinterface/tests/test_sycl_device_selector_interface.cpp b/libsyclinterface/tests/test_sycl_device_selector_interface.cpp
@@ -28,8 +28,8 @@
 #include "dpctl_sycl_device_manager.h"
 #include "dpctl_sycl_device_selector_interface.h"
 #include "dpctl_sycl_type_casters.hpp"
-#include <CL/sycl.hpp>
 #include <gtest/gtest.h>
+#include <sycl/sycl.hpp>
 
 using namespace sycl;
 
diff --git a/libsyclinterface/tests/test_sycl_device_subdevices.cpp b/libsyclinterface/tests/test_sycl_device_subdevices.cpp
@@ -32,8 +32,8 @@
 #include "dpctl_sycl_type_casters.hpp"
 #include "dpctl_utils.h"
 #include "dpctl_utils_helper.h"
-#include <CL/sycl.hpp>
 #include <gtest/gtest.h>
+#include <sycl/sycl.hpp>
 
 using namespace sycl;
 using namespace dpctl::syclinterface;
diff --git a/libsyclinterface/tests/test_sycl_event_interface.cpp b/libsyclinterface/tests/test_sycl_event_interface.cpp
@@ -27,8 +27,8 @@
 #include "Config/dpctl_config.h"
 #include "dpctl_sycl_event_interface.h"
 #include "dpctl_sycl_types.h"
-#include <CL/sycl.hpp>
 #include <gtest/gtest.h>
+#include <sycl/sycl.hpp>
 #include <vector>
 
 using namespace sycl;
diff --git a/libsyclinterface/tests/test_sycl_kernel_bundle_interface.cpp b/libsyclinterface/tests/test_sycl_kernel_bundle_interface.cpp
@@ -34,11 +34,11 @@
 #include "dpctl_sycl_kernel_interface.h"
 #include "dpctl_sycl_queue_interface.h"
 #include "dpctl_sycl_queue_manager.h"
-#include <CL/sycl.hpp>
 #include <array>
 #include <filesystem>
 #include <fstream>
 #include <gtest/gtest.h>
+#include <sycl/sycl.hpp>
 
 using namespace sycl;
 
diff --git a/libsyclinterface/tests/test_sycl_kernel_interface.cpp b/libsyclinterface/tests/test_sycl_kernel_interface.cpp
@@ -33,9 +33,9 @@
 #include "dpctl_sycl_queue_interface.h"
 #include "dpctl_sycl_queue_manager.h"
 #include "dpctl_utils.h"
-#include <CL/sycl.hpp>
 #include <array>
 #include <gtest/gtest.h>
+#include <sycl/sycl.hpp>
 
 using namespace sycl;
 
diff --git a/libsyclinterface/tests/test_sycl_platform_interface.cpp b/libsyclinterface/tests/test_sycl_platform_interface.cpp
@@ -29,8 +29,8 @@
 #include "dpctl_sycl_platform_interface.h"
 #include "dpctl_sycl_platform_manager.h"
 #include "dpctl_utils.h"
-#include <CL/sycl.hpp>
 #include <gtest/gtest.h>
+#include <sycl/sycl.hpp>
 #include <vector>
 
 using namespace sycl;
diff --git a/libsyclinterface/tests/test_sycl_platform_invalid_filters.cpp b/libsyclinterface/tests/test_sycl_platform_invalid_filters.cpp
@@ -26,8 +26,8 @@
 
 #include "dpctl_sycl_device_selector_interface.h"
 #include "dpctl_sycl_platform_interface.h"
-#include <CL/sycl.hpp>
 #include <gtest/gtest.h>
+#include <sycl/sycl.hpp>
 
 using namespace sycl;
 
diff --git a/libsyclinterface/tests/test_sycl_queue_interface.cpp b/libsyclinterface/tests/test_sycl_queue_interface.cpp
@@ -34,8 +34,8 @@
 #include "dpctl_sycl_queue_manager.h"
 #include "dpctl_sycl_type_casters.hpp"
 #include "dpctl_sycl_usm_interface.h"
-#include <CL/sycl.hpp>
 #include <gtest/gtest.h>
+#include <sycl/sycl.hpp>
 
 using namespace sycl;
 using namespace dpctl::syclinterface;
diff --git a/libsyclinterface/tests/test_sycl_queue_manager.cpp b/libsyclinterface/tests/test_sycl_queue_manager.cpp
@@ -30,8 +30,8 @@
 #include "dpctl_sycl_queue_interface.h"
 #include "dpctl_sycl_queue_manager.h"
 #include "dpctl_sycl_type_casters.hpp"
-#include <CL/sycl.hpp>
 #include <gtest/gtest.h>
+#include <sycl/sycl.hpp>
 #include <thread>
 
 using namespace std;
diff --git a/libsyclinterface/tests/test_sycl_queue_submit.cpp b/libsyclinterface/tests/test_sycl_queue_submit.cpp
@@ -32,10 +32,10 @@
 #include "dpctl_sycl_queue_interface.h"
 #include "dpctl_sycl_type_casters.hpp"
 #include "dpctl_sycl_usm_interface.h"
-#include <CL/sycl.hpp>
 #include <filesystem>
 #include <fstream>
 #include <gtest/gtest.h>
+#include <sycl/sycl.hpp>
 
 namespace
 {
diff --git a/libsyclinterface/tests/test_sycl_usm_interface.cpp b/libsyclinterface/tests/test_sycl_usm_interface.cpp
@@ -32,9 +32,9 @@
 #include "dpctl_sycl_queue_manager.h"
 #include "dpctl_sycl_type_casters.hpp"
 #include "dpctl_sycl_usm_interface.h"
-#include <CL/sycl.hpp>
 #include <cstring>
 #include <gtest/gtest.h>
+#include <sycl/sycl.hpp>
 
 using namespace sycl;
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`#pragma once`
`29`	`29`
`30`	`30`	`#include "Support/DllExport.h"`
`31`		`-#include <CL/sycl.hpp>`
	`31`	`+#include <sycl/sycl.hpp>`
`32`	`32`
`33`	`33`	`namespace dpctl`
`34`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`
`28`	`28`	`#include "dpctl_device_selection.hpp"`
`29`	`29`	`#include "Config/dpctl_config.h"`
`30`		`-#include <CL/sycl.hpp>`
	`30`	`+#include <sycl/sycl.hpp>`
`31`	`31`
`32`	`32`	`namespace`
`33`	`33`	`{`