Skip to content

Commit b1f7dcc

Browse files
committed
Fix CUDA adapter formatting
1 parent 9367aac commit b1f7dcc

File tree

9 files changed

+16
-15
lines changed

9 files changed

+16
-15
lines changed

sycl/plugins/cuda/pi_cuda.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727

2828
#include <ur/adapters/cuda/context.hpp>
2929
#include <ur/adapters/cuda/device.hpp>
30+
#include <ur/adapters/cuda/event.hpp>
3031
#include <ur/adapters/cuda/kernel.hpp>
32+
#include <ur/adapters/cuda/memory.hpp>
3133
#include <ur/adapters/cuda/platform.hpp>
3234
#include <ur/adapters/cuda/program.hpp>
33-
#include <ur/adapters/cuda/event.hpp>
3435
#include <ur/adapters/cuda/queue.hpp>
3536
#include <ur/adapters/cuda/sampler.hpp>
36-
#include <ur/adapters/cuda/memory.hpp>
3737

3838
// Share code between the PI Plugin and UR Adapter
3939
#include <pi2ur.hpp>
@@ -52,7 +52,7 @@ struct _pi_context : ur_context_handle_t_ {
5252
using ur_context_handle_t_::ur_context_handle_t_;
5353
};
5454

55-
struct _pi_mem : ur_mem_handle_t_ {
55+
struct _pi_mem : ur_mem_handle_t_ {
5656
using ur_mem_handle_t_::ur_mem_handle_t_;
5757
};
5858

sycl/plugins/unified_runtime/ur/adapters/cuda/common.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ void sycl::detail::ur::cuPrint(const char *Message) {
8686
std::cerr << "ur_print: " << Message << std::endl;
8787
}
8888

89-
9089
// Global variables for ZER_EXT_RESULT_ADAPTER_SPECIFIC_ERROR
9190
thread_local ur_result_t ErrorMessageCode = UR_RESULT_SUCCESS;
9291
thread_local char ErrorMessage[MaxMessageSize];

sycl/plugins/unified_runtime/ur/adapters/cuda/device.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -974,7 +974,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t device,
974974
cuDeviceGetPCIBusId(AddressBuffer, AddressBufferSize, device->get()) ==
975975
CUDA_SUCCESS);
976976
// CUDA API (8.x - 12.1) guarantees 12 bytes + \0 are written
977-
sycl::detail::ur::assertion(strnlen(AddressBuffer, AddressBufferSize) == 12);
977+
sycl::detail::ur::assertion(strnlen(AddressBuffer, AddressBufferSize) ==
978+
12);
978979
return ReturnValue(AddressBuffer,
979980
strnlen(AddressBuffer, AddressBufferSize - 1) + 1);
980981
}

sycl/plugins/unified_runtime/ur/adapters/cuda/event.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ ur_event_handle_t_::ur_event_handle_t_(ur_context_handle_t context,
4646
: commandType_{UR_COMMAND_EVENTS_WAIT}, refCount_{1}, has_ownership_{false},
4747
hasBeenWaitedOn_{false}, isRecorded_{false}, isStarted_{false},
4848
streamToken_{std::numeric_limits<uint32_t>::max()}, evEnd_{eventNative},
49-
evStart_{nullptr}, evQueued_{nullptr}, queue_{nullptr}, context_{
50-
context} {
49+
evStart_{nullptr}, evQueued_{nullptr}, queue_{nullptr},
50+
context_{context} {
5151
urContextRetain(context_);
5252
}
5353

sycl/plugins/unified_runtime/ur/adapters/cuda/memory.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
//===-----------------------------------------------------------------===//
88
#pragma once
99

10+
#include <cassert>
1011
#include <cuda.h>
1112
#include <ur_api.h>
12-
#include <cassert>
1313

1414
#include "common.hpp"
1515

sycl/plugins/unified_runtime/ur/adapters/cuda/platform.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ UR_DLLEXPORT ur_result_t UR_APICALL urPlatformGetInfo(
5757
/// However because multiple devices in a context is not currently supported,
5858
/// place each device in a separate platform.
5959
///
60-
UR_DLLEXPORT ur_result_t UR_APICALL urPlatformGet(uint32_t NumEntries,
61-
ur_platform_handle_t *phPlatforms,
62-
uint32_t *pNumPlatforms) {
60+
UR_DLLEXPORT ur_result_t UR_APICALL
61+
urPlatformGet(uint32_t NumEntries, ur_platform_handle_t *phPlatforms,
62+
uint32_t *pNumPlatforms) {
6363

6464
try {
6565
static std::once_flag initFlag;

sycl/plugins/unified_runtime/ur/adapters/cuda/program.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ urProgramRelease(ur_program_handle_t program) {
377377
// status.
378378
if (program->buildStatus_ == UR_PROGRAM_BUILD_STATUS_SUCCESS) {
379379
result = UR_CHECK_ERROR(cuModuleUnload(cuModule));
380-
} else if(program->buildStatus_ == UR_PROGRAM_BUILD_STATUS_NONE) {
380+
} else if (program->buildStatus_ == UR_PROGRAM_BUILD_STATUS_NONE) {
381381
// Nothing to free.
382382
result = UR_RESULT_SUCCESS;
383383
}

sycl/plugins/unified_runtime/ur/adapters/cuda/queue.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ struct ur_queue_handle_t_ {
6969
device_{device}, refCount_{1}, eventCount_{0}, compute_stream_idx_{0},
7070
transfer_stream_idx_{0}, num_compute_streams_{0},
7171
num_transfer_streams_{0}, last_sync_compute_streams_{0},
72-
last_sync_transfer_streams_{0}, flags_(flags),
73-
ur_flags_(ur_flags), has_ownership_{backend_owns} {
72+
last_sync_transfer_streams_{0}, flags_(flags), ur_flags_(ur_flags),
73+
has_ownership_{backend_owns} {
7474
urContextRetain(context_);
7575
urDeviceRetain(device_);
7676
}

sycl/plugins/unified_runtime/ur/adapters/cuda/ur_interface_loader.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,8 @@ urGetMemProcAddrTable(ur_api_version_t version, ur_mem_dditable_t *pDdiTable) {
148148
}
149149
pDdiTable->pfnBufferCreate = urMemBufferCreate;
150150
pDdiTable->pfnBufferPartition = urMemBufferPartition;
151-
pDdiTable->pfnBufferCreateWithNativeHandle = urMemBufferCreateWithNativeHandle;
151+
pDdiTable->pfnBufferCreateWithNativeHandle =
152+
urMemBufferCreateWithNativeHandle;
152153
pDdiTable->pfnImageCreateWithNativeHandle = urMemImageCreateWithNativeHandle;
153154
pDdiTable->pfnGetInfo = urMemGetInfo;
154155
pDdiTable->pfnGetNativeHandle = urMemGetNativeHandle;

0 commit comments

Comments
 (0)