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 /test/1.1 | |
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 'test/1.1')
-rw-r--r-- | test/1.1/Mean.cpp | 6 | ||||
-rw-r--r-- | test/1.1/Transpose.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/1.1/Mean.cpp b/test/1.1/Mean.cpp index 529371e1..10ca3aec 100644 --- a/test/1.1/Mean.cpp +++ b/test/1.1/Mean.cpp @@ -78,7 +78,7 @@ void MeanTestImpl(const TestTensor& input, outArg.dimensions = expectedOutput.GetDimensions(); // Make the request based on the arguments - Request request = {}; + V1_0::Request request = {}; request.inputs = hidl_vec<RequestArgument>{ inArg }; request.outputs = hidl_vec<RequestArgument>{ outArg }; @@ -89,8 +89,8 @@ void MeanTestImpl(const TestTensor& input, android::sp<IMemory> outMemory = AddPoolAndGetData<float>(expectedOutput.GetNumElements(), request); const float* outputData = static_cast<const float*>(static_cast<void*>(outMemory->getPointer())); - ErrorStatus execStatus = Execute(preparedModel, request); - BOOST_TEST(execStatus == ErrorStatus::NONE); + V1_0::ErrorStatus execStatus = Execute(preparedModel, request); + BOOST_TEST(execStatus == V1_0::ErrorStatus::NONE); const float* expectedOutputData = expectedOutput.GetData(); for (unsigned int i = 0; i < expectedOutput.GetNumElements(); i++) diff --git a/test/1.1/Transpose.cpp b/test/1.1/Transpose.cpp index 4d4238ba..5679ca22 100644 --- a/test/1.1/Transpose.cpp +++ b/test/1.1/Transpose.cpp @@ -76,7 +76,7 @@ void TransposeTestImpl(const TestTensor & inputs, int32_t perm[], output.dimensions = expectedOutputTensor.GetDimensions(); // make the request based on the arguments - Request request = {}; + V1_0::Request request = {}; request.inputs = hidl_vec<RequestArgument>{input}; request.outputs = hidl_vec<RequestArgument>{output}; |