Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 20:24:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Shorten NNAPI enum range names

Browse Source 
Test: mma
Change-Id: I5138589acc127336e8c0e72ca7d6b49532a4eeb9
Merged-In: I5138589acc127336e8c0e72ca7d6b49532a4eeb9
(cherry picked from commit 794703db84)
This commit is contained in:
Slava Shklyaev
2019-01-17 15:37:05 +00:00
committed by Xusong Wang
parent d2668b5b9d
commit 2739b2ef57
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
neuralnetworks/1.2/types.hal
View File

@@ -97,10 +97,10 @@ enum OperandType : @1.0::OperandType {
*/
TENSOR_QUANT16_ASYMM = 12,
/* ADDING A NEW FUNDAMENTAL TYPE REQUIRES UPDATING THE VALUE OF
* OperandTypeRange::OPERAND_FUNDAMENTAL_MAX.
* OperandTypeRange::FUNDAMENTAL_MAX.
*/
/* ADDING A NEW OEM TYPE REQUIRES UPDATING THE VALUE OF
* OperandTypeRange::OPERAND_OEM_MAX.
* OperandTypeRange::OEM_MAX.
*/
};
@@ -108,10 +108,10 @@ enum OperandType : @1.0::OperandType {
* The range of operand values in the OperandType enum.
*/
enum OperandTypeRange : uint32_t {
OPERAND_FUNDAMENTAL_MIN = 0,
OPERAND_FUNDAMENTAL_MAX = 12,
OPERAND_OEM_MIN = 10000,
OPERAND_OEM_MAX = 10001,
FUNDAMENTAL_MIN = 0,
FUNDAMENTAL_MAX = 12,
OEM_MIN = 10000,
OEM_MAX = 10001,
};
/**
@@ -178,10 +178,10 @@ enum OperationType : @1.1::OperationType {
UNIDIRECTIONAL_SEQUENCE_LSTM = 92,
UNIDIRECTIONAL_SEQUENCE_RNN = 93,
/* ADDING A NEW FUNDAMENTAL OPERATION REQUIRES UPDATING THE VALUE OF
* OperationTypeRange::OPERATION_FUNDAMENTAL_MAX.
* OperationTypeRange::FUNDAMENTAL_MAX.
*/
/* ADDING A NEW OEM OPERATION REQUIRES UPDATING THE VALUE OF
* OperationTypeRange::OPERATION_OEM_MAX.
* OperationTypeRange::OEM_MAX.
*/
};
@@ -189,10 +189,10 @@ enum OperationType : @1.1::OperationType {
* The range of values in the OperationType enum.
*/
enum OperationTypeRange : uint32_t {
OPERATION_FUNDAMENTAL_MIN = 0,
OPERATION_FUNDAMENTAL_MAX = 93,
OPERATION_OEM_MIN = 10000,
OPERATION_OEM_MAX = 10000,
FUNDAMENTAL_MIN = 0,
FUNDAMENTAL_MAX = 93,
OEM_MIN = 10000,
OEM_MAX = 10000,
};
/**

16
neuralnetworks/1.2/vts/functional/ValidateModel.cpp
View File

@@ -128,10 +128,10 @@ static uint32_t addOperand(Model* model, OperandLifeTime lifetime) {
///////////////////////// VALIDATE MODEL OPERAND TYPE /////////////////////////
static const uint32_t invalidOperandTypes[] = {
static_cast<uint32_t>(OperandTypeRange::OPERAND_FUNDAMENTAL_MIN) - 1,
static_cast<uint32_t>(OperandTypeRange::OPERAND_FUNDAMENTAL_MAX) + 1,
static_cast<uint32_t>(OperandTypeRange::OPERAND_OEM_MIN) - 1,
static_cast<uint32_t>(OperandTypeRange::OPERAND_OEM_MAX) + 1,
static_cast<uint32_t>(OperandTypeRange::FUNDAMENTAL_MIN) - 1,
static_cast<uint32_t>(OperandTypeRange::FUNDAMENTAL_MAX) + 1,
static_cast<uint32_t>(OperandTypeRange::OEM_MIN) - 1,
static_cast<uint32_t>(OperandTypeRange::OEM_MAX) + 1,
};
static void mutateOperandTypeTest(const sp<IDevice>& device, const Model& model) {
@@ -387,10 +387,10 @@ static void mutateOperationOperandTypeTest(const sp<IDevice>& device, const Mode
///////////////////////// VALIDATE MODEL OPERATION TYPE /////////////////////////
static const uint32_t invalidOperationTypes[] = {
static_cast<uint32_t>(OperationTypeRange::OPERATION_FUNDAMENTAL_MIN) - 1,
static_cast<uint32_t>(OperationTypeRange::OPERATION_FUNDAMENTAL_MAX) + 1,
static_cast<uint32_t>(OperationTypeRange::OPERATION_OEM_MIN) - 1,
static_cast<uint32_t>(OperationTypeRange::OPERATION_OEM_MAX) + 1,
static_cast<uint32_t>(OperationTypeRange::FUNDAMENTAL_MIN) - 1,
static_cast<uint32_t>(OperationTypeRange::FUNDAMENTAL_MAX) + 1,
static_cast<uint32_t>(OperationTypeRange::OEM_MIN) - 1,
static_cast<uint32_t>(OperationTypeRange::OEM_MAX) + 1,
};
static void mutateOperationTypeTest(const sp<IDevice>& device, const Model& model) {