From 6cf5f3e2a68f91959184c2c1a2ce33c74dccd29d Mon Sep 17 00:00:00 2001 From: Slava Shklyaev Date: Tue, 7 Apr 2020 13:20:47 +0100 Subject: [PATCH 1/2] Update loopTimeoutDuration documentation in NNAPI Bug: 149686804 Test: m Change-Id: I0096a2fc2e579d39a2d59a605a4217d53a381691 Merged-In: I0096a2fc2e579d39a2d59a605a4217d53a381691 (cherry picked from commit 6a222a3eec395ff4196675b513fa6878916c8395) --- 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 becbf9bc61..cb8ddee1d2 100644 --- a/current.txt +++ b/current.txt @@ -637,7 +637,7 @@ ddcf89cd8ee2df0d32aee55050826446fb64f7aafde0a7cd946c64f61b1a364c 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 c9320b04ec302624985180a02d591bea5e435601fc411a6cabb58878e4e1ad68 android.hardware.neuralnetworks@1.3::types 3e01d4446cd69fd1c48f8572efd97487bc179564b32bd795800b97bbe10be37b android.hardware.wifi@1.4::IWifi 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, From b79c31aba802c2744c17a137c797b810c5c95168 Mon Sep 17 00:00:00 2001 From: Xusong Wang Date: Thu, 9 Apr 2020 14:26:54 -0700 Subject: [PATCH 2/2] Remove BLOB AHWB tests from 1.2 VTS. Bug: 153282844 Test: 1.2 VTS Change-Id: I866fe1388a64a36372f90c60fef340d2fe4c8682 Merged-In: I866fe1388a64a36372f90c60fef340d2fe4c8682 (cherry picked from commit b642700c7ff54e84864df50f0337c43e99808590) --- neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp b/neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp index 35275b4e61..56f3c0b7e2 100644 --- a/neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp +++ b/neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp @@ -350,7 +350,7 @@ void EvaluatePreparedModel(const sp& preparedModel, const TestMo outputTypesList = {OutputType::FULLY_SPECIFIED}; measureTimingList = {MeasureTiming::NO, MeasureTiming::YES}; executorList = {Executor::ASYNC, Executor::SYNC, Executor::BURST}; - memoryTypeList = {MemoryType::ASHMEM, MemoryType::BLOB_AHWB}; + memoryTypeList = {MemoryType::ASHMEM}; } for (const OutputType outputType : outputTypesList) {