diff options
| author | arovir01 <Aron.Virginas-Tar@arm.com> | 2018-09-05 17:03:25 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-09-18 12:40:40 +0100 |
| commit | b0717b5241a15e3e4d37a1b51b6e5fd9a92a664f (patch) | |
| tree | 84159d2eb142f12081c494483c07012e8ebee8cb /ArmnnPreparedModel.cpp | |
| parent | 93e48980920ddcc8c6390fa6cbfdfc9740786617 (diff) | |
| download | android-nn-driver-b0717b5241a15e3e4d37a1b51b6e5fd9a92a664f.tar.gz | |
IVGCVSW-1806: Refactor Android-NN-Driver ModelToINetworkConverter
* Moved conversion logic into new V1_0 and V1_1 HalPolicy classes
* Extracted common helper functions into ConversionUtils class
Change-Id: I1ab50edc266dd528c0cb22a5cd1aa65e103674d9
Diffstat (limited to 'ArmnnPreparedModel.cpp')
| -rw-r--r-- | ArmnnPreparedModel.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/ArmnnPreparedModel.cpp b/ArmnnPreparedModel.cpp index 7a275af4..e4a8b147 100644 --- a/ArmnnPreparedModel.cpp +++ b/ArmnnPreparedModel.cpp @@ -295,11 +295,14 @@ void ArmnnPreparedModel<HalVersion>::ExecuteWithDummyInputs() } } -// Class template specializations -template class ArmnnPreparedModel<HalVersion_1_0>; +/// +/// Class template specializations +/// -#ifdef ARMNN_ANDROID_NN_V1_1 // Using ::android::hardware::neuralnetworks::V1_1. -template class ArmnnPreparedModel<HalVersion_1_1>; +template class ArmnnPreparedModel<hal_1_0::HalPolicy>; + +#if defined(ARMNN_ANDROID_NN_V1_1) +template class ArmnnPreparedModel<hal_1_1::HalPolicy>; #endif -} // namespace armnn_driver +} // namespace armnn_driver
\ No newline at end of file |