From: wenbin.chen-at-intel.com@ffmpeg.org
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 1/2] libavfilter/dnn_backend_openvino: Add dynamic output support
Date: Wed, 27 Dec 2023 12:16:57 +0800
Message-ID: <20231227041658.392174-1-wenbin.chen@intel.com> (raw)
From: Wenbin Chen <wenbin.chen@intel.com>
Add dynamic outputs support. Some models don't have fixed output size.
Its size changes according to result. Now openvino can run these kinds of
models.
Signed-off-by: Wenbin Chen <wenbin.chen@intel.com>
---
libavfilter/dnn/dnn_backend_openvino.c | 134 +++++++++++--------------
1 file changed, 59 insertions(+), 75 deletions(-)
diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c
index 671a995c70..e207d44584 100644
--- a/libavfilter/dnn/dnn_backend_openvino.c
+++ b/libavfilter/dnn/dnn_backend_openvino.c
@@ -219,31 +219,26 @@ static int fill_model_input_ov(OVModel *ov_model, OVRequestItem *request)
task = lltask->task;
#if HAVE_OPENVINO2
- if (!ov_model_is_dynamic(ov_model->ov_model)) {
- if (ov_model->input_port) {
- ov_output_const_port_free(ov_model->input_port);
- ov_model->input_port = NULL;
- }
- status = ov_model_const_input_by_name(ov_model->ov_model, task->input_name, &ov_model->input_port);
- if (status != OK) {
- av_log(ctx, AV_LOG_ERROR, "Failed to get input port shape.\n");
- return ov2_map_error(status, NULL);
- }
- status = ov_const_port_get_shape(ov_model->input_port, &input_shape);
- if (status != OK) {
- av_log(ctx, AV_LOG_ERROR, "Failed to get input port shape.\n");
- return ov2_map_error(status, NULL);
- }
- dims = input_shape.dims;
- status = ov_port_get_element_type(ov_model->input_port, &precision);
- if (status != OK) {
- av_log(ctx, AV_LOG_ERROR, "Failed to get input port data type.\n");
- ov_shape_free(&input_shape);
- return ov2_map_error(status, NULL);
- }
- } else {
- avpriv_report_missing_feature(ctx, "Do not support dynamic model.");
- return AVERROR(ENOSYS);
+ if (ov_model->input_port) {
+ ov_output_const_port_free(ov_model->input_port);
+ ov_model->input_port = NULL;
+ }
+ status = ov_model_const_input_by_name(ov_model->ov_model, task->input_name, &ov_model->input_port);
+ if (status != OK) {
+ av_log(ctx, AV_LOG_ERROR, "Failed to get input port shape.\n");
+ return ov2_map_error(status, NULL);
+ }
+ status = ov_const_port_get_shape(ov_model->input_port, &input_shape);
+ if (status != OK) {
+ av_log(ctx, AV_LOG_ERROR, "Failed to get input port shape.\n");
+ return ov2_map_error(status, NULL);
+ }
+ dims = input_shape.dims;
+ status = ov_port_get_element_type(ov_model->input_port, &precision);
+ if (status != OK) {
+ av_log(ctx, AV_LOG_ERROR, "Failed to get input port data type.\n");
+ ov_shape_free(&input_shape);
+ return ov2_map_error(status, NULL);
}
input.height = dims[1];
input.width = dims[2];
@@ -1049,30 +1044,22 @@ static int get_input_ov(void *model, DNNData *input, const char *input_name)
ov_element_type_e precision;
int64_t* dims;
ov_status_e status;
- if (!ov_model_is_dynamic(ov_model->ov_model)) {
- status = ov_model_const_input_by_name(ov_model->ov_model, input_name, &ov_model->input_port);
- if (status != OK) {
- av_log(ctx, AV_LOG_ERROR, "Failed to get input port shape.\n");
- return ov2_map_error(status, NULL);
- }
-
- status = ov_const_port_get_shape(ov_model->input_port, &input_shape);
- if (status != OK) {
- av_log(ctx, AV_LOG_ERROR, "Failed to get input port shape.\n");
- return ov2_map_error(status, NULL);
- }
- dims = input_shape.dims;
-
- status = ov_port_get_element_type(ov_model->input_port, &precision);
- if (status != OK) {
- av_log(ctx, AV_LOG_ERROR, "Failed to get input port data type.\n");
- return ov2_map_error(status, NULL);
- }
- } else {
- avpriv_report_missing_feature(ctx, "Do not support dynamic model now.");
- return AVERROR(ENOSYS);
+ status = ov_model_const_input_by_name(ov_model->ov_model, input_name, &ov_model->input_port);
+ if (status != OK) {
+ av_log(ctx, AV_LOG_ERROR, "Failed to get input port shape.\n");
+ return ov2_map_error(status, NULL);
}
-
+ status = ov_port_get_element_type(ov_model->input_port, &precision);
+ if (status != OK) {
+ av_log(ctx, AV_LOG_ERROR, "Failed to get input port data type.\n");
+ return ov2_map_error(status, NULL);
+ }
+ status = ov_const_port_get_shape(ov_model->input_port, &input_shape);
+ if (status != OK) {
+ av_log(ctx, AV_LOG_ERROR, "Failed to get input port shape.\n");
+ return ov2_map_error(status, NULL);
+ }
+ dims = input_shape.dims;
if (dims[1] <= 3) { // NCHW
input->channels = dims[1];
input->height = input_resizable ? -1 : dims[2];
@@ -1083,7 +1070,7 @@ static int get_input_ov(void *model, DNNData *input, const char *input_name)
input->channels = dims[3];
}
input->dt = precision_to_datatype(precision);
-
+ ov_shape_free(&input_shape);
return 0;
#else
char *model_input_name = NULL;
@@ -1267,34 +1254,31 @@ static int get_output_ov(void *model, const char *input_name, int input_width, i
#if HAVE_OPENVINO2
if (ctx->options.input_resizable) {
- if (!ov_model_is_dynamic(ov_model->ov_model)) {
- status = ov_partial_shape_create(4, dims, &partial_shape);
- if (status != OK) {
- av_log(ctx, AV_LOG_ERROR, "Failed create partial shape.\n");
- return ov2_map_error(status, NULL);
- }
- status = ov_const_port_get_shape(ov_model->input_port, &input_shape);
- input_shape.dims[2] = input_height;
- input_shape.dims[3] = input_width;
- if (status != OK) {
- av_log(ctx, AV_LOG_ERROR, "Failed create shape for model input resize.\n");
- return ov2_map_error(status, NULL);
- }
+ status = ov_partial_shape_create(4, dims, &partial_shape);
+ if (status != OK) {
+ av_log(ctx, AV_LOG_ERROR, "Failed to create partial shape.\n");
+ return ov2_map_error(status, NULL);
+ }
+ status = ov_const_port_get_shape(ov_model->input_port, &input_shape);
+ if (status != OK) {
+ av_log(ctx, AV_LOG_ERROR, "Failed to create shape for model input resize.\n");
+ return ov2_map_error(status, NULL);
+ }
+ input_shape.dims[2] = input_height;
+ input_shape.dims[3] = input_width;
- status = ov_shape_to_partial_shape(input_shape, &partial_shape);
- if (status != OK) {
- av_log(ctx, AV_LOG_ERROR, "Failed create partial shape for model input resize.\n");
- return ov2_map_error(status, NULL);
- }
+ status = ov_shape_to_partial_shape(input_shape, &partial_shape);
+ ov_shape_free(&input_shape);
+ if (status != OK) {
+ av_log(ctx, AV_LOG_ERROR, "Failed to create partial shape for model input resize.\n");
+ return ov2_map_error(status, NULL);
+ }
- status = ov_model_reshape_single_input(ov_model->ov_model, partial_shape);
- if (status != OK) {
- av_log(ctx, AV_LOG_ERROR, "Failed to reszie model input.\n");
- return ov2_map_error(status, NULL);
- }
- } else {
- avpriv_report_missing_feature(ctx, "Do not support dynamic model.");
- return AVERROR(ENOTSUP);
+ status = ov_model_reshape_single_input(ov_model->ov_model, partial_shape);
+ ov_partial_shape_free(&partial_shape);
+ if (status != OK) {
+ av_log(ctx, AV_LOG_ERROR, "Failed to reszie model input.\n");
+ return ov2_map_error(status, NULL);
}
}
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next reply other threads:[~2023-12-27 4:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-27 4:16 wenbin.chen-at-intel.com [this message]
2023-12-27 4:16 ` [FFmpeg-devel] [PATCH 2/2] libavfilter/vf_dnn_detect: Add two outputs ssd support wenbin.chen-at-intel.com
2023-12-29 10:37 ` [FFmpeg-devel] [PATCH 1/2] libavfilter/dnn_backend_openvino: Add dynamic output support Guo, Yejun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231227041658.392174-1-wenbin.chen@intel.com \
--to=wenbin.chen-at-intel.com@ffmpeg.org \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git