diff mbox series

[FFmpeg-devel] dnn_backend_native_layer_mathbinary: add floormod support

Message ID 20200814101122.23489-1-mingyu.yin@intel.com
State Superseded
Headers show
Series [FFmpeg-devel] dnn_backend_native_layer_mathbinary: add floormod support | expand

Checks

Context Check Description
andriy/default pending
andriy/configure warning Failed to apply patch

Commit Message

Mingyu Yin Aug. 14, 2020, 10:11 a.m. UTC 
Signed-off-by: Mingyu Yin <mingyu.yin@intel.com>
---
 .../dnn/dnn_backend_native_layer_mathbinary.c   | 17 +++++++++++++++++
 .../dnn/dnn_backend_native_layer_mathbinary.h   |  1 +
 tests/dnn/dnn-layer-mathbinary-test.c           |  5 +++++
 tools/python/convert_from_tensorflow.py         |  2 +-
 tools/python/convert_header.py                  |  2 +-
 5 files changed, 25 insertions(+), 2 deletions(-)

Comments

Xu, Guangxin Aug. 14, 2020, 12:01 p.m. UTC | #1 
> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of
> Mingyu Yin
> Sent: Friday, August 14, 2020 6:11 PM
> To: ffmpeg-devel@ffmpeg.org
> Subject: [FFmpeg-devel] [PATCH] dnn_backend_native_layer_mathbinary: add
> floormod support
> 
> Signed-off-by: Mingyu Yin <mingyu.yin@intel.com>
> ---
>  .../dnn/dnn_backend_native_layer_mathbinary.c   | 17 +++++++++++++++++
>  .../dnn/dnn_backend_native_layer_mathbinary.h   |  1 +
>  tests/dnn/dnn-layer-mathbinary-test.c           |  5 +++++
>  tools/python/convert_from_tensorflow.py         |  2 +-
>  tools/python/convert_header.py                  |  2 +-
>  5 files changed, 25 insertions(+), 2 deletions(-)
> 
> diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c
> b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c
> index dd42c329a9..6876aaf2c6 100644
> --- a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c
> +++ b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c
> @@ -175,6 +175,23 @@ int dnn_execute_layer_math_binary(DnnOperand
> *operands, const int32_t *input_ope
>              }
>          }
>          return 0;
> +    case DMBO_FLOORMOD:
> +        if (params->input0_broadcast) {
> +            for (int i = 0; i < dims_count; ++i) {
> +                dst[i] = (int)(params->v) % (int)(src[i]);
> +            }
> +        } else if (params->input1_broadcast) {
> +            for (int i = 0; i < dims_count; ++i) {
> +                dst[i] = (int)(src[i]) % (int)(params->v);
> +            }
> +        } else {
> +            const DnnOperand *input1 = &operands[input_operand_indexes[1]];
> +            const float *src1 = input1->data;
> +            for (int i = 0; i < dims_count; ++i) {
> +                dst[i] = (int)(src[i]) % (int)(src1[i]);
> +            }
> +        }
Nearly same code as DMBO_SUB.
Only the op is different, how about define a function pass op as a inline function.

