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

Commit b1865b65 authored by Michael Butler's avatar Michael Butler Committed by Slava Shklyaev
Browse files

Remove extra tests from NNAPI VTS validation tests 

Do not run validation on "inputs_as_internal" and
"all_tensors_as_inputs" variants.

Bug: 138149072
Bug: 149840439
Test: mma
Test: VtsHalNeuralnetworksV1_*TargetTest
Change-Id: I0699ed6703e48b6c4bc0e7a392b79c12770f04c9
Merged-In: I0699ed6703e48b6c4bc0e7a392b79c12770f04c9
(cherry picked from commit 678a1060)
parent 702a91ac

neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp

+4 −0
Original line number Diff line number Diff line
@@ -160,6 +160,10 @@ std::vector<NamedModel> getNamedModels(const FilterFn& filter) { 
    return TestModelManager::get().getTestModels(filter);

}



std::vector<NamedModel> getNamedModels(const FilterNameFn& filter) {

    return TestModelManager::get().getTestModels(filter);

}



std::string printGeneratedTest(const testing::TestParamInfo<GeneratedTestParam>& info) {

    const auto& [namedDevice, namedModel] = info.param;

    return gtestCompliantName(getName(namedDevice) + "_" + getName(namedModel));

neuralnetworks/1.0/vts/functional/GeneratedTestHarness.h

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ class GeneratedTestBase : public testing::TestWithParam<GeneratedTestParam> { 
using FilterFn = std::function<bool(const test_helper::TestModel&)>;

std::vector<NamedModel> getNamedModels(const FilterFn& filter);



using FilterNameFn = std::function<bool(const std::string&)>;

std::vector<NamedModel> getNamedModels(const FilterNameFn& filter);



std::string printGeneratedTest(const testing::TestParamInfo<GeneratedTestParam>& info);



#define INSTANTIATE_GENERATED_TEST(TestSuite, filter)                                     \

neuralnetworks/1.0/vts/functional/VtsHalNeuralnetworks.cpp

+6 −1
Original line number Diff line number Diff line
@@ -135,6 +135,11 @@ TEST_P(ValidationTest, Test) { 
    validateEverything(kDevice, model, request);

}



INSTANTIATE_GENERATED_TEST(ValidationTest, [](const test_helper::TestModel&) { return true; });

INSTANTIATE_GENERATED_TEST(ValidationTest, [](const std::string& testName) {

    // Skip validation for the "inputs_as_internal" and "all_tensors_as_inputs"

    // generated tests.

    return testName.find("inputs_as_internal") == std::string::npos &&

           testName.find("all_tensors_as_inputs") == std::string::npos;

});



}  // namespace android::hardware::neuralnetworks::V1_0::vts::functional

neuralnetworks/1.1/vts/functional/GeneratedTestHarness.cpp

+4 −0
Original line number Diff line number Diff line
@@ -168,6 +168,10 @@ std::vector<NamedModel> getNamedModels(const FilterFn& filter) { 
    return TestModelManager::get().getTestModels(filter);

}



std::vector<NamedModel> getNamedModels(const FilterNameFn& filter) {

    return TestModelManager::get().getTestModels(filter);

}



std::string printGeneratedTest(const testing::TestParamInfo<GeneratedTestParam>& info) {

    const auto& [namedDevice, namedModel] = info.param;

    return gtestCompliantName(getName(namedDevice) + "_" + getName(namedModel));

neuralnetworks/1.1/vts/functional/GeneratedTestHarness.h

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ class GeneratedTestBase : public testing::TestWithParam<GeneratedTestParam> { 
using FilterFn = std::function<bool(const test_helper::TestModel&)>;

std::vector<NamedModel> getNamedModels(const FilterFn& filter);



using FilterNameFn = std::function<bool(const std::string&)>;

std::vector<NamedModel> getNamedModels(const FilterNameFn& filter);



std::string printGeneratedTest(const testing::TestParamInfo<GeneratedTestParam>& info);



#define INSTANTIATE_GENERATED_TEST(TestSuite, filter)                                     \