diff options
author | Slava Shklyaev <slavash@google.com> | 2020-06-26 12:19:48 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-26 12:19:48 +0000 |
commit | 14f169438ee72bef00f8751bf1ec8aa96af8dff7 (patch) | |
tree | b5c372c6e0329cfa36783d4a9f8655a924b43b4f /nn/runtime | |
parent | 6cf4ec939ea315bb812e2ca3ce94cb13e5263d66 (diff) | |
parent | f1c5f04cce9359f51bb74085807b1a7e7d84f167 (diff) | |
download | ml-14f169438ee72bef00f8751bf1ec8aa96af8dff7.tar.gz |
Merge "Clarify control flow shape constraints" into rvc-dev
Diffstat (limited to 'nn/runtime')
-rw-r--r-- | nn/runtime/include/NeuralNetworks.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/nn/runtime/include/NeuralNetworks.h b/nn/runtime/include/NeuralNetworks.h index b4d304f78..2f7d3b38e 100644 --- a/nn/runtime/include/NeuralNetworks.h +++ b/nn/runtime/include/NeuralNetworks.h @@ -5441,12 +5441,14 @@ typedef enum { * The inputs and outputs of the two referenced models must agree with the * signature of this operation. That is, if the operation has (3 + n) inputs * and m outputs, both models must have n inputs and m outputs with the same - * types, ranks (if specified), and dimensions (if specified) as the - * corresponding operation inputs and outputs. + * types, ranks (if specified), dimensions (if specified), scales, + * zeroPoints, and other operand parameters as the corresponding operation + * inputs and outputs. * * Inputs: * * 0: A value of type {@link ANEURALNETWORKS_TENSOR_BOOL8} and shape [1] * that determines which of the two referenced models to execute. + * The operand must have fully specified dimensions. * * 1: A {@link ANEURALNETWORKS_MODEL} reference to the model to be * executed if the condition is true. * * 2: A {@link ANEURALNETWORKS_MODEL} reference to the model to be @@ -5511,13 +5513,16 @@ typedef enum { * Inputs: * * 0: A {@link ANEURALNETWORKS_MODEL} reference to the condition * model. The model must have (m + k + n) inputs with - * the same types, ranks (if specified), and dimensions (if specified) - * as the corresponding inputs of the WHILE operation and exactly one - * output of {@link ANEURALNETWORKS_TENSOR_BOOL8} and shape [1]. + * the same types, ranks (if specified), dimensions (if specified), + * scales, zeroPoints, and other operand parameters as the + * corresponding inputs of the WHILE operation and exactly one output + * of {@link ANEURALNETWORKS_TENSOR_BOOL8} and shape [1]. + * The output operand must have fully specified dimensions. * * 1: A {@link ANEURALNETWORKS_MODEL} reference to the body model. * The model must have (m + k + n) inputs and (m + k) outputs with - * the same types, ranks (if specified), and dimensions (if specified) - * as the corresponding inputs and outputs of the WHILE operation. + * the same types, ranks (if specified), dimensions (if specified), + * scales, zeroPoints, and other operand parameters as the + * corresponding inputs and outputs of the WHILE operation. * * (m inputs): Initial values for input-output operands. * * (k inputs): Initial values for state-only operands. * * (n inputs): Values for input-only operands. |