summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-10-15Snap for 6908631 from 7541c8a3e958585308b82beff3eb8e5dde2c3432 to ↵android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android11-qpr2-releaseandroid-build-team Robot
rvc-qpr2-release Change-Id: I7bdba233c2aa60776e27b25dc5ebc77d72ed8f6f
2020-10-15DO NOT MERGE ANYWHERE: temporarily remove libneuralnetworks_fuzzer from Haikuandroid-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-releaseKris Alder
'make haiku' is failing when this fuzzer is enabled due to b/151102177. This disables the fuzz target from running automatically for now. This also re-arranges some library sections in the build file to make the 'bpfmt' presubmit happy. Bug: 151238901 Bug: 170512504 Test: 'make haiku' and verify the fuzz target isn't built Change-Id: I2e11bd04bb1be136f7b3b0cc1ac2f80ad08a0b03
2020-08-21Fix mixed-build CTS failures. am: 6445511313 am: 710735cab5 am: a6b7c70ca4android-11.0.0_r30android11-qpr1-c-releaseXusong Wang
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/12283218 Change-Id: Ia539273d031a9ce033da3e8f7320cfaaddeac018
2020-08-21Fix mixed-build CTS failures. am: 6445511313 am: 710735cab5Xusong Wang
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/12283218 Change-Id: Id6aab02e2d6b7c69d9f6b060fa57fb2a0f5e70f8
2020-08-21Fix mixed-build CTS failures. am: 6445511313Xusong Wang
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/12283218 Change-Id: I7acdae6818fb9ceb7f054deae63d39a098c817db
2020-08-20Fix mixed-build CTS failures.android-cts-11.0_r2Xusong Wang
The tests are newly added in R and should not be enforced for devices with only a system upgrade. Bug: 162195407 Bug: 162395335 Test: CTS with a mixed build of R + P Test: CTS with a mixed build of R + Q Change-Id: Ia0761b0b0ed9c663c262388f4ad36bdc0c2f40d1 Merged-In: Ia0761b0b0ed9c663c262388f4ad36bdc0c2f40d1 (cherry picked from commit 34ca86b85dbe2fa954f1412b3f4f81dcf2797b5b)
2020-07-09Update scale and zeroPoint documentation am: c637d99357 am: ba32519aa6Slava Shklyaev
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/12070382 Change-Id: I0745e23e932dd0b3d923490599e1ebc45a150705
2020-07-09Update scale and zeroPoint documentation am: c637d99357Slava Shklyaev
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/12070382 Change-Id: Ifcbadff876594b1b9da709c77763bc2bac14efcb
2020-07-02Update scale and zeroPoint documentationandroid11-devSlava Shklyaev
The description for zeroPoint appears to be empty on https://developer.android.com/ndk/reference/struct/a-neural-networks-operand-type.html#zeropoint Moreover, the description for the two fields has become outdated, e.g. - TENSOR_QUANT16_SYMM only uses scale, - TENSOR_QUANT8_SYMM_PER_CHANNEL does not use scale or zeroPoint. Fix: 146789186 Bug: 160406237 Test: generate_api.sh Test: m Change-Id: I439a70405a47576da22dacf7070de3bf65ac7caf
2020-06-26Merge "Clarify control flow shape constraints" into rvc-dev am: 14f169438e ↵Slava Shklyaev
am: 61de2d0f4f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/11970898 Change-Id: Ia3f0fc9deda042120b78c8b0e4c6fcb8a9797b61
2020-06-26Merge "Clarify control flow shape constraints" into rvc-dev am: 14f169438eSlava Shklyaev
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/11970898 Change-Id: I456891f5bf8e01400d19f2383a7feba01f8ba2a3
2020-06-26Merge "Clarify control flow shape constraints" into rvc-devSlava Shklyaev
2020-06-25Fix bad merge am: 6cf4ec939e am: b079f85f4bSlava Shklyaev
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/12000541 Change-Id: I94fd8e159bbcf377e6f184b040905990251d4de7
2020-06-25Fix bad merge am: 6cf4ec939eSlava Shklyaev
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/12000541 Change-Id: Ie2409b93ce3f655bbd7619d828c62dc62800c02f
2020-06-25Fix bad mergeSlava Shklyaev
Change I514b78ee was supposed to replace *dynamic* tests with *unknown_rank* and *unknown_dimension* test but the old tests did not get removed for some reason. Bug: 132458982 Bug: 154597673 Test: m Change-Id: I19ed85add6d0e5a57a0b6415af6dbf63e2cc17b6
2020-06-25Clarify control flow shape constraintsSlava Shklyaev
Bug: 156918813 Bug: 158557728 Test: generate_api.sh Change-Id: I49f0903a4576fdc9d1a41139940d5fd31c99329f
2020-06-23Merge "Add control flow tests with unknown dimensions" into rvc-dev am: ↵Slava Shklyaev
39da16fbdf am: 0c20be10ba Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/11838078 Change-Id: I68735ae90723b8bcedcc7638de8aebd97910d138
2020-06-23Merge "Add control flow tests with unknown dimensions" into rvc-dev am: ↵Slava Shklyaev
39da16fbdf Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/11838078 Change-Id: I0d7fa7df07aaa173c01751832f1de94f16e63fb0
2020-06-23Merge "Add control flow tests with unknown dimensions" into rvc-devSlava Shklyaev
2020-06-23Merge "Add HAL-level validation for CF operands of unknown size" into ↵TreeHugger Robot
rvc-dev am: 4bc8563265 am: 2a6d8bc349 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/11913564 Change-Id: Ic5b520fa81f4b693f61abbe9e8ea1cb23a5d6295
2020-06-23Merge "Add HAL-level validation for CF operands of unknown size" into ↵TreeHugger Robot
rvc-dev am: 4bc8563265 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/11913564 Change-Id: I7df54cc5913831e4aba03270fe8fe0acc9fd2955
2020-06-23Merge "Add HAL-level validation for CF operands of unknown size" into rvc-devTreeHugger Robot
2020-06-22Add HAL-level validation for CF operands of unknown sizeSlava Shklyaev
At the NDK level, we allow IF and WHILE operations where an inner or outer input or output operand has a type that is not fully specified. However, this is not allowed At the HAL level. This CL adds HAL-level validation. See http://b/132458982#comment63 Bug: 132458982 Test: NNT_static Change-Id: I54754d6241a1f8eb99717899ffd4f0ace4750060
2020-06-22Merge "Do not schedule unknown size control flow operations to real devices" ↵Slava Shklyaev
into rvc-dev am: b79f989132 am: b2e40d6efa Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/11867244 Change-Id: I2112e89c33852f7f54f8264f8bc473f227799f93
2020-06-22Merge "Do not schedule unknown size control flow operations to real devices" ↵Slava Shklyaev
into rvc-dev am: b79f989132 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/11867244 Change-Id: I6353e344d52d40a659f8728db11fb275ea9ab5e3
2020-06-22Merge "Do not schedule unknown size control flow operations to real devices" ↵Slava Shklyaev
into rvc-dev
2020-06-22Do not schedule unknown size control flow operations to real devicesSlava Shklyaev
This feature would likely have very limited vendor support in Android R. It's too late to add IF or WHILE tests to the 1.3 VTS where an inner or outer input or output operand of a control flow operation has a type that is not fully specified. To avoid exercising untested behaviour, we have decided to disallow this at the HAL level. This change ensures that we do not schedule such operations for execution on any device other than the CPU device. See http://b/159076604#comment5 and http://b/132458982#comment63. Bug: 159076604 Bug: 132458982 Test: NNT_static Change-Id: Ic5f864e6129acc4208b7751b5b182ae30a39f0a4
2020-06-22Merge "Sets bias quant scale in QLSTM test to 0 as it's unused." into ↵Viet Dang
rvc-dev am: 35a0a19e4f am: 36c71e47e6 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/11914071 Change-Id: I7204967c27ee091aa022213e4fcdc4cd6ec43229
2020-06-22Merge "Sets bias quant scale in QLSTM test to 0 as it's unused." into ↵Viet Dang
rvc-dev am: 35a0a19e4f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/11914071 Change-Id: I0ca22341b875221c43d3a62636aefccfff5aef3d
2020-06-22Merge "Sets bias quant scale in QLSTM test to 0 as it's unused." into rvc-devViet Dang
2020-06-22Sets bias quant scale in QLSTM test to 0 as it's unused.Viet Dang
Bug: 155421116 Test: NeuralNetworksTest_static Change-Id: I434d70e30b137a37febfab83127d79f9a6ecbae6
2020-06-17Merge "Remove unknown rank control flow tests from VTS" into rvc-dev am: ↵Slava Shklyaev
e941d7c787 am: e8a7d0f6a9 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/11867240 Change-Id: I0da07295387efb300957b8dbbce1d3d7fb3f9cb5
2020-06-17Merge "Remove unknown rank control flow tests from VTS" into rvc-dev am: ↵Slava Shklyaev
e941d7c787 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/11867240 Change-Id: Ib55d105ba54c45b6b79a201829ae82fa65545267
2020-06-17Add control flow tests with unknown dimensionsSlava Shklyaev
Bug: 132458982 Bug: 154597673 Test: NNT_static --gtest_filter='*unknown_*' Change-Id: I514b78ee3cf2efd86a47412e413a6873341a59d0
2020-06-17Merge "Remove unknown rank control flow tests from VTS" into rvc-devSlava Shklyaev
2020-06-17Remove temporary test filters am: 4940d16f03 am: 68870b3878Miao Wang
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/11882615 Change-Id: Iffb46dd741e98ccf80b082b70b01ab1520181103
2020-06-17Remove temporary test filters am: 4940d16f03Miao Wang
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/11882615 Change-Id: I778f972749a52eff87872f80ba0507ad0c5500ea
2020-06-16Remove temporary test filtersMiao Wang
Bug: 153876253 Test: mm Change-Id: I4d36ed2aeaa7666fa349b50c93397792e34fad12
2020-06-16Remove unknown rank control flow tests from VTSSlava Shklyaev
Fix: 159076604 Test: m Change-Id: I44f31a004309594f03ef7eadf10c2ff51097e954
2020-06-15Merge "Change TEST_MAPPING configuration of NeuralNetworksTest_static" into ↵Michael Butler
rvc-dev am: e19d742a8f am: dfa49a7ac6 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/11815486 Change-Id: I1b9abbcb8b44ab7be0f1cb9ff475d82a7f84a53f
2020-06-15Merge "Change TEST_MAPPING configuration of NeuralNetworksTest_static" into ↵Michael Butler
rvc-dev am: e19d742a8f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/11815486 Change-Id: Iad612cd6e715e034c0c056869c4c14e5a60a6db2
2020-06-15Merge "Change TEST_MAPPING configuration of NeuralNetworksTest_static" into ↵Michael Butler
rvc-dev
2020-06-12Change TEST_MAPPING configuration of NeuralNetworksTest_staticMichael Butler
This change restricts presubmit to only run a single pass of NeuralNetworksTest_static ("pass 10"), corresponding to: * useCpuOnly = 0 * computeMode = ComputeMode::ASYNC * allowSyncExecHal = 1 Bug: 131770421 Test: mma Test: atest Change-Id: Ifd316ea87151ae80001208a38cb7af321f7cf9ec
2020-06-12Merge changes I8da1aa92,Ia112e46d into rvc-dev am: 73ef4105a2 am: d2be5141d1Slava Shklyaev
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/11680640 Change-Id: I43b1f4cf94266f1fcc6b6359d0f9996cbf7622c9
2020-06-12Merge changes I8da1aa92,Ia112e46d into rvc-dev am: 73ef4105a2Slava Shklyaev
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/11680640 Change-Id: I7c255211b7f9d161dfb4afbd52f082cb487a8988
2020-06-12Merge changes I8da1aa92,Ia112e46d into rvc-devSlava Shklyaev
* changes: Support WHILE with growing output tensor in CpuExecutor Relax control flow boundary operand dimension constraint
2020-06-10Support WHILE with growing output tensor in CpuExecutorSlava Shklyaev
1. Adds a WHILE test that produces a tensor of dynamic size. The loop body model has inputs and outputs of unknown rank. 2. Adds an IF test where the branch models have unkown input and output ranks. 3. Modifies the partitioner to avoid trying to delegate referenced models if an IF or WHILE or their associated referenced models have unknown dimensions. 4. Adds dynamic loop output shape support to CpuExecutor by allocating new temporaries on each iteration. Bug: 132458982 Bug: 154597673 Test: NNT_static --gtest_filter='*_dynamic*' Change-Id: I8da1aa92abf090adbdcbf647c113fe27f4c002d8
2020-06-10Relax control flow boundary operand dimension constraintSlava Shklyaev
Also updates the NDK spec to mention the constraints and adds some validation tests. Bug: 132458982 Bug: 156918813 Test: NNT_static Change-Id: Ia112e46da065a623a52ac1c402d28dcb963e5580
2020-06-09Merge "Verify non-optional tensors have values in CpuExecutor" into rvc-dev ↵Michael Butler
am: fe603b440c am: bbd60fa020 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/11620917 Change-Id: Ibaf84e7080d46cf9e8099aa98480778e5d680f6b
2020-06-09Merge "Verify non-optional tensors have values in CpuExecutor" into rvc-dev ↵Michael Butler
am: fe603b440c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/11620917 Change-Id: I42bebb34dafb55b58a7e329243a539fa15a60f2e