From f62d99eadd1a0996868a11368ac7bb72af9bdb47 Mon Sep 17 00:00:00 2001 From: Slava Shklyaev Date: Thu, 4 Feb 2021 13:31:18 +0000 Subject: [PATCH] Reformat neuralnetworks/1.2/types.hal according to clang-format While we cannot run clang-format on types.hal directly, we can do so on the canonical Types.h (which is generated from the same template) and observe the difference. See change Ia43936d8. Bug: 160667417 Test: m Change-Id: Id6a237f29c8156b213455ab093d11ed4c2015460 Merged-In: Id6a237f29c8156b213455ab093d11ed4c2015460 (cherry picked from commit dfc4a2fa322ea77bbf2ed5f15fa831fb1002be06) --- current.txt | 2 +- neuralnetworks/1.2/types.hal | 12 ++++++------ neuralnetworks/1.2/types.t | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/current.txt b/current.txt index 29a837ffb5..c90c7dd905 100644 --- a/current.txt +++ b/current.txt @@ -776,7 +776,7 @@ a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardwar dabe23dde7c9e3ad65c61def7392f186d7efe7f4216f9b6f9cf0863745b1a9f4 android.hardware.keymaster@4.1::IKeymasterDevice cd84ab19c590e0e73dd2307b591a3093ee18147ef95e6d5418644463a6620076 android.hardware.neuralnetworks@1.2::IDevice f729ee6a5f136b25d79ea6895d24700fce413df555baaecf2c39e4440d15d043 android.hardware.neuralnetworks@1.0::types -c6ae443608502339aec4256feef48e7b2d36f7477ca5361cc95cd27a8ed9c612 android.hardware.neuralnetworks@1.2::types +ba84f3a750b1cc43ac51074e8b8e22df924f3e6d9068fac50d95bcf57b2b1d61 android.hardware.neuralnetworks@1.2::types 9fe5a4093043c2b5da4e9491aed1646c388a5d3059b8fd77d5b6a9807e6d3a3e android.hardware.neuralnetworks@1.3::types e8c86c69c438da8d1549856c1bb3e2d1b8da52722f8235ff49a30f2cce91742c android.hardware.soundtrigger@2.1::ISoundTriggerHwCallback b9fbb6e2e061ed0960939d48b785e9700210add1f13ed32ecd688d0f1ca20ef7 android.hardware.renderscript@1.0::types diff --git a/neuralnetworks/1.2/types.hal b/neuralnetworks/1.2/types.hal index 7cec49e0e2..e3cee93bce 100644 --- a/neuralnetworks/1.2/types.hal +++ b/neuralnetworks/1.2/types.hal @@ -4711,14 +4711,14 @@ enum DeviceType : int32_t { // HAL equivalent of unknown type and a 1.2 HAL implementation must belong // to one of the categories below. /** The device does not fall into any category below. */ - OTHER = 1, + OTHER = 1, /** The device runs NNAPI models on single or multi-core CPU. */ - CPU = 2, + CPU = 2, /** The device can run NNAPI models and also accelerate graphics APIs such - * as OpenGL ES and Vulkan. */ - GPU = 3, + * as OpenGL ES and Vulkan. */ + GPU = 3, /** Dedicated accelerator for Machine Learning workloads. */ - ACCELERATOR = 4, + ACCELERATOR = 4, }; /** @@ -5054,7 +5054,7 @@ struct OutputShape { * Specifies whether or not to measure timing information during execution. */ enum MeasureTiming : int32_t { - NO = 0, + NO = 0, YES = 1, }; diff --git a/neuralnetworks/1.2/types.t b/neuralnetworks/1.2/types.t index 21d88acf8f..054d516104 100644 --- a/neuralnetworks/1.2/types.t +++ b/neuralnetworks/1.2/types.t @@ -107,14 +107,14 @@ enum DeviceType : int32_t { // HAL equivalent of unknown type and a 1.2 HAL implementation must belong // to one of the categories below. /** The device does not fall into any category below. */ - OTHER = 1, + OTHER = 1, /** The device runs NNAPI models on single or multi-core CPU. */ - CPU = 2, + CPU = 2, /** The device can run NNAPI models and also accelerate graphics APIs such - * as OpenGL ES and Vulkan. */ - GPU = 3, + * as OpenGL ES and Vulkan. */ + GPU = 3, /** Dedicated accelerator for Machine Learning workloads. */ - ACCELERATOR = 4, + ACCELERATOR = 4, }; /** @@ -450,7 +450,7 @@ struct OutputShape { * Specifies whether or not to measure timing information during execution. */ enum MeasureTiming : int32_t { - NO = 0, + NO = 0, YES = 1, };