diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-10 03:01:13 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-10 03:16:23 +0000 |
| commit | e0b42c125e3c7c3b4aace8e33a455ee6664e7717 (patch) | |
| tree | e8609ec1255ef20bd4856707a7f5d155b8634d65 | |
| parent | afafc9589546058d267e84564830a6dff7557b89 (diff) | |
| parent | 5c8ac8447356a4ea0942c0865252c26052dc0ecc (diff) | |
| download | ml-e0b42c125e3c7c3b4aace8e33a455ee6664e7717.tar.gz | |
Make change and version bump to r_aml_300900900 for mainline module file: nn/apex/manifest.json
Change-Id: Ib978d61368f2fb5f11de40800083148bc6c7f2e8
| -rw-r--r-- | nn/apex/manifest.json | 2 | ||||
| -rw-r--r-- | nn/runtime/include/NeuralNetworks.h | 16 | ||||
| -rw-r--r-- | nn/tools/api/NeuralNetworks.t | 16 |
3 files changed, 27 insertions, 7 deletions
diff --git a/nn/apex/manifest.json b/nn/apex/manifest.json index 40533931b..5f60d1ab6 100644 --- a/nn/apex/manifest.json +++ b/nn/apex/manifest.json @@ -1,4 +1,4 @@ { "name": "com.android.neuralnetworks", - "version": 300900800 + "version": 300900900 } diff --git a/nn/runtime/include/NeuralNetworks.h b/nn/runtime/include/NeuralNetworks.h index 2f7d3b38e..1eb2f5466 100644 --- a/nn/runtime/include/NeuralNetworks.h +++ b/nn/runtime/include/NeuralNetworks.h @@ -6230,11 +6230,21 @@ typedef struct ANeuralNetworksOperandType { const uint32_t* dimensions; /** - * These two fields are only used for quantized tensors. - * They must be zero for all other types. - * The dequantized value of each entry is (value - zeroPoint) * scale. + * The quantization scale. + * + * Must be 0 when not applicable to an operand type. + * + * See {@link OperandCode}. */ float scale; + + /** + * The quantization zero point. + * + * Must be 0 when not applicable to an operand type. + * + * See {@link OperandCode}. + */ int32_t zeroPoint; } ANeuralNetworksOperandType; diff --git a/nn/tools/api/NeuralNetworks.t b/nn/tools/api/NeuralNetworks.t index a6ab569cd..d7cf8b2d0 100644 --- a/nn/tools/api/NeuralNetworks.t +++ b/nn/tools/api/NeuralNetworks.t @@ -656,11 +656,21 @@ typedef struct ANeuralNetworksOperandType { const uint32_t* dimensions; /** - * These two fields are only used for quantized tensors. - * They must be zero for all other types. - * The dequantized value of each entry is (value - zeroPoint) * scale. + * The quantization scale. + * + * Must be 0 when not applicable to an operand type. + * + * See {@link OperandCode}. */ float scale; + + /** + * The quantization zero point. + * + * Must be 0 when not applicable to an operand type. + * + * See {@link OperandCode}. + */ int32_t zeroPoint; } ANeuralNetworksOperandType; |