From ae2b5e789e1441a44ba97d84015e0b3dd1ac4a91 Mon Sep 17 00:00:00 2001 From: gichan Date: Wed, 23 Nov 2022 12:10:23 +0900 Subject: [PATCH] Revert "[ CI ] Temporal Fix for the CI about NNStreamer Backone" This reverts commit e41011408c1dc51737e3884644c704fccee871a3. Signed-off-by: gichan --- .../TransferLearning/Draw_Classification/jni/meson.build | 8 ++++---- debian/rules | 4 ++-- packaging/nntrainer.spec | 10 +++++----- test/nnstreamer/meson.build | 8 ++++---- test/unittest/layers/unittest_layers_nnstreamer.cpp | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Applications/TransferLearning/Draw_Classification/jni/meson.build b/Applications/TransferLearning/Draw_Classification/jni/meson.build index 04ae08a..f2757de 100644 --- a/Applications/TransferLearning/Draw_Classification/jni/meson.build +++ b/Applications/TransferLearning/Draw_Classification/jni/meson.build @@ -30,7 +30,7 @@ nntrainer_filter_env = environment() nntrainer_filter_env.set('GTEST_OUTPUT', 'xml:@0@/@1@.xml'.format(meson.build_root(), 'app_draw_classification')) nntrainer_filter_env.set('NNSTREAMER_FILTERS', meson.build_root() / 'nnstreamer' / 'tensor_filter') -# if get_option('enable-nnstreamer-tensor-filter') -# test('app_draw_classification', e, env: nntrainer_filter_env, -# args: [nntr_draw_resdir / 'Training.ini', nntr_draw_resdir], timeout: 150) -# endif +if get_option('enable-nnstreamer-tensor-filter') + test('app_draw_classification', e, env: nntrainer_filter_env, + args: [nntr_draw_resdir / 'Training.ini', nntr_draw_resdir], timeout: 150) +endif diff --git a/debian/rules b/debian/rules index 31deec7..040d838 100755 --- a/debian/rules +++ b/debian/rules @@ -37,8 +37,8 @@ override_dh_auto_configure: --includedir=include -Dinstall-app=true \ -Dreduce-tolerance=$(ENABLE_REDUCE_TOLERANCE) \ -Denable-debug=$(ENABLE_DEBUG) \ - -Dml-api-support=enabled -Denable-nnstreamer-tensor-filter=true \ - -Denable-nnstreamer-backbone=true \ + -Dml-api-support=enabled -Denable-nnstreamer-tensor-filter=false \ + -Denable-nnstreamer-backbone=false \ -Dcapi-ml-common-actual=capi-ml-common \ -Dcapi-ml-inference-actual=capi-ml-inference \ -Denable-capi=enabled \ diff --git a/packaging/nntrainer.spec b/packaging/nntrainer.spec index b4f41c9..c271ca7 100644 --- a/packaging/nntrainer.spec +++ b/packaging/nntrainer.spec @@ -384,11 +384,11 @@ meson test -C build -t 2.0 --print-errorlogs # unittest for nntrainer plugin for nnstreamer # todo: migrate this to meson test soon -# %if 0%{?nnstreamer_filter} -# pushd test/nnstreamer -# ssat -# popd -# %endif #nnstreamer_filter +%if 0%{?nnstreamer_filter} +pushd test/nnstreamer +ssat +popd +%endif #nnstreamer_filter %endif #unit_test %if 0%{?gcov:1} diff --git a/test/nnstreamer/meson.build b/test/nnstreamer/meson.build index d62ba2e..70ef712 100644 --- a/test/nnstreamer/meson.build +++ b/test/nnstreamer/meson.build @@ -22,10 +22,10 @@ else nntrainer_filter_env = environment() nntrainer_filter_env.set('NNSTREAMER_FILTERS', meson.build_root() / 'nnstreamer' / 'tensor_filter') - # test(test_name, exe, - # args: '--gtest_output=xml:@0@/@1@.xml'.format(meson.build_root(), test_name), - # env: nntrainer_filter_env - # ) + test(test_name, exe, + args: '--gtest_output=xml:@0@/@1@.xml'.format(meson.build_root(), test_name), + env: nntrainer_filter_env + ) endif diff --git a/test/unittest/layers/unittest_layers_nnstreamer.cpp b/test/unittest/layers/unittest_layers_nnstreamer.cpp index f39b801..f81036c 100644 --- a/test/unittest/layers/unittest_layers_nnstreamer.cpp +++ b/test/unittest/layers/unittest_layers_nnstreamer.cpp @@ -22,5 +22,5 @@ auto semantic_nnstreamer = LayerSemanticsParamType( {"model_path=../test/test_models/models/add.tflite"}, LayerCreateSetPropertyOptions::AVAILABLE_FROM_APP_CONTEXT, false, 1); -// GTEST_PARAMETER_TEST(NNStreamer, LayerSemantics, -// ::testing::Values(semantic_nnstreamer)); +GTEST_PARAMETER_TEST(NNStreamer, LayerSemantics, + ::testing::Values(semantic_nnstreamer)); -- 2.7.4