tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make the enums signed int, remove unused info.

Browse source 
Bug: 63905942
Test: NeuralNetworksTest pass
Change-Id: I40ca1120d05ea8900f4f4e49409d3096f46ec0e1
This commit is contained in:
Miao Wang 2017-09-13 15:51:54 -07:00
parent 502fdebb4b
commit 5ea3ece7ca
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
neuralnetworks/1.0/types.hal
View file

@ -20,7 +20,7 @@ package android.hardware.neuralnetworks@1.0;
// The types an operand can have.
// These values are the same as found in the NeuralNetworks.h and NeuralNetworksOEM.h files.
enum OperandType : uint32_t {
enum OperandType : int32_t {
FLOAT32 = 0,
INT32 = 1,
UINT32 = 2,
@ -36,7 +36,7 @@ enum OperandType : uint32_t {
// NeuralNetworks.h and NeuralNetworksOEM.h files, these specify the data type they operate on.
// This is done to simplify the work of drivers.
// TODO: Currently they are the same. Add a conversion when finalizing the model.
enum OperationType : uint32_t {
enum OperationType : int32_t {
ADD = 0,
AVERAGE_POOL_2D = 1,
CONCATENATION = 2,
@ -79,7 +79,7 @@ enum FusedActivationFunc : int32_t {
};
// How an operand is used.
enum OperandLifeTime : uint32_t {
enum OperandLifeTime : int32_t {
// The operand is internal to the model. It's created by an operation
// and consumed by other operations.
TEMPORARY_VARIABLE,
@ -95,7 +95,7 @@ enum OperandLifeTime : uint32_t {
};
// Status of a device.
enum DeviceStatus : uint32_t {
enum DeviceStatus : int32_t {
AVAILABLE,
BUSY,
OFFLINE,
@ -120,11 +120,8 @@ struct OperationTuple {
// The capabilities of a driver.
struct Capabilities {
vec<OperationTuple> supportedOperationTuples;
// TODO Do the same for baseline model IDs
bool cachesCompilation;
// TODO revisit the data types and scales.
float bootupTime; // in nanoseconds
PerformanceInfo float16Performance;
PerformanceInfo float32Performance;
PerformanceInfo quantized8Performance;
};
@ -205,7 +202,7 @@ struct Request {
vec<memory> pools;
};
enum ErrorStatus : uint32_t {
enum ErrorStatus : int32_t {
NONE,
DEVICE_UNAVAILABLE,
GENERAL_FAILURE,

3
neuralnetworks/1.0/vts/functional/VtsHalNeuralnetworksV1_0TargetTest.cpp
View file

@ -83,9 +83,6 @@ TEST_F(NeuralnetworksHidlTest, GetCapabilitiesTest) {
EXPECT_NE(nullptr, capabilities.supportedOperationTuples.data());
EXPECT_NE(0ull, capabilities.supportedOperationTuples.size());
EXPECT_EQ(0u, static_cast<uint32_t>(capabilities.cachesCompilation) & ~0x1);
EXPECT_LT(0.0f, capabilities.bootupTime);
EXPECT_LT(0.0f, capabilities.float16Performance.execTime);
EXPECT_LT(0.0f, capabilities.float16Performance.powerUsage);
EXPECT_LT(0.0f, capabilities.float32Performance.execTime);
EXPECT_LT(0.0f, capabilities.float32Performance.powerUsage);
EXPECT_LT(0.0f, capabilities.quantized8Performance.execTime);