From b0717b5241a15e3e4d37a1b51b6e5fd9a92a664f Mon Sep 17 00:00:00 2001 From: arovir01 Date: Wed, 5 Sep 2018 17:03:25 +0100 Subject: 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 --- ArmnnDriver.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ArmnnDriver.hpp') diff --git a/ArmnnDriver.hpp b/ArmnnDriver.hpp index 2bf47eb3..fd5cfad0 100644 --- a/ArmnnDriver.hpp +++ b/ArmnnDriver.hpp @@ -9,18 +9,18 @@ #include -#if defined(ARMNN_ANDROID_NN_V1_1) // Using ::android::hardware::neuralnetworks::V1_1. +#if defined(ARMNN_ANDROID_NN_V1_1) #include "1.1/ArmnnDriver.hpp" namespace armnn_driver { -class ArmnnDriver : public V1_1::ArmnnDriver +class ArmnnDriver : public hal_1_1::ArmnnDriver { public: ArmnnDriver(DriverOptions options) - : V1_1::ArmnnDriver(std::move(options)) + : hal_1_1::ArmnnDriver(std::move(options)) { ALOGV("ArmnnDriver::ArmnnDriver()"); } @@ -36,11 +36,11 @@ public: namespace armnn_driver { -class ArmnnDriver : public V1_0::ArmnnDriver +class ArmnnDriver : public hal_1_0::ArmnnDriver { public: ArmnnDriver(DriverOptions options) - : V1_0::ArmnnDriver(std::move(options)) + : hal_1_0::ArmnnDriver(std::move(options)) { ALOGV("ArmnnDriver::ArmnnDriver()"); } -- cgit v1.2.1