Commit graph

547 commits

Author SHA1 Message Date
TreeHugger Robot
019b0c47e6 Merge "Add TENSOR_QUANT8_ASYMM_SIGNED support for DEQUANTIZE" 2019-12-12 12:15:05 +00:00
Xusong Wang
f4f2a0d6bf Merge "NN HAL: Upgrade IPreparedModel::executeSynchronously to 1.3." 2019-12-11 20:24:12 +00:00
Przemyslaw Szczepaniak
e9f0b92568 Add TENSOR_QUANT8_ASYMM_SIGNED support for ARG(MIN|MAX)
Test: CTS/VTS
Change-Id: I4a90642f4d8500237fd41de76687fbe4c021b652
2019-12-10 13:08:48 +00:00
Lev Proleev
af5fc2374d Fix use-after-free error in NNAPI VTS tests am: 56cda83f8c am: 0854f5f759
am: 5f688eb948

Change-Id: Ibea07442f2d230caef39f6a3f73e3acf40f5cf00
2019-12-09 12:08:38 -08:00
Lev Proleev
56cda83f8c Fix use-after-free error in NNAPI VTS tests
Replace std::initializer_list with std::vector.

Fix: 145705114
Test: VtsHalNeuralnetworksV1_[23]TargetTest
Change-Id: I92cbc56b2b8fbb36b3f3225e7cd0d4b05c84041e
2019-12-09 14:56:09 +00:00
Lev Proleev
2bd0b3339c Add TENSOR_QUANT8_ASYMM_SIGNED support for DEQUANTIZE
Add TENSOR_QUANT8_ASYMM_SIGNED to the list of exceptions when mutating
DEQUANTIZE for validation.

Bug: 143934768
Test: VtsHalNeuralnetworksV1_3TargetTest
Change-Id: I1b3b0a362d3949d4e31708388100d4794846ca3a
2019-12-05 16:59:20 +00:00
Lev Proleev
5595da3741 Add TENSOR_QUANT8_ASYMM_SIGNED support for more ops
Updated:
  CONCATENATION
  REDUCE_MIN
  REDUCE_MAX
  STRIDED_SLICE
  RESHAPE
  SQUEEZE
  MEAN

Bug: 143934554
Bug: 143935314
Bug: 143934726
Bug: 143934771
Bug: 143934557
Bug: 143934306
Bug: 143935140
Test: quantization coupling tests in CTS and VTS
Change-Id: Ie73d070fd6f0a27185c1f26561710635b6e03b26
Merged-In: Ie73d070fd6f0a27185c1f26561710635b6e03b26
(cherry picked from commit 91134e7fb9)
2019-12-02 11:40:55 +00:00
Przemyslaw Szczepaniak
90fc2cc193 Add TENSOR_QUANT8_ASYMM_SIGNED support for more ops
Updated:
 BATCH_TO_SPACE_ND
 CHANNEL_SHUFFLE
 DEPTH_TO_SPACE
 GROUPED_CONV_2D
 PAD
 PAD_V2
 QUANTIZE
 RESIZE_BILINEAR
 RESIZE_NEAREST_NEIGHBOR
 SPACE_TO_BATCH_ND
 SPACE_TO_DEPTH
 SPLIT
 TILE
 TOPK_V2
 TRANSPOSE

Bug: 143934582
Bug: 143934585
Bug: 143934628
Bug: 143934630
Bug: 143934721
Bug: 143935039
Bug: 143935052
Bug: 143935113
Bug: 143935115
Bug: 143935141
Bug: 143935353
Bug: 143935355
Bug: 143935392
Bug: 143935394
Bug: 143935413
Test: quantization coupling tests in CTS and VTS
Change-Id: I7e1b65507ea0f7dcdfdb5fd98e7871d84f569ed7
Merged-In: I7e1b65507ea0f7dcdfdb5fd98e7871d84f569ed7
(cherry picked from commit 6d3cdc322b)
2019-12-02 11:40:40 +00:00
Lev Proleev
91134e7fb9 Add TENSOR_QUANT8_ASYMM_SIGNED support for more ops
Updated:
  CONCATENATION
  REDUCE_MIN
  REDUCE_MAX
  STRIDED_SLICE
  RESHAPE
  SQUEEZE
  MEAN

