| Message ID | 1568951755-6071-1-git-send-email-yejun.guo@intel.com |
|---|---|
| State | Accepted |
| Commit | 9ae42c130ca989578ac014daef2106e54e09fe34 |
| Headers | show |
Em sex, 20 de set de 2019 às 01:01, Guo, Yejun <yejun.guo@intel.com> escreveu: > > Signed-off-by: Guo, Yejun <yejun.guo@intel.com> > --- > tests/dnn/Makefile | 1 + > tests/dnn/dnn-layer-maximum-test.c | 71 ++++++++++++++++++++++++++++++++++++++ > tests/fate/dnn.mak | 5 +++ > 3 files changed, 77 insertions(+) > create mode 100644 tests/dnn/dnn-layer-maximum-test.c > > diff --git a/tests/dnn/Makefile b/tests/dnn/Makefile > index 3cb5f6d..e1bfe3f 100644 > --- a/tests/dnn/Makefile > +++ b/tests/dnn/Makefile > @@ -1,6 +1,7 @@ > DNNTESTPROGS += dnn-layer-pad > DNNTESTPROGS += dnn-layer-conv2d > DNNTESTPROGS += dnn-layer-depth2space > +DNNTESTPROGS += dnn-layer-maximum > > DNNTESTOBJS := $(DNNTESTOBJS:%=$(DNNTESTSDIR)%) $(DNNTESTPROGS:%=$(DNNTESTSDIR)/%-test.o) > DNNTESTPROGS := $(DNNTESTPROGS:%=$(DNNTESTSDIR)/%-test$(EXESUF)) > diff --git a/tests/dnn/dnn-layer-maximum-test.c b/tests/dnn/dnn-layer-maximum-test.c > new file mode 100644 > index 0000000..06daf64 > --- /dev/null > +++ b/tests/dnn/dnn-layer-maximum-test.c > @@ -0,0 +1,71 @@ > +/* > + * Copyright (c) 2019 Guo Yejun > + * > + * This file is part of FFmpeg. > + * > + * FFmpeg is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * FFmpeg is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with FFmpeg; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > + */ > + > +#include <stdio.h> > +#include <string.h> > +#include <math.h> > +#include "libavfilter/dnn/dnn_backend_native_layer_maximum.h" > + > +#define EPSON 0.00001 > + > +static int test(void) > +{ > + DnnLayerMaximumParams params; > + DnnOperand operands[2]; > + int32_t input_indexes[1]; > + float input[1*1*2*3] = { > + -3, 2.5, 2, -2.1, 7.8, 100 > + }; > + float *output; > + > + params.val.y = 2.3; > + > + operands[0].data = input; > + operands[0].dims[0] = 1; > + operands[0].dims[1] = 1; > + operands[0].dims[2] = 2; > + operands[0].dims[3] = 3; > + operands[1].data = NULL; > + > + input_indexes[0] = 0; > + dnn_execute_layer_maximum(operands, input_indexes, 1, ¶ms); > + > + output = operands[1].data; > + for (int i = 0; i < sizeof(input) / sizeof(float); i++) { > + float expected_output = input[i] > params.val.y ? input[i] : params.val.y; > + if (fabs(output[i] - expected_output) > EPSON) { > + printf("at index %d, output: %f, expected_output: %f\n", i, output[i], expected_output); > + av_freep(&output); > + return 1; > + } > + } > + > + av_freep(&output); > + return 0; > + > +} > + > +int main(int argc, char **argv) > +{ > + if (test()) > + return 1; > + > + return 0; > +} > diff --git a/tests/fate/dnn.mak b/tests/fate/dnn.mak > index 99578e0..ec60b07 100644 > --- a/tests/fate/dnn.mak > +++ b/tests/fate/dnn.mak > @@ -13,6 +13,11 @@ fate-dnn-layer-depth2space: $(DNNTESTSDIR)/dnn-layer-depth2space-test$(EXESUF) > fate-dnn-layer-depth2space: CMD = run $(DNNTESTSDIR)/dnn-layer-depth2space-test$(EXESUF) > fate-dnn-layer-depth2space: CMP = null > > +FATE_DNN += fate-dnn-layer-maximum > +fate-dnn-layer-maximum: $(DNNTESTSDIR)/dnn-layer-maximum-test$(EXESUF) > +fate-dnn-layer-maximum: CMD = run $(DNNTESTSDIR)/dnn-layer-maximum-test$(EXESUF) > +fate-dnn-layer-maximum: CMP = null > + > FATE-yes += $(FATE_DNN) > > fate-dnn: $(FATE_DNN) > -- > 2.7.4 > LGTM, pushed. > _______________________________________________ > 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".
Am Fr., 20. Sept. 2019 um 06:01 Uhr schrieb Guo, Yejun <yejun.guo@intel.com>: > > Signed-off-by: Guo, Yejun <yejun.guo@intel.com> > --- > tests/dnn/Makefile | 1 + > tests/dnn/dnn-layer-maximum-test.c | 71 ++++++++++++++++++++++++++++++++++++++ > tests/fate/dnn.mak | 5 +++ > 3 files changed, 77 insertions(+) > create mode 100644 tests/dnn/dnn-layer-maximum-test.c > > diff --git a/tests/dnn/Makefile b/tests/dnn/Makefile > index 3cb5f6d..e1bfe3f 100644 > --- a/tests/dnn/Makefile > +++ b/tests/dnn/Makefile > @@ -1,6 +1,7 @@ > DNNTESTPROGS += dnn-layer-pad > DNNTESTPROGS += dnn-layer-conv2d > DNNTESTPROGS += dnn-layer-depth2space > +DNNTESTPROGS += dnn-layer-maximum Are these tests supposed to pass if FFmpeg was compiled with --disable-filter=dnn_processing ? Carl Eugen
> -----Original Message----- > From: ffmpeg-devel [mailto:ffmpeg-devel-bounces@ffmpeg.org] On Behalf Of > Carl Eugen Hoyos > Sent: Monday, January 20, 2020 1:20 AM > To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> > Subject: Re: [FFmpeg-devel] [PATCH 2/4] FATE/dnn: add unit test for layer > maximum > > Am Fr., 20. Sept. 2019 um 06:01 Uhr schrieb Guo, Yejun > <yejun.guo@intel.com>: > > > > Signed-off-by: Guo, Yejun <yejun.guo@intel.com> > > --- > > tests/dnn/Makefile | 1 + > > tests/dnn/dnn-layer-maximum-test.c | 71 > ++++++++++++++++++++++++++++++++++++++ > > tests/fate/dnn.mak | 5 +++ > > 3 files changed, 77 insertions(+) > > create mode 100644 tests/dnn/dnn-layer-maximum-test.c > > > > diff --git a/tests/dnn/Makefile b/tests/dnn/Makefile > > index 3cb5f6d..e1bfe3f 100644 > > --- a/tests/dnn/Makefile > > +++ b/tests/dnn/Makefile > > @@ -1,6 +1,7 @@ > > DNNTESTPROGS += dnn-layer-pad > > DNNTESTPROGS += dnn-layer-conv2d > > DNNTESTPROGS += dnn-layer-depth2space > > +DNNTESTPROGS += dnn-layer-maximum > > Are these tests supposed to pass if FFmpeg was compiled with > --disable-filter=dnn_processing ? yes, they are passed with/without this cmake option. These are unit tests for dnn native layers under the dnn interface layer. And dnn_processing is a filter calling the dnn interface layer. > > Carl Eugen > _______________________________________________ > 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 --git a/tests/dnn/Makefile b/tests/dnn/Makefile index 3cb5f6d..e1bfe3f 100644 --- a/tests/dnn/Makefile +++ b/tests/dnn/Makefile @@ -1,6 +1,7 @@ DNNTESTPROGS += dnn-layer-pad DNNTESTPROGS += dnn-layer-conv2d DNNTESTPROGS += dnn-layer-depth2space +DNNTESTPROGS += dnn-layer-maximum DNNTESTOBJS := $(DNNTESTOBJS:%=$(DNNTESTSDIR)%) $(DNNTESTPROGS:%=$(DNNTESTSDIR)/%-test.o) DNNTESTPROGS := $(DNNTESTPROGS:%=$(DNNTESTSDIR)/%-test$(EXESUF)) diff --git a/tests/dnn/dnn-layer-maximum-test.c b/tests/dnn/dnn-layer-maximum-test.c new file mode 100644 index 0000000..06daf64 --- /dev/null +++ b/tests/dnn/dnn-layer-maximum-test.c @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2019 Guo Yejun + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <stdio.h> +#include <string.h> +#include <math.h> +#include "libavfilter/dnn/dnn_backend_native_layer_maximum.h" + +#define EPSON 0.00001 + +static int test(void) +{ + DnnLayerMaximumParams params; + DnnOperand operands[2]; + int32_t input_indexes[1]; + float input[1*1*2*3] = { + -3, 2.5, 2, -2.1, 7.8, 100 + }; + float *output; + + params.val.y = 2.3; + + operands[0].data = input; + operands[0].dims[0] = 1; + operands[0].dims[1] = 1; + operands[0].dims[2] = 2; + operands[0].dims[3] = 3; + operands[1].data = NULL; + + input_indexes[0] = 0; + dnn_execute_layer_maximum(operands, input_indexes, 1, ¶ms); + + output = operands[1].data; + for (int i = 0; i < sizeof(input) / sizeof(float); i++) { + float expected_output = input[i] > params.val.y ? input[i] : params.val.y; + if (fabs(output[i] - expected_output) > EPSON) { + printf("at index %d, output: %f, expected_output: %f\n", i, output[i], expected_output); + av_freep(&output); + return 1; + } + } + + av_freep(&output); + return 0; + +} + +int main(int argc, char **argv) +{ + if (test()) + return 1; + + return 0; +} diff --git a/tests/fate/dnn.mak b/tests/fate/dnn.mak index 99578e0..ec60b07 100644 --- a/tests/fate/dnn.mak +++ b/tests/fate/dnn.mak @@ -13,6 +13,11 @@ fate-dnn-layer-depth2space: $(DNNTESTSDIR)/dnn-layer-depth2space-test$(EXESUF) fate-dnn-layer-depth2space: CMD = run $(DNNTESTSDIR)/dnn-layer-depth2space-test$(EXESUF) fate-dnn-layer-depth2space: CMP = null +FATE_DNN += fate-dnn-layer-maximum +fate-dnn-layer-maximum: $(DNNTESTSDIR)/dnn-layer-maximum-test$(EXESUF) +fate-dnn-layer-maximum: CMD = run $(DNNTESTSDIR)/dnn-layer-maximum-test$(EXESUF) +fate-dnn-layer-maximum: CMP = null + FATE-yes += $(FATE_DNN) fate-dnn: $(FATE_DNN)
Signed-off-by: Guo, Yejun <yejun.guo@intel.com> --- tests/dnn/Makefile | 1 + tests/dnn/dnn-layer-maximum-test.c | 71 ++++++++++++++++++++++++++++++++++++++ tests/fate/dnn.mak | 5 +++ 3 files changed, 77 insertions(+) create mode 100644 tests/dnn/dnn-layer-maximum-test.c