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

Commit 60a2253b authored by Michael Butler's avatar Michael Butler
Browse files

NNAPI Burst object cleanup -- VTS update 

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

Bug: 119570067
Test: mma
Test: atest VtsHalNeuralnetworksV1_0Target
Test: atest VtsHalNeuralnetworksV1_1Target
Test: atest VtsHalNeuralnetworksV1_2Target
Change-Id: I7cbc1d7025c0352aa1ed29d71dc84c2fcfc20a4f
Merged-In: I7cbc1d7025c0352aa1ed29d71dc84c2fcfc20a4f
(cherry picked from commit e68668f6)
parent 7c06193d

neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static std::unique_ptr<::android::nn::ExecutionBurstController> CreateBurst( 
}

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

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

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

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

}

enum class Executor { ASYNC, SYNC, BURST };

enum class OutputType { FULLY_SPECIFIED, UNSPECIFIED, INSUFFICIENT };

neuralnetworks/1.2/vts/functional/ValidateRequest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static void validate(const sp<IPreparedModel>& preparedModel, const std::string& 


        // create burst

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

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

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

        ASSERT_NE(nullptr, burst.get());



        // create memory keys