Skip to content

Commit 236034d

Browse files
author
DvirDukhan
committed
make format
1 parent 43b19b0 commit 236034d

File tree

8 files changed

+65
-69
lines changed

8 files changed

+65
-69
lines changed

‎src/DAG/dag.c‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,8 @@ void RedisAI_BatchedDagRunSession_ModelRun_Step(RedisAI_RunInfo **batched_rinfo,
178178
Dag_StoreOutputsFromModelRunCtx(rinfo, currentOp);
179179
}
180180
// Clear the result in case of an error.
181-
if(result == REDISMODULE_ERR) RAI_ClearError(&err);
181+
if (result == REDISMODULE_ERR)
182+
RAI_ClearError(&err);
182183
}
183184

184185
/**
@@ -748,9 +749,7 @@ int RedisAI_DagRun_IsKeysPositionRequest_ReportKeys(RedisModuleCtx *ctx, RedisMo
748749
return REDISMODULE_OK;
749750
}
750751

751-
void RunInfo_FreeData(RedisModuleCtx *ctx, void *rinfo) {
752-
RAI_FreeRunInfo(rinfo);
753-
}
752+
void RunInfo_FreeData(RedisModuleCtx *ctx, void *rinfo) { RAI_FreeRunInfo(rinfo); }
754753

755754
// Add Shallow copies of the DAG run info to the devices' queues.
756755
// Return REDISMODULE_OK in case of success, REDISMODULE_ERR if (at least) one insert op had

‎src/DAG/dag.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ bool RedisAI_DagComplete(RedisAI_RunInfo *rinfo);
3333

3434
/**
3535
* @brief Get an indication if an error happend during the dag run.
36-
*
36+
*
3737
* @param rinfo context in which RedisAI blocking commands operate.
38-
* @return true if there was an error
38+
* @return true if there was an error
3939
*/
4040
bool RedisAI_DagError(RedisAI_RunInfo *rinfo);
4141

@@ -58,7 +58,8 @@ RAI_DagOp *RedisAI_DagCurrentOp(RedisAI_RunInfo *rinfo);
5858
* a MODELRUN and is BATCHSIZE greater than zero
5959
* @return
6060
*/
61-
void RedisAI_DagCurrentOpInfo(RedisAI_RunInfo *rinfo, bool *currentOpReady, bool *currentOpBatchable);
61+
void RedisAI_DagCurrentOpInfo(RedisAI_RunInfo *rinfo, bool *currentOpReady,
62+
bool *currentOpBatchable);
6263

6364
/**
6465
* Get batching information about a DAG op.
@@ -150,5 +151,4 @@ int DAG_InsertDAGToQueue(RedisAI_RunInfo *rinfo);
150151
*/
151152
void RunInfo_FreeData(RedisModuleCtx *ctx, void *rinfo);
152153

153-
154154
#endif /* SRC_DAG_H_ */

