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

Commit 7550075c authored by Michael Butler's avatar Michael Butler Committed by android-build-merger
Browse files

Merge "Propagate ANNMemory_free to IBurstContext::freeMemory -- VTS update" 

am: 1e447c75

Change-Id: I7f84af4532a009a1c229c60cdde0098acf892fd7
parents f9f43281 1e447c75

neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp

+2 −2
Original line number Original line 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";

    ADD_FAILURE() << "asking for burst execution at V1_0";

    return nullptr;

    return nullptr;

}

}

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

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

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

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

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

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

}

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

                SCOPED_TRACE("burst");





                // create burst

                // create burst

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

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

                        CreateBurst(preparedModel);

                        CreateBurst(preparedModel);

                ASSERT_NE(nullptr, controller.get());

                ASSERT_NE(nullptr, controller.get());

neuralnetworks/1.2/vts/functional/ValidateRequest.cpp

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

        SCOPED_TRACE(message + " [burst]");





        // create burst

        // create burst

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

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

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

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

        ASSERT_NE(nullptr, burst.get());

        ASSERT_NE(nullptr, burst.get());