From 6a222a3eec395ff4196675b513fa6878916c8395 Mon Sep 17 00:00:00 2001 From: Slava Shklyaev Date: Tue, 7 Apr 2020 13:20:47 +0100 Subject: [PATCH] Update loopTimeoutDuration documentation in NNAPI Bug: 149686804 Test: m Change-Id: I0096a2fc2e579d39a2d59a605a4217d53a381691 --- current.txt | 2 +- neuralnetworks/1.3/IPreparedModel.hal | 36 +++++++++++---------------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/current.txt b/current.txt index 2677eb116a..656f5c7d61 100644 --- a/current.txt +++ b/current.txt @@ -711,7 +711,7 @@ a3eddd9bbdc87e8c22764070037dd1154f1cf006e6fba93364c4f85d4c134a19 android.hardwar 278817920bfd5292a7713f97f1832cca53de3de640f7670e413d97c6e7fd581c android.hardware.neuralnetworks@1.3::IDevice 127ba11efb8220dc3aec9a8f441b59eaf1c68d7f03f577833e1824de75a36b17 android.hardware.neuralnetworks@1.3::IExecutionCallback 6e904be0ddca5ae1de8eba020e6c38ed935ea7d80cd08f47787f137a0ca58555 android.hardware.neuralnetworks@1.3::IFencedExecutionCallback -2b0b10d2ea7a18a4048cd0eb83d35c19a817aeee95f65807fc31f4ef21381397 android.hardware.neuralnetworks@1.3::IPreparedModel +ee9dc34b9925b8367b1111c72bd6d9d375432735e451572ca5a665d8516a7744 android.hardware.neuralnetworks@1.3::IPreparedModel eee3430cc86c97c7b407495863d8fb61da6f1a64b7721e77b9b4909b11b174e9 android.hardware.neuralnetworks@1.3::IPreparedModelCallback acf84925f8ee0a651f2ec547ac334034de266479b93af5434f6c1f25e66aba96 android.hardware.neuralnetworks@1.3::types b454df853441c12f6e425e8a60dd29fda20f5e6e39b93d1103e4b37495db38aa android.hardware.radio@1.5::IRadio diff --git a/neuralnetworks/1.3/IPreparedModel.hal b/neuralnetworks/1.3/IPreparedModel.hal index a1814b5156..e7d63f4851 100644 --- a/neuralnetworks/1.3/IPreparedModel.hal +++ b/neuralnetworks/1.3/IPreparedModel.hal @@ -92,13 +92,11 @@ interface IPreparedModel extends @1.2::IPreparedModel { * executing a {@link OperationType::WHILE} * operation. If a loop condition model does not * output false within this duration, the - * execution must be aborted. If the model - * contains a {@link OperationType::WHILE} - * operation and no loop timeout duration is - * provided, the maximum amount of time is {@link - * LoopTimeoutDurationNs::DEFAULT}. When - * provided, the duration must not exceed {@link - * LoopTimeoutDurationNs::MAXIMUM}. + * execution must be aborted. If no loop timeout + * duration is provided, the maximum amount of + * time is {@link LoopTimeoutDurationNs::DEFAULT}. + * When provided, the duration must not exceed + * {@link LoopTimeoutDurationNs::MAXIMUM}. * @param callback A callback object used to return the error status of * the execution, shape information of model output operands, and * duration of execution. The callback object's notify function must @@ -170,13 +168,11 @@ interface IPreparedModel extends @1.2::IPreparedModel { * executing a {@link OperationType::WHILE} * operation. If a loop condition model does not * output false within this duration, the - * execution must be aborted. If the model - * contains a {@link OperationType::WHILE} - * operation and no loop timeout duration is - * provided, the maximum amount of time is {@link - * LoopTimeoutDurationNs::DEFAULT}. When - * provided, the duration must not exceed {@link - * LoopTimeoutDurationNs::MAXIMUM}. + * execution must be aborted. If no loop timeout + * duration is provided, the maximum amount of + * time is {@link LoopTimeoutDurationNs::DEFAULT}. + * When provided, the duration must not exceed + * {@link LoopTimeoutDurationNs::MAXIMUM}. * @return status Error status of the execution, must be: * - NONE if execution is performed successfully * - DEVICE_UNAVAILABLE if driver is offline or busy @@ -258,13 +254,11 @@ interface IPreparedModel extends @1.2::IPreparedModel { * executing a {@link OperationType::WHILE} * operation. If a loop condition model does not * output false within this duration, the - * execution must be aborted. If the model - * contains a {@link OperationType::WHILE} - * operation and no loop timeout duration is - * provided, the maximum amount of time is {@link - * LoopTimeoutDurationNs::DEFAULT}. When - * provided, the duration must not exceed {@link - * LoopTimeoutDurationNs::MAXIMUM}. + * execution must be aborted. If no loop timeout + * duration is provided, the maximum amount of + * time is {@link LoopTimeoutDurationNs::DEFAULT}. + * When provided, the duration must not exceed + * {@link LoopTimeoutDurationNs::MAXIMUM}. * @param duration The length of time within which the execution is expected * to complete after all sync fences in waitFor are signaled. * If the execution cannot be finished within the duration,