Merge changes I6c1af92f,Icf594d40 (e6849d56) · Commits · e / os / android_hardware_interfaces

current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -652,6 +652,8 @@ b809193970a91ca637a4b0184767315601d32e3ef3d5992ffbc7a8d14a14f015 android.hardwar

		# ABI preserving changes to HALs during Android S
		cd84ab19c590e0e73dd2307b591a3093ee18147ef95e6d5418644463a6620076 android.hardware.neuralnetworks@1.2::IDevice
		9625e85f56515ad2cf87b6a1847906db669f746ea4ab02cd3d4ca25abc9b0109 android.hardware.neuralnetworks@1.2::types
		9e758e208d14f7256e0885d6d8ad0b61121b21d8c313864f981727ae55bffd16 android.hardware.neuralnetworks@1.3::types
		38d65fb20c60a5b823298560fc0825457ecdc49603a4b4e94bf81511790737da android.hardware.radio@1.4::types
		954c334efd80e8869b66d1ce5fe2755712d96ba4b3c38d415739c330af5fb4cb android.hardware.radio@1.5::types

neuralnetworks/1.2/types.hal

+6 −3

Original line number	Diff line number	Diff line
		@@ -4853,15 +4853,18 @@ struct Operand {
		/**
		* Quantized scale of the operand.
		*
		* Only applicable if the operand is of type TENSOR_QUANT8_ASYMM or
		* TENSOR_INT32.
		* Must be 0 when not applicable to an operand type.
		*
		* See {@link OperandType}.
		*/
		float scale;

		/**
		* Quantized zero-point offset of the operand.
		*
		* Only applicable if the operand is of type TENSOR_QUANT8_ASYMM.
		* Must be 0 when not applicable to an operand type.
		*
		* See {@link OperandType}.
		*/
		int32_t zeroPoint;

neuralnetworks/1.2/types.t

+6 −3

Original line number	Diff line number	Diff line
		@@ -251,15 +251,18 @@ struct Operand {
		/**
		* Quantized scale of the operand.
		*
		* Only applicable if the operand is of type TENSOR_QUANT8_ASYMM or
		* TENSOR_INT32.
		* Must be 0 when not applicable to an operand type.
		*
		* See {@link OperandType}.
		*/
		float scale;

		/**
		* Quantized zero-point offset of the operand.
		*
		* Only applicable if the operand is of type TENSOR_QUANT8_ASYMM.
		* Must be 0 when not applicable to an operand type.
		*
		* See {@link OperandType}.
		*/
		int32_t zeroPoint;

neuralnetworks/1.3/types.hal

+17 −14

Original line number	Diff line number	Diff line
		@@ -5103,8 +5103,8 @@ enum OperationType : int32_t {
		* 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
		* types, ranks, dimensions, scales,
		* zeroPoints, and extraParams as the corresponding operation inputs and
		* outputs.
		* zeroPoints, and extraParams as the corresponding operation
		* inputs and outputs.
		* All of the operands mentioned must have fully specified dimensions.
		*
		* Inputs:
		@@ -5170,15 +5170,15 @@ enum OperationType : int32_t {
		* * 0: A {@link OperandType::SUBGRAPH} reference to the condition
		* subgraph. The subgraph must have (m + k + n) inputs with
		* the same types, ranks, dimensions,
		* scales, zeroPoints, and extraParams as the corresponding inputs of
		* the WHILE operation and exactly one output of
		* {@link OperandType::TENSOR_BOOL8} and shape [1].
		* scales, zeroPoints, and extraParams as the
		* corresponding inputs of 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.
		* The subgraph must have (m + k + n) inputs and (m + k) outputs with
		* the same types, ranks, dimensions,
		* scales, zeroPoints, and extraParams as the corresponding inputs and
		* outputs of the WHILE 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.
		* * (k inputs): Initial values for state-only operands.
		@@ -5538,15 +5538,18 @@ struct Operand {
		/**
		* Quantized scale of the operand.
		*
		* Only applicable if the operand is of type TENSOR_QUANT8_ASYMM or
		* TENSOR_INT32.
		* Must be 0 when not applicable to an operand type.
		*
		* See {@link OperandType}.
		*/
		float scale;

		/**
		* Quantized zero-point offset of the operand.
		*
		* Only applicable if the operand is of type TENSOR_QUANT8_ASYMM.
		* Must be 0 when not applicable to an operand type.
		*
		* See {@link OperandType}.
		*/
		int32_t zeroPoint;

		@@ -5740,8 +5743,8 @@ struct Request {
		* Input data and information to be used in the execution of a prepared
		* model.
		*
		* The index of the input corresponds to the index in Model.inputIndexes.
		* E.g., input[i] corresponds to Model.inputIndexes[i].
		* The index of the input corresponds to the index in Model.main.inputIndexes.
		* E.g., input[i] corresponds to Model.main.inputIndexes[i].
		*/
		vec<RequestArgument> inputs;

		@@ -5749,8 +5752,8 @@ struct Request {
		* Output data and information to be used in the execution of a prepared
		* model.
		*
		* The index of the output corresponds to the index in Model.outputIndexes.
		* E.g., output[i] corresponds to Model.outputIndexes[i].
		* The index of the output corresponds to the index in Model.main.outputIndexes.
		* E.g., output[i] corresponds to Model.main.outputIndexes[i].
		*/
		vec<RequestArgument> outputs;

neuralnetworks/1.3/types.t

+10 −7

Original line number	Diff line number	Diff line
		@@ -303,15 +303,18 @@ struct Operand {
		/**
		* Quantized scale of the operand.
		*
		* Only applicable if the operand is of type TENSOR_QUANT8_ASYMM or
		* TENSOR_INT32.
		* Must be 0 when not applicable to an operand type.
		*
		* See {@link OperandType}.
		*/
		float scale;

		/**
		* Quantized zero-point offset of the operand.
		*
		* Only applicable if the operand is of type TENSOR_QUANT8_ASYMM.
		* Must be 0 when not applicable to an operand type.
		*
		* See {@link OperandType}.
		*/
		int32_t zeroPoint;

		@@ -505,8 +508,8 @@ struct Request {
		* Input data and information to be used in the execution of a prepared
		* model.
		*
		* The index of the input corresponds to the index in Model.inputIndexes.
		* E.g., input[i] corresponds to Model.inputIndexes[i].
		* The index of the input corresponds to the index in Model.main.inputIndexes.
		* E.g., input[i] corresponds to Model.main.inputIndexes[i].
		*/
		vec<RequestArgument> inputs;

		@@ -514,8 +517,8 @@ struct Request {
		* Output data and information to be used in the execution of a prepared
		* model.
		*
		* The index of the output corresponds to the index in Model.outputIndexes.
		* E.g., output[i] corresponds to Model.outputIndexes[i].
		* The index of the output corresponds to the index in Model.main.outputIndexes.
		* E.g., output[i] corresponds to Model.main.outputIndexes[i].
		*/
		vec<RequestArgument> outputs;