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

Commit ef85db2b authored by Michael Butler's avatar Michael Butler Committed by Android (Google) Code Review
Browse files

Merge "Add validation tests for NNAPI Burst serialized format" into qt-dev

parents e867be8b 20f28a24

neuralnetworks/1.0/vts/functional/VtsHalNeuralnetworks.cpp

+5 −0
Original line number Diff line number Diff line
@@ -68,6 +68,11 @@ void NeuralnetworksHidlTest::TearDown() { 
    ::testing::VtsHalHidlTargetTestBase::TearDown();

}



void ValidationTest::validateEverything(const Model& model, const std::vector<Request>& request) {

    validateModel(model);

    validateRequests(model, request);

}



}  // namespace functional

}  // namespace vts

}  // namespace V1_0

neuralnetworks/1.0/vts/functional/VtsHalNeuralnetworks.h

+5 −2
Original line number Diff line number Diff line
@@ -63,6 +63,9 @@ class NeuralnetworksHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
// Tag for the validation tests

class ValidationTest : public NeuralnetworksHidlTest {

   protected:

     void validateEverything(const Model& model, const std::vector<Request>& request);



   private:

     void validateModel(const Model& model);

     void validateRequests(const Model& model, const std::vector<Request>& request);

};

neuralnetworks/1.1/vts/functional/VtsHalNeuralnetworks.cpp

+5 −0
Original line number Diff line number Diff line
@@ -68,6 +68,11 @@ void NeuralnetworksHidlTest::TearDown() { 
    ::testing::VtsHalHidlTargetTestBase::TearDown();

}



void ValidationTest::validateEverything(const Model& model, const std::vector<Request>& request) {

    validateModel(model);

    validateRequests(model, request);

}



}  // namespace functional

}  // namespace vts

}  // namespace V1_1

neuralnetworks/1.1/vts/functional/VtsHalNeuralnetworks.h

+5 −2
Original line number Diff line number Diff line
@@ -72,6 +72,9 @@ class NeuralnetworksHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
// Tag for the validation tests

class ValidationTest : public NeuralnetworksHidlTest {

   protected:

     void validateEverything(const Model& model, const std::vector<Request>& request);



   private:

     void validateModel(const Model& model);

     void validateRequests(const Model& model, const std::vector<Request>& request);

};

neuralnetworks/1.2/vts/functional/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ cc_test { 
    defaults: ["VtsHalNeuralNetworksTargetTestDefaults"],

    srcs: [

        "GeneratedTestsV1_0.cpp",

        "ValidateBurst.cpp",

    ],

    cflags: [

        "-DNN_TEST_DYNAMIC_OUTPUT_SHAPE"
@@ -32,6 +33,7 @@ cc_test { 
    defaults: ["VtsHalNeuralNetworksTargetTestDefaults"],

    srcs: [

        "GeneratedTestsV1_1.cpp",

        "ValidateBurst.cpp",

    ],

    cflags: [

        "-DNN_TEST_DYNAMIC_OUTPUT_SHAPE"
@@ -46,6 +48,7 @@ cc_test { 
        "BasicTests.cpp",

        "CompilationCachingTests.cpp",

        "GeneratedTests.cpp",

        "ValidateBurst.cpp",

    ],

    cflags: [

        "-DNN_TEST_DYNAMIC_OUTPUT_SHAPE"
@@ -58,6 +61,7 @@ cc_test { 
    srcs: [

        "BasicTests.cpp",

        "GeneratedTests.cpp",

        "ValidateBurst.cpp",

    ],

    cflags: [

        "-DNN_TEST_DYNAMIC_OUTPUT_SHAPE",