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/DriverTestHelpers.hpp | |
| 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/DriverTestHelpers.hpp')
| -rw-r--r-- | test/DriverTestHelpers.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/DriverTestHelpers.hpp b/test/DriverTestHelpers.hpp index ce09ee68..cce220e5 100644 --- a/test/DriverTestHelpers.hpp +++ b/test/DriverTestHelpers.hpp @@ -31,7 +31,7 @@ std::ostream& operator<<(std::ostream& os, ErrorStatus stat); namespace driverTestHelpers { -std::ostream& operator<<(std::ostream& os, android::hardware::neuralnetworks::V1_0::ErrorStatus stat); +std::ostream& operator<<(std::ostream& os, V1_0::ErrorStatus stat); struct ExecutionCallback : public IExecutionCallback { @@ -172,14 +172,14 @@ void AddOutputOperand(HalModel& model, model.outputIndexes[model.outputIndexes.size() - 1] = model.operands.size() - 1; } -android::sp<IPreparedModel> PrepareModelWithStatus(const ::android::hardware::neuralnetworks::V1_0::Model& model, +android::sp<IPreparedModel> PrepareModelWithStatus(const V1_0::Model& model, armnn_driver::ArmnnDriver& driver, ErrorStatus& prepareStatus, ErrorStatus expectedStatus = ErrorStatus::NONE); -#if defined(ARMNN_ANDROID_NN_V1_1) // Using ::android::hardware::neuralnetworks::V1_1. +#ifdef ARMNN_ANDROID_NN_V1_1 -android::sp<IPreparedModel> PrepareModelWithStatus(const ::android::hardware::neuralnetworks::V1_1::Model& model, +android::sp<IPreparedModel> PrepareModelWithStatus(const V1_1::Model& model, armnn_driver::ArmnnDriver& driver, ErrorStatus& prepareStatus, ErrorStatus expectedStatus = ErrorStatus::NONE); |