diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-10-10 02:42:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-10 02:42:13 +0000 |
| commit | e5e339d2a5a5a98fc6fd3643ced6fa938e5bdc44 (patch) | |
| tree | 4231e4fcf17df9923f91087d2ea10ec614041f95 | |
| parent | 3021f1fafbfb1a4b464effa543aee381f42d8080 (diff) | |
| parent | 5bf4edfb9fb7b1e0893609058dcfc8ff67be17cb (diff) | |
| download | android_hardware_interfaces-e5e339d2a5a5a98fc6fd3643ced6fa938e5bdc44.tar.gz android_hardware_interfaces-e5e339d2a5a5a98fc6fd3643ced6fa938e5bdc44.tar.bz2 android_hardware_interfaces-e5e339d2a5a5a98fc6fd3643ced6fa938e5bdc44.zip | |
Merge "Refactor test harness for generated VTS tests" into oc-mr1-dev
| -rw-r--r-- | neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp b/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp index 735528b95..d740b5f53 100644 --- a/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp +++ b/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp @@ -46,11 +46,11 @@ using ::generated_tests::Int32Operands; using ::generated_tests::Quant8Operands; using ::generated_tests::compare; -template <typename ty> +template <typename T> void copy_back_(MixedTyped* dst, const std::vector<RequestArgument>& ra, char* src) { MixedTyped& test = *dst; - for_each(test, [&ra, src](int index, std::vector<ty>& m) { - ASSERT_EQ(m.size(), ra[index].location.length / sizeof(ty)); + for_each<T>(test, [&ra, src](int index, std::vector<T>& m) { + ASSERT_EQ(m.size(), ra[index].location.length / sizeof(T)); char* begin = src + ra[index].location.offset; memcpy(m.data(), begin, ra[index].location.length); }); @@ -213,10 +213,8 @@ void Execute(const sp<IDevice>& device, std::function<Model(void)> create_model, copy_back(&test, outputs_info, outputPtr); outputMemory->commit(); // Filter out don't cares - MixedTyped filtered_golden; - MixedTyped filtered_test; - filter(golden, &filtered_golden, is_ignored); - filter(test, &filtered_test, is_ignored); + MixedTyped filtered_golden = filter(golden, is_ignored); + MixedTyped filtered_test = filter(test, is_ignored); // We want "close-enough" results for float compare(filtered_golden, filtered_test); |