diff options
Diffstat (limited to 'include/armnn')
| -rw-r--r-- | include/armnn/Types.hpp | 10 | ||||
| -rw-r--r-- | include/armnn/TypesUtils.hpp | 14 |
2 files changed, 14 insertions, 10 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; } |