format

t4c1 · t4c1 · commit 5c8e0301b8fa · 2022-03-28T09:14:55.000+01:00
diff --git a/sycl/include/CL/sycl.hpp b/sycl/include/CL/sycl.hpp
@@ -62,9 +62,9 @@
 #endif
 <<<<<<< HEAD
 #include <sycl/ext/oneapi/barrier.hpp>
-=======
+    =======
 #include <sycl/ext/oneapi/bf16_storage_builtins.hpp>
->>>>>>> sycl
+    >>>>>>> sycl
 #include <sycl/ext/oneapi/device_global/properties.hpp>
 #include <sycl/ext/oneapi/experimental/builtins.hpp>
 #include <sycl/ext/oneapi/filter_selector.hpp>
diff --git a/sycl/plugins/cuda/pi_cuda.cpp b/sycl/plugins/cuda/pi_cuda.cpp
@@ -1764,8 +1764,8 @@ pi_result cuda_piDeviceGetInfo(pi_device device, pi_device_info param_name,
   default:
     __SYCL_PI_HANDLE_UNKNOWN_PARAM_NAME(param_name);
   }
-  cl::sycl::detail::pi::die("Device info request not implemented");
-  return {};
+    cl::sycl::detail::pi::die("Device info request not implemented");
+    return {};
 }
 
 /// Gets the native CUDA handle of a PI device object

Original file line number	Diff line number	Diff line change
`@@ -1764,8 +1764,8 @@ pi_result cuda_piDeviceGetInfo(pi_device device, pi_device_info param_name,`
`1764`	`1764`	`default:`
`1765`	`1765`	`__SYCL_PI_HANDLE_UNKNOWN_PARAM_NAME(param_name);`
`1766`	`1766`	`}`
`1767`		`- cl::sycl::detail::pi::die("Device info request not implemented");`
`1768`		`- return {};`
	`1767`	`+ cl::sycl::detail::pi::die("Device info request not implemented");`
	`1768`	`+ return {};`
`1769`	`1769`	`}`
`1770`	`1770`
`1771`	`1771`	`/// Gets the native CUDA handle of a PI device object`