diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2018-09-03 13:50:50 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-09-18 12:40:38 +0100 |
| commit | e48bdff741568236d3c0747ad3d18a8eba5b36dd (patch) | |
| tree | 77aabce6f75d86d3f2f3924f342292ae5a7267e7 /1.0/ArmnnDriver.hpp | |
| parent | a15dc11fd7bf3ad49e752ec75157b731287fe46d (diff) | |
| download | android-nn-driver-e48bdff741568236d3c0747ad3d18a8eba5b36dd.tar.gz | |
IVGCVSW-1806 Refactored Android-NN-Driver, added common "getCapabilities",
"getSupportedOperations" and "prepareModel" implementations
* Added common base ArmnnDriverImpl class
* Added common template implementation of the driver's "getCapabilities",
"getSupportedOperations" and "prepareModel" methods
* Refactored ArmnnPreparedModel and RequestThread to support HAL
v1.1 models
* Moved "getStatus" to the common base class, as it is shared by both
HAL implementations
* Refactored the code where necessary
Change-Id: I747334730026d63b4002662523fb93608f67c899
Diffstat (limited to '1.0/ArmnnDriver.hpp')
| -rw-r--r-- | 1.0/ArmnnDriver.hpp | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/1.0/ArmnnDriver.hpp b/1.0/ArmnnDriver.hpp index 83484ca9..18e25968 100644 --- a/1.0/ArmnnDriver.hpp +++ b/1.0/ArmnnDriver.hpp @@ -7,8 +7,8 @@ #include <HalInterfaces.h> -#include "ArmnnDriverImpl.hpp" #include "ArmnnDevice.hpp" +#include "../ArmnnDriverImpl.hpp" #include <log/log.h> @@ -29,36 +29,44 @@ public: public: Return<void> getCapabilities( - ::android::hardware::neuralnetworks::V1_0::IDevice::getCapabilities_cb cb) + ::android::hardware::neuralnetworks::V1_0::IDevice::getCapabilities_cb cb) override { ALOGV("V1_0::ArmnnDriver::getCapabilities()"); - return ArmnnDriverImpl::getCapabilities(m_Runtime, cb); + return armnn_driver::ArmnnDriverImpl<HalVersion_1_0>::getCapabilities(m_Runtime, + cb); } Return<void> getSupportedOperations( const ::android::hardware::neuralnetworks::V1_0::Model& model, - ::android::hardware::neuralnetworks::V1_0::IDevice::getSupportedOperations_cb cb) + ::android::hardware::neuralnetworks::V1_0::IDevice::getSupportedOperations_cb cb) override { ALOGV("V1_0::ArmnnDriver::getSupportedOperations()"); - return ArmnnDriverImpl::getSupportedOperations(m_Runtime, m_Options, model, cb); + return armnn_driver::ArmnnDriverImpl<HalVersion_1_0>::getSupportedOperations(m_Runtime, + m_Options, + model, + cb); } Return<ErrorStatus> prepareModel( const ::android::hardware::neuralnetworks::V1_0::Model& model, - const android::sp<IPreparedModelCallback>& cb) + const android::sp<IPreparedModelCallback>& cb) override { ALOGV("V1_0::ArmnnDriver::prepareModel()"); - return ArmnnDriverImpl::prepareModel(m_Runtime, m_ClTunedParameters, m_Options, model, cb); + return armnn_driver::ArmnnDriverImpl<HalVersion_1_0>::prepareModel(m_Runtime, + m_ClTunedParameters, + m_Options, + model, + cb); } - Return<DeviceStatus> getStatus() + Return<DeviceStatus> getStatus() override { ALOGV("V1_0::ArmnnDriver::getStatus()"); - return ArmnnDriverImpl::getStatus(); + return armnn_driver::ArmnnDriverImpl<HalVersion_1_0>::getStatus(); } }; |