diff options
| author | Derek Lamberti <derek.lamberti@arm.com> | 2020-01-10 17:14:08 +0000 |
|---|---|---|
| committer | Kevin May <kevin.may@arm.com> | 2020-01-13 18:18:12 +0000 |
| commit | f90c56d72de4848a2dc5844a97458aaf09df07c2 (patch) | |
| tree | 71f1c6f16a4687286614f5526ed70938a611b27d /include | |
| parent | 842e0dbd40114e19bf26916fefe06c869dbe416d (diff) | |
| download | armnn-f90c56d72de4848a2dc5844a97458aaf09df07c2.tar.gz | |
Rename quantized data types to remove ambiguity for signed/unsigned payloads
!android-nn-driver:2572
Change-Id: I8fe52ceb09987b3d05c539409510f535165455cc
Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/armnn/Types.hpp | 10 | ||||
| -rw-r--r-- | include/armnn/TypesUtils.hpp | 14 | ||||
| -rw-r--r-- | include/armnnQuantizer/INetworkQuantizer.hpp | 2 |
3 files changed, 15 insertions, 11 deletions
diff --git a/include/armnn/Types.hpp b/include/armnn/Types.hpp index dcc8c9e52c..e5a7fc0987 100644 --- a/include/armnn/Types.hpp +++ b/include/armnn/Types.hpp @@ -10,6 +10,7 @@ #include <stdint.h> #include "BackendId.hpp" #include "Exceptions.hpp" +#include "Deprecated.hpp" namespace armnn { @@ -32,12 +33,15 @@ enum class DataType { Float16 = 0, Float32 = 1, - QuantisedAsymm8 = 2, + QAsymmU8 = 2, Signed32 = 3, Boolean = 4, - QuantisedSymm16 = 5, + QSymmS16 = 5, QuantizedSymm8PerAxis = 6, - QSymmS8 = 7 + QSymmS8 = 7, + + QuantisedAsymm8 ARMNN_DEPRECATED_MSG("Use DataType::QAsymmU8 instead.") = QAsymmU8, + QuantisedSymm16 ARMNN_DEPRECATED_MSG("Use DataType::QSymmS16 instead.") = QSymmS16 }; enum class DataLayout diff --git a/include/armnn/TypesUtils.hpp b/include/armnn/TypesUtils.hpp index 4394d9ddd9..065b6839fc 100644 --- a/include/armnn/TypesUtils.hpp +++ b/include/armnn/TypesUtils.hpp @@ -115,10 +115,10 @@ constexpr unsigned int GetDataTypeSize(DataType dataType) case DataType::Float16: return 2U; case DataType::Float32: case DataType::Signed32: return 4U; - case DataType::QuantisedAsymm8: return 1U; + case DataType::QAsymmU8: return 1U; case DataType::QSymmS8: return 1U; case DataType::QuantizedSymm8PerAxis: return 1U; - case DataType::QuantisedSymm16: return 2U; + case DataType::QSymmS16: return 2U; case DataType::Boolean: return 1U; default: return 0U; } @@ -163,10 +163,10 @@ constexpr const char* GetDataTypeName(DataType dataType) { case DataType::Float16: return "Float16"; case DataType::Float32: return "Float32"; - case DataType::QuantisedAsymm8: return "QAsymm8"; - case DataType::QSymmS8: return "QSymm8"; + case DataType::QAsymmU8: return "QAsymmU8"; + case DataType::QSymmS8: return "QSymmS8"; case DataType::QuantizedSymm8PerAxis: return "QSymm8PerAxis"; - case DataType::QuantisedSymm16: return "QSymm16"; + case DataType::QSymmS16: return "QSymm16"; case DataType::Signed32: return "Signed32"; case DataType::Boolean: return "Boolean"; @@ -199,9 +199,9 @@ constexpr bool IsQuantizedType() constexpr bool IsQuantizedType(DataType dataType) { - return dataType == DataType::QuantisedAsymm8 || + return dataType == DataType::QAsymmU8 || dataType == DataType::QSymmS8 || - dataType == DataType::QuantisedSymm16 || + dataType == DataType::QSymmS16 || dataType == DataType::QuantizedSymm8PerAxis; } diff --git a/include/armnnQuantizer/INetworkQuantizer.hpp b/include/armnnQuantizer/INetworkQuantizer.hpp index 826b077f6e..5fc5763216 100644 --- a/include/armnnQuantizer/INetworkQuantizer.hpp +++ b/include/armnnQuantizer/INetworkQuantizer.hpp @@ -14,7 +14,7 @@ namespace armnn struct QuantizerOptions { - QuantizerOptions() : QuantizerOptions(DataType::QuantisedAsymm8, false) {} + QuantizerOptions() : QuantizerOptions(DataType::QAsymmU8, false) {} QuantizerOptions(DataType activationFormat) : QuantizerOptions(activationFormat, false) {} |