Bug: 143934554
Bug: 143935314
Bug: 143934726
Bug: 143934771
Bug: 143934557
Bug: 143934306
Bug: 143935140
Test: quantization coupling tests in CTS and VTS
Change-Id: Ie73d070fd6f0a27185c1f26561710635b6e03b26
2019-11-28 11:54:29 +00:00
Przemyslaw Szczepaniak
6d3cdc322b Add TENSOR_QUANT8_ASYMM_SIGNED support for more ops
Updated:
 BATCH_TO_SPACE_ND
 CHANNEL_SHUFFLE
 DEPTH_TO_SPACE
 GROUPED_CONV_2D
 PAD
 PAD_V2
 QUANTIZE
 RESIZE_BILINEAR
 RESIZE_NEAREST_NEIGHBOR
 SPACE_TO_BATCH_ND
 SPACE_TO_DEPTH
 SPLIT
 TILE
 TOPK_V2
 TRANSPOSE

Bug: 143934582
Bug: 143934585
Bug: 143934628
Bug: 143934630
Bug: 143934721
Bug: 143935039
Bug: 143935052
Bug: 143935113
Bug: 143935115
Bug: 143935141
Bug: 143935353
Bug: 143935355
Bug: 143935392
Bug: 143935394
Bug: 143935413
Test: quantization coupling tests in CTS and VTS
Change-Id: I7e1b65507ea0f7dcdfdb5fd98e7871d84f569ed7
2019-11-27 15:09:09 +00:00
Lev Proleev
cdb67453de Add TENSOR_QUANT8_ASYMM_SIGNED support for activations
Ops updated: RELU, RELU1, RELU6, TANH, LOGISTIC

Fix: 143933951
Fix: 143934720
Fix: 143933831
Fix: 143934770
Fix: 143934743
Test: quantization coupling tests in CTS and VTS
Change-Id: Id5e7a8c6b30463708bd93dbf6a3f30d05c2bcf40
Merged-In: Id5e7a8c6b30463708bd93dbf6a3f30d05c2bcf40
(cherry picked from commit 3466c78b04)
2019-11-27 14:55:49 +00:00
Lev Proleev
d1b3450b3d Add TENSOR_QUANT8_ASYMM_SIGNED support for pooling ops
* Update AVERAGE_POOL_2D and MAX_POOL_2D

Bug: 143934716
Bug: 143934303
Test: quantization coupling tests in CTS and VTS
Change-Id: I15f36d6f819c92f96a46c40f9cc1491627644278
Merged-In: I15f36d6f819c92f96a46c40f9cc1491627644278
(cherry picked from commit 3f17cc3daa)
2019-11-27 14:55:13 +00:00
Lev Proleev
53c79d179a Add TENSOR_QUANT8_ASYMM_SIGNED support to ADD, MUL and SUB.
Bug: 143934463
Bug: 143934627
Bug: 143935040
Test: NNTest_static and 1.3 VTS
Change-Id: I47ffc2c264390f3c6b98aa9567fb47f2c58333fe
Merged-In: I47ffc2c264390f3c6b98aa9567fb47f2c58333fe
(cherry picked from commit 122bc2c0cc)
2019-11-27 14:54:27 +00:00
Lev Proleev
3466c78b04 Add TENSOR_QUANT8_ASYMM_SIGNED support for activations
Ops updated: RELU, RELU1, RELU6, TANH, LOGISTIC

Change-Id: Id5e7a8c6b30463708bd93dbf6a3f30d05c2bcf40
Fix: 143933951
Fix: 143934720
Fix: 143933831
Fix: 143934770
Fix: 143934743
Test: quantization coupling tests in CTS and VTS
2019-11-21 17:35:30 +00:00
Lev Proleev
3f17cc3daa Add TENSOR_QUANT8_ASYMM_SIGNED support for pooling ops
* Update AVERAGE_POOL_2D and MAX_POOL_2D

Bug: 143934716
Bug: 143934303
Test: quantization coupling tests in CTS and VTS
Change-Id: I15f36d6f819c92f96a46c40f9cc1491627644278
2019-11-21 14:39:40 +00:00
Lev Proleev
3683c785f2 Add QUANT8_ASYMM_SIGNED support to SELECT op
Also fix repo hook complaining about comment formatting.

Bug: 143935354
Test: NNTest_static and VTS_1_3  with --gtest_filter="*QuantizationCouplingTest*select*"
Change-Id: I1b0d1e987ebccc6700dd172b4222f9996105513d
Merged-In: I1b0d1e987ebccc6700dd172b4222f9996105513d
(cherry picked from commit 04bf939c7a)
2019-11-21 12:06:36 +00:00
Lev Proleev
9226c1e910 Add quantization coupling test
Quantization coupling test is ran only on models that contain only one
operator and at least one of its inputs has a type of
TENSOR_QUANT8_ASYMM. The test verifies that a model with all the
operands converted to TENSOR_QUANT8_ASYMM_SIGNED will produce the same
result (OK/SKIPPED/FAILED).

