diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2018-09-07 09:25:10 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-09-18 12:40:42 +0100 |
| commit | 8b287c23f5141102555ba869a34397ec720a3e4f (patch) | |
| tree | 4a60d9c806669aad06816414601ac532946d6878 /test/Merger.cpp | |
| parent | 77605826a353981d41f0ee346850d411770535f8 (diff) | |
| download | android-nn-driver-8b287c23f5141102555ba869a34397ec720a3e4f.tar.gz | |
IVGCVSW-1806 More Android NN Driver refactoring
* Changed #if defined to #ifdef
* Simplified the Android ML namespace resolution
* Fixed the relative path in some include directives
Change-Id: I46e46faff98559c8042c1a4b8b82007f462df57d
Diffstat (limited to 'test/Merger.cpp')
| -rw-r--r-- | test/Merger.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/Merger.cpp b/test/Merger.cpp index a296d8d9..118e0d66 100644 --- a/test/Merger.cpp +++ b/test/Merger.cpp @@ -30,7 +30,7 @@ MergerTestImpl(const std::vector<const TestTensor*> & inputs, ErrorStatus expectedExecStatus=ErrorStatus::NONE) { std::unique_ptr<ArmnnDriver> driver = std::make_unique<ArmnnDriver>(DriverOptions(computeDevice)); - neuralnetworks::V1_0::Model model{}; + V1_0::Model model{}; hidl_vec<uint32_t> modelInputIds; modelInputIds.resize(inputs.size()+1); @@ -45,7 +45,7 @@ MergerTestImpl(const std::vector<const TestTensor*> & inputs, // make the concat operation model.operations.resize(1); - model.operations[0].type = neuralnetworks::V1_0::OperationType::CONCATENATION; + model.operations[0].type = V1_0::OperationType::CONCATENATION; model.operations[0].inputs = modelInputIds; model.operations[0].outputs = hidl_vec<uint32_t>{static_cast<uint32_t>(inputs.size()+1)}; |