From 541e24311de0561a27bcba7f197f9bd46be67359 Mon Sep 17 00:00:00 2001 From: David Gross Date: Tue, 10 Apr 2018 14:27:33 -0700 Subject: [PATCH] Fix documentation. 1. Fix documentation for Operand::numberOfConsumers. 2. Fix typos. Bug: 69055733 Bug: 76016141 Bug: 74111771 Test: NeuralNetworksTest_static Test: VtsHalNeuralnetworksV1_0TargetTest --hal_service_instance=android.hardware.neuralnetworks@1.0::IDevice/sample-all Test: VtsHalNeuralnetworksV1_1TargetTest --hal_service_instance=android.hardware.neuralnetworks@1.1::IDevice/sample-all Change-Id: Ib3d5bbfa701070597731992c3867f72d7b0280bd --- current.txt | 5 +++-- neuralnetworks/1.0/IDevice.hal | 2 +- neuralnetworks/1.0/types.hal | 6 +++++- neuralnetworks/1.0/vts/functional/Callbacks.h | 4 ---- neuralnetworks/1.1/IDevice.hal | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/current.txt b/current.txt index f74479707c..ddbca36893 100644 --- a/current.txt +++ b/current.txt @@ -258,7 +258,8 @@ cf72ff5a52bfa4d08e9e1000cf3ab5952a2d280c7f13cdad5ab7905c08050766 android.hardwar fb92e2b40f8e9d494e8fd3b4ac18499a3216342e7cff160714c3bbf3660b6e79 android.hardware.gnss@1.0::IGnssConfiguration 251594ea9b27447bfa005ebd806e58fb0ae4aad84a69938129c9800ec0c64eda android.hardware.gnss@1.0::IGnssMeasurementCallback 4e7169919d24fbe5573e5bcd683d0bd7abf553a4e6c34c41f9dfc1e12050db07 android.hardware.gnss@1.0::IGnssNavigationMessageCallback -1488db5ffb8a7979488d1084761aab8bca2f59bc9a02d75cdefc296afeaf591b android.hardware.neuralnetworks@1.0::types +5804ca86611d72e5481f022b3a0c1b334217f2e4988dad25730c42af2d1f4d1c android.hardware.neuralnetworks@1.0::IDevice +6721fc5b64d997f3eda15b762a0dd9f3fa414926219dbca58312972d565b4bee android.hardware.neuralnetworks@1.0::types d4840db8efabdf1e4b344fc981cd36e5fe81a39aff6e199f6d06c1c8da413efd android.hardware.radio@1.0::types b280c4704dfcc548a9bf127b59b7c3578f460c50cce70a06b66fe0df8b27cff0 android.hardware.wifi@1.0::types @@ -336,7 +337,7 @@ e15ebdf1e0a326ff5b8a59668d4d8cd3852bd88388eae91de13f5f7e1af50ed1 android.hardwar b8c7ed58aa8740361e63d0ce9e7c94227572a629f356958840b34809d2393a7c android.hardware.media.bufferpool@1.0::IClientManager 4a2c0dc82780e6c90731725a103feab8ab6ecf85a64e049b9cbd2b2c61620fe1 android.hardware.media.bufferpool@1.0::IConnection 6aef1218e5949f867b0104752ac536c1b707222a403341720de90141df129e3e android.hardware.media.bufferpool@1.0::types -1529409ed76ae87facab152b770495e9e62544fcc5215daabf146c28d588bab9 android.hardware.neuralnetworks@1.1::IDevice +3e4d8e0085ebe8549efb8ad4b8b400a141a3fa3f47ae23696b3e05a1612eb003 android.hardware.neuralnetworks@1.1::IDevice e808a6f61cd7b47887c599d8843e67a2dcbf4ec5aadd5d22fdce93020070ef1b android.hardware.neuralnetworks@1.1::types 8d3d86da0bfa4bf070970d8303c659f67f35d670c287d45a3f542e4fedadd578 android.hardware.nfc@1.1::INfc e85f566698d2a2c28100e264fcf2c691a066756ddf8dd341d009ff50cfe10614 android.hardware.nfc@1.1::INfcClientCallback diff --git a/neuralnetworks/1.0/IDevice.hal b/neuralnetworks/1.0/IDevice.hal index 49c29674ee..62fb2baed5 100644 --- a/neuralnetworks/1.0/IDevice.hal +++ b/neuralnetworks/1.0/IDevice.hal @@ -36,7 +36,7 @@ interface IDevice { /** * Gets the supported operations in a model. * - * getSupportedSubgraph indicates which operations of a model are fully + * getSupportedOperations indicates which operations of a model are fully * supported by the vendor driver. If an operation may not be supported for * any reason, getSupportedOperations must return false for that operation. * diff --git a/neuralnetworks/1.0/types.hal b/neuralnetworks/1.0/types.hal index a9c91cd46b..5b8f22cf8e 100644 --- a/neuralnetworks/1.0/types.hal +++ b/neuralnetworks/1.0/types.hal @@ -1081,7 +1081,11 @@ struct Operand { vec dimensions; /** - * The number of operations that use this operand as input. + * The number of times this operand appears as an operation input. + * + * (For example, if this operand appears once in one operation's + * input list, and three times in another operation's input list, + * then numberOfConsumers = 4.) */ uint32_t numberOfConsumers; diff --git a/neuralnetworks/1.0/vts/functional/Callbacks.h b/neuralnetworks/1.0/vts/functional/Callbacks.h index 2ac6130df7..570a4fb74a 100644 --- a/neuralnetworks/1.0/vts/functional/Callbacks.h +++ b/neuralnetworks/1.0/vts/functional/Callbacks.h @@ -30,10 +30,6 @@ namespace implementation { * "notify". This "notify" call awakens any client threads waiting on the * callback object. * - * callback object. When the asynchronous task has finished its workload or has - * failed to launch, it must immediately call "notify", awakening any client - * threads waiting on the callback object. - * * The CallbackBase class implements some of the base synchronization common to * both PrepareModelCallback and ExecutionCallback. For consistency, any HIDL * callback class must inherit from CallbackBase as well as the HIDL callback diff --git a/neuralnetworks/1.1/IDevice.hal b/neuralnetworks/1.1/IDevice.hal index ca225554d5..d2c48433bb 100644 --- a/neuralnetworks/1.1/IDevice.hal +++ b/neuralnetworks/1.1/IDevice.hal @@ -41,7 +41,7 @@ interface IDevice extends @1.0::IDevice { /** * Gets the supported operations in a model. * - * getSupportedSubgraph indicates which operations of a model are fully + * getSupportedOperations indicates which operations of a model are fully * supported by the vendor driver. If an operation may not be supported for * any reason, getSupportedOperations must return false for that operation. *