diff options
| -rw-r--r-- | libavfilter/dnn/dnn_backend_native_layer_mathunary.c | 4 | ||||
| -rw-r--r-- | libavfilter/dnn/dnn_backend_native_layer_mathunary.h | 1 | ||||
| -rw-r--r-- | tests/dnn/dnn-layer-mathunary-test.c | 4 | ||||
| -rw-r--r-- | tools/python/convert_from_tensorflow.py | 2 | ||||
| -rw-r--r-- | tools/python/convert_header.py | 2 |
5 files changed, 11 insertions, 2 deletions
diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c index f9f88983f9..58ee0e9d3d 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c @@ -138,6 +138,10 @@ int dnn_execute_layer_math_unary(DnnOperand *operands, const int32_t *input_oper for (int i = 0; i < dims_count; ++i) dst[i] = floor(src[i]); return 0; + case DMUO_ROUND: + for (int i = 0; i < dims_count; ++i) + dst[i] = round(src[i]); + return 0; default: return -1; } diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathunary.h b/libavfilter/dnn/dnn_backend_native_layer_mathunary.h index 1b78fbe1c2..d6a61effd5 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.h +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.h @@ -45,6 +45,7 @@ typedef enum { DMUO_ATANH = 12, DMUO_CEIL = 13, DMUO_FLOOR = 14, + DMUO_ROUND = 15, DMUO_COUNT } DNNMathUnaryOperation; diff --git a/tests/dnn/dnn-layer-mathunary-test.c b/tests/dnn/dnn-layer-mathunary-test.c index 0bfcdcbd85..e9235120f3 100644 --- a/tests/dnn/dnn-layer-mathunary-test.c +++ b/tests/dnn/dnn-layer-mathunary-test.c @@ -60,6 +60,8 @@ static float get_expected(float f, DNNMathUnaryOperation op) return ceil(f); case DMUO_FLOOR: return floor(f); + case DMUO_ROUND: + return round(f); default: av_assert0(!"not supported yet"); return 0.f; @@ -136,5 +138,7 @@ int main(int agrc, char **argv) return 1; if (test(DMUO_FLOOR)) return 1; + if (test(DMUO_ROUND)) + return 1; return 0; } diff --git a/tools/python/convert_from_tensorflow.py b/tools/python/convert_from_tensorflow.py index 4107774f88..3c14bed487 100644 --- a/tools/python/convert_from_tensorflow.py +++ b/tools/python/convert_from_tensorflow.py @@ -76,7 +76,7 @@ class TFConverter: self.mathbin2code = {'Sub':0, 'Add':1, 'Mul':2, 'RealDiv':3, 'Minimum':4} 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} + 'Acosh':11, 'Atanh':12, 'Ceil':13, 'Floor':14, 'Round':15} self.mirrorpad_mode = {'CONSTANT':0, 'REFLECT':1, 'SYMMETRIC':2} self.name_operand_dict = {} diff --git a/tools/python/convert_header.py b/tools/python/convert_header.py index b12b5079fc..747c8776eb 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 = 20 +minor = 21 |