Lev Proleev
f47b9f9625
Merge "Revert "Increase neuralnetworks compatibility to 1.3"" am: c805505344 am: 5b33b3e129
...
am: 9c0273b979
Change-Id: I3f27476b035b257743b01e528dc62e7a31ffbab9
2019-10-10 07:34:15 -07:00
Lev Proleev
b4b2ca81c5
Merge changes from topic "NNAPI v1.3" am: b8d9568f3d am: 5af04da4a0
...
am: b339abc82c
Change-Id: I399f85bd975bda5eabc188a527afd7c35608d8f3
2019-10-10 07:34:10 -07:00
Lev Proleev
42fb310936
Revert "Copy VTS tests from v1.2 to v1.3" am: 9613b4649b am: 432f6d1609
...
am: fe2cd91115
Change-Id: I70ea76a6ea1fd25ebe9e3cebb5bb58cbb5b9ec86
2019-10-10 07:34:06 -07:00
Lev Proleev
edadec3f9e
Revert "Modify NNAPI VTS tests to run on version 1.3" am: 64f9eb4bd5 am: 7973d7dec5
...
am: 8bde98b027
Change-Id: I718390876de18dc34326e1026de9d343ba812a64
2019-10-10 07:34:02 -07:00
Lev Proleev
9c0273b979
Merge "Revert "Increase neuralnetworks compatibility to 1.3"" am: c805505344
...
am: 5b33b3e129
Change-Id: I8d4dbc7a7da974db99fcda0492e588f35315860c
2019-10-10 07:27:15 -07:00
Lev Proleev
b339abc82c
Merge changes from topic "NNAPI v1.3" am: b8d9568f3d
...
am: 5af04da4a0
Change-Id: I071d26d9a6530e6645b99503d7155a87a1f00378
2019-10-10 07:27:11 -07:00
Lev Proleev
fe2cd91115
Revert "Copy VTS tests from v1.2 to v1.3" am: 9613b4649b
...
am: 432f6d1609
Change-Id: I1725a29dfff75400345573abd808273f72fda1ae
2019-10-10 07:27:07 -07:00
Lev Proleev
8bde98b027
Revert "Modify NNAPI VTS tests to run on version 1.3" am: 64f9eb4bd5
...
am: 7973d7dec5
Change-Id: Ib5f939fc99adfe737965577eb6c9da8a25e466a6
2019-10-10 07:27:03 -07:00
Lev Proleev
5b33b3e129
Merge "Revert "Increase neuralnetworks compatibility to 1.3""
...
am: c805505344
Change-Id: I0cf669b1c26b45a6c4465d03f616bbc0c10f4072
2019-10-10 07:20:28 -07:00
Lev Proleev
5af04da4a0
Merge changes from topic "NNAPI v1.3"
...
am: b8d9568f3d
Change-Id: Ib0c49f4af0d83830b0b568b68efc8df17a94a7a1
2019-10-10 07:20:24 -07:00
Lev Proleev
432f6d1609
Revert "Copy VTS tests from v1.2 to v1.3"
...
am: 9613b4649b
Change-Id: I55e1032435ccf5372fc59781b84333150c7818e5
2019-10-10 07:20:20 -07:00
Lev Proleev
7973d7dec5
Revert "Modify NNAPI VTS tests to run on version 1.3"
...
am: 64f9eb4bd5
Change-Id: I21709a4fe6cd46e07d9acf3a0ff1b28572a5d2bc
2019-10-10 07:20:14 -07:00
Lev Proleev
c805505344
Merge "Revert "Increase neuralnetworks compatibility to 1.3""
2019-10-10 14:06:42 +00:00
Lev Proleev
b8d9568f3d
Merge changes from topic "NNAPI v1.3"
...
* changes:
Revert "Create NNAPI HAL v1.3 and add TENSOR_QUANT8_ASYMM_SIGNED OperandType"
Revert "Copy VTS tests from v1.2 to v1.3"
Revert "Modify NNAPI VTS tests to run on version 1.3"
2019-10-10 14:06:42 +00:00
Lev Proleev
839ca3c428
Revert "Create NNAPI HAL v1.3 and add TENSOR_QUANT8_ASYMM_SIGNED OperandType"
...
This reverts commit bd2b4e78ac .
Reason for revert: the topic breaks git_qt-dev-plus-aosp
Change-Id: Ic72dcbb7ac4ef8e6ed597eb778289b39475f03f8
2019-10-10 14:01:05 +00:00
Lev Proleev
9613b4649b
Revert "Copy VTS tests from v1.2 to v1.3"
...
This reverts commit d0e339e1da .
Reason for revert: the topic breaks git_qt-dev-plus-aosp
Change-Id: I68d31526cc7699b9a6c69a1ccc669fdb7605124e
2019-10-10 13:58:56 +00:00
Lev Proleev
a927c57a86
Revert "Increase neuralnetworks compatibility to 1.3"
...
This reverts commit 485abc99bc .
Reason for revert: the topic breaks git_qt-dev-plus-aosp
Change-Id: I5449cd84fe3085dd90a5f45c7fb4f13577b8b4f2
2019-10-10 13:54:42 +00:00
Lev Proleev
64f9eb4bd5
Revert "Modify NNAPI VTS tests to run on version 1.3"
...
This reverts commit 543606fb92 .
Reason for revert: the topic breaks git_qt-dev-plus-aosp
Change-Id: I74859bae687d65d344ed7edc617e1a7d086960a1
2019-10-10 13:54:38 +00:00
Lev Proleev
7854cc1906
Merge changes from topic "NNAPI v1.3" am: b4ff6258c9 am: ed0f3469ce
...
am: e601f0d3e4
Change-Id: I8a8a1a4dbf8ece7e5a01179054eb39a438b070d7
2019-10-10 05:47:26 -07:00
Lev Proleev
b4a3e446b6
Modify NNAPI VTS tests to run on version 1.3 am: 543606fb92 am: 74678b4522
...
am: cd4ccc9527
Change-Id: Id08329d73b0f76256c7d19269bbea3aafb020f9d
2019-10-10 05:47:18 -07:00
Lev Proleev
6d26f5503e
Copy VTS tests from v1.2 to v1.3 am: d0e339e1da am: 297720e03f
...
am: b5f893c1e3
Change-Id: I01e4897fe3e1514bd7b4154cd3258222a1535da0
2019-10-10 05:47:11 -07:00
Lev Proleev
b85540a5db
Create NNAPI HAL v1.3 and add TENSOR_QUANT8_ASYMM_SIGNED OperandType am: bd2b4e78ac am: 427d12bcad
...
am: 437f7d5f19
Change-Id: I94d40eaa7755a98c15716848685194b1507b9734
2019-10-10 05:47:04 -07:00
Lev Proleev
e601f0d3e4
Merge changes from topic "NNAPI v1.3" am: b4ff6258c9
...
am: ed0f3469ce
Change-Id: I846e221d227205bc829ba769fa2a0515ec3e4819
2019-10-10 05:21:37 -07:00
Lev Proleev
cd4ccc9527
Modify NNAPI VTS tests to run on version 1.3 am: 543606fb92
...
am: 74678b4522
Change-Id: I74791f1a99fb5d40fc007e2034fbf512ed973325
2019-10-10 05:21:30 -07:00
Lev Proleev
b5f893c1e3
Copy VTS tests from v1.2 to v1.3 am: d0e339e1da
...
am: 297720e03f
Change-Id: I5541a0c8c0baac40bfeb69de4cee480abd51fb00
2019-10-10 05:21:22 -07:00
Lev Proleev
437f7d5f19
Create NNAPI HAL v1.3 and add TENSOR_QUANT8_ASYMM_SIGNED OperandType am: bd2b4e78ac
...
am: 427d12bcad
Change-Id: I2f7b859d9891f19770718ab6fc511625c4fa6a33
2019-10-10 05:21:15 -07:00
Lev Proleev
ed0f3469ce
Merge changes from topic "NNAPI v1.3"
...
am: b4ff6258c9
Change-Id: I569f7cc0866b622f0e5e01999a2325c925db87a5
2019-10-10 05:08:52 -07:00
Lev Proleev
74678b4522
Modify NNAPI VTS tests to run on version 1.3
...
am: 543606fb92
Change-Id: I8bf292652e24fe89318992ca6351489b9b3db61e
2019-10-10 05:08:40 -07:00
Lev Proleev
297720e03f
Copy VTS tests from v1.2 to v1.3
...
am: d0e339e1da
Change-Id: I31218237b1372912e4a02c1f0c20acb182dabbb1
2019-10-10 05:08:24 -07:00
Lev Proleev
427d12bcad
Create NNAPI HAL v1.3 and add TENSOR_QUANT8_ASYMM_SIGNED OperandType
...
am: bd2b4e78ac
Change-Id: Ia10e7459dc59aa9b12509c2a6fb21373be2068f1
2019-10-10 05:08:01 -07:00
Lev Proleev
b4ff6258c9
Merge changes from topic "NNAPI v1.3"
...
* changes:
Increase neuralnetworks compatibility to 1.3
Modify NNAPI VTS tests to run on version 1.3
Copy VTS tests from v1.2 to v1.3
Create NNAPI HAL v1.3 and add TENSOR_QUANT8_ASYMM_SIGNED OperandType
2019-10-10 10:25:21 +00:00
Nathan Harold
3c239867ea
Merge "Fix RadioHidlTest_v1_2.startNetworkScan maxSearchTime" am: 3c8f624724 am: aad649b8df
...
am: 797aee8331
Change-Id: I047e5072d877368cfd71186aa2d1af6a70ae5ca4
2019-10-09 19:50:47 -07:00
Nathan Harold
797aee8331
Merge "Fix RadioHidlTest_v1_2.startNetworkScan maxSearchTime" am: 3c8f624724
...
am: aad649b8df
Change-Id: I44287c0d85a4c15804092321d2dd5f532757f2b9
2019-10-09 19:44:45 -07:00
Nathan Harold
aad649b8df
Merge "Fix RadioHidlTest_v1_2.startNetworkScan maxSearchTime"
...
am: 3c8f624724
Change-Id: If856c76531d329e7beac3d0b4902ecf46a7c8b6d
2019-10-09 19:38:49 -07:00
Nathan Harold
3c8f624724
Merge "Fix RadioHidlTest_v1_2.startNetworkScan maxSearchTime"
2019-10-10 02:18:48 +00:00
jun.wang
5341e17199
Fix RadioHidlTest_v1_2.startNetworkScan maxSearchTime
...
Add the initialization of the incrementalResultsPeriodicity and
maxSearchTime in the networkScan request.
The incrementalResultsPeriodicity and maxSearchTime are not
initialized in the networkScan request. So the default value is 0.
But the incrementalResultsPeriodicity and maxSearchTime
are required not to be 0 in subsequent tests.
CL ported from pag/1433565
Bug:140451434
Test: make vts && vts-tradefed run commandAndExit vts -m \
VtsHalRadioV1_2Target -t RadioHidlTest_v1_2#startNetworkScan
Change-Id: I1b4e512a37d3d85ebc905a64987a40af801bce53
(cherry picked from commit f7894eb4d8c395add7c70a20520336057ae2656f)
2019-10-09 15:41:59 -07:00
David Gross
6eadb4ff1a
Replace sync_enums_to_hal.py with generate_api.{py,sh} and regenerate */types.hal am: 8c0a48bceb am: b14faf16d3
...
am: 14556dfcc6
Change-Id: Ia019822fe32acf09d902be21300f36edff074959
2019-10-09 12:33:25 -07:00
David Gross
14556dfcc6
Replace sync_enums_to_hal.py with generate_api.{py,sh} and regenerate */types.hal am: 8c0a48bceb
...
am: b14faf16d3
Change-Id: I1f22cc68be18e646a35928cb068d05d60d70f541
2019-10-09 12:20:33 -07:00
David Gross
b14faf16d3
Replace sync_enums_to_hal.py with generate_api.{py,sh} and regenerate */types.hal
...
am: 8c0a48bceb
Change-Id: Ifcdb58dbf2c71d2bd178f221770f2bf5e12a1164
2019-10-09 12:08:36 -07:00
Michael Butler
485abc99bc
Increase neuralnetworks compatibility to 1.3
...
Bug: 139120468
Test: mma
Change-Id: Ic41febe005dfefe834587ec67fdda52e112c37cb
Merged-In: Ic41febe005dfefe834587ec67fdda52e112c37cb
(cherry picked from commit 7259f3ab24 )
2019-10-09 14:18:49 +01:00
Lev Proleev
543606fb92
Modify NNAPI VTS tests to run on version 1.3
...
Bug: 139120468
Test: VtsHalNeuralnetworksV1_3TargetTest
Change-Id: Id9e4d99852da8a3d5167ab7464c0e71885250501
Merged-In: Id9e4d99852da8a3d5167ab7464c0e71885250501
(cherry picked from commit b49dadfb64 )
2019-10-09 14:18:49 +01:00
Lev Proleev
d0e339e1da
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: Ief294d21349ca6531595612a16fa3ae3382f83ac
Merged-In: Ief294d21349ca6531595612a16fa3ae3382f83ac
(cherry picked from commit 3b13b55ac1 )
2019-10-09 14:18:49 +01:00
Lev Proleev
bd2b4e78ac
Create NNAPI HAL v1.3 and add TENSOR_QUANT8_ASYMM_SIGNED OperandType
...
Bug: 137828494
Bug: 139120468
Bug: 136735770
Test: mma
Change-Id: I1f615047d1c0c208a90082ffb6ffc43f252f77b4
Merged-In: I1f615047d1c0c208a90082ffb6ffc43f252f77b4
(cherry picked from commit 5a7b67ab8f )
2019-10-09 14:18:49 +01:00
David Gross
8c0a48bceb
Replace sync_enums_to_hal.py with generate_api.{py,sh} and regenerate */types.hal
...
There are certain pieces of NeuralNetworks.h and of our various *.hal
files that ought to be kept in sync -- most notably the operand type
and operation type definitions and descriptions in our
NeuralNetworks.h and types.hal files. To avoid having to do this
manually, a tool can be employed.
The old solution to this problem is sync_enums_to_hal.py, which parses
the existing NeuralNetworks.h and types.hal files, and then rewrites
the types.hal files: It identifies the operand type and operation type
portions of the files, and in the types.hal files replaces them with
transformed versions of the portions from NeuralNetworks.h. This
approach is brittle -- it is very sensitive to the structure of the
files, as was recognized when this tool was created. Changes to those
files since the script was last updated essentially broke the script,
as noted in http://b/140132458 .
The new solution employs a new tool generate_api.py to combine a
single "specification file" with one "template file" per API file
(NeuralNetworks.h or types.hal) to produce that API file. The script
generate_api.sh invokes generate_api.py once per API file, passing
appropriate arguments. See frameworks/ml/nn/tools/api/README.md for
more details.
In the process of combining information from NeuralNetworks.h and
*/types.hal, some formatting, syntactic, and semantic changes have
been made to those files. For example:
- types.hal files no longer refer to API levels or (similarly)
to HAL versions other than earlier HAL versions
Bug: 130169064
Bug: 140132458
Test: cd neuralnetworks ; mma
Change-Id: Iceb38effc2c7e6c32344e49225b85256144c0945
Merged-In: Iceb38effc2c7e6c32344e49225b85256144c0945
(cherry picked from commit 2cae5c8b01 )
2019-10-09 14:18:06 +01:00
Eric Chung
13a6edaab2
Merge "Refine freeBuffer in Mapper 2.0" am: 9b2431d02a am: f6e09b2ff5
...
am: 3057612183
Change-Id: I7debbbd85aa80da13dcdb1118240b5dc5c6cb59e
2019-10-08 16:39:48 -07:00
Eric Chung
3057612183
Merge "Refine freeBuffer in Mapper 2.0" am: 9b2431d02a
...
am: f6e09b2ff5
Change-Id: Ieb088a21a145e1b426b144ad6d44b6c610aebd9c
2019-10-08 16:34:02 -07:00
Eric Chung
f6e09b2ff5
Merge "Refine freeBuffer in Mapper 2.0"
...
am: 9b2431d02a
Change-Id: Ia35e361e2b8343b3ad6205f30b1571547e7bdb3f
2019-10-08 16:26:46 -07:00
Treehugger Robot
9b2431d02a
Merge "Refine freeBuffer in Mapper 2.0"
2019-10-08 23:17:06 +00:00
Amy
7c6c328f89
Adding a Broadcast data flow test with a PES filter am: 058e343f8d am: 2ce7eca42f
...
am: 49e16fa881
Change-Id: Ia229a9ff95ec6f82792c6d58a099eba823d710e3
2019-10-08 15:58:32 -07:00
Amy
509d0bcbd9
Adding the mocking frontend tuning functionality to take specific ts file as source of a Demux. am: e258376b3c am: 632b27421f
...
am: bd17a6843a
Change-Id: Iaa1062a34a098b93c9d504a8328e438ee1acfd04
2019-10-08 15:58:26 -07:00