diff options
| author | Nattapat Chaimanowong <nattapat.chaimanowong@arm.com> | 2019-01-22 16:10:44 +0000 |
|---|---|---|
| committer | Nattapat Chaimanowong <nattapat.chaimanowong@arm.com> | 2019-01-22 16:10:44 +0000 |
| commit | 649dd9515ddf4bd00a0bff64d51dfd835a6c7b39 (patch) | |
| tree | c938bc8eb11dd24223c0cb00a57d4372a907b943 /src/armnnUtils | |
| parent | 382e21ce95c04479a6900afca81a57949b369f1e (diff) | |
| download | armnn-649dd9515ddf4bd00a0bff64d51dfd835a6c7b39.tar.gz | |
IVGCVSW-2467 Remove GetDataType<T> function
Change-Id: I7359617a307b9abb4c30b3d5f2364dc6d0f828f0
Diffstat (limited to 'src/armnnUtils')
| -rw-r--r-- | src/armnnUtils/TensorUtils.cpp | 19 | ||||
| -rw-r--r-- | src/armnnUtils/TensorUtils.hpp | 20 |
2 files changed, 23 insertions, 16 deletions
diff --git a/src/armnnUtils/TensorUtils.cpp b/src/armnnUtils/TensorUtils.cpp index 2c25eec163..57f823fe13 100644 --- a/src/armnnUtils/TensorUtils.cpp +++ b/src/armnnUtils/TensorUtils.cpp @@ -27,5 +27,24 @@ armnn::TensorShape GetTensorShape(unsigned int numberOfBatches, } } +armnn::TensorInfo GetTensorInfo(unsigned int numberOfBatches, + unsigned int numberOfChannels, + unsigned int height, + unsigned int width, + const armnn::DataLayout dataLayout, + const armnn::DataType dataType) +{ + switch (dataLayout) + { + case armnn::DataLayout::NCHW: + return armnn::TensorInfo({numberOfBatches, numberOfChannels, height, width}, dataType); + case armnn::DataLayout::NHWC: + return armnn::TensorInfo({numberOfBatches, height, width, numberOfChannels}, dataType); + default: + throw armnn::InvalidArgumentException("Unknown data layout [" + + std::to_string(static_cast<int>(dataLayout)) + + "]", CHECK_LOCATION()); + } } +} diff --git a/src/armnnUtils/TensorUtils.hpp b/src/armnnUtils/TensorUtils.hpp index 6461b37f75..fb5e6eb10d 100644 --- a/src/armnnUtils/TensorUtils.hpp +++ b/src/armnnUtils/TensorUtils.hpp @@ -15,23 +15,11 @@ armnn::TensorShape GetTensorShape(unsigned int numberOfBatches, unsigned int width, const armnn::DataLayout dataLayout); -template<typename T> armnn::TensorInfo GetTensorInfo(unsigned int numberOfBatches, unsigned int numberOfChannels, unsigned int height, unsigned int width, - const armnn::DataLayout dataLayout) -{ - switch (dataLayout) - { - case armnn::DataLayout::NCHW: - return armnn::TensorInfo({numberOfBatches, numberOfChannels, height, width}, armnn::GetDataType<T>()); - case armnn::DataLayout::NHWC: - return armnn::TensorInfo({numberOfBatches, height, width, numberOfChannels}, armnn::GetDataType<T>()); - default: - throw armnn::InvalidArgumentException("Unknown data layout [" - + std::to_string(static_cast<int>(dataLayout)) + - "]", CHECK_LOCATION()); - } -} -} // namespace armnnUtils
\ No newline at end of file + const armnn::DataLayout dataLayout, + const armnn::DataType dataType); + +} // namespace armnnUtils |