From patchwork Thu Aug 13 14:47:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guo, Yejun" X-Patchwork-Id: 21632 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1A8844498DC for ; Thu, 13 Aug 2020 17:52:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E4E1868AD22; Thu, 13 Aug 2020 17:52:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B1CB68AC45 for ; Thu, 13 Aug 2020 17:52:26 +0300 (EEST) IronPort-SDR: 8tZMuxoztG14N/Ef85bqNEjQaSnGhfe8te+GwE4ZXPWDrBt9ooZ5uSX2wkaYVlAicFcd1u+OTa hzpLOld9KJww== X-IronPort-AV: E=McAfee;i="6000,8403,9712"; a="154195135" X-IronPort-AV: E=Sophos;i="5.76,308,1592895600"; d="scan'208";a="154195135" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2020 07:52:24 -0700 IronPort-SDR: B4wr9ewo13sXB2AZ0Te1VjTNiu0JwcTrYlHXzgMJ91BCBae8a6V4795lS1X+3pNc8U6/S6hZQB Xc+i5TxZzs8A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,308,1592895600"; d="scan'208";a="470234742" Received: from yguo18-skl-u1604.sh.intel.com ([10.239.159.53]) by orsmga005.jf.intel.com with ESMTP; 13 Aug 2020 07:52:23 -0700 From: "Guo, Yejun" To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Aug 2020 22:47:20 +0800 Message-Id: <1597330040-14156-1-git-send-email-yejun.guo@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH 1/2] dnn: fix build issue for tensorflow backend X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: Guo, Yejun --- libavfilter/dnn/dnn_backend_tf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index 86da991..9099d2b 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -490,7 +490,7 @@ static DNNReturnType load_native_model(TFModel *tf_model, const char *model_file DNNModel *native_model = NULL; ConvolutionalNetwork *conv_network; - native_model = ff_dnn_load_model_native(model_filename); + native_model = ff_dnn_load_model_native(model_filename, NULL); if (!native_model){ return DNN_ERROR; } From patchwork Thu Aug 13 14:47:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guo, Yejun" X-Patchwork-Id: 21633 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2833D4498DC for ; Thu, 13 Aug 2020 17:52:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0A1D868AE86; Thu, 13 Aug 2020 17:52:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2484688108 for ; Thu, 13 Aug 2020 17:52:35 +0300 (EEST) IronPort-SDR: 67QQhb9KrsmpnOaVk3DXVaB7KNL1ELD+WaI+u+8vkECIceo7ZSEgmkW9CUhFQWTzR9k8opmeJW Krhy0zZQlCQg== X-IronPort-AV: E=McAfee;i="6000,8403,9712"; a="215760984" X-IronPort-AV: E=Sophos;i="5.76,308,1592895600"; d="scan'208";a="215760984" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2020 07:52:34 -0700 IronPort-SDR: jU8KH8MJDrkk+JW/1fwjYHXifPEgjIKkP111z1jMFKFAWg25G84h+vNHLASjbA/QtPOuAWAB1O zhLNYzGym1mQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,308,1592895600"; d="scan'208";a="439798477" Received: from yguo18-skl-u1604.sh.intel.com ([10.239.159.53]) by orsmga004.jf.intel.com with ESMTP; 13 Aug 2020 07:52:33 -0700 From: "Guo, Yejun" To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Aug 2020 22:47:30 +0800 Message-Id: <1597330050-14203-1-git-send-email-yejun.guo@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH 2/2] dnn_backend_openvino.c: parse options in openvino backend X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: Guo, Yejun --- libavfilter/dnn/dnn_backend_openvino.c | 40 +++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index d343bf2..030670b 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -26,8 +26,14 @@ #include "dnn_backend_openvino.h" #include "libavformat/avio.h" #include "libavutil/avassert.h" +#include "libavutil/avstring.h" #include +typedef struct OVOptions{ + uint32_t batch_size; + uint32_t req_num; +} OVOptions; + typedef struct OVModel{ ie_core_t *core; ie_network_t *network; @@ -36,6 +42,7 @@ typedef struct OVModel{ ie_blob_t *input_blob; ie_blob_t **output_blobs; uint32_t nb_output; + OVOptions options; } OVModel; static DNNDataType precision_to_datatype(precision_e precision) @@ -50,6 +57,32 @@ static DNNDataType precision_to_datatype(precision_e precision) } } +static int parse_options(OVOptions *to, const char *from) +{ + AVDictionary *dict = NULL; + AVDictionaryEntry *opt = NULL; + int err = av_dict_parse_string(&dict, from, "=", "&", 0); + if (err < 0) { + av_dict_free(&dict); + return err; + } + + opt = av_dict_get(dict, "nireq", opt, AV_DICT_MATCH_CASE); + if (opt != NULL) + { + to->req_num = atoi(opt->value); + } + + opt = av_dict_get(dict, "batch", opt, AV_DICT_MATCH_CASE); + if (opt != NULL) + { + to->batch_size = atoi(opt->value); + } + + av_dict_free(&dict); + return 0; +} + static DNNReturnType get_input_ov(void *model, DNNData *input, const char *input_name) { OVModel *ov_model = (OVModel *)model; @@ -171,6 +204,12 @@ DNNModel *ff_dnn_load_model_ov(const char *model_filename, const char *options) if (!ov_model) goto err; + model->options = options; + if (model->options != NULL) + { + parse_options(&ov_model->options, model->options); + } + status = ie_core_create("", &ov_model->core); if (status != OK) goto err; @@ -186,7 +225,6 @@ DNNModel *ff_dnn_load_model_ov(const char *model_filename, const char *options) model->model = (void *)ov_model; model->set_input_output = &set_input_output_ov; model->get_input = &get_input_ov; - model->options = options; return model;