diff options
author | David Gross | 2018-06-19 13:38:15 -0500 |
---|---|---|
committer | David Gross | 2018-06-19 13:49:35 -0500 |
commit | c6625a71e4a889b34dc335a290efd599056bc2b0 (patch) | |
tree | 064c6eb8762f9887ab679a212586a7fffeab69e5 /neuralnetworks/1.1 | |
parent | f839bbedd7025e9925188c87540add774809d471 (diff) | |
parent | ad2db12b3a6d1cd72b50a09ae19164e9815eb219 (diff) | |
download | platform-hardware-interfaces-c6625a71e4a889b34dc335a290efd599056bc2b0.tar.gz platform-hardware-interfaces-c6625a71e4a889b34dc335a290efd599056bc2b0.tar.xz platform-hardware-interfaces-c6625a71e4a889b34dc335a290efd599056bc2b0.zip |
resolve merge conflicts of ad2db12b3a6d1cd72b50a09ae19164e9815eb219 to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I11175cd1624734e50adc30e63cb32f652c8f1380
Diffstat (limited to 'neuralnetworks/1.1')
-rw-r--r-- | neuralnetworks/1.1/types.hal | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/neuralnetworks/1.1/types.hal b/neuralnetworks/1.1/types.hal index b5718f35..7b2a21a8 100644 --- a/neuralnetworks/1.1/types.hal +++ b/neuralnetworks/1.1/types.hal | |||
@@ -137,13 +137,19 @@ enum OperationType : @1.0::OperationType { | |||
137 | * * 1: A 2-D Tensor of {@link OperandType::TENSOR_INT32}, the paddings | 137 | * * 1: A 2-D Tensor of {@link OperandType::TENSOR_INT32}, the paddings |
138 | * for each spatial dimension of the input tensor. The shape of the | 138 | * for each spatial dimension of the input tensor. The shape of the |
139 | * tensor must be {rank(input0), 2}. | 139 | * tensor must be {rank(input0), 2}. |
140 | * padding[i, 0] specifies the number of element to be padded in the | 140 | * padding[i, 0] specifies the number of elements to be padded in the |
141 | * front of dimension i. | 141 | * front of dimension i. |
142 | * padding[i, 1] specifies the number of element to be padded after the | 142 | * padding[i, 1] specifies the number of elements to be padded after the |
143 | * end of dimension i. | 143 | * end of dimension i. |
144 | * | 144 | * |
145 | * Outputs: | 145 | * Outputs: |
146 | * * 0: A tensor of the same {@link OperandType} as input0. | 146 | * * 0: A tensor of the same {@link OperandType} as input0. The |
147 | * output tensor has the same rank as input0, and each | ||
148 | * dimension of the output tensor has the same size as the | ||
149 | * corresponding dimension of the input tensor plus the size | ||
150 | * of the padding: | ||
151 | * output0.dimension[i] = | ||
152 | * padding[i, 0] + input0.dimension[i] + padding[i, 1] | ||
147 | */ | 153 | */ |
148 | PAD = 32, | 154 | PAD = 32, |
149 | 155 | ||
@@ -377,19 +383,21 @@ struct Model { | |||
377 | /** | 383 | /** |
378 | * All operations included in the model. | 384 | * All operations included in the model. |
379 | * | 385 | * |
380 | * The operations are sorted into execution order. | 386 | * The operations are sorted into execution order. Every operand |
387 | * with lifetime MODEL_OUTPUT or TEMPORARY_VARIABLE must be | ||
388 | * written before it is read. | ||
381 | */ | 389 | */ |
382 | vec<Operation> operations; | 390 | vec<Operation> operations; |
383 | 391 | ||
384 | /** | 392 | /** |
385 | * Input indexes of the model. | 393 | * Input indexes of the model. There must be at least one. |
386 | * | 394 | * |
387 | * Each value corresponds to the index of the operand in "operands". | 395 | * Each value corresponds to the index of the operand in "operands". |
388 | */ | 396 | */ |
389 | vec<uint32_t> inputIndexes; | 397 | vec<uint32_t> inputIndexes; |
390 | 398 | ||
391 | /** | 399 | /** |
392 | * Output indexes of the model. | 400 | * Output indexes of the model. There must be at least one. |
393 | * | 401 | * |
394 | * Each value corresponds to the index of the operand in "operands". | 402 | * Each value corresponds to the index of the operand in "operands". |
395 | */ | 403 | */ |