summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-12-09Merge cherrypicks of ['ag/20615108'] into rvc-platform-release.android-platform-11.0.0_r40android-platform-11.0.0_r39android-platform-11.0.0_r38android-platform-11.0.0_r37android-platform-11.0.0_r36android-platform-11.0.0_r35android-platform-11.0.0_r34android-platform-11.0.0_r33android-platform-11.0.0_r32android-platform-11.0.0_r31android-platform-11.0.0_r30android-platform-11.0.0_r29android-platform-11.0.0_r28android-platform-11.0.0_r27android11-platform-releaseAndroid Build Coastguard Worker
Change-Id: I9c9394ef98529bbf645717edf1c88a44397c41fc
2022-12-09Add additional bounds checks to NNAPI FMQ deserialize utility functionsMichael Butler
This CL adds the following additional bounds checks: * Adds additional checks of the index of the std::vector before accessing the element at the index * Changes the array index operator [] to the checked std::vector::at method Bug: 256589724 Test: mma Merged-In: I3461c9e33b64e7d44bb3b430c8eb00d794669037 Change-Id: I3461c9e33b64e7d44bb3b430c8eb00d794669037 (cherry picked from commit 9525bc4a6a63acf97513288dbdf8c48b5382c8d8) Merged-In: I3461c9e33b64e7d44bb3b430c8eb00d794669037
2021-03-15Snap for 7192656 from 1cb525cd201d28e58cbbea6bf991d650634ffd0a to ↵android-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r6android-platform-11.0.0_r5android-platform-11.0.0_r26android-platform-11.0.0_r25android-platform-11.0.0_r24android-platform-11.0.0_r23android-platform-11.0.0_r22android-platform-11.0.0_r21android-platform-11.0.0_r20android-platform-11.0.0_r19android-platform-11.0.0_r18android-platform-11.0.0_r17android-platform-11.0.0_r16android-platform-11.0.0_r15android-platform-11.0.0_r14android-platform-11.0.0_r13android-platform-11.0.0_r12android-platform-11.0.0_r11android-platform-11.0.0_r10android-build-team Robot
rvc-platform-release Change-Id: I883e6164039310f2b68880dfb04c011d1658a144
2021-03-01Merge commit '607052118eb819d70042bb1985be64069c3a2605' into HEADYimin Li
Change-Id: I2dc7323dbd13ca65ac52f099b12c98ab10de18e4
2020-11-03Snap for 6948038 from 889cc6367c229f87ddde2b9cd597fd75d66742c1 to ↵android-platform-11.0.0_r4android-platform-11.0.0_r3android-build-team Robot
rvc-platform-release Change-Id: Icaf93923d9c684c5c872465b075384a3fa247ac3
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-10-03Merge branch 'rvc-qpr1-release' into rvc-platform-mergeYimin Li
Change-Id: I13252cecd9bec8ddf178bc60228e7365da072f06
2020-09-21Snap for 6787936 from ac0a3efaef2db8750979eae913e4d717246ee8c7 to ↵android-platform-11.0.0_r2android-platform-11.0.0_r1android-11.0.0_r6android-build-team Robot
rvc-platform-release Change-Id: Iaebed543cae1ec0bb236764c5f68797437ce7886
2020-09-21Add a test that uses AHardwareBuffer as execution input am: 5401d830d8 am: ↵Automerger Merge Worker
dac643202d am: 96ebc10980 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/10420537 Change-Id: Id0f71b37fa5c72b3c3f0cf159245d527b6ccae3a
2020-09-13Merge "Update the sample driver to validate unspecified output shape for ↵Automerger Merge Worker
executeFenced." into rvc-dev am: ed808b7d29 am: b18a0e51ba am: 4cfef2ce5c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/10420098 Change-Id: Ib2896c083ab820fe718c07b4e601b486a9f171ce
2020-09-11Set output shape in RANK operation prepare am: bdbd44fc71 am: ca0dd2ec32 am: ↵Automerger Merge Worker
2da014465b Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/10512177 Change-Id: If16a4ca0816df3a4e0fa7d5704385e2401d1e06a
2020-09-11Cleanup NNAPI QoS Deadline am: f2091affab am: b43ca2c8ab am: d4ff5c729dAutomerger Merge Worker
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/10417109 Change-Id: Ia0ba81f045108f9f3a78e9be00d73cf7c6f33d25
2020-09-11Merge "Mark updatable APEXes" into rvc-dev am: c416c67cb9 am: 3bfb041dd4 am: ↵Automerger Merge Worker
cb9e947493 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/10399376 Change-Id: I86212772a13f7f83a5cd142743f4d0bebaaeea4b
2020-08-24[automerger skipped] Fix memory violation in subgraph validation am: ↵Automerger Merge Worker
e3b8bd8025 am: d7ce21ac0b am: dee647713c -s ours am skip reason: Change-Id I6070534441d6f957f158a3c95b8e7d011fe6ae9f with SHA-1 e3b8bd8025 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/10419918 Change-Id: I717c05dcae38015e260c237f6648a99434e37b4c
2020-08-21Snap for 6782765 from c66a43962b10e3f175f7fea965c0f4a7cc54501a to ↵android-11.0.0_r31android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid-build-team Robot
rvc-qpr1-release Change-Id: I4465441c98dbcbd5c089989207cc4ce47fdc1591
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-10Snap for 6668007 from c637d993570cbc22e8c72894c02f8172243a2afe to rvc-releaseandroid-vts-11.0_r1android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-cts-11.0_r1android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-s1-releaseandroid11-releaseandroid-build-team Robot
Change-Id: If0ab476175fb1079b8e212da5130d18497225e29
2020-07-09Snap for 6667244 from 5d8e64ad8936c79bf07c2a061bc027091a4ac5e1 to ↵android-build-team Robot
rvc-qpr1-release Change-Id: I72837c7da46852e966cd09b43194736a49863320
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-27Snap for 6634012 from 14f169438ee72bef00f8751bf1ec8aa96af8dff7 to rvc-releaseandroid-build-team Robot
Change-Id: Ife0ad0a8b779b4f4013c0f42fc8d1d9e460ba207
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-26Snap for 6630229 from 6cf4ec939ea315bb812e2ca3ce94cb13e5263d66 to rvc-releaseandroid-build-team Robot
Change-Id: I028ea1ae39e0c0f565c71833dab853a973537813
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-24Snap for 6621766 from 39da16fbdf42b8e0fd64b6da54f85e1da9b84b86 to rvc-releaseandroid-build-team Robot
Change-Id: Ia68f2c18f764410a36f8a66bdc7180b0ea7b3697
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-23Snap for 6617762 from b79f98913281823803824ac578772f44e5f40e21 to rvc-releaseandroid-build-team Robot
Change-Id: I03c823955e84334bf793c5522a3d237de715ffa3
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