> +        return 0;
>      default:
>          return -1;
>      }
> diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.h
> b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.h
> index 0acf3b0ea0..9525685afa 100644
> --- a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.h
> +++ b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.h
> @@ -36,6 +36,7 @@ typedef enum {
>      DMBO_MUL = 2,
>      DMBO_REALDIV = 3,
>      DMBO_MINIMUM = 4,
> +    DMBO_FLOORMOD = 5,
>      DMBO_COUNT
>  } DNNMathBinaryOperation;
> 
> diff --git a/tests/dnn/dnn-layer-mathbinary-test.c b/tests/dnn/dnn-layer-
> mathbinary-test.c
> index e7f8f8557c..e5f6a12939 100644
> --- a/tests/dnn/dnn-layer-mathbinary-test.c
> +++ b/tests/dnn/dnn-layer-mathbinary-test.c
> @@ -40,6 +40,8 @@ static float get_expected(float f1, float f2,
> DNNMathBinaryOperation op)
>          return f1 / f2;
>      case DMBO_MINIMUM:
>          return (f1 < f2) ? f1 : f2;
> +    case DMBO_FLOORMOD:
> +        return (int)(f1) % (int)(f2);
>      default:
>          av_assert0(!"not supported yet");
>          return 0.f;
> @@ -205,5 +207,8 @@ int main(int argc, char **argv)
>      if (test(DMBO_MINIMUM))
>          return 1;
> 
> +    if (test(DMBO_FLOORMOD))
> +        return 1;
> +
>      return 0;
>  }
> diff --git a/tools/python/convert_from_tensorflow.py
> b/tools/python/convert_from_tensorflow.py
> index 65fdbc5d43..2ed0f66829 100644
> --- a/tools/python/convert_from_tensorflow.py
> +++ b/tools/python/convert_from_tensorflow.py
> @@ -71,7 +71,7 @@ class TFConverter:
>          self.conv2d_scope_names = set()
>          self.conv2d_scopename_inputname_dict = {}
>          self.op2code = {'Conv2D':1, 'DepthToSpace':2, 'MirrorPad':3, 'Maximum':4,
> 'MathBinary':5, 'MathUnary':6}
> -        self.mathbin2code = {'Sub':0, 'Add':1, 'Mul':2, 'RealDiv':3, 'Minimum':4}
> +        self.mathbin2code = {'Sub':0, 'Add':1, 'Mul':2, 'RealDiv':3,
> + 'Minimum':4, 'FloorMod':5}
>          self.mathun2code  = {'Abs':0, 'Sin':1, 'Cos':2, 'Tan':3, 'Asin':4,
>                  'Acos':5, 'Atan':6, 'Sinh':7, 'Cosh':8, 'Tanh':9, 'Asinh':10,
>                  'Acosh':11, 'Atanh':12, 'Ceil':13, 'Floor':14, 'Round':15} diff --git
> a/tools/python/convert_header.py b/tools/python/convert_header.py index
> 747c8776eb..782a6341f9 100644
> --- a/tools/python/convert_header.py
> +++ b/tools/python/convert_header.py
> @@ -23,4 +23,4 @@ str = 'FFMPEGDNNNATIVE'
>  major = 1
> 
>  # increase minor when we don't have to re-convert the model file -minor = 21
> +minor = 22
> --
> 2.17.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".
Mingyu Yin Aug. 18, 2020, 1:12 p.m. UTC | #2 
Thank you for your suggestion, we will try this method, and if it is successful, a new patch will be sent later.

> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Xu,
> Guangxin
> Sent: Friday, August 14, 2020 8:01 PM
> To: FFmpeg development discussions and patches <ffmpeg-
> devel@ffmpeg.org>
> Subject: Re: [FFmpeg-devel] [PATCH]
> dnn_backend_native_layer_mathbinary: add floormod support
> 
> 
> 
> > -----Original Message-----
> > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of
> > Mingyu Yin
> > Sent: Friday, August 14, 2020 6:11 PM
> > To: ffmpeg-devel@ffmpeg.org
> > Subject: [FFmpeg-devel] [PATCH] dnn_backend_native_layer_mathbinary:
> > add floormod support
> >
> > Signed-off-by: Mingyu Yin <mingyu.yin@intel.com>
> > ---
> >  .../dnn/dnn_backend_native_layer_mathbinary.c   | 17
> +++++++++++++++++
> >  .../dnn/dnn_backend_native_layer_mathbinary.h   |  1 +
> >  tests/dnn/dnn-layer-mathbinary-test.c           |  5 +++++
> >  tools/python/convert_from_tensorflow.py         |  2 +-
> >  tools/python/convert_header.py                  |  2 +-
> >  5 files changed, 25 insertions(+), 2 deletions(-)
> >
> > diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c
> > b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c
> > index dd42c329a9..6876aaf2c6 100644
> > --- a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c
> > +++ b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c
> > @@ -175,6 +175,23 @@ int
> dnn_execute_layer_math_binary(DnnOperand
> > *operands, const int32_t *input_ope
> >              }
> >          }
> >          return 0;
> > +    case DMBO_FLOORMOD:
> > +        if (params->input0_broadcast) {
> > +            for (int i = 0; i < dims_count; ++i) {
> > +                dst[i] = (int)(params->v) % (int)(src[i]);
> > +            }
> > +        } else if (params->input1_broadcast) {
> > +            for (int i = 0; i < dims_count; ++i) {
> > +                dst[i] = (int)(src[i]) % (int)(params->v);
> > +            }
> > +        } else {
> > +            const DnnOperand *input1 =
> &operands[input_operand_indexes[1]];
> > +            const float *src1 = input1->data;
> > +            for (int i = 0; i < dims_count; ++i) {
> > +                dst[i] = (int)(src[i]) % (int)(src1[i]);
> > +            }
> > +        }
> Nearly same code as DMBO_SUB.
> Only the op is different, how about define a function pass op as a inline
> function.
> 
> > +        return 0;
> >      default:
> >          return -1;
> >      }
> > diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.h
> > b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.h
> > index 0acf3b0ea0..9525685afa 100644
> > --- a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.h
> > +++ b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.h
> > @@ -36,6 +36,7 @@ typedef enum {
> >      DMBO_MUL = 2,
> >      DMBO_REALDIV = 3,
> >      DMBO_MINIMUM = 4,
> > +    DMBO_FLOORMOD = 5,
> >      DMBO_COUNT
> >  } DNNMathBinaryOperation;
> >
> > diff --git a/tests/dnn/dnn-layer-mathbinary-test.c
> > b/tests/dnn/dnn-layer- mathbinary-test.c index e7f8f8557c..e5f6a12939
> > 100644
> > --- a/tests/dnn/dnn-layer-mathbinary-test.c
> > +++ b/tests/dnn/dnn-layer-mathbinary-test.c
> > @@ -40,6 +40,8 @@ static float get_expected(float f1, float f2,
> > DNNMathBinaryOperation op)
> >          return f1 / f2;
> >      case DMBO_MINIMUM:
> >          return (f1 < f2) ? f1 : f2;
> > +    case DMBO_FLOORMOD:
> > +        return (int)(f1) % (int)(f2);
> >      default:
> >          av_assert0(!"not supported yet");
> >          return 0.f;
> > @@ -205,5 +207,8 @@ int main(int argc, char **argv)
> >      if (test(DMBO_MINIMUM))
> >          return 1;
> >
> > +    if (test(DMBO_FLOORMOD))
> > +        return 1;
> > +
> >      return 0;
> >  }
> > diff --git a/tools/python/convert_from_tensorflow.py
> > b/tools/python/convert_from_tensorflow.py
> > index 65fdbc5d43..2ed0f66829 100644
> > --- a/tools/python/convert_from_tensorflow.py
> > +++ b/tools/python/convert_from_tensorflow.py
> > @@ -71,7 +71,7 @@ class TFConverter:
> >          self.conv2d_scope_names = set()
> >          self.conv2d_scopename_inputname_dict = {}
> >          self.op2code = {'Conv2D':1, 'DepthToSpace':2, 'MirrorPad':3,
> > 'Maximum':4, 'MathBinary':5, 'MathUnary':6}
> > -        self.mathbin2code = {'Sub':0, 'Add':1, 'Mul':2, 'RealDiv':3,
> 'Minimum':4}
> > +        self.mathbin2code = {'Sub':0, 'Add':1, 'Mul':2, 'RealDiv':3,
> > + 'Minimum':4, 'FloorMod':5}
> >          self.mathun2code  = {'Abs':0, 'Sin':1, 'Cos':2, 'Tan':3, 'Asin':4,
> >                  'Acos':5, 'Atan':6, 'Sinh':7, 'Cosh':8, 'Tanh':9, 'Asinh':10,
> >                  'Acosh':11, 'Atanh':12, 'Ceil':13, 'Floor':14,
> > 'Round':15} diff --git a/tools/python/convert_header.py
> > b/tools/python/convert_header.py index
> > 747c8776eb..782a6341f9 100644
> > --- a/tools/python/convert_header.py
> > +++ b/tools/python/convert_header.py
> > @@ -23,4 +23,4 @@ str = 'FFMPEGDNNNATIVE'
> >  major = 1
> >
> >  # increase minor when we don't have to re-convert the model file
> > -minor = 21
> > +minor = 22
> > --
> > 2.17.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".
> _______________________________________________
> 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".
diff mbox series

