From 5bf4edfb9fb7b1e0893609058dcfc8ff67be17cb Mon Sep 17 00:00:00 2001 From: "I-Jui (Ray) Sung" Date: Fri, 6 Oct 2017 13:22:39 -0700 Subject: [PATCH] Refactor test harness for generated VTS tests Address comments in ag/2926388 Test: VtsHalNeuralnetworksV1_0TargetTest on Angler with sample driver Bug: 67597726 Change-Id: Ie3118dcbfb11c25dbc84d2becdefbbae868ff28f --- .../1.0/vts/functional/GeneratedTestHarness.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp b/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp index 735528b951..d740b5f53c 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 +template void copy_back_(MixedTyped* dst, const std::vector& ra, char* src) { MixedTyped& test = *dst; - for_each(test, [&ra, src](int index, std::vector& m) { - ASSERT_EQ(m.size(), ra[index].location.length / sizeof(ty)); + for_each(test, [&ra, src](int index, std::vector& 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& device, std::function 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);