From 0da5c34a3a20129673491297ff5bdd6758794ff5 Mon Sep 17 00:00:00 2001 From: Slava Shklyaev Date: Wed, 17 Jul 2019 15:50:57 +0100 Subject: [PATCH] Refactor generated NNAPI tests (follow-up) Bug: 136097638 Test: m Change-Id: I0688a843ab04caca9d62f95d38179804eb1b0f80 --- neuralnetworks/1.0/vts/functional/GeneratedTests.h | 3 --- neuralnetworks/1.1/vts/functional/GeneratedTests.h | 1 - .../1.2/vts/functional/CompilationCachingTests.cpp | 7 ++++--- neuralnetworks/1.2/vts/functional/GeneratedTests.h | 1 - 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/neuralnetworks/1.0/vts/functional/GeneratedTests.h b/neuralnetworks/1.0/vts/functional/GeneratedTests.h index 11ee5e882a..5cabf68c1d 100644 --- a/neuralnetworks/1.0/vts/functional/GeneratedTests.h +++ b/neuralnetworks/1.0/vts/functional/GeneratedTests.h @@ -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 diff --git a/neuralnetworks/1.1/vts/functional/GeneratedTests.h b/neuralnetworks/1.1/vts/functional/GeneratedTests.h index 2343a4f955..80442bfece 100644 --- a/neuralnetworks/1.1/vts/functional/GeneratedTests.h +++ b/neuralnetworks/1.1/vts/functional/GeneratedTests.h @@ -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 diff --git a/neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp b/neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp index 082d7583a3..590764635e 100644 --- a/neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp +++ b/neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp @@ -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& get_examples(); diff --git a/neuralnetworks/1.2/vts/functional/GeneratedTests.h b/neuralnetworks/1.2/vts/functional/GeneratedTests.h index f393eb2499..98420364b2 100644 --- a/neuralnetworks/1.2/vts/functional/GeneratedTests.h +++ b/neuralnetworks/1.2/vts/functional/GeneratedTests.h @@ -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