har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavfi/dnn_backend_tf: Error Handling for execute_model_tf

Browse Source 
This patch adds error handling for cases where the execute_model_tf
fails, clears the used memory in the TFRequestItem and finally pushes
it back to the request queue.

Signed-off-by: Shubhanshu Saxena <shubhanshu.e01@gmail.com>
This commit is contained in:
Shubhanshu Saxena 2021-08-08 16:25:35 +05:30 committed by Guo Yejun
parent 0985e9283c
commit a3db9b5405
1 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
libavfilter/dnn/dnn_backend_tf.c
View File

@ -173,6 +173,24 @@ static DNNReturnType tf_start_inference(void *args)
return DNN_SUCCESS; return DNN_SUCCESS;
} }
/**
* Free the TFRequestItem completely.
*
* @param arg Address of the TFInferRequest instance.
*/
static inline void destroy_request_item(TFRequestItem **arg) {
TFRequestItem *request;
if (!arg) {
return;
}
request = *arg;
tf_free_request(request->infer_request);
av_freep(&request->infer_request);
av_freep(&request->inference);
ff_dnn_async_module_cleanup(&request->exec_module);
av_freep(arg);
}
static DNNReturnType extract_inference_from_task(TaskItem *task, Queue *inference_queue) static DNNReturnType extract_inference_from_task(TaskItem *task, Queue *inference_queue)
{ {
TFModel *tf_model = task->model; TFModel *tf_model = task->model;
@ -881,6 +899,7 @@ DNNModel *ff_dnn_load_model_tf(const char *model_filename, DNNFunctionType func_
if (!item) { if (!item) {
goto err; goto err;
} }
item->inference = NULL;
item->infer_request = tf_create_inference_request(); item->infer_request = tf_create_inference_request();
if (!item->infer_request) { if (!item->infer_request) {
av_log(ctx, AV_LOG_ERROR, "Failed to allocate memory for TensorFlow inference request\n"); av_log(ctx, AV_LOG_ERROR, "Failed to allocate memory for TensorFlow inference request\n");
@ -892,8 +911,7 @@ DNNModel *ff_dnn_load_model_tf(const char *model_filename, DNNFunctionType func_
item->exec_module.args = item; item->exec_module.args = item;
if (ff_safe_queue_push_back(tf_model->request_queue, item) < 0) { if (ff_safe_queue_push_back(tf_model->request_queue, item) < 0) {
av_freep(&item->infer_request); destroy_request_item(&item);
av_freep(&item);
goto err; goto err;
} }
} }
@ -1060,8 +1078,7 @@ err:
av_freep(&outputs); av_freep(&outputs);
if (ff_safe_queue_push_back(tf_model->request_queue, request) < 0) { if (ff_safe_queue_push_back(tf_model->request_queue, request) < 0) {
av_freep(&request->infer_request); destroy_request_item(&request);
av_freep(&request);
av_log(ctx, AV_LOG_ERROR, "Failed to push back request_queue.\n"); av_log(ctx, AV_LOG_ERROR, "Failed to push back request_queue.\n");
} }
} }
@ -1073,28 +1090,35 @@ static DNNReturnType execute_model_tf(TFRequestItem *request, Queue *inference_q
InferenceItem *inference; InferenceItem *inference;
TaskItem *task; TaskItem *task;
inference = ff_queue_peek_front(inference_queue); if (ff_queue_size(inference_queue) == 0) {
if (!inference) { destroy_request_item(&request);
av_log(NULL, AV_LOG_ERROR, "Failed to get inference item\n"); return DNN_SUCCESS;
return DNN_ERROR;
} }
inference = ff_queue_peek_front(inference_queue);
task = inference->task; task = inference->task;
tf_model = task->model; tf_model = task->model;
ctx = &tf_model->ctx; ctx = &tf_model->ctx;
if (fill_model_input_tf(tf_model, request) != DNN_SUCCESS) { if (fill_model_input_tf(tf_model, request) != DNN_SUCCESS) {
return DNN_ERROR; goto err;
} }
if (task->async) { if (task->async) {
return ff_dnn_start_inference_async(ctx, &request->exec_module); return ff_dnn_start_inference_async(ctx, &request->exec_module);
} else { } else {
if (tf_start_inference(request) != DNN_SUCCESS) { if (tf_start_inference(request) != DNN_SUCCESS) {
return DNN_ERROR; goto err;
} }
infer_completion_callback(request); infer_completion_callback(request);
return (task->inference_done == task->inference_todo) ? DNN_SUCCESS : DNN_ERROR; return (task->inference_done == task->inference_todo) ? DNN_SUCCESS : DNN_ERROR;
} }
err:
tf_free_request(request->infer_request);
if (ff_safe_queue_push_back(tf_model->request_queue, request) < 0) {
destroy_request_item(&request);
}
return DNN_ERROR;
} }
DNNReturnType ff_dnn_execute_model_tf(const DNNModel *model, DNNExecBaseParams *exec_params) DNNReturnType ff_dnn_execute_model_tf(const DNNModel *model, DNNExecBaseParams *exec_params)
@ -1194,8 +1218,7 @@ DNNReturnType ff_dnn_flush_tf(const DNNModel *model)
if (ret != DNN_SUCCESS) { if (ret != DNN_SUCCESS) {
av_log(ctx, AV_LOG_ERROR, "Failed to fill model input.\n"); av_log(ctx, AV_LOG_ERROR, "Failed to fill model input.\n");
if (ff_safe_queue_push_back(tf_model->request_queue, request) < 0) { if (ff_safe_queue_push_back(tf_model->request_queue, request) < 0) {
av_freep(&request->infer_request); destroy_request_item(&request);
av_freep(&request);
} }
return ret; return ret;
} }
@ -1211,10 +1234,7 @@ void ff_dnn_free_model_tf(DNNModel **model)
tf_model = (*model)->model; tf_model = (*model)->model;
while (ff_safe_queue_size(tf_model->request_queue) != 0) { while (ff_safe_queue_size(tf_model->request_queue) != 0) {
TFRequestItem *item = ff_safe_queue_pop_front(tf_model->request_queue); TFRequestItem *item = ff_safe_queue_pop_front(tf_model->request_queue);
ff_dnn_async_module_cleanup(&item->exec_module); destroy_request_item(&item);
tf_free_request(item->infer_request);
av_freep(&item->infer_request);
av_freep(&item);
} }
ff_safe_queue_destroy(tf_model->request_queue); ff_safe_queue_destroy(tf_model->request_queue);