Bug: 137828994
Test: VtsHalNeuralNetworksV1_3TargetTest --gtest_filter="*QuantizationCouplingTest*"
Change-Id: I5a2e09b2b1bd790e7e37dde133554e516155a34d
Merged-In: I5a2e09b2b1bd790e7e37dde133554e516155a34d
(cherry picked from commit c88f4c60a8)
2019-11-21 12:06:34 +00:00
Lev Proleev
0d4ba3f33a Combine test parameters into TestConfig structure
Test: VtsHalNeuralnetworksV1_2TargetTest --gtest_filter="GeneratedTests*"
Change-Id: I928aaa42e4745b4a8e0e461046e9632b052d0135
Merged-In: I928aaa42e4745b4a8e0e461046e9632b052d0135
(cherry picked from commit 66f598e10d)
2019-11-21 12:06:31 +00:00
Lev Proleev
3b60d80ff6 Add NNAPI 1.3 OperationType
* Add 1.3 OperationType.
* Remove "using V1_2::OperationType" from 1.3 VTS tests.
* Update current.txt

Test: mma
Change-Id: Ieaede9b7a6cecb16dbcc753f347f7ff04c009f20
Merged-In: Ieaede9b7a6cecb16dbcc753f347f7ff04c009f20
(cherry picked from commit 8774f10b76)
2019-11-21 12:06:27 +00:00
Lev Proleev
122bc2c0cc Add TENSOR_QUANT8_ASYMM_SIGNED support to ADD, MUL and SUB.
Bug: 143934463
Bug: 143934627
Bug: 143935040
Test: NNTest_static and 1.3 VTS
Change-Id: I47ffc2c264390f3c6b98aa9567fb47f2c58333fe
2019-11-20 11:15:02 +00:00
Lev Proleev
5c305e52ef Merge changes from topic "quant_coupling"
* changes:
  Add QUANT8_ASYMM_SIGNED support to SELECT op
  Add quantization coupling test
2019-11-20 10:56:14 +00:00
Xusong Wang
1b3f426648 NN HAL: Upgrade IPreparedModel::execute to 1.3.
Bug: 143242728
Test: 1.3 VTS with sample driver
Change-Id: I9ca1e28ddc97fe880a72885afe7afb6c93903697
Merged-In: I9ca1e28ddc97fe880a72885afe7afb6c93903697
(cherry picked from commit 62a760c32d)
2019-11-19 12:18:41 -08:00
Xusong Wang
cc47dffa57 NN HAL: Upgrade IPreparedModelCallback::notify to 1.3.
Bug: 143242728
Test: 1.3 VTS with sample driver
Change-Id: I56bc7a2fb179a9576036ad0c2aae0e1f41ec4e2c
Merged-In: I56bc7a2fb179a9576036ad0c2aae0e1f41ec4e2c
(cherry picked from commit 68c3234ad3)
2019-11-19 12:18:33 -08:00
Dan Shi
4c3a94d48d Merge "Remove VtsHalNeuralnetworksV1_2TargetTest from vts-core suite" am: 86c7aabcc0 am: 572970bcc6
am: 2327f621e7

Change-Id: Ibf66f98dd9d5d82d620f8907629eb56dae65ca81
2019-11-18 13:05:14 -08:00
Xusong Wang
ebd88ba8d2 NN HAL: Upgrade IPreparedModel::executeSynchronously to 1.3.
Bug: 143242728
Test: 1.3 VTS with sample driver
Change-Id: I4b74e8ac031c5d793cf7e5d66190734949367538
2019-11-18 11:20:37 -08:00
Lev Proleev
04bf939c7a Add QUANT8_ASYMM_SIGNED support to SELECT op
Also fix repo hook complaining about comment formatting.

Bug: 143935354
Test: NNTest_static and VTS_1_3  with --gtest_filter="*QuantizationCouplingTest*select*"
Change-Id: I1b0d1e987ebccc6700dd172b4222f9996105513d
2019-11-18 17:20:55 +00:00
Lev Proleev
c88f4c60a8 Add quantization coupling test
Quantization coupling test is ran only on models that contain only one
operator and at least one of its inputs has a type of
TENSOR_QUANT8_ASYMM. The test verifies that a model with all the
operands converted to TENSOR_QUANT8_ASYMM_SIGNED will produce the same
result (OK/SKIPPED/FAILED).

