Replaced deprecated cl::sycl namespace with sycl

oleksandr-pavlyk · oleksandr-pavlyk · commit 16a925e89bb2 · 2022-09-04T14:11:45.000-05:00
diff --git a/examples/cython/sycl_direct_linkage/sycl_function.cpp b/examples/cython/sycl_direct_linkage/sycl_function.cpp
@@ -31,7 +31,7 @@
 #include <CL/sycl.hpp>
 #include <oneapi/mkl.hpp>
 
-int c_columnwise_total(cl::sycl::queue &q,
+int c_columnwise_total(sycl::queue &q,
                        size_t n,
                        size_t m,
                        double *mat,
diff --git a/examples/cython/usm_memory/sycl_blackscholes.cpp b/examples/cython/usm_memory/sycl_blackscholes.cpp
@@ -89,32 +89,32 @@ cpp_blackscholes(DPCTLSyclQueueRef q_ptr, size_t n_opts, T *params, T *callput)
                 data_t mr = -opt_rate,
                        sig_sig_two = two * opt_volatility * opt_volatility;
 
-                a = cl::sycl::log(opt_price / opt_strike);
+                a = sycl::log(opt_price / opt_strike);
                 b = opt_maturity * mr;
                 z = opt_maturity * sig_sig_two;
 
                 c = quarter * z;
-                e = cl::sycl::exp(b);
-                y = cl::sycl::rsqrt(z);
+                e = sycl::exp(b);
+                y = sycl::rsqrt(z);
 
                 a = b - a;
                 w1 = (a - c) * y;
                 w2 = (a + c) * y;
 
                 if (w1 < zero) {
-                    d1 = cl::sycl::erfc(w1) * half;
+                    d1 = sycl::erfc(w1) * half;
                     d1c = one - d1;
                 }
                 else {
-                    d1c = cl::sycl::erfc(-w1) * half;
+                    d1c = sycl::erfc(-w1) * half;
                     d1 = one - d1c;
                 }
                 if (w2 < zero) {
-                    d2 = cl::sycl::erfc(w2) * half;
+                    d2 = sycl::erfc(w2) * half;
                     d2c = one - d2;
                 }
                 else {
-                    d2c = cl::sycl::erfc(-w2) * half;
+                    d2c = sycl::erfc(-w2) * half;
                     d2 = one - d2c;
                 }
 
diff --git a/libsyclinterface/helper/source/dpctl_error_handlers.cpp b/libsyclinterface/helper/source/dpctl_error_handlers.cpp
@@ -31,8 +31,7 @@
 #include <glog/logging.h>
 #endif
 
-void DPCTL_AsyncErrorHandler::operator()(
-    const cl::sycl::exception_list &exceptions)
+void DPCTL_AsyncErrorHandler::operator()(const sycl::exception_list &exceptions)
 {
     for (std::exception_ptr const &e : exceptions) {
         try {
diff --git a/libsyclinterface/helper/source/dpctl_utils_helper.cpp b/libsyclinterface/helper/source/dpctl_utils_helper.cpp
@@ -27,7 +27,7 @@
 #include <sstream>
 #include <string>
 
-using namespace cl::sycl;
+using namespace sycl;
 
 /*!
  * Transforms enum info::device_type to string.
@@ -164,7 +164,7 @@ DPCTLSyclDeviceType DPCTL_SyclDeviceTypeToDPCTLDeviceType(info::device_type D)
 }
 
 /*!
- * Transforms cl::sycl::aspect to string.
+ * Transforms sycl::aspect to string.
  */
 std::string DPCTL_AspectToStr(aspect aspectTy)
 {
@@ -237,7 +237,7 @@ std::string DPCTL_AspectToStr(aspect aspectTy)
 }
 
 /*!
- * Transforms string to cl::sycl::aspect.
+ * Transforms string to sycl::aspect.
  */
 aspect DPCTL_StrToAspectType(const std::string &aspectTyStr)
 {
diff --git a/libsyclinterface/source/dpctl_sycl_context_interface.cpp b/libsyclinterface/source/dpctl_sycl_context_interface.cpp
@@ -30,7 +30,7 @@
 #include <CL/sycl.hpp>
 #include <vector>
 
-using namespace cl::sycl;
+using namespace sycl;
 
 namespace
 {
diff --git a/libsyclinterface/source/dpctl_sycl_device_interface.cpp b/libsyclinterface/source/dpctl_sycl_device_interface.cpp
@@ -35,7 +35,7 @@
 #include <cstring>
 #include <vector>
 
-using namespace cl::sycl;
+using namespace sycl;
 
 namespace
 {
diff --git a/libsyclinterface/source/dpctl_sycl_device_manager.cpp b/libsyclinterface/source/dpctl_sycl_device_manager.cpp
@@ -35,7 +35,7 @@
 #include <unordered_map>
 #include <vector>
 
-using namespace cl::sycl;
+using namespace sycl;
 
 namespace
 {
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_error_handlers.h"
 #include <CL/sycl.hpp> /* SYCL headers   */
 
-using namespace cl::sycl;
+using namespace sycl;
 
 namespace
 {
diff --git a/libsyclinterface/source/dpctl_sycl_event_interface.cpp b/libsyclinterface/source/dpctl_sycl_event_interface.cpp
@@ -31,7 +31,7 @@
 #include <CL/sycl.hpp> /* SYCL headers   */
 #include <vector>
 
-using namespace cl::sycl;
+using namespace sycl;
 
 namespace
 {
diff --git a/libsyclinterface/source/dpctl_sycl_kernel_bundle_interface.cpp b/libsyclinterface/source/dpctl_sycl_kernel_bundle_interface.cpp
@@ -52,7 +52,7 @@
 // clang-format on
 #endif
 
-using namespace cl::sycl;
+using namespace sycl;
 
 namespace
 {
diff --git a/libsyclinterface/source/dpctl_sycl_kernel_interface.cpp b/libsyclinterface/source/dpctl_sycl_kernel_interface.cpp
@@ -31,7 +31,7 @@
 #include <CL/sycl.hpp> /* Sycl headers */
 #include <cstdint>
 
-using namespace cl::sycl;
+using namespace sycl;
 
 namespace
 {
diff --git a/libsyclinterface/source/dpctl_sycl_platform_interface.cpp b/libsyclinterface/source/dpctl_sycl_platform_interface.cpp
@@ -36,7 +36,7 @@
 #include <sstream>
 #include <vector>
 
-using namespace cl::sycl;
+using namespace sycl;
 
 namespace
 {
diff --git a/libsyclinterface/source/dpctl_sycl_platform_manager.cpp b/libsyclinterface/source/dpctl_sycl_platform_manager.cpp
@@ -36,7 +36,7 @@
 #include <set>
 #include <sstream>
 
-using namespace cl::sycl;
+using namespace sycl;
 
 namespace
 {
diff --git a/libsyclinterface/source/dpctl_sycl_queue_interface.cpp b/libsyclinterface/source/dpctl_sycl_queue_interface.cpp
@@ -34,7 +34,7 @@
 #include <exception>
 #include <stdexcept>
 
-using namespace cl::sycl;
+using namespace sycl;
 
 namespace
 {
diff --git a/libsyclinterface/source/dpctl_sycl_queue_manager.cpp b/libsyclinterface/source/dpctl_sycl_queue_manager.cpp
@@ -30,7 +30,7 @@
 #include <CL/sycl.hpp> /* SYCL headers   */
 #include <vector>
 
-using namespace cl::sycl;
+using namespace sycl;
 
 /*------------------------------- Private helpers ----------------------------*/
 
diff --git a/libsyclinterface/source/dpctl_sycl_usm_interface.cpp b/libsyclinterface/source/dpctl_sycl_usm_interface.cpp
@@ -30,7 +30,7 @@
 #include "dpctl_sycl_device_interface.h"
 #include <CL/sycl.hpp> /* SYCL headers   */
 
-using namespace cl::sycl;
+using namespace sycl;
 
 namespace
 {
diff --git a/libsyclinterface/tests/test_sycl_context_interface.cpp b/libsyclinterface/tests/test_sycl_context_interface.cpp
@@ -33,7 +33,7 @@
 #include <gtest/gtest.h>
 #include <vector>
 
-using namespace cl::sycl;
+using namespace sycl;
 
 namespace
 {
diff --git a/libsyclinterface/tests/test_sycl_device_aspects.cpp b/libsyclinterface/tests/test_sycl_device_aspects.cpp
@@ -74,40 +74,36 @@ auto build_params()
         "opencl:gpu", "opencl:cpu", "level_zero:gpu", "host");
 
     constexpr auto param_2 =
-        get_param_list<std::pair<const char *, cl::sycl::aspect>>(
-            std::make_pair("host", cl::sycl::aspect::host),
-            std::make_pair("cpu", cl::sycl::aspect::cpu),
-            std::make_pair("gpu", cl::sycl::aspect::gpu),
-            std::make_pair("accelerator", cl::sycl::aspect::accelerator),
-            std::make_pair("custom", cl::sycl::aspect::custom),
-            std::make_pair("fp16", cl::sycl::aspect::fp16),
-            std::make_pair("fp64", cl::sycl::aspect::fp64),
-            std::make_pair("atomic64", cl::sycl::aspect::atomic64),
-            std::make_pair("online_compiler",
-                           cl::sycl::aspect::online_compiler),
-            std::make_pair("online_linker", cl::sycl::aspect::online_linker),
-            std::make_pair("queue_profiling",
-                           cl::sycl::aspect::queue_profiling),
+        get_param_list<std::pair<const char *, sycl::aspect>>(
+            std::make_pair("host", sycl::aspect::host),
+            std::make_pair("cpu", sycl::aspect::cpu),
+            std::make_pair("gpu", sycl::aspect::gpu),
+            std::make_pair("accelerator", sycl::aspect::accelerator),
+            std::make_pair("custom", sycl::aspect::custom),
+            std::make_pair("fp16", sycl::aspect::fp16),
+            std::make_pair("fp64", sycl::aspect::fp64),
+            std::make_pair("atomic64", sycl::aspect::atomic64),
+            std::make_pair("online_compiler", sycl::aspect::online_compiler),
+            std::make_pair("online_linker", sycl::aspect::online_linker),
+            std::make_pair("queue_profiling", sycl::aspect::queue_profiling),
             std::make_pair("usm_device_allocations",
-                           cl::sycl::aspect::usm_device_allocations),
+                           sycl::aspect::usm_device_allocations),
             std::make_pair("usm_host_allocations",
-                           cl::sycl::aspect::usm_host_allocations),
+                           sycl::aspect::usm_host_allocations),
             std::make_pair("usm_shared_allocations",
-                           cl::sycl::aspect::usm_shared_allocations),
+                           sycl::aspect::usm_shared_allocations),
             std::make_pair("usm_restricted_shared_allocations",
-                           cl::sycl::aspect::usm_restricted_shared_allocations),
+                           sycl::aspect::usm_restricted_shared_allocations),
             std::make_pair("usm_system_allocations",
-                           cl::sycl::aspect::usm_system_allocations),
+                           sycl::aspect::usm_system_allocations),
             std::make_pair("usm_atomic_host_allocations",
-                           cl::sycl::aspect::usm_atomic_host_allocations),
+                           sycl::aspect::usm_atomic_host_allocations),
             std::make_pair("usm_atomic_shared_allocations",
-                           cl::sycl::aspect::usm_atomic_shared_allocations),
-            std::make_pair("host_debuggable",
-                           cl::sycl::aspect::host_debuggable));
+                           sycl::aspect::usm_atomic_shared_allocations),
+            std::make_pair("host_debuggable", sycl::aspect::host_debuggable));
 
     auto pairs =
-        build_param_pairs<const char *,
-                          std::pair<const char *, cl::sycl::aspect>,
+        build_param_pairs<const char *, std::pair<const char *, sycl::aspect>,
                           param_1.size(), param_2.size()>(param_1, param_2);
 
     return build_gtest_values(pairs);
@@ -117,7 +113,7 @@ auto build_params()
 
 struct TestDPCTLSyclDeviceInterfaceAspects
     : public ::testing::TestWithParam<
-          std::pair<const char *, std::pair<const char *, cl::sycl::aspect>>>
+          std::pair<const char *, std::pair<const char *, sycl::aspect>>>
 {
     DPCTLSyclDeviceSelectorRef DSRef = nullptr;
     DPCTLSyclDeviceRef DRef = nullptr;
diff --git a/libsyclinterface/tests/test_sycl_device_interface.cpp b/libsyclinterface/tests/test_sycl_device_interface.cpp
@@ -32,7 +32,7 @@
 #include <CL/sycl.hpp>
 #include <gtest/gtest.h>
 
-using namespace cl::sycl;
+using namespace sycl;
 
 struct TestDPCTLSyclDeviceInterface
     : public ::testing::TestWithParam<const char *>
diff --git a/libsyclinterface/tests/test_sycl_device_invalid_filters.cpp b/libsyclinterface/tests/test_sycl_device_invalid_filters.cpp
@@ -28,7 +28,8 @@
 #include <CL/sycl.hpp>
 #include <gtest/gtest.h>
 
-using namespace cl::sycl;
+using namespace sycl;
+
 struct TestUnsupportedFilters : public ::testing::TestWithParam<const char *>
 {
     DPCTLSyclDeviceSelectorRef DSRef = nullptr;
diff --git a/libsyclinterface/tests/test_sycl_device_manager.cpp b/libsyclinterface/tests/test_sycl_device_manager.cpp
@@ -186,7 +186,7 @@ struct TestGetNumDevicesForBTy : public ::testing::TestWithParam<int>
 
 TEST_P(TestGetNumDevicesForBTy, ChkGetNumDevices)
 {
-    auto platforms = cl::sycl::platform::get_platforms();
+    auto platforms = sycl::platform::get_platforms();
     size_t nDevices = 0;
     sycl::default_selector mRanker;
     for (const auto &P : platforms) {
diff --git a/libsyclinterface/tests/test_sycl_device_selector_interface.cpp b/libsyclinterface/tests/test_sycl_device_selector_interface.cpp
@@ -31,7 +31,7 @@
 #include <CL/sycl.hpp>
 #include <gtest/gtest.h>
 
-using namespace cl::sycl;
+using namespace sycl;
 
 namespace
 {
diff --git a/libsyclinterface/tests/test_sycl_device_subdevices.cpp b/libsyclinterface/tests/test_sycl_device_subdevices.cpp
@@ -35,7 +35,7 @@
 #include <CL/sycl.hpp>
 #include <gtest/gtest.h>
 
-using namespace cl::sycl;
+using namespace sycl;
 
 DEFINE_SIMPLE_CONVERSION_FUNCTIONS(device, DPCTLSyclDeviceRef);
 
diff --git a/libsyclinterface/tests/test_sycl_event_interface.cpp b/libsyclinterface/tests/test_sycl_event_interface.cpp
@@ -31,7 +31,7 @@
 #include <gtest/gtest.h>
 #include <vector>
 
-using namespace cl::sycl;
+using namespace sycl;
 
 namespace
 {
diff --git a/libsyclinterface/tests/test_sycl_kernel_bundle_interface.cpp b/libsyclinterface/tests/test_sycl_kernel_bundle_interface.cpp
@@ -40,7 +40,7 @@
 #include <fstream>
 #include <gtest/gtest.h>
 
-using namespace cl::sycl;
+using namespace sycl;
 
 struct TestDPCTLSyclKernelBundleInterface
     : public ::testing::TestWithParam<const char *>
diff --git a/libsyclinterface/tests/test_sycl_kernel_interface.cpp b/libsyclinterface/tests/test_sycl_kernel_interface.cpp
@@ -36,7 +36,7 @@
 #include <array>
 #include <gtest/gtest.h>
 
-using namespace cl::sycl;
+using namespace sycl;
 
 namespace
 {
diff --git a/libsyclinterface/tests/test_sycl_platform_interface.cpp b/libsyclinterface/tests/test_sycl_platform_interface.cpp
@@ -34,7 +34,7 @@
 #include <gtest/gtest.h>
 #include <vector>
 
-using namespace cl::sycl;
+using namespace sycl;
 
 namespace
 {
diff --git a/libsyclinterface/tests/test_sycl_platform_invalid_filters.cpp b/libsyclinterface/tests/test_sycl_platform_invalid_filters.cpp
@@ -29,7 +29,8 @@
 #include <CL/sycl.hpp>
 #include <gtest/gtest.h>
 
-using namespace cl::sycl;
+using namespace sycl;
+
 struct TestUnsupportedFilters : public ::testing::TestWithParam<const char *>
 {
     DPCTLSyclDeviceSelectorRef DSRef = nullptr;
diff --git a/libsyclinterface/tests/test_sycl_queue_interface.cpp b/libsyclinterface/tests/test_sycl_queue_interface.cpp
@@ -36,7 +36,7 @@
 #include <CL/sycl.hpp>
 #include <gtest/gtest.h>
 
-using namespace cl::sycl;
+using namespace sycl;
 
 namespace
 {
diff --git a/libsyclinterface/tests/test_sycl_queue_manager.cpp b/libsyclinterface/tests/test_sycl_queue_manager.cpp
@@ -35,7 +35,7 @@
 #include <thread>
 
 using namespace std;
-using namespace cl::sycl;
+using namespace sycl;
 
 namespace
 {
diff --git a/libsyclinterface/tests/test_sycl_usm_interface.cpp b/libsyclinterface/tests/test_sycl_usm_interface.cpp
@@ -36,7 +36,7 @@
 #include <cstring>
 #include <gtest/gtest.h>
 
-using namespace cl::sycl;
+using namespace sycl;
 
 namespace
 {

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,7 @@`
`31`	`31`	`#include <glog/logging.h>`
`32`	`32`	`#endif`
`33`	`33`
`34`		`-void DPCTL_AsyncErrorHandler::operator()(`
`35`		`- const cl::sycl::exception_list &exceptions)`
	`34`	`+void DPCTL_AsyncErrorHandler::operator()(const sycl::exception_list &exceptions)`
`36`	`35`	`{`
`37`	`36`	`for (std::exception_ptr const &e : exceptions) {`
`38`	`37`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`#include <sstream>`
`28`	`28`	`#include <string>`
`29`	`29`
`30`		`-using namespace cl::sycl;`
	`30`	`+using namespace sycl;`
`31`	`31`
`32`	`32`	`/*!`
`33`	`33`	`* Transforms enum info::device_type to string.`
`@@ -164,7 +164,7 @@ DPCTLSyclDeviceType DPCTL_SyclDeviceTypeToDPCTLDeviceType(info::device_type D)`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`/*!`
`167`		`- * Transforms cl::sycl::aspect to string.`
	`167`	`+ * Transforms sycl::aspect to string.`
`168`	`168`	`*/`
`169`	`169`	`std::string DPCTL_AspectToStr(aspect aspectTy)`
`170`	`170`	`{`
`@@ -237,7 +237,7 @@ std::string DPCTL_AspectToStr(aspect aspectTy)`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`/*!`
`240`		`- * Transforms string to cl::sycl::aspect.`
	`240`	`+ * Transforms string to sycl::aspect.`
`241`	`241`	`*/`
`242`	`242`	`aspect DPCTL_StrToAspectType(const std::string &aspectTyStr)`
`243`	`243`	`{`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`#include <CL/sycl.hpp>`
`31`	`31`	`#include <vector>`
`32`	`32`
`33`		`-using namespace cl::sycl;`
	`33`	`+using namespace sycl;`
`34`	`34`
`35`	`35`	`namespace`
`36`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`#include <cstring>`
`36`	`36`	`#include <vector>`
`37`	`37`
`38`		`-using namespace cl::sycl;`
	`38`	`+using namespace sycl;`
`39`	`39`
`40`	`40`	`namespace`
`41`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`#include "dpctl_error_handlers.h"`
`29`	`29`	`#include <CL/sycl.hpp> /* SYCL headers */`
`30`	`30`
`31`		`-using namespace cl::sycl;`
	`31`	`+using namespace sycl;`
`32`	`32`
`33`	`33`	`namespace`
`34`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`#include <CL/sycl.hpp> /* SYCL headers */`
`32`	`32`	`#include <vector>`
`33`	`33`
`34`		`-using namespace cl::sycl;`
	`34`	`+using namespace sycl;`
`35`	`35`
`36`	`36`	`namespace`
`37`	`37`	`{`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`// clang-format on`
`53`	`53`	`#endif`
`54`	`54`
`55`		`-using namespace cl::sycl;`
	`55`	`+using namespace sycl;`
`56`	`56`
`57`	`57`	`namespace`
`58`	`58`	`{`