From patchwork Thu Jul 21 09:41:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ting Fu X-Patchwork-Id: 36881 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp2940173pzb; Thu, 21 Jul 2022 02:57:04 -0700 (PDT) X-Google-Smtp-Source: AGRyM1seEdY3kt2KAiPAxSzgBenIJXbPMK5zo4QYQ0sgUkAtQ82EU/3l810Zzah+tpWoDoin4Hli X-Received: by 2002:a05:6402:239f:b0:43a:92a7:84e with SMTP id j31-20020a056402239f00b0043a92a7084emr57048373eda.293.1658397424663; Thu, 21 Jul 2022 02:57:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658397424; cv=none; d=google.com; s=arc-20160816; b=hY2WHmsFb42H8pdPauiIQ6nLf5h6irT5GSmzLqwiJN2FIGkb7M5utRB/vNmgap4gr9 3TLaEgMvi0fsuavs26h7gjA+iRi68NHjwaUm27UqpSadPgNZCEYbRWFuqhuiMRcCgz2w lloIl2WYdmfWmrscSF/20dZ7h2dtwma0hc3pZ7Vi1Fo5gVjHNmF1m7cODItd9q/oPuk9 TjJivUEjRtUTRGCaV12TjGdopjJ6baUhH9Gao0H7VV8du46M/8zbnC5A/J8/tPk/1ytl gXkZmplRIOWfRstPCu7LcOX1U40Fax8IqtiyKz+DEg8/vL8nGKe4Q56DduSTRvDRZrPq dK0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=CM2YMIc18WQLK5ji6RkM/SgIZIkn8jsgGCaYu76MZ9c=; b=e3LK6lTULWv0dzZr5cutrBurklOZjO0wwHS1MBlrDr91Mg+QyIZ5j7g+TMi1UjVC2m LsrlNUYdgtgTHSCrc1wZBiwCxor+IDre1XMFAq8en45i1FvCkW4S187UvJXyfAxZBRrY kkepKl+hbulRxO9xmaJA9ZoimKs9G6+lVtywTB8hLcLAIc0ho1tNzKEGu6nmG93H277n pinF7cgJ00orZhyqvkdBVDoQzLLTYlrPvrieN5aBATljBuVVMv4zk9UOXzBUfTfZgr6J ys4nul7UylHNBaWmsSz9I9/q8iyYp7wUGrLBGs8vxzLxlngnNgFeK2Z7bfbR1jeaQdPt M1RQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=L+Vw7q6d; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ht8-20020a170907608800b0072b6a93c5ebsi2532839ejc.60.2022.07.21.02.57.03; Thu, 21 Jul 2022 02:57:04 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=L+Vw7q6d; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6ACAC68B53C; Thu, 21 Jul 2022 12:56:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1600768B312 for ; Thu, 21 Jul 2022 12:56:51 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658397417; x=1689933417; h=from:to:subject:date:message-id; bh=JJV3tbaFawAFMN/Vnv4y8E2AIT7gVTBabghg1zLuqfA=; b=L+Vw7q6dNx9xAs7vHGfONBBC0GTmEz3Zg3jslU1CM6M1sVmDDebcvsBX RS+UBtsPnVWymoRUyPxdph6LIPRlttFCrkrHe4C4jmB0+OelvO92JB/ug Rb8ew55CLPbr+2Zh/jEKI8+secy8Y1QI7RI7ldOuM70oUAD6PYXGwmLfE bDc0EVYlPmKbfGAgRdSYHCzmp+FuB8DO9A9GDqoCIj7pQG0n+zbmt7322 xYUZoYZHbfzTF1TtFmWdcTtg5rHslJuscsouS2vlG48UzWgKwLZMyVEbv YX4QMnDiTmYNMH1Ga1g5rn7XSeTewUtjQ9cJRbSoJcdQ9ZoYqu6T3FOag g==; X-IronPort-AV: E=McAfee;i="6400,9594,10414"; a="267401913" X-IronPort-AV: E=Sophos;i="5.92,289,1650956400"; d="scan'208";a="267401913" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2022 02:56:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,289,1650956400"; d="scan'208";a="598405459" Received: from semmer-ubuntu.sh.intel.com ([10.239.159.83]) by orsmga002.jf.intel.com with ESMTP; 21 Jul 2022 02:56:44 -0700 From: Ting Fu To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Jul 2022 17:41:03 +0800 Message-Id: <20220721094103.18400-1-ting.fu@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH V2] lavf/dnn: dump OpenVINO model input/output names to OVMdel struct. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3euOto/jEOxd Dump all input/output names to OVModel struct. In case other funcs use them for reporting errors or locating issues. Signed-off-by: Ting Fu Signed-off-by: Ting Fu --- libavfilter/dnn/dnn_backend_openvino.c | 66 +++++++++++++++++++------- 1 file changed, 48 insertions(+), 18 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index cf012aca4c..b494f26f55 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -58,6 +58,8 @@ typedef struct OVModel{ SafeQueue *request_queue; // holds OVRequestItem Queue *task_queue; // holds TaskItem Queue *lltask_queue; // holds LastLevelTaskItem + const char *all_input_names; + const char *all_output_names; } OVModel; // one request for one call to openvino @@ -211,19 +213,9 @@ static void infer_completion_callback(void *args) status = ie_infer_request_get_blob(request->infer_request, task->output_names[0], &output_blob); if (status != OK) { - //incorrect output name - char *model_output_name = NULL; - char *all_output_names = NULL; - size_t model_output_count = 0; - av_log(ctx, AV_LOG_ERROR, "Failed to get model output data\n"); - status = ie_network_get_outputs_number(ov_model->network, &model_output_count); - for (size_t i = 0; i < model_output_count; i++) { - status = ie_network_get_output_name(ov_model->network, i, &model_output_name); - APPEND_STRING(all_output_names, model_output_name) - } av_log(ctx, AV_LOG_ERROR, "output \"%s\" may not correct, all output(s) are: \"%s\"\n", - task->output_names[0], all_output_names); + task->output_names[0], ov_model->all_output_names); return; } @@ -336,13 +328,23 @@ static int init_model_ov(OVModel *ov_model, const char *input_name, const char * // while we pass NHWC data from FFmpeg to openvino status = ie_network_set_input_layout(ov_model->network, input_name, NHWC); if (status != OK) { - av_log(ctx, AV_LOG_ERROR, "Failed to set layout as NHWC for input %s\n", input_name); + if (status == NOT_FOUND) { + av_log(ctx, AV_LOG_ERROR, "Could not find \"%s\" in model, failed to set input layout as NHWC, "\ + "all input(s) are: \"%s\"\n", input_name, ov_model->all_input_names); + } else{ + av_log(ctx, AV_LOG_ERROR, "Failed to set layout as NHWC for input %s\n", input_name); + } ret = DNN_GENERIC_ERROR; goto err; } status = ie_network_set_output_layout(ov_model->network, output_name, NHWC); if (status != OK) { - av_log(ctx, AV_LOG_ERROR, "Failed to set layout as NHWC for output %s\n", output_name); + if (status == NOT_FOUND) { + av_log(ctx, AV_LOG_ERROR, "Could not find \"%s\" in model, failed to set output layout as NHWC, "\ + "all output(s) are: \"%s\"\n", input_name, ov_model->all_output_names); + } else{ + av_log(ctx, AV_LOG_ERROR, "Failed to set layout as NHWC for output %s\n", output_name); + } ret = DNN_GENERIC_ERROR; goto err; } @@ -505,7 +507,6 @@ static int get_input_ov(void *model, DNNData *input, const char *input_name) OVModel *ov_model = model; OVContext *ctx = &ov_model->ctx; char *model_input_name = NULL; - char *all_input_names = NULL; IEStatusCode status; size_t model_input_count = 0; dimensions_t dims; @@ -538,15 +539,12 @@ static int get_input_ov(void *model, DNNData *input, const char *input_name) input->width = input_resizable ? -1 : dims.dims[3]; input->dt = precision_to_datatype(precision); return 0; - } else { - //incorrect input name - APPEND_STRING(all_input_names, model_input_name) } ie_network_name_free(&model_input_name); } - av_log(ctx, AV_LOG_ERROR, "Could not find \"%s\" in model, all input(s) are: \"%s\"\n", input_name, all_input_names); + av_log(ctx, AV_LOG_ERROR, "Could not find \"%s\" in model, all input(s) are: \"%s\"\n", input_name, ov_model->all_input_names); return AVERROR(EINVAL); } @@ -729,6 +727,8 @@ DNNModel *ff_dnn_load_model_ov(const char *model_filename, DNNFunctionType func_ OVModel *ov_model = NULL; OVContext *ctx = NULL; IEStatusCode status; + size_t node_count = 0; + char *node_name = NULL; model = av_mallocz(sizeof(DNNModel)); if (!model){ @@ -744,6 +744,8 @@ DNNModel *ff_dnn_load_model_ov(const char *model_filename, DNNFunctionType func_ ov_model->model = model; ov_model->ctx.class = &dnn_openvino_class; ctx = &ov_model->ctx; + ov_model->all_input_names = NULL; + ov_model->all_output_names = NULL; //parse options av_opt_set_defaults(ctx); @@ -767,6 +769,34 @@ DNNModel *ff_dnn_load_model_ov(const char *model_filename, DNNFunctionType func_ goto err; } + //get all the input and output names + status = ie_network_get_inputs_number(ov_model->network, &node_count); + if (status != OK) { + av_log(ctx, AV_LOG_ERROR, "Failed to get input count\n"); + goto err; + } + for (size_t i = 0; i < node_count; i++) { + status = ie_network_get_input_name(ov_model->network, i, &node_name); + if (status != OK) { + av_log(ctx, AV_LOG_ERROR, "Failed to get No.%d input's name\n", (int)i); + goto err; + } + APPEND_STRING(ov_model->all_input_names, node_name) + } + status = ie_network_get_outputs_number(ov_model->network, &node_count); + if (status != OK) { + av_log(ctx, AV_LOG_ERROR, "Failed to get output count\n"); + goto err; + } + for (size_t i = 0; i < node_count; i++) { + status = ie_network_get_output_name(ov_model->network, i, &node_name); + if (status != OK) { + av_log(ctx, AV_LOG_ERROR, "Failed to get No.%d output's name\n", (int)i); + goto err; + } + APPEND_STRING(ov_model->all_output_names, node_name) + } + model->get_input = &get_input_ov; model->get_output = &get_output_ov; model->options = options;