Bug: 137828994
Test: VtsHalNeuralNetworksV1_3TargetTest --gtest_filter="*QuantizationCouplingTest*"
Change-Id: I5a2e09b2b1bd790e7e37dde133554e516155a34d
2019-11-18 17:20:55 +00:00
Dan Shi
07f4235b53 Remove VtsHalNeuralnetworksV1_2TargetTest from vts-core suite
The test takes over 12 hours to run. Remove it from vts-core suite.

Bug: 144527956
Test: None
Change-Id: If37a7b04e6d7b044d1594dcb4df07432236a1cf3
2019-11-18 08:40:19 -08:00
Lev Proleev
66f598e10d Combine test parameters into TestConfig structure
Test: VtsHalNeuralnetworksV1_2TargetTest --gtest_filter="GeneratedTests*"
Change-Id: I928aaa42e4745b4a8e0e461046e9632b052d0135
2019-11-12 15:38:36 +00:00
Lev Proleev
8774f10b76 Add NNAPI 1.3 OperationType
* Add 1.3 OperationType.
* Remove "using V1_2::OperationType" from 1.3 VTS tests.
* Update current.txt

Test: mma
Change-Id: Ieaede9b7a6cecb16dbcc753f347f7ff04c009f20
2019-11-11 18:11:50 +00:00
Xusong Wang
62a760c32d NN HAL: Upgrade IPreparedModel::execute to 1.3.
Bug: 143242728
Test: 1.3 VTS with sample driver
Change-Id: I9ca1e28ddc97fe880a72885afe7afb6c93903697
2019-11-07 17:30:56 -08:00
Xusong Wang
68c3234ad3 NN HAL: Upgrade IPreparedModelCallback::notify to 1.3.
Bug: 143242728
Test: 1.3 VTS with sample driver
Change-Id: I56bc7a2fb179a9576036ad0c2aae0e1f41ec4e2c
2019-11-07 17:30:43 -08:00
Michael Butler
b2e17dd9cd Merge "Change NNAPI VTS TEST_MAPPING to restrict testing on sample drivers" am: 3d3c792bb8 am: fb196c4365
am: b64ab1daa4

Change-Id: Ie9ba34ca05702a7a254c6f07db5d975032e3ae86
2019-11-01 12:00:55 -07:00
Michael Butler
3076228e92 Merge "Add VtsHalNeuralnetworksV1_3TargetTest to TEST_MAPPING" am: 70798b6b10 am: ed9ade26de
am: 463118ec7d

Change-Id: Id0fc549c0c3de87c14f54f298c183d6a2c2e471f
2019-10-31 16:18:04 -07:00
Michael Butler
24f83d497b Merge "Simplify NNAPI VTS TEST_MAPPING options" am: 950dcb63cf am: cf57e42449
am: 2951b226a2

Change-Id: I98e6aafcac065e5040652acdf9865733b3898722
2019-10-30 11:26:33 -07:00
Michael Butler
c9c0d5bef9 Change NNAPI VTS TEST_MAPPING to restrict testing on sample drivers
Bug: N/A
Test: cd $TOP/hardware/interfaces/neuralnetworks && atest
Change-Id: If06740718e7cfebbe92058779b19282913cd5fc7
2019-10-29 19:08:38 -07:00
Michael Butler
62b76902fb Add VtsHalNeuralnetworksV1_3TargetTest to TEST_MAPPING
Bug: N/A
Test: cd $TOP/hardware/interfaces/neuralnetworks && atest
Change-Id: Ic903a45fbb6487f2b8b18dfd32d356c987a98b14
2019-10-29 19:08:27 -07:00
Michael Butler
3104464c7f Simplify NNAPI VTS TEST_MAPPING options
Bug: N/A
Test: cd $TOP/hardware/interfaces/neuralnetworks && atest
Change-Id: I1eb0f25fe13c641cc661484021629ecd811ed984
2019-10-29 18:43:17 -07:00
Michael Butler
648ada5fcf NNAPI VTS update in response to utility function change
The frameworks/ml/nn CL "Improve performance of Burst executions"
changed the signature of a utility function used by NNAPI's VTS tests.
This CL modifies the test accordingly.

