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

Merge changes I866fe138,I0096a2fc

Browse source 
* changes:
  Remove BLOB AHWB tests from 1.2 VTS.
  Update loopTimeoutDuration documentation in NNAPI
This commit is contained in:
Slava Shklyaev 2020-04-16 12:45:32 +00:00 committed by Gerrit Code Review
commit 17a0b4fcdc
3 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
current.txt
View file

@ -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
acf84925f8ee0a651f2ec547ac334034de266479b93af5434f6c1f25e66aba96 android.hardware.neuralnetworks@1.3::types
3e01d4446cd69fd1c48f8572efd97487bc179564b32bd795800b97bbe10be37b android.hardware.wifi@1.4::IWifi

2
neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp
View file

@ -350,7 +350,7 @@ void EvaluatePreparedModel(const sp<IPreparedModel>& 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) {

36
neuralnetworks/1.3/IPreparedModel.hal
View file

@ -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,