diff options
| author | Slava Shklyaev <slavash@google.com> | 2020-08-13 13:16:03 +0100 |
|---|---|---|
| committer | Slava Shklyaev <slavash@google.com> | 2020-11-02 10:07:07 +0000 |
| commit | cbcaa00003cf5a4597460dbb5f8cb9f992e939e7 (patch) | |
| tree | fcfc08ec92b731594fc96c586e1207bccce2624d /nn/common/operations/LSHProjection.h | |
| parent | e4a030ef549d8d2c279436628c961eb3f70df7d6 (diff) | |
| download | ml-cbcaa00003cf5a4597460dbb5f8cb9f992e939e7.tar.gz | |
Migrate NNAPI runtime to canonical types
This change replaces most uses of HAL types in the codebase with
equivalent canonical types. Later changes will introduce more
refactorings.
Also removes unused files nn/runtime/test/Bridge.{h,cpp}.
Bug: 160669906
Fix: 155923931
Test: NeuralNetworksTest_static (all 7 passes)
Test: NeuralNetworksTest_operations
Test: NeuralNetworksTest_utils
Test: NeuralNetworksTest_logtag
Test: nnCache_test
Test: BlobCache_test
Change-Id: I63fa286e926a096948f1b1b172d1d562c4f52f29
Merged-In: I63fa286e926a096948f1b1b172d1d562c4f52f29
(cherry picked from commit 069993366ce59913ff162ed144749bb8794d990c)
Diffstat (limited to 'nn/common/operations/LSHProjection.h')
| -rw-r--r-- | nn/common/operations/LSHProjection.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nn/common/operations/LSHProjection.h b/nn/common/operations/LSHProjection.h index 520f58a89..3a953a0ad 100644 --- a/nn/common/operations/LSHProjection.h +++ b/nn/common/operations/LSHProjection.h @@ -19,7 +19,7 @@ #include <vector> -#include "HalInterfaces.h" +#include "nnapi/Types.h" namespace android { namespace nn { @@ -36,9 +36,9 @@ struct Shape; class LSHProjection { public: - LSHProjection(const hal::Operation& operation, RunTimeOperandInfo* operands); + LSHProjection(const Operation& operation, RunTimeOperandInfo* operands); - static bool Prepare(const hal::Operation& operation, RunTimeOperandInfo* operands, + static bool Prepare(const Operation& operation, RunTimeOperandInfo* operands, Shape* outputShape); template <typename T> bool Eval(); |