commit 1e447c752868d123e883b852ea27a042c39c00c0
author Michael Butler <butlermichael@google.com> Wed Apr 03 23:38:56 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 03 23:38:56 2019 +0000
tree 5e3c15d1e965177bdf6e7742c3d7d9c9eaa7f002
parent 72ff236669c43f5e0086b959202a8262b89ba550
parent 51c72186ceff70b6c66e03847b1f973403acdea5

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

neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp

diff --git a/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp b/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp
index 9c9779a..c819b52 100644
--- a/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp
+++ b/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp
@@ -125,7 +125,7 @@
     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 @@
                 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());
 

neuralnetworks/1.2/vts/functional/ValidateRequest.cpp

diff --git a/neuralnetworks/1.2/vts/functional/ValidateRequest.cpp b/neuralnetworks/1.2/vts/functional/ValidateRequest.cpp
index 09e26cc..870d017 100644
--- a/neuralnetworks/1.2/vts/functional/ValidateRequest.cpp
+++ b/neuralnetworks/1.2/vts/functional/ValidateRequest.cpp
@@ -155,7 +155,7 @@
         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());