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

Commit 102e0442 authored by Michael Butler's avatar Michael Butler
Browse files

Propagate ANNMemory_free to IBurstContext::freeMemory -- VTS update 

This CL adapts the VTS code to the corresponding changes made in the NN
utility library.

Bug: 128319484
Test: mma
Test: atest VtsHalNeuralnetworksV1_0Target
Test: atest VtsHalNeuralnetworksV1_1Target
Test: atest VtsHalNeuralnetworksV1_2Target
Change-Id: I470e8228cde2b75620ad851e4fe408f8e8329e7c
parent 6485342b

neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static std::unique_ptr<::android::nn::ExecutionBurstController> CreateBurst( 
    ADD_FAILURE() << "asking for burst execution at V1_0";

    return nullptr;

}

static std::unique_ptr<::android::nn::ExecutionBurstController> CreateBurst(

static std::shared_ptr<::android::nn::ExecutionBurstController> CreateBurst(

        const sp<V1_2::IPreparedModel>& preparedModel) {

    return ::android::nn::ExecutionBurstController::create(preparedModel, /*blocking=*/true);

}
@@ -286,7 +286,7 @@ void EvaluatePreparedModel(sp<T_IPreparedModel>& preparedModel, std::function<bo 
                SCOPED_TRACE("burst");



                // create burst

                const std::unique_ptr<::android::nn::ExecutionBurstController> controller =

                const std::shared_ptr<::android::nn::ExecutionBurstController> controller =

                        CreateBurst(preparedModel);

                ASSERT_NE(nullptr, controller.get());

neuralnetworks/1.2/vts/functional/ValidateRequest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static void validate(const sp<IPreparedModel>& preparedModel, const std::string& 
        SCOPED_TRACE(message + " [burst]");



        // create burst

        std::unique_ptr<::android::nn::ExecutionBurstController> burst =

        std::shared_ptr<::android::nn::ExecutionBurstController> burst =

                ::android::nn::ExecutionBurstController::create(preparedModel, /*blocking=*/true);

        ASSERT_NE(nullptr, burst.get());