diff options
| author | Kevin May <kevin.may@arm.com> | 2020-02-26 17:00:39 +0000 |
|---|---|---|
| committer | David Monahan <david.monahan@arm.com> | 2020-03-03 08:40:23 +0000 |
| commit | ec1e5b8d0a0eeba7eae0f1fdb5e32c72f8a8093c (patch) | |
| tree | ac4e2d3194012e08241afa9c6691d52608c1a869 /1.2/ArmnnDriverImpl.hpp | |
| parent | 4a9565870037150ad6ee060a3cd232d867711b60 (diff) | |
| download | android-nn-driver-ec1e5b8d0a0eeba7eae0f1fdb5e32c72f8a8093c.tar.gz | |
IVGCVSW-4473 Android R pre Hal 1_3 build changes
* Update ErrorStatus to V1_0::ErrorStatus
* Update Request to V1_0::Request
* Update OperandType to V1_2::OperandType
* Add namespace android::nn::hal in ArmnnDriverImpl for R only
* Add missing g_RelaxedFloat32toFloat16PerformancePowerUsageName
* Add namespace V1_0 or V1_1 where necessary
* Update Android.mk with R macro and android.hardware.neuralnetworks@1.3
* Remove androidnn.go
* include IAllocator in DriverTestHelpers
* Remove unused LOCAL_CFLAGS
Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I1787f1ed6784b3bbec017536d87d49197405e853
Signed-off-by: Kevin May <kevin.may@arm.com>
Diffstat (limited to '1.2/ArmnnDriverImpl.hpp')
| -rw-r--r-- | 1.2/ArmnnDriverImpl.hpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/1.2/ArmnnDriverImpl.hpp b/1.2/ArmnnDriverImpl.hpp index b3c65079..73ba133e 100644 --- a/1.2/ArmnnDriverImpl.hpp +++ b/1.2/ArmnnDriverImpl.hpp @@ -11,6 +11,13 @@ #include <armnn/ArmNN.hpp> +#ifdef ARMNN_ANDROID_R +using namespace android::nn::hal; +#endif + +namespace V1_0 = ::android::hardware::neuralnetworks::V1_0; +namespace V1_2 = ::android::hardware::neuralnetworks::V1_2; + namespace armnn_driver { namespace hal_1_2 @@ -19,12 +26,12 @@ namespace hal_1_2 class ArmnnDriverImpl { public: - static Return<ErrorStatus> prepareArmnnModel_1_2(const armnn::IRuntimePtr& runtime, - const armnn::IGpuAccTunedParametersPtr& clTunedParameters, - const DriverOptions& options, - const V1_2::Model& model, - const android::sp<V1_2::IPreparedModelCallback>& cb, - bool float32ToFloat16 = false); + static Return<V1_0::ErrorStatus> prepareArmnnModel_1_2(const armnn::IRuntimePtr& runtime, + const armnn::IGpuAccTunedParametersPtr& clTunedParameters, + const DriverOptions& options, + const V1_2::Model& model, + const android::sp<V1_2::IPreparedModelCallback>& cb, + bool float32ToFloat16 = false); static Return<void> getCapabilities_1_2(const armnn::IRuntimePtr& runtime, V1_2::IDevice::getCapabilities_1_2_cb cb); |