From patchwork Wed Sep 9 01:52:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fu, Ting" X-Patchwork-Id: 22209 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 9AE6244A941 for ; Wed, 9 Sep 2020 04:57:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 76B5668B7A4; Wed, 9 Sep 2020 04:57:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 61C1268B716 for ; Wed, 9 Sep 2020 04:57:36 +0300 (EEST) IronPort-SDR: QJ19J/+mUL9XPerXMkVE33y/jUovmtniIBO4nkvIASm6OnN2BCfp6S4NoZLLNmDF4yafxkrEmP CqfK99/++uYg== X-IronPort-AV: E=McAfee;i="6000,8403,9738"; a="222459632" X-IronPort-AV: E=Sophos;i="5.76,407,1592895600"; d="scan'208";a="222459632" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Sep 2020 18:57:34 -0700 IronPort-SDR: tZhC6jhyb4/L0JgarCkRvFH8iysRYRJo06QoKaKUrSoOpPsXtWzp2qzIPN6wl6417YdEqgVE6Z LFbzA+lzgk/Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,407,1592895600"; d="scan'208";a="341391619" Received: from semmer-ubuntu.sh.intel.com ([10.239.159.54]) by FMSMGA003.fm.intel.com with ESMTP; 08 Sep 2020 18:57:33 -0700 From: Ting Fu To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 09:52:18 +0800 Message-Id: <20200909015219.5690-1-ting.fu@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] dnn/openvino: support run inference via GPU 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" for enabling OpenVINO GPU please: 1. install required OpenCL drivers, see: https://github.com/intel/compute-runtime/releases/tag/19.41.14441 2. build OpenVINO c lib with GPU enabled: use cmake config with: -DENABLE_CLDNN=ON 3. then make, and include the OpenVINO c lib in environment variables detailed steps please refer: https://github.com/openvinotoolkit/openvino/blob/master/build-instruction.md inference model with GPU please add: optioins=device=GPU Signed-off-by: Ting Fu --- libavfilter/dnn/dnn_backend_openvino.c | 52 ++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 8 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 5d6d3ed542..2f0998046a 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -26,10 +26,18 @@ #include "dnn_backend_openvino.h" #include "libavformat/avio.h" #include "libavutil/avassert.h" +#include "libavutil/opt.h" +#include "libavutil/avstring.h" +#include "../internal.h" #include +typedef struct OVOptions{ + char *device_type; +} OVOptions; + typedef struct OVContext { const AVClass *class; + OVOptions options; } OVContext; typedef struct OVModel{ @@ -41,14 +49,19 @@ typedef struct OVModel{ ie_blob_t *input_blob; } OVModel; -static const AVClass dnn_openvino_class = { - .class_name = "dnn_openvino", - .item_name = av_default_item_name, - .option = NULL, - .version = LIBAVUTIL_VERSION_INT, - .category = AV_CLASS_CATEGORY_FILTER, +#define APPEND_STRING(generated_string, iterate_string) \ + generated_string = generated_string ? av_asprintf("%s %s", generated_string, iterate_string) : \ + av_asprintf("%s", iterate_string); + +#define OFFSET(x) offsetof(OVContext, x) +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM +static const AVOption dnn_openvino_options[] = { + { "device", "device to run model", OFFSET(options.device_type), AV_OPT_TYPE_STRING, { .str = "CPU" }, 0, 0, FLAGS }, + { NULL } }; +AVFILTER_DEFINE_CLASS(dnn_openvino); + static DNNDataType precision_to_datatype(precision_e precision) { switch (precision) @@ -159,10 +172,13 @@ err: DNNModel *ff_dnn_load_model_ov(const char *model_filename, const char *options) { + char *all_dev_names = NULL; DNNModel *model = NULL; OVModel *ov_model = NULL; + OVContext *ctx = NULL; IEStatusCode status; ie_config_t config = {NULL, NULL, NULL}; + ie_available_devices_t a_dev; model = av_malloc(sizeof(DNNModel)); if (!model){ @@ -173,6 +189,14 @@ DNNModel *ff_dnn_load_model_ov(const char *model_filename, const char *options) if (!ov_model) goto err; ov_model->ctx.class = &dnn_openvino_class; + ctx = &ov_model->ctx; + + //parse options + av_opt_set_defaults(ctx); + if (av_opt_set_from_string(ctx, options, NULL, "=", "&") < 0) { + av_log(ctx, AV_LOG_ERROR, "Failed to parse options \"%s\"\n", options); + goto err; + } status = ie_core_create("", &ov_model->core); if (status != OK) @@ -182,9 +206,21 @@ DNNModel *ff_dnn_load_model_ov(const char *model_filename, const char *options) if (status != OK) goto err; - status = ie_core_load_network(ov_model->core, ov_model->network, "CPU", &config, &ov_model->exe_network); - if (status != OK) + status = ie_core_load_network(ov_model->core, ov_model->network, ctx->options.device_type, &config, &ov_model->exe_network); + if (status != OK) { + av_log(ctx, AV_LOG_ERROR, "Failed to init OpenVINO model\n"); + status = ie_core_get_available_devices(ov_model->core, &a_dev); + if (status != OK) { + av_log(ctx, AV_LOG_ERROR, "Failed to get available devices\n"); + goto err; + } + for (int i = 0; i < a_dev.num_devices; i++) { + APPEND_STRING(all_dev_names, a_dev.devices[i]) + } + av_log(ctx, AV_LOG_ERROR,"device %s may not be supported, all available devices are: \"%s\"\n", + ctx->options.device_type, all_dev_names); goto err; + } model->model = (void *)ov_model; model->set_input = &set_input_ov; From patchwork Wed Sep 9 01:52:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fu, Ting" X-Patchwork-Id: 22210 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 8BA9E44A941 for ; Wed, 9 Sep 2020 04:57:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7803268B7CB; Wed, 9 Sep 2020 04:57:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 43D7068B792 for ; Wed, 9 Sep 2020 04:57:42 +0300 (EEST) IronPort-SDR: o03S+pwFFIWy/9UZGQDzIUm2qOW1UUWIkmi4d+yczlX29ztK+JX3XTPeUdDXqDPtKgHJaHj0cp 00RrQfKPqDfQ== X-IronPort-AV: E=McAfee;i="6000,8403,9738"; a="222459635" X-IronPort-AV: E=Sophos;i="5.76,407,1592895600"; d="scan'208";a="222459635" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Sep 2020 18:57:34 -0700 IronPort-SDR: nYeFQUtQ7ppzTkppbFocI28IMmDhOe0Omp77s5zOo+rG6qCLTZDsVqG15W7s56EiC4Y1fALDg7 c7AhVpg305rQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,407,1592895600"; d="scan'208";a="341391626" Received: from semmer-ubuntu.sh.intel.com ([10.239.159.54]) by FMSMGA003.fm.intel.com with ESMTP; 08 Sep 2020 18:57:34 -0700 From: Ting Fu To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 09:52:19 +0800 Message-Id: <20200909015219.5690-2-ting.fu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200909015219.5690-1-ting.fu@intel.com> References: <20200909015219.5690-1-ting.fu@intel.com> Subject: [FFmpeg-devel] [PATCH 2/2] dnn/openvino: add input/output name info 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" show all input/output names when the input or output name not correct Signed-off-by: Ting Fu --- libavfilter/dnn/dnn_backend_openvino.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 2f0998046a..e5842906d1 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -79,6 +79,7 @@ static DNNReturnType get_input_ov(void *model, DNNData *input, const char *input OVModel *ov_model = (OVModel *)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; @@ -118,12 +119,15 @@ static DNNReturnType get_input_ov(void *model, DNNData *input, const char *input input->width = dims.dims[3]; input->dt = precision_to_datatype(precision); return DNN_SUCCESS; + } 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\n", 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); return DNN_ERROR; } @@ -246,12 +250,15 @@ err: DNNReturnType ff_dnn_execute_model_ov(const DNNModel *model, DNNData *outputs, const char **output_names, uint32_t nb_output) { + char *model_output_name = NULL; + char *all_output_names = NULL; dimensions_t dims; precision_e precision; ie_blob_buffer_t blob_buffer; OVModel *ov_model = (OVModel *)model->model; OVContext *ctx = &ov_model->ctx; IEStatusCode status = ie_infer_request_infer(ov_model->infer_request); + size_t model_output_count = 0; if (status != OK) { av_log(ctx, AV_LOG_ERROR, "Failed to start synchronous model inference\n"); return DNN_ERROR; @@ -262,7 +269,16 @@ DNNReturnType ff_dnn_execute_model_ov(const DNNModel *model, DNNData *outputs, c ie_blob_t *output_blob = NULL; status = ie_infer_request_get_blob(ov_model->infer_request, output_name, &output_blob); if (status != OK) { + //incorrect output name 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", + output_name, all_output_names); return DNN_ERROR; }