diff options
| author | Lev Proleev <levp@google.com> | 2020-03-18 17:29:30 +0000 |
|---|---|---|
| committer | Lev Proleev <levp@google.com> | 2020-03-25 16:21:43 +0000 |
| commit | 44f40827d8e41055f18c1a313701785da74f6c15 (patch) | |
| tree | f99d3d92020260f16e294abb723e80f4a4d08bab /nn/runtime/test/Android.bp | |
| parent | 8148bb217c6342ae50187a4d3487b7c115ad6e74 (diff) | |
| download | ml-44f40827d8e41055f18c1a313701785da74f6c15.tar.gz | |
Add rank check to concatenation op
Without this check concatenation would crash if passed 5D tensors as
inputs.
Also:
* Add a folder for CTS only tests and modify Android.bp accordingly.
* Add concatenation test with invalid rank to CTS.
* Modify createModel and GeneratedTests::execute functions to handle
validation failures for models with exepectFailure flag.
The test is added only to CTS because we will very likely relax this
rank requirement in the future. If this test was added to VTS, future
drivers would have to contain logic to reject models with larger ranks
from clients using older versions. In order to make driver development
easier, we only introduce this test to CTS. Once we relax the rank
requirements, we will remove corresponding tests.
Fix: 139957680
Test: NNTest_static and VtsHalNeuralnetworksV1_3Target
Change-Id: I6d3b825360e055934a4e2d44e50b8fdc83b958e3
Diffstat (limited to 'nn/runtime/test/Android.bp')
| -rw-r--r-- | nn/runtime/test/Android.bp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/nn/runtime/test/Android.bp b/nn/runtime/test/Android.bp index 3326a5e7a..aae3ca2d9 100644 --- a/nn/runtime/test/Android.bp +++ b/nn/runtime/test/Android.bp @@ -84,6 +84,7 @@ cc_defaults { "neuralnetworks_generated_V1_0_example", "neuralnetworks_generated_V1_1_example", "neuralnetworks_generated_V1_2_example", + "neuralnetworks_generated_V1_3_cts_only_example", "neuralnetworks_generated_V1_3_example", ], cflags: [ @@ -270,6 +271,7 @@ cc_defaults { "neuralnetworks_generated_V1_0_example", "neuralnetworks_generated_V1_1_example", "neuralnetworks_generated_V1_2_example", + "neuralnetworks_generated_V1_3_cts_only_example", "neuralnetworks_generated_V1_3_example", ], shared_libs: [ @@ -374,3 +376,10 @@ cc_library_static { srcs: ["generated/spec_V1_3/*.example.cpp"], static_libs: ["libneuralnetworks_generated_test_harness"], } + +cc_library_static { + name: "neuralnetworks_generated_V1_3_cts_only_example", + defaults: ["neuralnetworks_float16"], + srcs: ["generated/spec_V1_3_cts_only/*.example.cpp"], + static_libs: ["libneuralnetworks_generated_test_harness"], +} |