Post clean up along with libchrome uprev r456626.
Remove mojo::Array, Map, String.
BUG=b:37434548
TEST=Build locally.
Change-Id: I1ea332847e33730f693ef5c4dcb1e2fa6d933279
Reviewed-on: https://chromium-review.googlesource.com/1348529
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Commit-Ready: Hidehiko Abe <hidehiko@chromium.org>
Tested-by: Hidehiko Abe <hidehiko@chromium.org>
Reviewed-by: Ryo Hashimoto <hashimoto@chromium.org>
diff --git a/ml/graph_executor_impl.cc b/ml/graph_executor_impl.cc
index ad0bd4d..1464c69 100644
--- a/ml/graph_executor_impl.cc
+++ b/ml/graph_executor_impl.cc
@@ -163,8 +163,8 @@
}
void GraphExecutorImpl::Execute(
- mojo::Map<mojo::String, TensorPtr> tensors,
- mojo::Array<mojo::String> outputs,
+ std::unordered_map<std::string, TensorPtr> tensors,
+ const std::vector<std::string>& outputs,
const ExecuteCallback& callback) {
// Validate input and output names (before executing graph, for efficiency).
@@ -184,7 +184,7 @@
}
std::set<std::string> seen_outputs;
- for (const mojo::String& cur_output_name : outputs) {
+ for (const auto& cur_output_name : outputs) {
const auto name_lookup = required_outputs_.find(cur_output_name);
if (name_lookup == required_outputs_.end() ||
name_lookup->second >= interpreter_->tensors_size()) {
@@ -239,8 +239,8 @@
}
// Extract output.
- mojo::Array<chromeos::machine_learning::mojom::TensorPtr> output_tensors;
- for (const mojo::String& cur_output_name : outputs) {
+ std::vector<chromeos::machine_learning::mojom::TensorPtr> output_tensors;
+ for (const auto& cur_output_name : outputs) {
output_tensors.push_back(Tensor::New());
// Always valid, by the output name check at the start of this function.