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

Commit 7d5b7d3d authored by Michael Butler's avatar Michael Butler Committed by android-build-merger
Browse files

Merge "Add presubmit tests to NNAPI -- hardware/interfaces/neuralnetworks" am: 80ad3f84 

am: 6e9f3462

Change-Id: I0f5a12f2884c94bae6ade5f703b4bc23ec551599
parents d540ee85 6e9f3462

neuralnetworks/1.0/vts/functional/Android.bp

+13 −1
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ cc_defaults { 
            },

        },

    },

    test_suites: ["general-tests"],

}



cc_test {
@@ -89,5 +90,16 @@ cc_test { 
        "BasicTests.cpp",

        "GeneratedTests.cpp",

    ],

    test_suites: ["general-tests"],

}



cc_test {

    name: "PresubmitHalNeuralnetworksV1_0TargetTest",

    defaults: ["VtsHalNeuralNetworksTargetTestDefaults"],

    srcs: [

        "BasicTests.cpp",

        "GeneratedTests.cpp",

    ],

    cflags: [

        "-DPRESUBMIT_NOT_VTS",

    ],

}

neuralnetworks/1.0/vts/functional/VtsHalNeuralnetworks.cpp

+11 −1
Original line number Diff line number Diff line
@@ -50,6 +50,16 @@ void NeuralnetworksHidlTest::SetUp() { 
    ::testing::VtsHalHidlTargetTestBase::SetUp();

    device = ::testing::VtsHalHidlTargetTestBase::getService<IDevice>(

            NeuralnetworksHidlEnvironment::getInstance());



#ifdef PRESUBMIT_NOT_VTS

    const std::string name =

            NeuralnetworksHidlEnvironment::getInstance()->getServiceName<IDevice>();

    const std::string sampleDriver = "sample-";

    if (device == nullptr && name.substr(0, sampleDriver.size()) == sampleDriver) {

        GTEST_SKIP();

    }

#endif  // PRESUBMIT_NOT_VTS



    ASSERT_NE(nullptr, device.get());

}

neuralnetworks/1.1/vts/functional/Android.bp

+12 −1
Original line number Diff line number Diff line
@@ -31,5 +31,16 @@ cc_test { 
        "BasicTests.cpp",

        "GeneratedTests.cpp",

    ],

    test_suites: ["general-tests"],

}



cc_test {

    name: "PresubmitHalNeuralnetworksV1_1TargetTest",

    defaults: ["VtsHalNeuralNetworksTargetTestDefaults"],

    srcs: [

        "BasicTests.cpp",

        "GeneratedTests.cpp",

    ],

    cflags: [

        "-DPRESUBMIT_NOT_VTS",

    ],

}

neuralnetworks/1.1/vts/functional/VtsHalNeuralnetworks.cpp

+11 −1
Original line number Diff line number Diff line
@@ -50,6 +50,16 @@ void NeuralnetworksHidlTest::SetUp() { 
    ::testing::VtsHalHidlTargetTestBase::SetUp();

    device = ::testing::VtsHalHidlTargetTestBase::getService<IDevice>(

            NeuralnetworksHidlEnvironment::getInstance());



#ifdef PRESUBMIT_NOT_VTS

    const std::string name =

            NeuralnetworksHidlEnvironment::getInstance()->getServiceName<IDevice>();

    const std::string sampleDriver = "sample-";

    if (device == nullptr && name.substr(0, sampleDriver.size()) == sampleDriver) {

        GTEST_SKIP();

    }

#endif  // PRESUBMIT_NOT_VTS



    ASSERT_NE(nullptr, device.get());

}

neuralnetworks/1.2/vts/functional/Android.bp

+13 −3
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ cc_test { 
    cflags: [

        "-DNN_TEST_DYNAMIC_OUTPUT_SHAPE"

    ],

    test_suites: ["general-tests"],

}



// Tests for V1_1 models using the V1_2 HAL.
@@ -37,7 +36,6 @@ cc_test { 
    cflags: [

        "-DNN_TEST_DYNAMIC_OUTPUT_SHAPE"

    ],

    test_suites: ["general-tests"],

}



// Tests for V1_2 models.
@@ -52,5 +50,17 @@ cc_test { 
    cflags: [

        "-DNN_TEST_DYNAMIC_OUTPUT_SHAPE"

    ],

    test_suites: ["general-tests"],

}



cc_test {

    name: "PresubmitHalNeuralnetworksV1_2TargetTest",

    defaults: ["VtsHalNeuralNetworksTargetTestDefaults"],

    srcs: [

        "BasicTests.cpp",

        "GeneratedTests.cpp",

    ],

    cflags: [

        "-DNN_TEST_DYNAMIC_OUTPUT_SHAPE",

        "-DPRESUBMIT_NOT_VTS",

    ],

}