Patch

diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c
index dd42c329a9..6876aaf2c6 100644
--- a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c
+++ b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c
@@ -175,6 +175,23 @@  int dnn_execute_layer_math_binary(DnnOperand *operands, const int32_t *input_ope
             }
         }
         return 0;
+    case DMBO_FLOORMOD:
+        if (params->input0_broadcast) {
+            for (int i = 0; i < dims_count; ++i) {
+                dst[i] = (int)(params->v) % (int)(src[i]);
+            }
+        } else if (params->input1_broadcast) {
+            for (int i = 0; i < dims_count; ++i) {
+                dst[i] = (int)(src[i]) % (int)(params->v);
+            }
+        } else {
+            const DnnOperand *input1 = &operands[input_operand_indexes[1]];
+            const float *src1 = input1->data;
+            for (int i = 0; i < dims_count; ++i) {
+                dst[i] = (int)(src[i]) % (int)(src1[i]);
+            }
+        }
+        return 0;
     default:
         return -1;
     }
diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.h b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.h
index 0acf3b0ea0..9525685afa 100644
--- a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.h
+++ b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.h
@@ -36,6 +36,7 @@  typedef enum {
     DMBO_MUL = 2,
     DMBO_REALDIV = 3,
     DMBO_MINIMUM = 4,
+    DMBO_FLOORMOD = 5,
     DMBO_COUNT
 } DNNMathBinaryOperation;
 
diff --git a/tests/dnn/dnn-layer-mathbinary-test.c b/tests/dnn/dnn-layer-mathbinary-test.c
index e7f8f8557c..e5f6a12939 100644
--- a/tests/dnn/dnn-layer-mathbinary-test.c
+++ b/tests/dnn/dnn-layer-mathbinary-test.c
@@ -40,6 +40,8 @@  static float get_expected(float f1, float f2, DNNMathBinaryOperation op)
         return f1 / f2;
     case DMBO_MINIMUM:
         return (f1 < f2) ? f1 : f2;
+    case DMBO_FLOORMOD:
+        return (int)(f1) % (int)(f2);
     default:
         av_assert0(!"not supported yet");
         return 0.f;
@@ -205,5 +207,8 @@  int main(int argc, char **argv)
     if (test(DMBO_MINIMUM))
         return 1;
 
+    if (test(DMBO_FLOORMOD))
+        return 1;
+
     return 0;
 }
diff --git a/tools/python/convert_from_tensorflow.py b/tools/python/convert_from_tensorflow.py
index 65fdbc5d43..2ed0f66829 100644
--- a/tools/python/convert_from_tensorflow.py
+++ b/tools/python/convert_from_tensorflow.py
@@ -71,7 +71,7 @@  class TFConverter:
         self.conv2d_scope_names = set()
         self.conv2d_scopename_inputname_dict = {}
         self.op2code = {'Conv2D':1, 'DepthToSpace':2, 'MirrorPad':3, 'Maximum':4, 'MathBinary':5, 'MathUnary':6}
-        self.mathbin2code = {'Sub':0, 'Add':1, 'Mul':2, 'RealDiv':3, 'Minimum':4}
+        self.mathbin2code = {'Sub':0, 'Add':1, 'Mul':2, 'RealDiv':3, 'Minimum':4, 'FloorMod':5}
         self.mathun2code  = {'Abs':0, 'Sin':1, 'Cos':2, 'Tan':3, 'Asin':4,
                 'Acos':5, 'Atan':6, 'Sinh':7, 'Cosh':8, 'Tanh':9, 'Asinh':10,
                 'Acosh':11, 'Atanh':12, 'Ceil':13, 'Floor':14, 'Round':15}
diff --git a/tools/python/convert_header.py b/tools/python/convert_header.py
index 747c8776eb..782a6341f9 100644
--- a/tools/python/convert_header.py
+++ b/tools/python/convert_header.py
@@ -23,4 +23,4 @@  str = 'FFMPEGDNNNATIVE'
 major = 1
 
 # increase minor when we don't have to re-convert the model file
-minor = 21
+minor = 22