From efc4a2da65d75cfa4a47998266f3a5aaa5011917 Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Tue, 12 Mar 2019 12:33:29 +0000 Subject: COMPMID-1995: Fix call_all_input_node_accessors Substituing std::any_of with std::for_each approach because we need to invoke call_accessor for all input nodes. Change-Id: If0a0458a5fa9371985917e8d010fbf79b8be76b7 Signed-off-by: Michele Di Giorgio Reviewed-on: https://review.mlplatform.org/c/847 Reviewed-by: Isabella Gottardi Tested-by: Arm Jenkins --- src/graph/detail/ExecutionHelpers.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/graph') diff --git a/src/graph/detail/ExecutionHelpers.cpp b/src/graph/detail/ExecutionHelpers.cpp index 767154b45e..900be42e3f 100644 --- a/src/graph/detail/ExecutionHelpers.cpp +++ b/src/graph/detail/ExecutionHelpers.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -204,10 +204,13 @@ void call_all_const_node_accessors(Graph &g) bool call_all_input_node_accessors(ExecutionWorkload &workload) { - return !std::any_of(std::begin(workload.inputs), std::end(workload.inputs), [](Tensor * input_tensor) + bool is_valid = true; + std::for_each(std::begin(workload.inputs), std::end(workload.inputs), [&](Tensor * input_tensor) { - return (input_tensor == nullptr) || !input_tensor->call_accessor(); + bool valid_input = (input_tensor != nullptr) && input_tensor->call_accessor(); + is_valid = is_valid && valid_input; }); + return is_valid; } void prepare_all_tasks(ExecutionWorkload &workload) -- cgit v1.2.1