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

Commit 2234fc66 authored by Michael Butler's avatar Michael Butler Committed by android-build-merger
Browse files

NNAPI Burst object cleanup -- VTS update am: 60a2253b 

am: 12b4bc76

Change-Id: I6cdec360636481d02525ff04257ca2ce70eb88f5
parents 139f8bd9 12b4bc76

neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp

+1 −1
Original line number Original line 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(

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

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

        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 Executor { ASYNC, SYNC, BURST };

enum class OutputType { FULLY_SPECIFIED, UNSPECIFIED, INSUFFICIENT };

enum class OutputType { FULLY_SPECIFIED, UNSPECIFIED, INSUFFICIENT };

neuralnetworks/1.2/vts/functional/ValidateRequest.cpp

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




        // create burst

        // create burst

        std::unique_ptr<::android::nn::ExecutionBurstController> 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());

        ASSERT_NE(nullptr, burst.get());





        // create memory keys

        // create memory keys