Merge "Refactor generated NNAPI tests (follow-up)" am: 651869e0c6 am: adf64d6cbe am: 6c1d24473f am: 0deb8aa21b

am: 20763ef488

Change-Id: I9e96057d994c322157588b818de58bc09089e796
This commit is contained in:
Slava Shklyaev
2019-08-15 13:39:20 -07:00
committed by android-build-merger
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