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

Commit e867be8b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix the order of width and height for NNAPI RESIZE_BILINEAR and... 

Merge "Fix the order of width and height for NNAPI RESIZE_BILINEAR and RESIZE_NEAREST_NEIGHBOR" into qt-dev
parents 3ca195bf 286339b4

current.txt

+2 −2
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ f7d7cb747dc01a9fdb2d39a80003b4d8df9be733d65f5842198802eb6209db69 android.hardwar 
65a021fa89085b62fc96b2b6d3bef2f9103cf4d63379c68bc154fd9eef672852 android.hardware.health@1.0::types

b7ecf29927055ec422ec44bf776223f07d79ad9f92ccf9becf167e62c2607e7a android.hardware.keymaster@4.0::IKeymasterDevice

574e8f1499436fb4075894dcae0b36682427956ecb114f17f1fe22d116a83c6b android.hardware.neuralnetworks@1.0::IPreparedModel

567de4ebb3a224721eabae40c4484fad2cd1608eb0e66ec9214eb88e9b15d3c9 android.hardware.neuralnetworks@1.0::types

e75759b40a1c5f97b463b30aab91954012c9ea9e454dde308db853a56796e5a6 android.hardware.neuralnetworks@1.0::types

d51937a3567a50f239589e40300264c4b57f2c3582c6fc6df082f45eb74d90e3 android.hardware.neuralnetworks@1.1::types

1d4a5776614c08b5d794a5ec5ab04697260cbd4b3441d5935cd53ee71d19da02 android.hardware.radio@1.0::IRadioResponse

ed9da80ec0c96991fd03f0a46107815d0e50f764656e49dba4980fa5c31d5bc3 android.hardware.radio@1.0::types
@@ -515,7 +515,7 @@ b83317b66721241887d2770b5ae95fd5af1e77c5daa7530ecb08fae8892f2b43 android.hardwar 
92714960d1a53fc2ec557302b41c7cc93d2636d8364a44bd0f85be0c92927ff8 android.hardware.neuralnetworks@1.2::IExecutionCallback

36e1064c869965dee533c537cefbe87e54db8bd8cd45be7e0e93e00e8a43863a android.hardware.neuralnetworks@1.2::IPreparedModel

e1c734d1545e1a4ae749ff1dd9704a8e594c59aea7c8363159dc258e93e0df3b android.hardware.neuralnetworks@1.2::IPreparedModelCallback

51725cd8541bf459190d8a911f9aae9a0825678256b88fc39fac81d69feb04af android.hardware.neuralnetworks@1.2::types

30f6da776bf909fc139f2bc4c176b5a74e9db0978240efcd7429d04e221bfaee android.hardware.neuralnetworks@1.2::types

cf7a4ba516a638f9b82a249c91fb603042c2d9ca43fd5aad9cf6c0401ed2a5d7 android.hardware.nfc@1.2::INfc

abf98c2ae08bf765db54edc8068e36d52eb558cff6706b6fd7c18c65a1f3fc18 android.hardware.nfc@1.2::types

4cb252dc6372a874aef666b92a6e9529915aa187521a700f0789065c3c702ead android.hardware.power.stats@1.0::IPowerStats

neuralnetworks/1.0/types.hal

