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

Commit 0bdce7c3 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge changes from topics "executeFenced_tests", "nnapi-decouple-1.2" am: 8db59c36 am: c785386a 

Change-Id: I30f3ee90899a04d26c7e69e344f3f5fda5dd3104
parents 717fdba9 c785386a

neuralnetworks/1.2/vts/functional/Android.bp

+8 −6
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ cc_library_static { 
    ],

    header_libs: [

        "libbase_headers",

    ]

    ],

}



cc_test {
@@ -39,9 +39,9 @@ cc_test { 
        "CompilationCachingTests.cpp",

        "GeneratedTestHarness.cpp",

        "TestAssertions.cpp",

        "ValidateBurst.cpp",

        "ValidateModel.cpp",

        "ValidateRequest.cpp",

        "ValidateBurst.cpp",

        "VtsHalNeuralnetworks.cpp",

    ],

    local_include_dirs: ["include"],
@@ -50,18 +50,17 @@ cc_test { 
        "libnativewindow",

    ],

    static_libs: [

        "VtsHalNeuralNetworksV1_0_utils",

        "VtsHalNeuralNetworksV1_2Callbacks",

        "android.hardware.neuralnetworks@1.0",

        "android.hardware.neuralnetworks@1.1",

        "android.hardware.neuralnetworks@1.2",

        "android.hardware.neuralnetworks@1.3",

        "android.hidl.allocator@1.0",

        "android.hidl.memory@1.0",

        "libgmock",

        "libhidlmemory",

        "libneuralnetworks_generated_test_harness",

        "libneuralnetworks_utils",

        "VtsHalNeuralNetworksV1_0_utils",

        "VtsHalNeuralNetworksV1_2Callbacks",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_0_example",
@@ -71,5 +70,8 @@ cc_test { 
    header_libs: [

        "libneuralnetworks_headers",

    ],

    test_suites: ["general-tests", "vts-core"],

    test_suites: [

        "general-tests",

        "vts-core",

    ],

}

neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include "GeneratedTestHarness.h"

#include "MemoryUtils.h"

#include "TestHarness.h"

#include "Utils.h"

#include "VtsHalNeuralnetworks.h"



// Forward declaration of the mobilenet generated test models in

neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp

+1 −2
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#include "ExecutionBurstController.h"

#include "MemoryUtils.h"

#include "TestHarness.h"

#include "Utils.h"

#include "VtsHalNeuralnetworks.h"



namespace android::hardware::neuralnetworks::V1_2::vts::functional {
@@ -273,7 +272,7 @@ void EvaluatePreparedModel(const sp<IPreparedModel>& preparedModel, const TestMo 
            int n;

            std::tie(n, outputShapes, timing, std::ignore) =

                    controller->compute(request, testConfig.measureTiming, keys);

            executionStatus = nn::convertToV1_0(nn::convertResultCodeToErrorStatus(n));

            executionStatus = nn::legacyConvertResultCodeToErrorStatus(n);



            break;

        }

neuralnetworks/1.2/vts/functional/ValidateBurst.cpp

+2 −4
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include "ExecutionBurstServer.h"

#include "GeneratedTestHarness.h"

#include "TestHarness.h"

#include "Utils.h"



#include <android-base/logging.h>

#include <chrono>
@@ -296,8 +295,7 @@ static void validateBurstFmqLength(const sp<IPreparedModel>& preparedModel, 
    // collect serialized result by running regular burst

    const auto [nRegular, outputShapesRegular, timingRegular, fallbackRegular] =

            controllerRegular->compute(request, MeasureTiming::NO, keys);

    const ErrorStatus statusRegular =

            nn::convertToV1_0(nn::convertResultCodeToErrorStatus(nRegular));

    const ErrorStatus statusRegular = nn::legacyConvertResultCodeToErrorStatus(nRegular);

    EXPECT_FALSE(fallbackRegular);



    // skip test if regular burst output isn't useful for testing a failure
@@ -313,7 +311,7 @@ static void validateBurstFmqLength(const sp<IPreparedModel>& preparedModel, 
    // large enough to return the serialized result

    const auto [nSmall, outputShapesSmall, timingSmall, fallbackSmall] =

            controllerSmall->compute(request, MeasureTiming::NO, keys);

    const ErrorStatus statusSmall = nn::convertToV1_0(nn::convertResultCodeToErrorStatus(nSmall));

    const ErrorStatus statusSmall = nn::legacyConvertResultCodeToErrorStatus(nSmall);

    EXPECT_NE(ErrorStatus::NONE, statusSmall);

    EXPECT_EQ(0u, outputShapesSmall.size());

    EXPECT_TRUE(badTiming(timingSmall));

neuralnetworks/1.2/vts/functional/ValidateRequest.cpp

+1 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include "ExecutionBurstController.h"

#include "GeneratedTestHarness.h"

#include "TestHarness.h"

#include "Utils.h"

#include "VtsHalNeuralnetworks.h"



namespace android::hardware::neuralnetworks::V1_2::vts::functional {
@@ -107,7 +106,7 @@ static void validate(const sp<IPreparedModel>& preparedModel, const std::string& 


        // execute and verify

        const auto [n, outputShapes, timing, fallback] = burst->compute(request, measure, keys);

        const ErrorStatus status = nn::convertToV1_0(nn::convertResultCodeToErrorStatus(n));

        const ErrorStatus status = nn::legacyConvertResultCodeToErrorStatus(n);

        EXPECT_EQ(ErrorStatus::INVALID_ARGUMENT, status);

        EXPECT_EQ(outputShapes.size(), 0);

        EXPECT_TRUE(badTiming(timing));