Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfe15258 authored by Slava Shklyaev's avatar Slava Shklyaev
Browse files

Clarify NNAPI control flow shape constraints RESTRICT AUTOMERGE 

This change also removes some non-NN hashes in current.txt that were
unintentionally introduced in https://r.android.com/1178665.

Bug: 156918813
Bug: 158557728
Test: m
Change-Id: I4c2b83e11b27b791b3aa624be68474011b92a269
Merged-In: I4c2b83e11b27b791b3aa624be68474011b92a269
(cherry picked from commit 709842ab)
parent 01937cb9

current.txt

+1 −6
Original line number Original line Diff line number Diff line
@@ -644,12 +644,7 @@ ee9dc34b9925b8367b1111c72bd6d9d375432735e451572ca5a665d8516a7744 android.hardwar 
eee3430cc86c97c7b407495863d8fb61da6f1a64b7721e77b9b4909b11b174e9 android.hardware.neuralnetworks@1.3::IPreparedModelCallback

eee3430cc86c97c7b407495863d8fb61da6f1a64b7721e77b9b4909b11b174e9 android.hardware.neuralnetworks@1.3::IPreparedModelCallback

acf84925f8ee0a651f2ec547ac334034de266479b93af5434f6c1f25e66aba96 android.hardware.neuralnetworks@1.3::types

acf84925f8ee0a651f2ec547ac334034de266479b93af5434f6c1f25e66aba96 android.hardware.neuralnetworks@1.3::types

e9080d04218e98512b63aace9ff3da52f0130238391f15cbbf7df396a3ec9072 android.hardware.neuralnetworks@1.3::types # b/155508675, b/155662254, b/155238914, b/155660285

e9080d04218e98512b63aace9ff3da52f0130238391f15cbbf7df396a3ec9072 android.hardware.neuralnetworks@1.3::types # b/155508675, b/155662254, b/155238914, b/155660285

3e01d4446cd69fd1c48f8572efd97487bc179564b32bd795800b97bbe10be37b android.hardware.wifi@1.4::IWifi

583dc88b41e702e940fd954edda1beb8b4151eab55a5c6d7e69e2781bce84b59 android.hardware.neuralnetworks@1.3::types # b/156918813

a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardware.wifi.supplicant@1.3::ISupplicant

44445b8a03d7b9e68b2fbd954672c18a8fce9e32851b0692f4f4ab3407f86ecb android.hardware.wifi.supplicant@1.3::ISupplicantStaIface

619fc9839ec6e369cfa9b28e3e9412e6885720ff8f9b5750c1b6ffb905120391 android.hardware.wifi.supplicant@1.3::ISupplicantStaIfaceCallback

c9273429fcf98d797d3bb07fdba6f1be95bf960f9255cde169fd1ca4db85f856 android.hardware.wifi.supplicant@1.3::ISupplicantStaNetwork

9b0a3ab6f4f74b971ed094426d8a443e29b512ff03e1ab50c07156396cdb2483 android.hardware.wifi.supplicant@1.3::types

a5bcd595a5108312fe2eb402e716d0b7dab8eb689a2a5f54fdef3ff71f3babd5 android.hardware.radio@1.5::types

a5bcd595a5108312fe2eb402e716d0b7dab8eb689a2a5f54fdef3ff71f3babd5 android.hardware.radio@1.5::types

b454df853441c12f6e425e8a60dd29fda20f5e6e39b93d1103e4b37495db38aa android.hardware.radio@1.5::IRadio

b454df853441c12f6e425e8a60dd29fda20f5e6e39b93d1103e4b37495db38aa android.hardware.radio@1.5::IRadio

fcbb0742a88215ee7a6d7ce0825d253eb2b50391fc6c8c48667f9fd7f6d4549e android.hardware.radio@1.5::IRadioIndication

fcbb0742a88215ee7a6d7ce0825d253eb2b50391fc6c8c48667f9fd7f6d4549e android.hardware.radio@1.5::IRadioIndication

neuralnetworks/1.3/types.hal

