From patchwork Wed Dec 15 15:52:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32531 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp8378486iog; Wed, 15 Dec 2021 07:52:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJw+x+yq/CXn+PpOd+UfLVhuaV2ELF24k+qJd6Hg4Ni10rfYVi9AelJTZ/oV8QV0ZrJP2y73 X-Received: by 2002:a17:906:390:: with SMTP id b16mr12488106eja.522.1639583568520; Wed, 15 Dec 2021 07:52:48 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y12si1802992eda.144.2021.12.15.07.52.47; Wed, 15 Dec 2021 07:52:48 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=QteNRxgi; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 862C468B0B4; Wed, 15 Dec 2021 17:52:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2014.outbound.protection.outlook.com [40.92.90.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DFEEF68AFBA for ; Wed, 15 Dec 2021 17:52:36 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TQP83qjO0M4AhjBbDCzd4bYiG/swwXz0ZtOimOixSVRyhEo5JJO5/er/R2xLK/iez7zJoGFxaF/x2gZLLXl7rVp5MGqzSL5g0drxMUzTPm3FJzMnF24BDIxIhO1Zs2SXMZbQsyiQQde9anQlKdHnDB1eVx9ZN98gQBWFqfBT4Gvorv8cp5cCNMg65IpZtr8zPwRvD0G4ZbhjQE0ZOXlJxg4EHwN0BaIroZ52LXwarmvThnQ+/B6PIawywZoEhfsbjxce+MZz3SAATFXwSiHpVCIa3tcSllg3WEU824TWoiIltPTxCwGf06WlSzZedtLtOYob/3C7RrnUsct3TwDPXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bbLmuFNAD/hLouVnBsf/1Jeb0ZIN/Iiw6YZcUXWD/e8=; b=QtZ+NfW4g2FWS+ljc+n29E7YCp6XOx5Eiz7f95FjPEMXXBF03Mx62rnnadwseItAnDoPCTWxlFz2OwrWmvSMevzmIjtih9xkXsC1hUHSYJXIVt6/MmrDM8e7Q2i/Gz4OtrY5CahUA1WAktHEpZvELVydUKTpFcBDjunTRkbyQrc91M0zYCkwUSRVcJJtT2AQI045TkjtRG8vjLdH0R5pTADYjKqlCmy3VYFeILkH2cHAyF4Gc0KEAGq/7c7shAxhusLFqZmRvGBjamxkwmaIz9oNOPDRwffyAVoTYisDjSzdrUCLQf42yAHOjOc+Dql4+53QVRoiO7CrE1YGvQ0J6g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bbLmuFNAD/hLouVnBsf/1Jeb0ZIN/Iiw6YZcUXWD/e8=; b=QteNRxgiC62QaHCGoEHTbUC0PG7ST9a3DqFSHr1DIINqrXpel/PgrtcUEEB3QqCujPN97aYuvU1NX3KKR7LfIRB/maRUh62WvktRkBC0bY6tv0nFQMG4Cx43SPfzAc0eOelNvzQCbNAPq0fsssrWxQUswuLemsH0kKSB8FlwBX41eiYqEaoIg2BShRtxjhZqntFgxCGQkmUMfTR68xBSrlcYCeUF11eR51UQ8gzIZJyT4AY+BjvGCfuXcexRMQdwx6z8SpzPWiQkE1VISz2Q433nBGdELfKJq8NNl9k/QFSS9SBBW/tdOXHxX1ZmDHUKOFqjhI8GhE4IC8Kx79ed6A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4373.eurprd03.prod.outlook.com (2603:10a6:20b:10::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.12; Wed, 15 Dec 2021 15:52:34 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4778.018; Wed, 15 Dec 2021 15:52:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Dec 2021 16:52:25 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [o/dd4RvjOlLSjYhyK+RD1Uij+WohXELl] X-ClientProxiedBy: AM5PR04CA0011.eurprd04.prod.outlook.com (2603:10a6:206:1::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211215155226.45785-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0e8dd434-d4b4-4091-ed0e-08d9bfe2e8b9 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JWjg8cbaHQL4EsXgrBGJRn9QSYTozW0vWQkaz/SaHn+JL0U8nKTkLwB5djZuym99uxrY5Hv8OYgIeRYbcoIPkCYQrwMABpeBHsnsBnK9oDkGnXCXdioITQMI1ybuP2q4MykpLl1kF3nYfakfQTLj4O19G+3vlG6zF591qKwdC4ZiTWbjv5oJ0iKGCU5K0T0oAgdXYCK2Bf5g1aGa2TIxKDakZtw2V8c2KPytEB3K40jLmx1WHffBgR1CAmLk0wzX5CXy9ANikgf8CbtpoLHZyOUBHQNpKkifHEvAOLU8+6Ww9DXaLWCSu8dVXK3LB+rKZlsN0UcKHAkcwk9nQf/AL1oDIPbaE+gUr+7HmnNNA6V1umnJWWdwdyb3HVSPfBMY/p0a/4asq2u7P0gvGuqUBYr7wJOIMtf5RqSBZONddr+R4mXQpl1WUFte7IciRJ5IgQzor1O9s/XBJyNLAD2W9YUvZIkmEY0bqwWPsdh3Xl0atvEdeaNyKK4WWw8XrxCFggqVc04ldhFA3oJ7zJ2NLDuPWwKvCTNfkDbDjaktTnq7a1x7V+0w+50v7FH/mk242vqhtpFXLOMXIGU75qAg3WsJLVi3WaSsX3HmnBoEG6FrMU0GvT85yfV0N5SZslbjKsqSPmn34ymmBlzhq0dc5wEc8rSAS0CUMp3f0+H8KhPCovWsYQ7PQtwU5JBcT6U3g7PpttYfAvjsT0cIpGqr5kVyjhPvSvxDd+cLgERKga48= X-MS-TrafficTypeDiagnostic: AM6PR03MB4373:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Dx54r1TXKQF0mRJoaBHMlWkGvioYH+5Gql5N9WSHeNnvntsHCzen/KxHgVx3W9yPiKGp1h8GgbB8osEJ3NiLoKBvHHF02tPEr0cS4ksOkHfXF7BH+hqWRIAPa8vQ57lUxQj4xjKV9q+Xrpgi/oOfJACT+V48PABKlUETFzBwd8w77FA7kDxj2PU2LZeZFlqL3WDNHHSBHWObEFP6kdeEFu5/ZwEq5gyuaXLdopKj9QyeLzbJgii5gknN+RAObvmuWY9Si/Ofdui4M4b9klvSHzr8YrkhUBnS2+9PxMkID4w8Fe69YHBUnFqf21FyDxAiO+oWgWYWrl4PECi8jJx/yo9V0Kt9vBh7hZOFHoSvY+lRdlMwGZiT3FwHaOhwIYxTdEyHcFJRa8z6N0i+cX1p87kSJCvv00ajeHf7zTjAPfkxoD610fUPrT4uvFK+wk3W2nqiv6kVzdaRWkEWLT23DTIoi9s2iqRb7yoWi5dtImah8B8kPkScTsSbwjrXnPS8+QCafVDBAJ7wQjY+CJ+aJN+P9TL4311oXhH6aAyyQnFEflffzjL+lKnKogm/IhyPvEeyXzg34VpZAtUVrhqsGQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PYls0zxnQU9HS1K1QksZPbImH/MMlq/1xerf4EY7yXGpCIWWx4aW95c0YWav4e9+xNmHJnIbu7yBVcIapVxqZesrT+QTMGrvi4h0X4Y4O9d2WKwUvMK3XceZwUvGGNlAnPYLvWGb18iwMaonwLgBuN0Z+5emvK32QPW4xweDCADX4525jiOIS9s0bivzr40UTt6wNdrGWvicHUeNWLAP2MNVuugrdG0mZ8PPfSqqxI+slKgJGcXXOuNHsH5Z8Yh/f9EV+v9SzwTDOFI+Fzc53zlZupH7PJL63C5SaCXB580dO7KmllJT6gKBoTavv01FuxOtfpEsxvbdQ3p9VmXQNWBUJdKwa1H04bmC02riGEUrAHOLIrBw5KXecj4lkdRcgC4AiloenkjEJksej99R/ztF/7EYjxUG8uJAu2q3i3spgV699kx269tGWc4NAchhaqdlBHEkq70uV9lYopHUXzfupHzu2BmPtF8+xtciaKTGqoVxfotqlMIUFtRfrG5lL4clHf8XPetCPdKCFn7Kl3YtfZay+vSV3YlYdwprHUUKUMQW5eqOrk/9UnBC+itsIkZARgbR/IEay/MKSYvjBzR3MjobPoYokNzxiVweoSoQKk48D5aXxBsZfZg0/IJkcoBrfFW6tj8zayvUm9pq11FJtHbWtxvqTR/9PGeZdsv0BcgplRpx7BQNf61N7ngwG5PfdQKPnHci1EIis1io9GvRJ1W1sbbzZeXYbRL7WBNZ0ItTDEW9e3qbKXuCJTnS2x9YbckiInP3wXp5MriCPpEwhKalrJt47qXKbTFH6bfHwYa1uAQV9nRZszZrGdDv0IYThGSHDOnO2nIhuIJ2ohzA/Zknwyl5vkoBjsBL61QmzkxhXJwCE71qpHKlycNAG4fv1gwzTPPC9eIbvkwZGjxaKgQLcPfidLxa8tdAGPHRwcWhdtOyVRNwqhXwEPWUGXtkFJODsAdFLEQ/mtojKA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e8dd434-d4b4-4091-ed0e-08d9bfe2e8b9 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 15:52:34.2179 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB4373 Subject: [FFmpeg-devel] [PATCH 1/2] tests/dnn: Make DNN tests regular libavfilter tests X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 51kEHDHpsrRB They test libavfilter internal API, so they should be libavfilter test programs (which implies: linked statically to libavfilter to access internal APIs and linked normally (statically or dynamically depending upon the build configuration) against all the other libs). Right now, they are always linked statically against all libs, which is a significant size waste compared to shared libs as all of libavcodec has been pulled in despite not being really used. This also leads to linking failures on systems for which av_export_avutil is intended: libavcodec does not expect to be linked statically against the library providing avpriv_(cga|vga16)_font in this case. This is fixed by this commit. Signed-off-by: Andreas Rheinhardt --- libavfilter/Makefile | 3 ++ libavfilter/tests/.gitignore | 8 +++++ .../tests/dnn-layer-avgpool.c | 0 .../tests/dnn-layer-conv2d.c | 0 .../tests/dnn-layer-dense.c | 0 .../tests/dnn-layer-depth2space.c | 0 .../tests/dnn-layer-mathbinary.c | 0 .../tests/dnn-layer-mathunary.c | 0 .../tests/dnn-layer-maximum.c | 0 .../tests/dnn-layer-pad.c | 0 tests/Makefile | 5 ++- tests/dnn/.gitignore | 8 ----- tests/dnn/Makefile | 18 ---------- tests/fate/dnn.mak | 34 ++++++++++--------- 14 files changed, 31 insertions(+), 45 deletions(-) rename tests/dnn/dnn-layer-avgpool-test.c => libavfilter/tests/dnn-layer-avgpool.c (100%) rename tests/dnn/dnn-layer-conv2d-test.c => libavfilter/tests/dnn-layer-conv2d.c (100%) rename tests/dnn/dnn-layer-dense-test.c => libavfilter/tests/dnn-layer-dense.c (100%) rename tests/dnn/dnn-layer-depth2space-test.c => libavfilter/tests/dnn-layer-depth2space.c (100%) rename tests/dnn/dnn-layer-mathbinary-test.c => libavfilter/tests/dnn-layer-mathbinary.c (100%) rename tests/dnn/dnn-layer-mathunary-test.c => libavfilter/tests/dnn-layer-mathunary.c (100%) rename tests/dnn/dnn-layer-maximum-test.c => libavfilter/tests/dnn-layer-maximum.c (100%) rename tests/dnn/dnn-layer-pad-test.c => libavfilter/tests/dnn-layer-pad.c (100%) delete mode 100644 tests/dnn/.gitignore delete mode 100644 tests/dnn/Makefile diff --git a/libavfilter/Makefile b/libavfilter/Makefile index f4f077af46..d39fab2304 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -587,6 +587,9 @@ SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_filter.h TOOLS = graph2dot TESTPROGS = drawutils filtfmts formats integral +TESTPROGS-$(CONFIG_DNN) += dnn-layer-avgpool dnn-layer-conv2d dnn-layer-dense \ + dnn-layer-depth2space dnn-layer-mathbinary \ + dnn-layer-mathunary dnn-layer-maximum dnn-layer-pad \ TOOLS-$(CONFIG_LIBZMQ) += zmqsend diff --git a/libavfilter/tests/.gitignore b/libavfilter/tests/.gitignore index 65ef86f2e5..db482cd49b 100644 --- a/libavfilter/tests/.gitignore +++ b/libavfilter/tests/.gitignore @@ -1,3 +1,11 @@ +/dnn-layer-conv2d +/dnn-layer-depth2space +/dnn-layer-maximum +/dnn-layer-pad +/dnn-layer-mathbinary +/dnn-layer-mathunary +/dnn-layer-avgpool +/dnn-layer-dense /drawutils /filtfmts /formats diff --git a/tests/dnn/dnn-layer-avgpool-test.c b/libavfilter/tests/dnn-layer-avgpool.c similarity index 100% rename from tests/dnn/dnn-layer-avgpool-test.c rename to libavfilter/tests/dnn-layer-avgpool.c diff --git a/tests/dnn/dnn-layer-conv2d-test.c b/libavfilter/tests/dnn-layer-conv2d.c similarity index 100% rename from tests/dnn/dnn-layer-conv2d-test.c rename to libavfilter/tests/dnn-layer-conv2d.c diff --git a/tests/dnn/dnn-layer-dense-test.c b/libavfilter/tests/dnn-layer-dense.c similarity index 100% rename from tests/dnn/dnn-layer-dense-test.c rename to libavfilter/tests/dnn-layer-dense.c diff --git a/tests/dnn/dnn-layer-depth2space-test.c b/libavfilter/tests/dnn-layer-depth2space.c similarity index 100% rename from tests/dnn/dnn-layer-depth2space-test.c rename to libavfilter/tests/dnn-layer-depth2space.c diff --git a/tests/dnn/dnn-layer-mathbinary-test.c b/libavfilter/tests/dnn-layer-mathbinary.c similarity index 100% rename from tests/dnn/dnn-layer-mathbinary-test.c rename to libavfilter/tests/dnn-layer-mathbinary.c diff --git a/tests/dnn/dnn-layer-mathunary-test.c b/libavfilter/tests/dnn-layer-mathunary.c similarity index 100% rename from tests/dnn/dnn-layer-mathunary-test.c rename to libavfilter/tests/dnn-layer-mathunary.c diff --git a/tests/dnn/dnn-layer-maximum-test.c b/libavfilter/tests/dnn-layer-maximum.c similarity index 100% rename from tests/dnn/dnn-layer-maximum-test.c rename to libavfilter/tests/dnn-layer-maximum.c diff --git a/tests/dnn/dnn-layer-pad-test.c b/libavfilter/tests/dnn-layer-pad.c similarity index 100% rename from tests/dnn/dnn-layer-pad-test.c rename to libavfilter/tests/dnn-layer-pad.c diff --git a/tests/Makefile b/tests/Makefile index 1e0345b163..1bf9a7a36b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,3 +1,4 @@ + THREADS = 1 VREF = tests/vsynth1/00.pgm AREF = tests/data/asynth1.sw @@ -10,8 +11,7 @@ FFMPEG=ffmpeg$(PROGSSUF)$(EXESUF) $(AREF): CMP= APITESTSDIR := tests/api -DNNTESTSDIR := tests/dnn -FATE_OUTDIRS = tests/data tests/data/fate tests/data/filtergraphs tests/data/lavf tests/data/lavf-fate tests/data/pixfmt tests/vsynth1 $(APITESTSDIR) $(DNNTESTSDIR) +FATE_OUTDIRS = tests/data tests/data/fate tests/data/filtergraphs tests/data/lavf tests/data/lavf-fate tests/data/pixfmt tests/vsynth1 $(APITESTSDIR) OUTDIRS += $(FATE_OUTDIRS) $(VREF): tests/videogen$(HOSTEXESUF) | tests/vsynth1 @@ -96,7 +96,6 @@ CONFIG_LARGE_TESTS:= endif include $(SRC_PATH)/$(APITESTSDIR)/Makefile -include $(SRC_PATH)/$(DNNTESTSDIR)/Makefile include $(SRC_PATH)/tests/fate/acodec.mak include $(SRC_PATH)/tests/fate/vcodec.mak diff --git a/tests/dnn/.gitignore b/tests/dnn/.gitignore deleted file mode 100644 index 03b04d6653..0000000000 --- a/tests/dnn/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/dnn-layer-conv2d-test -/dnn-layer-depth2space-test -/dnn-layer-maximum-test -/dnn-layer-pad-test -/dnn-layer-mathbinary-test -/dnn-layer-mathunary-test -/dnn-layer-avgpool-test -/dnn-layer-dense-test diff --git a/tests/dnn/Makefile b/tests/dnn/Makefile deleted file mode 100644 index ef827520de..0000000000 --- a/tests/dnn/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -DNNTESTPROGS += dnn-layer-pad -DNNTESTPROGS += dnn-layer-conv2d -DNNTESTPROGS += dnn-layer-depth2space -DNNTESTPROGS += dnn-layer-dense -DNNTESTPROGS += dnn-layer-mathbinary -DNNTESTPROGS += dnn-layer-maximum -DNNTESTPROGS += dnn-layer-mathunary -DNNTESTPROGS += dnn-layer-avgpool - -DNNTESTOBJS := $(DNNTESTOBJS:%=$(DNNTESTSDIR)%) $(DNNTESTPROGS:%=$(DNNTESTSDIR)/%-test.o) -DNNTESTPROGS := $(DNNTESTPROGS:%=$(DNNTESTSDIR)/%-test$(EXESUF)) --include $(wildcard $(DNNTESTOBJS:.o=.d)) - -$(DNNTESTPROGS): %$(EXESUF): %.o $(FF_STATIC_DEP_LIBS) - $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(filter %.o,$^) $(FF_STATIC_DEP_LIBS) $(EXTRALIBS-avcodec) $(EXTRALIBS-avfilter) $(EXTRALIBS-avformat) $(EXTRALIBS-avutil) $(EXTRALIBS-swresample) $(EXTRALIBS) - -testclean:: - $(RM) $(addprefix $(DNNTESTSDIR)/,$(CLEANSUFFIXES) *-test$(EXESUF)) diff --git a/tests/fate/dnn.mak b/tests/fate/dnn.mak index ef07ee45f8..a30a2976d9 100644 --- a/tests/fate/dnn.mak +++ b/tests/fate/dnn.mak @@ -1,41 +1,43 @@ +DNNTESTSDIR := libavfilter/tests + FATE_DNN += fate-dnn-layer-pad -fate-dnn-layer-pad: $(DNNTESTSDIR)/dnn-layer-pad-test$(EXESUF) -fate-dnn-layer-pad: CMD = run $(DNNTESTSDIR)/dnn-layer-pad-test$(EXESUF) +fate-dnn-layer-pad: $(DNNTESTSDIR)/dnn-layer-pad$(EXESUF) +fate-dnn-layer-pad: CMD = run $(DNNTESTSDIR)/dnn-layer-pad$(EXESUF) fate-dnn-layer-pad: CMP = null FATE_DNN += fate-dnn-layer-conv2d -fate-dnn-layer-conv2d: $(DNNTESTSDIR)/dnn-layer-conv2d-test$(EXESUF) -fate-dnn-layer-conv2d: CMD = run $(DNNTESTSDIR)/dnn-layer-conv2d-test$(EXESUF) +fate-dnn-layer-conv2d: $(DNNTESTSDIR)/dnn-layer-conv2d$(EXESUF) +fate-dnn-layer-conv2d: CMD = run $(DNNTESTSDIR)/dnn-layer-conv2d$(EXESUF) fate-dnn-layer-conv2d: CMP = null FATE_DNN += fate-dnn-layer-dense -fate-dnn-layer-dense: $(DNNTESTSDIR)/dnn-layer-dense-test$(EXESUF) -fate-dnn-layer-dense: CMD = run $(DNNTESTSDIR)/dnn-layer-dense-test$(EXESUF) +fate-dnn-layer-dense: $(DNNTESTSDIR)/dnn-layer-dense$(EXESUF) +fate-dnn-layer-dense: CMD = run $(DNNTESTSDIR)/dnn-layer-dense$(EXESUF) fate-dnn-layer-dense: CMP = null FATE_DNN += fate-dnn-layer-depth2space -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: $(DNNTESTSDIR)/dnn-layer-depth2space$(EXESUF) +fate-dnn-layer-depth2space: CMD = run $(DNNTESTSDIR)/dnn-layer-depth2space$(EXESUF) fate-dnn-layer-depth2space: CMP = null FATE_DNN += fate-dnn-layer-mathbinary -fate-dnn-layer-mathbinary: $(DNNTESTSDIR)/dnn-layer-mathbinary-test$(EXESUF) -fate-dnn-layer-mathbinary: CMD = run $(DNNTESTSDIR)/dnn-layer-mathbinary-test$(EXESUF) +fate-dnn-layer-mathbinary: $(DNNTESTSDIR)/dnn-layer-mathbinary$(EXESUF) +fate-dnn-layer-mathbinary: CMD = run $(DNNTESTSDIR)/dnn-layer-mathbinary$(EXESUF) fate-dnn-layer-mathbinary: 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: $(DNNTESTSDIR)/dnn-layer-maximum$(EXESUF) +fate-dnn-layer-maximum: CMD = run $(DNNTESTSDIR)/dnn-layer-maximum$(EXESUF) fate-dnn-layer-maximum: CMP = null FATE_DNN += fate-dnn-layer-mathunary -fate-dnn-layer-mathunary: $(DNNTESTSDIR)/dnn-layer-mathunary-test$(EXESUF) -fate-dnn-layer-mathunary: CMD = run $(DNNTESTSDIR)/dnn-layer-mathunary-test$(EXESUF) +fate-dnn-layer-mathunary: $(DNNTESTSDIR)/dnn-layer-mathunary$(EXESUF) +fate-dnn-layer-mathunary: CMD = run $(DNNTESTSDIR)/dnn-layer-mathunary$(EXESUF) fate-dnn-layer-mathunary: CMP = null FATE_DNN += fate-dnn-layer-avgpool -fate-dnn-layer-avgpool: $(DNNTESTSDIR)/dnn-layer-avgpool-test$(EXESUF) -fate-dnn-layer-avgpool: CMD = run $(DNNTESTSDIR)/dnn-layer-avgpool-test$(EXESUF) +fate-dnn-layer-avgpool: $(DNNTESTSDIR)/dnn-layer-avgpool$(EXESUF) +fate-dnn-layer-avgpool: CMD = run $(DNNTESTSDIR)/dnn-layer-avgpool$(EXESUF) fate-dnn-layer-avgpool: CMP = null FATE-$(CONFIG_DNN) += $(FATE_DNN)