Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adf64d6c authored by Slava Shklyaev's avatar Slava Shklyaev Committed by android-build-merger
Browse files

Merge "Refactor generated NNAPI tests (follow-up)" 

am: 651869e0

Change-Id: Ia3bdfbfc6abbdc970efcd0cf31df2b58676eebe8
parents e2f9d55a 651869e0

neuralnetworks/1.0/vts/functional/GeneratedTests.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -32,7 +32,4 @@ namespace android::hardware::neuralnetworks::V1_0::generated_tests { 




using namespace android::hardware::neuralnetworks::V1_0::vts::functional;

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
 
}  // namespace android::hardware::neuralnetworks::V1_0::generated_tests

neuralnetworks/1.1/vts/functional/GeneratedTests.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -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::OperandLifeTime;

using ::android::hardware::neuralnetworks::V1_0::Request;

using ::android::hardware::neuralnetworks::V1_0::Request;

using ::android::hardware::neuralnetworks::V1_1::Model;





}  // namespace android::hardware::neuralnetworks::V1_1::generated_tests
 
}  // namespace android::hardware::neuralnetworks::V1_1::generated_tests

neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp

+4 −3
Original line number Original line Diff line number Diff line
@@ -35,10 +35,11 @@ 
#include "Utils.h"

#include "Utils.h"

#include "VtsHalNeuralnetworks.h"

#include "VtsHalNeuralnetworks.h"





namespace android::hardware::neuralnetworks::V1_2::generated_tests::

namespace android::hardware::neuralnetworks::V1_2 {

        mobilenet_224_gender_basic_fixed {

namespace generated_tests::mobilenet_224_gender_basic_fixed {

Model createTestModel();

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 {

namespace generated_tests::mobilenet_224_gender_basic_fixed {

std::vector<test_helper::MixedTypedExample>& get_examples();

std::vector<test_helper::MixedTypedExample>& get_examples();

neuralnetworks/1.2/vts/functional/GeneratedTests.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -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::OperandLifeTime;

using ::android::hardware::neuralnetworks::V1_0::Request;

using ::android::hardware::neuralnetworks::V1_0::Request;

using ::android::hardware::neuralnetworks::V1_2::Model;





}  // namespace android::hardware::neuralnetworks::V1_2::generated_tests
 
}  // namespace android::hardware::neuralnetworks::V1_2::generated_tests