+2 −2
Original line number Diff line number Diff line
@@ -1225,9 +1225,9 @@ enum OperationType : int32_t { 
     * * 0: A 4-D tensor, of shape [batches, height, width, depth], specifying

     *      the input.

     * * 1: An {@link OperandType::INT32} scalar, specifying the output

     *      height of the output tensor.

     * * 2: An {@link OperandType::INT32} scalar, specifying the output

     *      width of the output tensor.

     * * 2: An {@link OperandType::INT32} scalar, specifying the output

     *      height of the output tensor.

     *

     * Outputs:

     * * 0: The output 4-D tensor, of shape

neuralnetworks/1.2/types.hal

+12 −12
Original line number Diff line number Diff line
@@ -1593,9 +1593,9 @@ enum OperationType : int32_t { 
     *      the input. Since API level 29, zero batches is supported for this

     *      tensor.

     * * 1: An {@link OperandType::INT32} scalar, specifying the output

     *      height of the output tensor.

     * * 2: An {@link OperandType::INT32} scalar, specifying the output

     *      width of the output tensor.

     * * 2: An {@link OperandType::INT32} scalar, specifying the output

     *      height of the output tensor.

     * * 3: An optional {@link OperandType::BOOL} scalar, default to false.

     *      Set to true to specify NCHW data layout for input0 and output0.

     *      Available since API level 29.
@@ -1603,15 +1603,15 @@ enum OperationType : int32_t { 
     * Inputs (resizing by scale, since API level 29):

     * * 0: A 4-D tensor, of shape [batches, height, width, depth], specifying

     *      the input. Zero batches is supported for this tensor.

     * * 1: A scalar, specifying height_scale, the scaling factor of the height

     * * 1: A scalar, specifying width_scale, the scaling factor of the width

     *      dimension from the input tensor to the output tensor. The output

     *      height is calculated as new_height = floor(height * height_scale).

     *      width is calculated as new_width = floor(width * width_scale).

     *      The scalar must be of {@link OperandType::FLOAT16} if input0 is

     *      of {@link OperandType::TENSOR_FLOAT16} and of

     *      {@link OperandType::FLOAT32} otherwise.

     * * 2: A scalar, specifying width_scale, the scaling factor of the width

     * * 2: A scalar, specifying height_scale, the scaling factor of the height

     *      dimension from the input tensor to the output tensor. The output

     *      width is calculated as new_width = floor(width * width_scale).

     *      height is calculated as new_height = floor(height * height_scale).

     *      The scalar must be of {@link OperandType::FLOAT16} if input0 is

     *      of {@link OperandType::TENSOR_FLOAT16} and of

     *      {@link OperandType::FLOAT32} otherwise.
@@ -4663,24 +4663,24 @@ enum OperationType : int32_t { 
     * * 0: A 4-D tensor, of shape [batches, height, width, depth], specifying

     *      the input. Zero batches is supported for this tensor.

     * * 1: An {@link OperandType::INT32} scalar, specifying the output

     *      height of the output tensor.

     * * 2: An {@link OperandType::INT32} scalar, specifying the output

     *      width of the output tensor.

     * * 2: An {@link OperandType::INT32} scalar, specifying the output

     *      height of the output tensor.

     * * 3: An {@link OperandType::BOOL} scalar, default to false.

     *      Set to true to specify NCHW data layout for input0 and output0.

     *

     * Inputs (resizing by scale):

     * * 0: A 4-D tensor, of shape [batches, height, width, depth], specifying

     *      the input. Zero batches is supported for this tensor.

     * * 1: A scalar, specifying height_scale, the scaling factor of the height

     * * 1: A scalar, specifying width_scale, the scaling factor of the width

     *      dimension from the input tensor to the output tensor. The output

     *      height is calculated as new_height = floor(height * height_scale).

     *      width is calculated as new_width = floor(width * width_scale).

     *      The scalar must be of {@link OperandType::FLOAT16} if input0 is

     *      of {@link OperandType::TENSOR_FLOAT16} and of

     *      {@link OperandType::FLOAT32} otherwise.

     * * 2: A scalar, specifying width_scale, the scaling factor of the width

     * * 2: A scalar, specifying height_scale, the scaling factor of the height

     *      dimension from the input tensor to the output tensor. The output

     *      width is calculated as new_width = floor(width * width_scale).

     *      height is calculated as new_height = floor(height * height_scale).

     *      The scalar must be of {@link OperandType::FLOAT16} if input0 is

     *      of {@link OperandType::TENSOR_FLOAT16} and of

     *      {@link OperandType::FLOAT32} otherwise.