diff options
| -rw-r--r-- | libavfilter/dnn/dnn_backend_native_layer_mathbinary.c | 7 | ||||
| -rw-r--r-- | libavfilter/dnn/dnn_backend_native_layer_mathbinary.h | 1 | ||||
| -rw-r--r-- | tests/dnn/dnn-layer-mathbinary-test.c | 5 | ||||
| -rw-r--r-- | tools/python/convert_from_tensorflow.py | 2 | ||||
| -rw-r--r-- | tools/python/convert_header.py | 2 |
5 files changed, 15 insertions, 2 deletions
diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c index 38742db7a6..7d81694288 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c +++ b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c @@ -50,6 +50,10 @@ static float minimum(float src0, float src1) { return FFMIN(src0, src1); } +static float floormod(float src0, float src1) +{ + return (float)((int)(src0) % (int)(src1)); +} static void math_binary_commutative(FunType pfun, const DnnLayerMathBinaryParams *params, const DnnOperand *input, DnnOperand *output, DnnOperand *operands, const int32_t *input_operand_indexes) { @@ -178,6 +182,9 @@ int dnn_execute_layer_math_binary(DnnOperand *operands, const int32_t *input_ope case DMBO_MINIMUM: math_binary_commutative(minimum, params, input, output, operands, input_operand_indexes); return 0; + case DMBO_FLOORMOD: + math_binary_not_commutative(floormod, params, input, output, operands, input_operand_indexes); + 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..5422b2a207 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 (float)((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 3c14bed487..1762091fdd 100644 --- a/tools/python/convert_from_tensorflow.py +++ b/tools/python/convert_from_tensorflow.py @@ -73,7 +73,7 @@ class TFConverter: self.conv2d_scopename_inputname_dict = {} self.op2code = {'Conv2D':1, 'DepthToSpace':2, 'MirrorPad':3, 'Maximum':4, 'MathBinary':5, 'MathUnary':6, 'AvgPool':7} - 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 |