Bug: 132073143
Test: mma
Test: VtsHalNeuralnetworksV1_2TargetTest (with sample-all)
Test: VtsHalNeuralnetworksV1_3TargetTest (with sample-all)
Change-Id: I56c3b04e6fec11d526e2a1ff5b896f31cb12eb5f
Merged-In: I56c3b04e6fec11d526e2a1ff5b896f31cb12eb5f
(cherry picked from commit 5756887a7b)
2019-10-28 13:17:08 -07:00
Lev Proleev
e5376fea95 Add template for 1.3 types.hal and regenerate it
After this update, types.hal v1.3 no longer refers to API level 30.

Test: none needed
Bug: 140132458
Change-Id: If707dfbcade6be1a0885fc21f6ddf47f3c27b244
Merged-In: If707dfbcade6be1a0885fc21f6ddf47f3c27b244
(cherry picked from commit e98e6793be)
2019-10-28 13:03:00 +00:00
Lev Proleev
26d1bc8a4e Modify NNAPI VTS tests to run on version 1.3
Bug: 139120468
Test: VtsHalNeuralnetworksV1_3TargetTest
Change-Id: I4654dc75c17f8801103015dc1da91663dfa28d52
Merged-In: I4654dc75c17f8801103015dc1da91663dfa28d52
(cherry picked from commit b49dadfb64)
2019-10-17 18:34:51 +01:00
Lev Proleev
13fdfcd44f Copy VTS tests from v1.2 to v1.3
So that it's easier to see what actually has changed in VTS tests for
version 1.3

Bug: 139120468
Test: m
Change-Id: I09797f5f3898501a008186a22dd411b00e9e2c67
Merged-In: I09797f5f3898501a008186a22dd411b00e9e2c67
(cherry picked from commit 3b13b55ac1)
2019-10-17 18:34:51 +01:00
Lev Proleev
ce8c632a09 Create NNAPI HAL v1.3 and add TENSOR_QUANT8_ASYMM_SIGNED OperandType
Bug: 137828494
Bug: 139120468
Bug: 136735770
Test: mma
Change-Id: I28f74e4b364fec1d7431a96cf5687256b3106069
Merged-In: I28f74e4b364fec1d7431a96cf5687256b3106069
(cherry picked from commit 5a7b67ab8f)
2019-10-17 18:34:51 +01:00
Dan Shi
ecbc1ab590 Merge "Add VtsHalLightV2_0TargetTest and VtsHalNeuralnetworksV1_* to vts-core" am: 0e1efc568c am: 7626cc8cd5 am: 86395146bf
am: 9154805dce

Change-Id: Ic87df0df72d87be833bc408af5bc6a9139dcf7f4
2019-10-14 09:12:32 -07:00
Dan Shi
0e1efc568c Merge "Add VtsHalLightV2_0TargetTest and VtsHalNeuralnetworksV1_* to vts-core" 2019-10-14 15:35:48 +00:00
Michael Butler
50d76d6cfe Merge "NNAPI VTS update in response to utility function change" 2019-10-11 17:31:20 +00:00
Colin Cross
552c7a66ea Revert "Revert "Modify NNAPI VTS tests to run on version 1.3" am: 64f9eb4bd5 am: 7973d7dec5 am: 8bde98b027"
This reverts commit 496320b1ec.

Reason for revert: revert of a cherry-pick broke master

Change-Id: I4654dc75c17f8801103015dc1da91663dfa28d52
2019-10-10 23:13:36 +00:00
Colin Cross
b098d21e0c Revert "Revert "Copy VTS tests from v1.2 to v1.3" am: 9613b4649b am: 432f6d1609 am: fe2cd91115"
This reverts commit 1ea542bd1a.

Reason for revert: revert of a cherry-pick broke master

Change-Id: I09797f5f3898501a008186a22dd411b00e9e2c67
2019-10-10 23:13:02 +00:00
Lev Proleev
1ea542bd1a Revert "Copy VTS tests from v1.2 to v1.3" am: 9613b4649b am: 432f6d1609 am: fe2cd91115
am: 42fb310936

Change-Id: Icf12606c6d9d8efae82e35de09581fcdfa24f6f6
2019-10-10 14:54:49 -07:00
Lev Proleev
496320b1ec Revert "Modify NNAPI VTS tests to run on version 1.3" am: 64f9eb4bd5 am: 7973d7dec5 am: 8bde98b027
am: edadec3f9e

Change-Id: Idb6d7245c58afd0aba52db67cb1a540604ed8e33
2019-10-10 14:54:42 -07:00