From e68668f65bbc85268cfb7e591eed2f062d36f3f5 Mon Sep 17 00:00:00 2001 From: Michael Butler Date: Thu, 28 Mar 2019 13:41:14 -0700 Subject: [PATCH] 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 --- neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp | 2 +- neuralnetworks/1.2/vts/functional/ValidateRequest.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp b/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp index 106f33279d..9c9779a859 100644 --- a/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp +++ b/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp @@ -127,7 +127,7 @@ static std::unique_ptr<::android::nn::ExecutionBurstController> CreateBurst( } static std::unique_ptr<::android::nn::ExecutionBurstController> CreateBurst( const sp& 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 }; diff --git a/neuralnetworks/1.2/vts/functional/ValidateRequest.cpp b/neuralnetworks/1.2/vts/functional/ValidateRequest.cpp index b15f657348..09e26cc1ad 100644 --- a/neuralnetworks/1.2/vts/functional/ValidateRequest.cpp +++ b/neuralnetworks/1.2/vts/functional/ValidateRequest.cpp @@ -156,7 +156,7 @@ static void validate(const sp& 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