diff options
| author | Michael Butler <butlermichael@google.com> | 2019-09-07 19:06:54 -0700 |
|---|---|---|
| committer | Michael Butler <butlermichael@google.com> | 2019-09-11 11:06:43 -0700 |
| commit | 4906200354133ef0565eb599de7e88a3432d5a11 (patch) | |
| tree | aa23c55dfd21516d923cd05a2cecb8987fbdb0c1 /nn/runtime/test/TestPartitioningRandom.cpp | |
| parent | ceecaab5179b49babcfa686567554276c38be305 (diff) | |
| download | ml-4906200354133ef0565eb599de7e88a3432d5a11.tar.gz | |
Cleanup CacheToken and HalInterfaces
Prior to this CL, many different NN runtime files declared HidlToken.
This CL relocates the HidlToken definition to HalInterfaces.h and
renames it to CacheToken.
This CL additionally removes the redundant hardware::interfaces::
qualifier in HalInterfaces.h.
Bug: N/A
Test: mma
Change-Id: Ic7dc75b982d9d511a357f0ed5cb4bea1e79b0345
Merged-In: Ic7dc75b982d9d511a357f0ed5cb4bea1e79b0345
(cherry picked from commit a34d9c7f0c58362d0c345e38f130e2b380e93b4b)
Diffstat (limited to 'nn/runtime/test/TestPartitioningRandom.cpp')
| -rw-r--r-- | nn/runtime/test/TestPartitioningRandom.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nn/runtime/test/TestPartitioningRandom.cpp b/nn/runtime/test/TestPartitioningRandom.cpp index e591f1697..faf28d782 100644 --- a/nn/runtime/test/TestPartitioningRandom.cpp +++ b/nn/runtime/test/TestPartitioningRandom.cpp @@ -97,7 +97,6 @@ using DeviceManager = nn::DeviceManager; using ExecutionPlan = nn::ExecutionPlan; using HalVersion = nn::HalVersion; using HidlModel = V1_2::Model; -using HidlToken = hidl_array<uint8_t, ANEURALNETWORKS_BYTE_SIZE_OF_CACHE_TOKEN>; using ModelBuilder = nn::ModelBuilder; using Result = nn::test_wrapper::Result; using SampleDriver = nn::sample_driver::SampleDriver; @@ -553,7 +552,7 @@ class TestDriver : public SampleDriver { Return<ErrorStatus> prepareModel_1_2(const HidlModel& model, ExecutionPreference preference, const hidl_vec<hidl_handle>& modelCache, const hidl_vec<hidl_handle>& dataCache, - const HidlToken& token, + const CacheToken& token, const sp<IPreparedModelCallback>& callback) override { // NOTE: We verify that all operations in the model are supported. ErrorStatus outStatus = ErrorStatus::INVALID_ARGUMENT; |