‎src/backends.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -429,16 +429,16 @@ int RAI_LoadBackend(RedisModuleCtx *ctx, int backend, const char *path) {
429429
int ret;
430430
switch (backend) {
431431
case RAI_BACKEND_TENSORFLOW:
432-
ret = RAI_LoadBackend_TensorFlow(ctx, RedisModule_StringPtrLen(fullpath, NULL));
432+
ret = RAI_LoadBackend_TensorFlow(ctx, RedisModule_StringPtrLen(fullpath, NULL));
433433
break;
434434
case RAI_BACKEND_TFLITE:
435-
ret = RAI_LoadBackend_TFLite(ctx, RedisModule_StringPtrLen(fullpath, NULL));
435+
ret = RAI_LoadBackend_TFLite(ctx, RedisModule_StringPtrLen(fullpath, NULL));
436436
break;
437437
case RAI_BACKEND_TORCH:
438-
ret = RAI_LoadBackend_Torch(ctx, RedisModule_StringPtrLen(fullpath, NULL));
438+
ret = RAI_LoadBackend_Torch(ctx, RedisModule_StringPtrLen(fullpath, NULL));
439439
break;
440440
case RAI_BACKEND_ONNXRUNTIME:
441-
ret = RAI_LoadBackend_ONNXRuntime(ctx, RedisModule_StringPtrLen(fullpath, NULL));
441+
ret = RAI_LoadBackend_ONNXRuntime(ctx, RedisModule_StringPtrLen(fullpath, NULL));
442442
break;
443443
}
444444
RedisModule_FreeString(ctx, fullpath);

‎src/backends/tensorflow.c‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,7 @@ RAI_Model *RAI_ModelCreateTF(RAI_Backend backend, const char *devicestr, RAI_Mod
224224
RAI_SetError(error, RAI_EMODELIMPORT, "ERR unsupported device");
225225
}
226226

227-
228-
TF_Graph *model =TF_NewGraph();
227+
TF_Graph *model = TF_NewGraph();
229228
TF_Status *status = TF_NewStatus();
230229
TF_Buffer *tfbuffer = TF_NewBuffer();
231230
TF_ImportGraphDefOptions *options = TF_NewImportGraphDefOptions();
@@ -336,7 +335,7 @@ RAI_Model *RAI_ModelCreateTF(RAI_Backend backend, const char *devicestr, RAI_Mod
336335

337336
if (TF_GetCode(optionsStatus) != TF_OK) {
338337
RAI_SetError(error, RAI_EMODELCONFIGURE, RedisModule_Strdup(TF_Message(optionsStatus)));
339-
goto cleanup;
338+
goto cleanup;
340339
}
341340
TF_DeleteStatus(optionsStatus);
342341
optionsStatus = NULL;
@@ -402,11 +401,16 @@ RAI_Model *RAI_ModelCreateTF(RAI_Backend backend, const char *devicestr, RAI_Mod
402401

403402
cleanup:
404403
TF_DeleteGraph(model);
405-
if(options) TF_DeleteImportGraphDefOptions(options);
406-
if(tfbuffer) TF_DeleteBuffer(tfbuffer);
407-
if(status) TF_DeleteStatus(status);
408-
if(sessionOptions) TF_DeleteSessionOptions(sessionOptions);
409-
if(sessionStatus) TF_DeleteStatus(sessionStatus);
404+
if (options)
405+
TF_DeleteImportGraphDefOptions(options);
406+
if (tfbuffer)
407+
TF_DeleteBuffer(tfbuffer);
408+
if (status)
409+
TF_DeleteStatus(status);
410+
if (sessionOptions)
411+
TF_DeleteSessionOptions(sessionOptions);
412+
if (sessionStatus)
413+
TF_DeleteStatus(sessionStatus);
410414
return NULL;
411415
}
412416

‎src/backends/tflite.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ RAI_Model *RAI_ModelCreateTFLite(RAI_Backend backend, const char *devicestr, RAI
3939
}
4040

4141
char *error_descr = NULL;
42-
void *model =
43-
tfliteLoadModel(modeldef, modellen, dl_device, deviceid, &error_descr);
42+
void *model = tfliteLoadModel(modeldef, modellen, dl_device, deviceid, &error_descr);
4443

4544
if (model == NULL) {
4645
RAI_SetError(error, RAI_EMODELCREATE, error_descr);

‎src/background_workers.c‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,10 @@ static void _BGThread_Wait(RunQueueInfo *run_queue_info) {
105105
absTimeout.tv_sec = now.tv_sec;
106106
absTimeout.tv_nsec = (now.tv_usec + 1000) * 1000; // 1 millisecond
107107

108-
pthread_cond_timedwait(&run_queue_info->queue_condition_var,
109-
&run_queue_info->run_queue_mutex, &absTimeout);
108+
pthread_cond_timedwait(&run_queue_info->queue_condition_var, &run_queue_info->run_queue_mutex,
109+
&absTimeout);
110110
}
111111

112-
113112
static void _BGThread_RinfoFinish(RedisAI_RunInfo *rinfo) {
114113
RedisAI_RunInfo *orig = rinfo->orig_copy;
115114
uint dagRefCount = RAI_DagRunInfoFreeShallowCopy(rinfo);
@@ -144,18 +143,17 @@ static void _BGThread_ExecutionFinish(RunQueueInfo *run_queue_info, RedisAI_RunI
144143
RedisAI_RunInfo *rinfo = batch_rinfo[i];
145144
rinfo->dagDeviceCompleteOpCount += 1;
146145
__atomic_add_fetch(rinfo->dagCompleteOpCount, 1, __ATOMIC_RELAXED);
147-
if(RedisAI_DagDeviceComplete(rinfo) || RedisAI_DagError(rinfo) ){
148-
_BGThread_RinfoFinish(rinfo);
149-
}
150-
else {
146+
if (RedisAI_DagDeviceComplete(rinfo) || RedisAI_DagError(rinfo)) {
147+
_BGThread_RinfoFinish(rinfo);
148+
} else {
151149
queuePushFront(run_queue_info->run_queue, rinfo);
152150
}
153151
}
154152
}
155153

156154
static void _BGThread_Execute(RunQueueInfo *run_queue_info, RedisAI_RunInfo **batch_rinfo) {
157155
uint n_rinfo = array_len(batch_rinfo);
158-
if(n_rinfo != 0) {
156+
if (n_rinfo != 0) {
159157
bool batched_run = n_rinfo > 1;
160158
// For simplicity, we call into different functions whether the run
161159
// is batched or not
@@ -167,15 +165,18 @@ static void _BGThread_Execute(RunQueueInfo *run_queue_info, RedisAI_RunInfo **ba
167165
}
168166
}
169167

170-
static RedisAI_RunInfo** _BGThread_BatchOperations(RunQueueInfo *run_queue_info, RedisAI_RunInfo *rinfo,RedisAI_RunInfo **batch_rinfo) {
168+
static RedisAI_RunInfo **_BGThread_BatchOperations(RunQueueInfo *run_queue_info,
169+
RedisAI_RunInfo *rinfo,
170+
RedisAI_RunInfo **batch_rinfo) {
171171
// Since the current op can be batched, then we collect info on batching, namely
172172
// - batchsize
173173
// - minbatchsize
174174
// - minbatchtimeout
175175
// - actual size of the input along the batch (0-th) dimension
176176
RAI_DagOp *currentOp = RedisAI_DagCurrentOp(rinfo);
177177
size_t batchsize, minbatchsize, minbatchtimeout, inbatchsize;
178-
RedisAI_DagOpBatchInfo(rinfo, currentOp, &batchsize, &minbatchsize, &minbatchtimeout, &inbatchsize);
178+
RedisAI_DagOpBatchInfo(rinfo, currentOp, &batchsize, &minbatchsize, &minbatchtimeout,
179+
&inbatchsize);
179180

180181
// Get the size of the batch so far, that is, the size of the first input
181182
// tensor in the 0-th dimension
@@ -211,8 +212,7 @@ static RedisAI_RunInfo** _BGThread_BatchOperations(RunQueueInfo *run_queue_info,
211212

212213
int batched = 0;
213214
size_t next_batchsize = 0;
214-
RedisAI_DagOpBatchingMatch(rinfo, currentOp, next_rinfo, nextOp, &batched,
215-
&next_batchsize);
215+
RedisAI_DagOpBatchingMatch(rinfo, currentOp, next_rinfo, nextOp, &batched, &next_batchsize);
216216

217217
if (batched == 0) {
218218
next_item = queueNext(next_item);
@@ -228,7 +228,7 @@ static RedisAI_RunInfo** _BGThread_BatchOperations(RunQueueInfo *run_queue_info,
228228

229229
// If all previous checks pass, then keep track of the item
230230
// in the list of evicted items
231-
queueItem* evicted = queueEvict(run_queue_info->run_queue, next_item);
231+
queueItem *evicted = queueEvict(run_queue_info->run_queue, next_item);
232232
RedisModule_Free(evicted);
233233
batch_rinfo = array_append(batch_rinfo, next_rinfo);
234234

@@ -263,7 +263,6 @@ static RedisAI_RunInfo** _BGThread_BatchOperations(RunQueueInfo *run_queue_info,
263263
return batch_rinfo;
264264
}
265265

266-
267266
void *RedisAI_Run_ThreadMain(void *arg) {
268267
RunQueueInfo *run_queue_info = (RunQueueInfo *)arg;
269268
RAI_PTHREAD_SETNAME("redisai_bthread");
@@ -283,33 +282,32 @@ void *RedisAI_Run_ThreadMain(void *arg) {
283282
RedisAI_RunInfo *rinfo = (RedisAI_RunInfo *)item->value;
284283
RedisModule_Free(item);
285284
// In case of timeout.
286-
if(_BGThread_IsRInfoTimedOut(rinfo)) {
285+
if (_BGThread_IsRInfoTimedOut(rinfo)) {
287286
_BGThread_RinfoFinish(rinfo);
288287
continue;
289288
}
290289

291-
if(RedisAI_DagError(rinfo)) {
290+
if (RedisAI_DagError(rinfo)) {
292291
_BGThread_RinfoFinish(rinfo);
293292
continue;
294293
}
295294

296295
// Get if the operation is ready and bacthable
297296
bool currentOpReady, currentOpBatchable;
298297
RedisAI_DagCurrentOpInfo(rinfo, &currentOpReady, &currentOpBatchable);
299-
if(currentOpReady){
298+
if (currentOpReady) {
300299
batch_rinfo = array_append(batch_rinfo, rinfo);
301-
}
302-
else {
300+
} else {
303301
// Op is not ready - push back to queue and continue the loop.
304302
queuePush(run_queue_info->run_queue, rinfo);
305303
continue;
306304
}
307305

308-
if(currentOpBatchable) {
306+
if (currentOpBatchable) {
309307
batch_rinfo = _BGThread_BatchOperations(run_queue_info, rinfo, batch_rinfo);
310308
}
311309
// Run the computation step (batched or not)
312-
// We're done with the queue here, items have been evicted so we can
310+
// We're done with the queue here, items have been evicted so we can
313311
// safely unlock the queue mutex, to allow other threads to operate
314312
// on the same queue. The evicted items at this point are only visible
315313
// to this worker.
@@ -318,7 +316,6 @@ void *RedisAI_Run_ThreadMain(void *arg) {
318316
// Lock the queue again: we're done operating on evicted items only.
319317
pthread_mutex_lock(&run_queue_info->run_queue_mutex);
320318
_BGThread_ExecutionFinish(run_queue_info, batch_rinfo);
321-
322319
}
323320
}
324321
array_free(batch_rinfo);

‎src/redisai.c‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,17 +1006,15 @@ void RAI_moduleInfoFunc(RedisModuleInfoCtx *ctx, int for_crash_report) {
10061006
// Return resource usage statistics for the calling thread
10071007
// which in this case is Redis/RedisAI main thread
10081008
// RUSAGE_THREAD is Linux-specific.
1009-
RedisModuleString* main_thread_used_cpu_sys = NULL;
1010-
RedisModuleString* main_thread_used_cpu_user = NULL;
1009+
RedisModuleString *main_thread_used_cpu_sys = NULL;
1010+
RedisModuleString *main_thread_used_cpu_user = NULL;
10111011
#if (defined(__linux__) && defined(RUSAGE_THREAD))
10121012
struct rusage main_thread_ru;
10131013
getrusage(RUSAGE_THREAD, &main_thread_ru);
1014-
main_thread_used_cpu_sys =
1015-
RedisModule_CreateStringPrintf(NULL, "%ld.%06ld", (long)main_thread_ru.ru_stime.tv_sec,
1016-
(long)self_ru.ru_stime.tv_usec);
1017-
main_thread_used_cpu_user =
1018-
RedisModule_CreateStringPrintf(NULL, "%ld.%06ld", (long)main_thread_ru.ru_utime.tv_sec,
1019-
(long)self_ru.ru_utime.tv_usec);
1014+
main_thread_used_cpu_sys = RedisModule_CreateStringPrintf(
1015+
NULL, "%ld.%06ld", (long)main_thread_ru.ru_stime.tv_sec, (long)self_ru.ru_stime.tv_usec);
1016+
main_thread_used_cpu_user = RedisModule_CreateStringPrintf(
1017+
NULL, "%ld.%06ld", (long)main_thread_ru.ru_utime.tv_sec, (long)self_ru.ru_utime.tv_usec);
10201018
#else
10211019
main_thread_used_cpu_sys = RedisModule_CreateStringPrintf(NULL, "N/A");
10221020
main_thread_used_cpu_user = RedisModule_CreateStringPrintf(NULL, "N/A");
@@ -1025,22 +1023,22 @@ void RAI_moduleInfoFunc(RedisModuleInfoCtx *ctx, int for_crash_report) {
10251023
// Return resource usage statistics for all of its
10261024
// terminated child processes
10271025
getrusage(RUSAGE_CHILDREN, &c_ru);
1028-
RedisModuleString* self_used_cpu_sys = RedisModule_CreateStringPrintf(NULL, "%ld.%06ld", (long)self_ru.ru_stime.tv_sec,
1029-
(long)self_ru.ru_stime.tv_usec);
1030-
RedisModuleString* self_used_cpu_user = RedisModule_CreateStringPrintf(NULL, "%ld.%06ld", (long)self_ru.ru_utime.tv_sec,
1031-
(long)self_ru.ru_utime.tv_usec);
1032-
RedisModuleString* children_used_cpu_sys = RedisModule_CreateStringPrintf(NULL, "%ld.%06ld", (long)c_ru.ru_stime.tv_sec,
1033-
(long)c_ru.ru_stime.tv_usec);
1034-
RedisModuleString* children_used_cpu_user = RedisModule_CreateStringPrintf(NULL, "%ld.%06ld", (long)c_ru.ru_utime.tv_sec,
1035-
(long)c_ru.ru_utime.tv_usec);
1026+
RedisModuleString *self_used_cpu_sys = RedisModule_CreateStringPrintf(
1027+
NULL, "%ld.%06ld", (long)self_ru.ru_stime.tv_sec, (long)self_ru.ru_stime.tv_usec);
1028+
RedisModuleString *self_used_cpu_user = RedisModule_CreateStringPrintf(
1029+
NULL, "%ld.%06ld", (long)self_ru.ru_utime.tv_sec, (long)self_ru.ru_utime.tv_usec);
1030+
RedisModuleString *children_used_cpu_sys = RedisModule_CreateStringPrintf(
1031+
NULL, "%ld.%06ld", (long)c_ru.ru_stime.tv_sec, (long)c_ru.ru_stime.tv_usec);
1032+
RedisModuleString *children_used_cpu_user = RedisModule_CreateStringPrintf(
1033+
NULL, "%ld.%06ld", (long)c_ru.ru_utime.tv_sec, (long)c_ru.ru_utime.tv_usec);
10361034
RedisModule_InfoAddSection(ctx, "cpu");
10371035
RedisModule_InfoAddFieldString(ctx, "self_used_cpu_sys", self_used_cpu_sys);
10381036
RedisModule_InfoAddFieldString(ctx, "self_used_cpu_user", self_used_cpu_user);
10391037
RedisModule_InfoAddFieldString(ctx, "children_used_cpu_sys", children_used_cpu_sys);
10401038
RedisModule_InfoAddFieldString(ctx, "children_used_cpu_user", children_used_cpu_user);
10411039
RedisModule_InfoAddFieldString(ctx, "main_thread_used_cpu_sys", main_thread_used_cpu_sys);
10421040
RedisModule_InfoAddFieldString(ctx, "main_thread_used_cpu_user", main_thread_used_cpu_user);
1043-
1041+
10441042
RedisModule_FreeString(NULL, self_used_cpu_sys);
10451043
RedisModule_FreeString(NULL, self_used_cpu_user);
10461044
RedisModule_FreeString(NULL, children_used_cpu_sys);
@@ -1058,9 +1056,9 @@ void RAI_moduleInfoFunc(RedisModuleInfoCtx *ctx, int for_crash_report) {
10581056
pthread_t current_bg_threads = run_queue_info->threads[i];
10591057
struct timespec ts;
10601058
clockid_t cid;
1061-
RedisModuleString* queue_used_cpu_total = RedisModule_CreateStringPrintf(
1059+
RedisModuleString *queue_used_cpu_total = RedisModule_CreateStringPrintf(
10621060
NULL, "queue_%s_bthread_n%d_used_cpu_total", queue_name, i + 1);
1063-
RedisModuleString* bthread_used_cpu_total = NULL;
1061+
RedisModuleString *bthread_used_cpu_total = NULL;
10641062
#if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || defined(_DARWIN_C_SOURCE) || \
10651063
defined(__cplusplus)
10661064
const int status = -1;
@@ -1073,15 +1071,15 @@ void RAI_moduleInfoFunc(RedisModuleInfoCtx *ctx, int for_crash_report) {
10731071
if (clock_gettime(cid, &ts) == -1) {
10741072
bthread_used_cpu_total = RedisModule_CreateStringPrintf(NULL, "N/A");
10751073
} else {
1076-
bthread_used_cpu_total =
1077-
RedisModule_CreateStringPrintf(NULL, "%ld.%06ld", (long)ts.tv_sec,
1078-
(long)(ts.tv_nsec / 1000));
1074+
bthread_used_cpu_total = RedisModule_CreateStringPrintf(
1075+
NULL, "%ld.%06ld", (long)ts.tv_sec, (long)(ts.tv_nsec / 1000));
10791076
}
10801077
}
1081-
RedisModule_InfoAddFieldString(ctx, (char*)RedisModule_StringPtrLen(queue_used_cpu_total, NULL), bthread_used_cpu_total);
1078+
RedisModule_InfoAddFieldString(
1079+
ctx, (char *)RedisModule_StringPtrLen(queue_used_cpu_total, NULL),
1080+
bthread_used_cpu_total);
10821081
RedisModule_FreeString(NULL, queue_used_cpu_total);
10831082
RedisModule_FreeString(NULL, bthread_used_cpu_total);
1084-
10851083
}
10861084
}
10871085
entry = AI_dictNext(iter);

‎src/serialization/AOF/rai_aof_rewrite.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ void RAI_AOFRewriteTensor(RedisModuleIO *aof, RedisModuleString *key, void *valu
2020

2121
RedisModule_EmitAOF(aof, "AI.TENSORSET", "scvcb", key, dtypestr, dims, ndims, "BLOB", data,
2222
size);
23-
2423
}
2524

2625
void RAI_AOFRewriteModel(RedisModuleIO *aof, RedisModuleString *key, void *value) {

0 commit comments

Comments
 (0)