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 /ArmnnPreparedModel_1_2.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 'ArmnnPreparedModel_1_2.hpp')
| -rw-r--r-- | ArmnnPreparedModel_1_2.hpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ArmnnPreparedModel_1_2.hpp b/ArmnnPreparedModel_1_2.hpp index b97895e8..f609ef7e 100644 --- a/ArmnnPreparedModel_1_2.hpp +++ b/ArmnnPreparedModel_1_2.hpp @@ -45,13 +45,13 @@ public: virtual ~ArmnnPreparedModel_1_2(); - virtual Return<ErrorStatus> execute(const Request& request, - const sp<V1_0::IExecutionCallback>& callback) override; + virtual Return<V1_0::ErrorStatus> execute(const V1_0::Request& request, + const sp<V1_0::IExecutionCallback>& callback) override; - virtual Return<ErrorStatus> execute_1_2(const Request& request, MeasureTiming measure, - const sp<V1_2::IExecutionCallback>& callback) override; + virtual Return<V1_0::ErrorStatus> execute_1_2(const V1_0::Request& request, MeasureTiming measure, + const sp<V1_2::IExecutionCallback>& callback) override; - virtual Return<void> executeSynchronously(const Request &request, + virtual Return<void> executeSynchronously(const V1_0::Request &request, MeasureTiming measure, V1_2::IPreparedModel::executeSynchronously_cb cb) override; @@ -72,9 +72,9 @@ public: bool ExecuteWithDummyInputs(); private: - Return <ErrorStatus> Execute(const Request& request, - MeasureTiming measureTiming, - armnnExecuteCallback_1_2 callback); + Return <V1_0::ErrorStatus> Execute(const V1_0::Request& request, + MeasureTiming measureTiming, + armnnExecuteCallback_1_2 callback); template <typename TensorBindingCollection> void DumpTensorsIfRequired(char const* tensorNamePrefix, const TensorBindingCollection& tensorBindings); |