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.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/DriverTestHelpers.cpp')
| -rw-r--r-- | test/DriverTestHelpers.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/DriverTestHelpers.cpp b/test/DriverTestHelpers.cpp index ded24592..3bc0a20a 100644 --- a/test/DriverTestHelpers.cpp +++ b/test/DriverTestHelpers.cpp @@ -109,7 +109,7 @@ void AddPoolAndSetData(uint32_t size, Request& request, const float* data) memcpy(dst, data, size * sizeof(float)); } -android::sp<IPreparedModel> PrepareModelWithStatus(const neuralnetworks::V1_0::Model& model, +android::sp<IPreparedModel> PrepareModelWithStatus(const V1_0::Model& model, armnn_driver::ArmnnDriver& driver, ErrorStatus& prepareStatus, ErrorStatus expectedStatus) @@ -126,15 +126,15 @@ android::sp<IPreparedModel> PrepareModelWithStatus(const neuralnetworks::V1_0::M return cb->GetPreparedModel(); } -#if defined(ARMNN_ANDROID_NN_V1_1) // Using ::android::hardware::neuralnetworks::V1_1. +#ifdef ARMNN_ANDROID_NN_V1_1 -android::sp<IPreparedModel> PrepareModelWithStatus(const neuralnetworks::V1_1::Model& model, +android::sp<IPreparedModel> PrepareModelWithStatus(const V1_1::Model& model, armnn_driver::ArmnnDriver& driver, ErrorStatus& prepareStatus, ErrorStatus expectedStatus) { android::sp<PreparedModelCallback> cb(new PreparedModelCallback()); - driver.prepareModel_1_1(model, neuralnetworks::V1_1::ExecutionPreference::LOW_POWER, cb); + driver.prepareModel_1_1(model, V1_1::ExecutionPreference::LOW_POWER, cb); prepareStatus = cb->GetErrorStatus(); BOOST_TEST(prepareStatus == expectedStatus); @@ -172,12 +172,12 @@ template<> OperandType TypeToOperandType<float>() { return OperandType::TENSOR_FLOAT32; -}; +} template<> OperandType TypeToOperandType<int32_t>() { return OperandType::TENSOR_INT32; -}; +} } // namespace driverTestHelpers |