[Bf-blender-cvs] [8bed2fa5427] cycles_oneapi: Cleanup: clang-format
Nikita Sirgienko
noreply at git.blender.org
Mon Apr 4 19:51:41 CEST 2022
Commit: 8bed2fa5427d615cc59b30fa99f0a20b79ac7642
Author: Nikita Sirgienko
Date: Mon Apr 4 19:08:00 2022 +0300
Branches: cycles_oneapi
https://developer.blender.org/rB8bed2fa5427d615cc59b30fa99f0a20b79ac7642
Cleanup: clang-format
===================================================================
M intern/cycles/device/oneapi/device_impl.cpp
M intern/cycles/device/oneapi/queue.cpp
===================================================================
diff --git a/intern/cycles/device/oneapi/device_impl.cpp b/intern/cycles/device/oneapi/device_impl.cpp
index 99974f25405..566779787e2 100644
--- a/intern/cycles/device/oneapi/device_impl.cpp
+++ b/intern/cycles/device/oneapi/device_impl.cpp
@@ -40,7 +40,8 @@ OneapiDevice::OneapiDevice(const DeviceInfo &info,
bool is_finished_ok = (oneapi_dll.oneapi_create_queue)(device_queue, info.num);
if (is_finished_ok == false) {
- set_error("oneAPI queue initialization error: got runtime exception \"" + oneapi_error_string + "\"");
+ set_error("oneAPI queue initialization error: got runtime exception \"" + oneapi_error_string +
+ "\"");
}
else {
VLOG(1) << "oneAPI queue has been successfully created for the device \"" << info.description
@@ -51,7 +52,8 @@ OneapiDevice::OneapiDevice(const DeviceInfo &info,
size_t globals_segment_size;
is_finished_ok = (oneapi_dll.oneapi_kernel_globals_size)(device_queue, globals_segment_size);
if (is_finished_ok == false) {
- set_error("oneAPI constant memory initialization got runtime exception \"" + oneapi_error_string + "\"");
+ set_error("oneAPI constant memory initialization got runtime exception \"" +
+ oneapi_error_string + "\"");
}
else {
VLOG(1) << "Successfuly created global/constant memory segment (kernel globals object)";
@@ -262,9 +264,11 @@ void OneapiDevice::mem_copy_from(device_memory &mem, size_t y, size_t w, size_t
assert(mem.device_pointer);
char *shifted_host = (char *)mem.host_pointer + offset;
char *shifted_device = (char *)mem.device_pointer + offset;
- bool is_finished_ok = (oneapi_dll.oneapi_usm_memcpy)(device_queue, shifted_host, shifted_device, size);
+ bool is_finished_ok =
+ (oneapi_dll.oneapi_usm_memcpy)(device_queue, shifted_host, shifted_device, size);
if (is_finished_ok == false) {
- set_error("oneAPI memory operation error: got runtime exception \"" + oneapi_error_string + "\"");
+ set_error("oneAPI memory operation error: got runtime exception \"" + oneapi_error_string +
+ "\"");
}
}
}
@@ -285,9 +289,13 @@ void OneapiDevice::mem_zero(device_memory &mem)
}
assert(device_queue);
- bool is_finished_ok = (oneapi_dll.oneapi_usm_memset)(device_queue, (void *)mem.device_pointer, 0, mem.memory_size());
+ bool is_finished_ok = (oneapi_dll.oneapi_usm_memset)(device_queue,
+ (void *)mem.device_pointer,
+ 0,
+ mem.memory_size());
if (is_finished_ok == false) {
- set_error("oneAPI memory operation error: got runtime exception \"" + oneapi_error_string + "\"");
+ set_error("oneAPI memory operation error: got runtime exception \"" + oneapi_error_string +
+ "\"");
}
}
diff --git a/intern/cycles/device/oneapi/queue.cpp b/intern/cycles/device/oneapi/queue.cpp
index 8747796bb76..168e0e567e7 100644
--- a/intern/cycles/device/oneapi/queue.cpp
+++ b/intern/cycles/device/oneapi/queue.cpp
@@ -260,8 +260,8 @@ bool OneapiDeviceQueue::enqueue(DeviceKernel kernel,
if (is_finished_ok == false) {
oneapi_device->set_error("oneAPI kernel \"" + std::string(device_kernel_as_string(kernel)) +
- "\" execution error: got runtime exception \"" + oneapi_device->oneapi_error_message() +
- "\"");
+ "\" execution error: got runtime exception \"" +
+ oneapi_device->oneapi_error_message() + "\"");
}
return is_finished_ok;
@@ -275,7 +275,8 @@ bool OneapiDeviceQueue::synchronize()
bool is_finished_ok = (oneapi_dll.oneapi_queue_synchronize)(oneapi_device->sycl_queue());
if (is_finished_ok == false)
- oneapi_device->set_error("oneAPI unknown kernel execution error: got runtime exception \"" + oneapi_device->oneapi_error_message() + "\"");
+ oneapi_device->set_error("oneAPI unknown kernel execution error: got runtime exception \"" +
+ oneapi_device->oneapi_error_message() + "\"");
debug_synchronize();
More information about the Bf-blender-cvs
mailing list