Refactor generated NNAPI tests (follow-up)

Bug: 136097638
Test: m
Change-Id: I0688a843ab04caca9d62f95d38179804eb1b0f80
This commit is contained in:
Slava Shklyaev
2019-07-17 15:50:57 +01:00
parent e8b2446b35
commit 0da5c34a3a
4 changed files with 4 additions and 8 deletions

View File

@@ -32,7 +32,4 @@ namespace android::hardware::neuralnetworks::V1_0::generated_tests {
using namespace android::hardware::neuralnetworks::V1_0::vts::functional;
using ::android::hardware::neuralnetworks::V1_0::Model;
using ::android::hardware::neuralnetworks::V1_0::Request;
} // namespace android::hardware::neuralnetworks::V1_0::generated_tests

View File

@@ -34,6 +34,5 @@ using namespace android::hardware::neuralnetworks::V1_1::vts::functional;
using ::android::hardware::neuralnetworks::V1_0::OperandLifeTime;
using ::android::hardware::neuralnetworks::V1_0::Request;
using ::android::hardware::neuralnetworks::V1_1::Model;
} // namespace android::hardware::neuralnetworks::V1_1::generated_tests

View File

@@ -35,10 +35,11 @@
#include "Utils.h"
#include "VtsHalNeuralnetworks.h"
namespace android::hardware::neuralnetworks::V1_2::generated_tests::
mobilenet_224_gender_basic_fixed {
namespace android::hardware::neuralnetworks::V1_2 {
namespace generated_tests::mobilenet_224_gender_basic_fixed {
Model createTestModel();
} // namespace android::hardware::neuralnetworks::V1_2::generated_tests::mobilenet_224_gender_basic_fixed
} // namespace generated_tests::mobilenet_224_gender_basic_fixed
} // namespace android::hardware::neuralnetworks::V1_2
namespace generated_tests::mobilenet_224_gender_basic_fixed {
std::vector<test_helper::MixedTypedExample>& get_examples();

View File

@@ -35,6 +35,5 @@ using namespace ::android::hardware::neuralnetworks::V1_2::vts::functional;
using ::android::hardware::neuralnetworks::V1_0::OperandLifeTime;
using ::android::hardware::neuralnetworks::V1_0::Request;
using ::android::hardware::neuralnetworks::V1_2::Model;
} // namespace android::hardware::neuralnetworks::V1_2::generated_tests