diff options
| author | Derek Lamberti <derek.lamberti@arm.com> | 2020-01-22 15:37:29 +0000 |
|---|---|---|
| committer | Derek Lamberti <derek.lamberti@arm.com> | 2020-01-24 09:21:47 +0000 |
| commit | d466a54e79560f0ccacc6b13cd64e08defbac47c (patch) | |
| tree | d8f8d5226d71178aed32c6ad407570071e55dded /include | |
| parent | 4a3c61091037e7e86e8b03bb060d8c1ab82731a9 (diff) | |
| download | armnn-d466a54e79560f0ccacc6b13cd64e08defbac47c.tar.gz | |
IVGCVSW-4370 Deprecate DataType::QuantizedSymm8PerAxis
!android-nn-driver:2622
Change-Id: If99d3eff71ff66ba28af1e5af248299fe04511b9
Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/armnn/Deprecated.hpp | 2 | ||||
| -rw-r--r-- | include/armnn/Types.hpp | 2 | ||||
| -rw-r--r-- | include/armnn/TypesUtils.hpp | 12 |
3 files changed, 11 insertions, 5 deletions
diff --git a/include/armnn/Deprecated.hpp b/include/armnn/Deprecated.hpp index 73871772bc..2b9240fbc4 100644 --- a/include/armnn/Deprecated.hpp +++ b/include/armnn/Deprecated.hpp @@ -42,7 +42,7 @@ ARMNN_NO_DEPRECATE_WARN_END #define ARMNN_DEPRECATED [[deprecated]] #define ARMNN_DEPRECATED_MSG(message) [[deprecated(message)]] -#if defined(__GNUC__) && (__GNUC__ <= 6) +#if defined(__GNUC__) && (__GNUC__ < 6) # define ARMNN_DEPRECATED_ENUM # define ARMNN_DEPRECATED_ENUM_MSG(message) #else diff --git a/include/armnn/Types.hpp b/include/armnn/Types.hpp index 1ab5660109..b0f5a08bd3 100644 --- a/include/armnn/Types.hpp +++ b/include/armnn/Types.hpp @@ -37,7 +37,7 @@ enum class DataType Signed32 = 3, Boolean = 4, QSymmS16 = 5, - QuantizedSymm8PerAxis = 6, + QuantizedSymm8PerAxis ARMNN_DEPRECATED_ENUM_MSG("Per Axis property inferred by number of scales in TensorInfo") = 6, QSymmS8 = 7, QuantisedAsymm8 ARMNN_DEPRECATED_ENUM_MSG("Use DataType::QAsymmU8 instead.") = QAsymmU8, diff --git a/include/armnn/TypesUtils.hpp b/include/armnn/TypesUtils.hpp index 790f57a432..257e39f363 100644 --- a/include/armnn/TypesUtils.hpp +++ b/include/armnn/TypesUtils.hpp @@ -119,8 +119,10 @@ constexpr unsigned int GetDataTypeSize(DataType dataType) case DataType::Signed32: return 4U; case DataType::QAsymmU8: return 1U; case DataType::QSymmS8: return 1U; + ARMNN_NO_DEPRECATE_WARN_BEGIN case DataType::QuantizedSymm8PerAxis: return 1U; - case DataType::QSymmS16: return 2U; + ARMNN_NO_DEPRECATE_WARN_END + case DataType::QSymmS16: return 2U; case DataType::Boolean: return 1U; default: return 0U; } @@ -167,8 +169,10 @@ constexpr const char* GetDataTypeName(DataType dataType) case DataType::Float32: return "Float32"; case DataType::QAsymmU8: return "QAsymmU8"; case DataType::QSymmS8: return "QSymmS8"; + ARMNN_NO_DEPRECATE_WARN_BEGIN case DataType::QuantizedSymm8PerAxis: return "QSymm8PerAxis"; - case DataType::QSymmS16: return "QSymm16"; + ARMNN_NO_DEPRECATE_WARN_END + case DataType::QSymmS16: return "QSymm16"; case DataType::Signed32: return "Signed32"; case DataType::Boolean: return "Boolean"; @@ -230,10 +234,12 @@ constexpr bool IsQuantizedType() constexpr bool IsQuantizedType(DataType dataType) { + ARMNN_NO_DEPRECATE_WARN_BEGIN return dataType == DataType::QAsymmU8 || dataType == DataType::QSymmS8 || - dataType == DataType::QSymmS16 || + dataType == DataType::QSymmS16 || dataType == DataType::QuantizedSymm8PerAxis; + ARMNN_NO_DEPRECATE_WARN_END } inline std::ostream& operator<<(std::ostream& os, Status stat) |