Skip to content

Commit 780794c

Browse files
committed
removed accidental changes
1 parent 50db5c5 commit 780794c

7 files changed

Lines changed: 7 additions & 8 deletions

File tree

include/umf/memory_provider_ops.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#define UMF_MEMORY_PROVIDER_OPS_H 1
1212

1313
#include <stdarg.h>
14-
#include <stdbool.h>
1514

1615
#include <umf/base.h>
1716

@@ -322,6 +321,7 @@ typedef struct umf_memory_provider_ops_t {
322321
umf_result_t (*ext_get_allocation_properties_size)(
323322
void *provider, umf_memory_property_id_t memory_property_id,
324323
size_t *size);
324+
325325
} umf_memory_provider_ops_t;
326326

327327
#ifdef __cplusplus

include/umf/providers/provider_level_zero.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
#ifndef UMF_LEVEL_ZERO_PROVIDER_H
99
#define UMF_LEVEL_ZERO_PROVIDER_H
1010

11+
#include <stdbool.h>
12+
1113
#include <umf/memory_provider_gpu.h>
1214

1315
#ifdef __cplusplus

src/memory_provider.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,4 +605,4 @@ umf_result_t umfMemoryProviderGetAllocationPropertiesSize(
605605

606606
checkErrorAndSetLastProvider(res, hProvider);
607607
return res;
608-
}
608+
}

src/provider/provider_level_zero.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ umf_result_t umfLevelZeroMemoryProviderParamsCreate(
275275
umf_result_t umfLevelZeroMemoryProviderParamsDestroy(
276276
umf_level_zero_memory_provider_params_handle_t hParams) {
277277
umf_ba_global_free(hParams);
278+
278279
return UMF_RESULT_SUCCESS;
279280
}
280281

@@ -355,12 +356,10 @@ umf_result_t umfLevelZeroMemoryProviderParamsSetName(
355356
umf_result_t umfLevelZeroMemoryProviderParamsSetResidentDevices(
356357
umf_level_zero_memory_provider_params_handle_t hParams,
357358
ze_device_handle_t *hDevices, uint32_t deviceCount) {
358-
359359
if (!hParams) {
360360
LOG_ERR("Level Zero memory provider params handle is NULL");
361361
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
362362
}
363-
364363
if (deviceCount > 0 && hDevices == NULL) {
365364
LOG_ERR("Resident devices array is NULL, but deviceCount is not zero");
366365
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
@@ -519,7 +518,6 @@ static umf_result_t ze_memory_provider_alloc_helper(void *provider, size_t size,
519518

520519
utils_read_lock(&ze_provider->resident_device_rwlock);
521520
for (uint32_t i = 0; i < ze_provider->resident_device_count; i++) {
522-
523521
ze_result = g_ze_ops.zeContextMakeMemoryResident(
524522
ze_provider->context, ze_provider->resident_device_handles[i],
525523
*resultPtr, size);

src/utils/utils_level_zero.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ static void utils_ze_init_level_zero_once(void) {
336336

337337
int utils_ze_init_level_zero(void) {
338338
utils_init_once(&level_zero_init_flag, utils_ze_init_level_zero_once);
339+
339340
return InitResult;
340341
}
341342

test/providers/provider_level_zero_residency.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,4 @@ int main(int argc, char **argv) {
8484
InitGoogleTest(&argc, argv);
8585
AddGlobalTestEnvironment(new MockedLevelZeroTestEnvironment);
8686
return RUN_ALL_TESTS();
87-
}
87+
}

test/utils/utils_log.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,9 @@ int fput_count = 0;
3131

3232
int mock_fputs(const char *s, FILE *stream) {
3333
fput_count++;
34-
#ifndef UMF_DEVELOPER_MODE
3534
if (!expected_message.empty()) {
3635
EXPECT_STREQ(s, expected_message.c_str());
3736
}
38-
#endif
3937
EXPECT_EQ(stream, expected_stream);
4038
return (int)strlen(s);
4139
}

0 commit comments

Comments
 (0)