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

This commit is contained in:
Michael Butler
2019-04-02 21:57:35 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 3 deletions

View File

@@ -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());

View File

@@ -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());