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

Commit 3eee94d0 authored by Michael Butler's avatar Michael Butler Committed by Automerger Merge Worker
Browse files

Merge "Remove extra tests from NNAPI VTS validation tests" into rvc-dev am:... 

Merge "Remove extra tests from NNAPI VTS validation tests" into rvc-dev am: 3c8593c0 am: 6d82995d am: 259dfdf3

Change-Id: Ia74ebb571088ae7dc0b4824cc4763698b3258009
parents 75c7786e 259dfdf3

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)                                     \