+19 −9
Original line number Original line Diff line number Diff line
@@ -5102,11 +5102,15 @@ enum OperationType : int32_t { 
     * The inputs and outputs of the two referenced subgraphs must agree with the

     * The inputs and outputs of the two referenced subgraphs must agree with the

     * signature of this operation. That is, if the operation has (3 + n) inputs

     * signature of this operation. That is, if the operation has (3 + n) inputs

     * and m outputs, both subgraphs must have n inputs and m outputs with the same

     * and m outputs, both subgraphs must have n inputs and m outputs with the same

     * types as the corresponding operation inputs and outputs.

     * types, ranks, dimensions, scales,

     * zeroPoints, and extraParams as the corresponding operation inputs and

     * outputs.

     * All of the operands mentioned must have fully specified dimensions.

     *

     *

     * Inputs:

     * Inputs:

     * * 0: A value of type {@link OperandType::TENSOR_BOOL8} and shape [1]

     * * 0: A value of type {@link OperandType::TENSOR_BOOL8} and shape [1]

     *      that determines which of the two referenced subgraphs to execute.

     *      that determines which of the two referenced subgraphs to execute.

     *      The operand must have fully specified dimensions.

     * * 1: A {@link OperandType::SUBGRAPH} reference to the subgraph to be

     * * 1: A {@link OperandType::SUBGRAPH} reference to the subgraph to be

     *      executed if the condition is true.

     *      executed if the condition is true.

     * * 2: A {@link OperandType::SUBGRAPH} reference to the subgraph to be

     * * 2: A {@link OperandType::SUBGRAPH} reference to the subgraph to be
@@ -5165,13 +5169,17 @@ enum OperationType : int32_t { 
     * Inputs:

     * Inputs:

     * * 0: A {@link OperandType::SUBGRAPH} reference to the condition

     * * 0: A {@link OperandType::SUBGRAPH} reference to the condition

     *      subgraph. The subgraph must have (m + k + n) inputs with

     *      subgraph. The subgraph must have (m + k + n) inputs with

     *      the same types as the corresponding inputs of the WHILE operation

     *      the same types, ranks, dimensions,

     *      and exactly one output of {@link OperandType::TENSOR_BOOL8}

     *      scales, zeroPoints, and extraParams as the corresponding inputs of

     *      and shape [1].

     *      the WHILE operation and exactly one output of

     *      {@link OperandType::TENSOR_BOOL8} and shape [1].

     *      All of the operands mentioned must have fully specified dimensions.

     * * 1: A {@link OperandType::SUBGRAPH} reference to the body subgraph.

     * * 1: A {@link OperandType::SUBGRAPH} reference to the body subgraph.

     *      The subgraph must have (m + k + n) inputs and (m + k) outputs with

     *      The subgraph must have (m + k + n) inputs and (m + k) outputs with

     *      the same types as the corresponding inputs and outputs of the WHILE

     *      the same types, ranks, dimensions,

     *      operation.

     *      scales, zeroPoints, and extraParams as the corresponding inputs and

     *      outputs of the WHILE operation.

     *      All of the operands mentioned must have fully specified dimensions.

     * * (m inputs): Initial values for input-output operands.

     * * (m inputs): Initial values for input-output operands.

     * * (k inputs): Initial values for state-only operands.

     * * (k inputs): Initial values for state-only operands.

     * * (n inputs): Values for input-only operands.

     * * (n inputs): Values for input-only operands.
@@ -5491,7 +5499,9 @@ struct Operand { 
     * If a tensor operand's dimensions are not fully specified, the

     * If a tensor operand's dimensions are not fully specified, the

     * dimensions of the operand are deduced from the operand

     * dimensions of the operand are deduced from the operand

     * dimensions and values of the operation for which that operand

     * dimensions and values of the operation for which that operand

     * is an output.

     * is an output or from the corresponding {@link OperationType::IF} or

     * {@link OperationType::WHILE} operation input operand dimensions in the

     * case of referenced subgraph input operands.

     *

     *

     * In the following situations, a tensor operand's dimensions must

     * In the following situations, a tensor operand's dimensions must

     * be fully specified:

     * be fully specified:
@@ -5499,8 +5509,8 @@ struct Operand { 
     *     . The operand has lifetime CONSTANT_COPY or

     *     . The operand has lifetime CONSTANT_COPY or

     *       CONSTANT_REFERENCE.

     *       CONSTANT_REFERENCE.

     *

     *

     *     . The operand has lifetime SUBGRAPH_INPUT. Fully

     *     . The operand has lifetime SUBGRAPH_INPUT and belongs to the main

     *       specified dimensions must either be present in the

     *       subgraph. Fully specified dimensions must either be present in the

     *       Operand or they must be provided in the corresponding

     *       Operand or they must be provided in the corresponding

     *       RequestArgument.

     *       RequestArgument.

     *       EXCEPTION: If the input is optional and omitted

     *       EXCEPTION: If the input is optional and omitted

neuralnetworks/1.3/types.t

+5 −3
Original line number Original line Diff line number Diff line
@@ -264,7 +264,9 @@ struct Operand { 
     * If a tensor operand's dimensions are not fully specified, the

     * If a tensor operand's dimensions are not fully specified, the

     * dimensions of the operand are deduced from the operand

     * dimensions of the operand are deduced from the operand

     * dimensions and values of the operation for which that operand

     * dimensions and values of the operation for which that operand

     * is an output.

     * is an output or from the corresponding {@link OperationType::IF} or

     * {@link OperationType::WHILE} operation input operand dimensions in the

     * case of referenced subgraph input operands.

     *

     *

     * In the following situations, a tensor operand's dimensions must

     * In the following situations, a tensor operand's dimensions must

     * be fully specified:

     * be fully specified:
@@ -272,8 +274,8 @@ struct Operand { 
     *     . The operand has lifetime CONSTANT_COPY or

     *     . The operand has lifetime CONSTANT_COPY or

     *       CONSTANT_REFERENCE.

     *       CONSTANT_REFERENCE.

     *

     *

     *     . The operand has lifetime SUBGRAPH_INPUT. Fully

     *     . The operand has lifetime SUBGRAPH_INPUT and belongs to the main

     *       specified dimensions must either be present in the

     *       subgraph. Fully specified dimensions must either be present in the

     *       Operand or they must be provided in the corresponding

     *       Operand or they must be provided in the corresponding

     *       RequestArgument.

     *       RequestArgument.

     *       EXCEPTION: If the input is optional and omitted

     *       EXCEPTION: If the input is optional and omitted