diff options
author | Matteo Martincigh <matteo.martincigh@arm.com> | 2018-11-14 12:27:04 +0000 |
---|---|---|
committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2018-11-15 19:05:01 +0000 |
commit | c743412b714a42d2e0ccbcae49698a602a6f3d94 (patch) | |
tree | a771ff3e99c55ee334e8a0f86ad0c408f345a953 /test/DriverTestHelpers.hpp | |
parent | da7184da06c9f59cba9b524e2bfb90523fe7c2b3 (diff) | |
download | android-nn-driver-c743412b714a42d2e0ccbcae49698a602a6f3d94.tar.gz |
IVGCVSW-2092 Port LSTMCell::Eval to ArmNN
* Refactored the LSTM unit tests to avoid unnecessary copies
* Added new AddTensorOperand convenience function
* Fixed some required arguments in some tests
* Added new files to Android.bp
!armnn:124
Change-Id: I77ed22f2692d8aa46884b9ee31e48403f7299545
Diffstat (limited to 'test/DriverTestHelpers.hpp')
-rw-r--r-- | test/DriverTestHelpers.hpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/test/DriverTestHelpers.hpp b/test/DriverTestHelpers.hpp index 370936fe..4d91ae22 100644 --- a/test/DriverTestHelpers.hpp +++ b/test/DriverTestHelpers.hpp @@ -110,8 +110,8 @@ OperandType TypeToOperandType<int32_t>(); template<typename HalModel, typename T> void AddTensorOperand(HalModel& model, - hidl_vec<uint32_t> dimensions, - T* values, + const hidl_vec<uint32_t>& dimensions, + const T* values, OperandType operandType = OperandType::TENSOR_FLOAT32) { uint32_t totalElements = 1; @@ -139,9 +139,18 @@ void AddTensorOperand(HalModel& model, AddOperand<HalModel>(model, op); } +template<typename HalModel, typename T> +void AddTensorOperand(HalModel& model, + const hidl_vec<uint32_t>& dimensions, + const std::vector<T>& values, + OperandType operandType = OperandType::TENSOR_FLOAT32) +{ + AddTensorOperand<HalModel, T>(model, dimensions, values.data(), operandType); +} + template<typename HalModel> void AddInputOperand(HalModel& model, - hidl_vec<uint32_t> dimensions, + const hidl_vec<uint32_t>& dimensions, OperandType operandType = OperandType::TENSOR_FLOAT32) { Operand op = {}; @@ -158,7 +167,7 @@ void AddInputOperand(HalModel& model, template<typename HalModel> void AddOutputOperand(HalModel& model, - hidl_vec<uint32_t> dimensions, + const hidl_vec<uint32_t>& dimensions, OperandType operandType = OperandType::TENSOR_FLOAT32) { Operand op = {}; |