This is an automated email from the ASF dual-hosted git repository.
wkcn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new 413fe97 Avoid uneccesary vector copies in imperative_utils.cc (#14665)
413fe97 is described below
commit 413fe97d01c9832e5590b1691c55579531a8289b
Author: Pedro Larroy <[email protected]>
AuthorDate: Mon Apr 15 19:35:49 2019 -0700
Avoid uneccesary vector copies in imperative_utils.cc (#14665)
---
src/imperative/imperative_utils.cc | 58 ++++++++++++++++++++------------------
src/imperative/imperative_utils.h | 4 +--
2 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/src/imperative/imperative_utils.cc
b/src/imperative/imperative_utils.cc
index 6cb4a70..c7204c1 100644
--- a/src/imperative/imperative_utils.cc
+++ b/src/imperative/imperative_utils.cc
@@ -20,62 +20,61 @@
#include "./imperative_utils.h"
#include "./cached_op.h"
-namespace mxnet {
-namespace imperative {
+namespace {
-inline std::vector<NDArray*> NodeInputs(const nnvm::IndexedGraph& idx,
- const int node_idx,
- const std::vector<NDArray*> arrays) {
+std::vector<NDArray*> NodeInputs(const nnvm::IndexedGraph& idx,
+ const int node_idx,
+ const std::vector<NDArray*>& arrays) {
const nnvm::IndexedGraph::Node& node = idx[node_idx];
const size_t num_inputs = node.inputs.size();
std::vector<NDArray*> ndinputs;
ndinputs.reserve(num_inputs);
for (const auto& j : node.inputs) {
- size_t eid = idx.entry_id(j);
+ const size_t eid = idx.entry_id(j);
ndinputs.emplace_back(arrays[eid]);
}
return ndinputs;
}
-inline std::vector<NDArray*> NodeOutputs(const nnvm::IndexedGraph& idx,
- const int node_idx,
- const std::vector<NDArray*> arrays) {
+std::vector<NDArray*> NodeOutputs(const nnvm::IndexedGraph& idx,
+ const int node_idx,
+ const std::vector<NDArray*>& arrays) {
const nnvm::IndexedGraph::Node& node = idx[node_idx];
const size_t num_outputs = node.source->num_outputs();
std::vector<NDArray*> ndoutputs;
ndoutputs.reserve(num_outputs);
for (size_t j = 0; j < num_outputs; ++j) {
- size_t eid = idx.entry_id(node_idx, j);
+ const size_t eid = idx.entry_id(node_idx, j);
ndoutputs.emplace_back(arrays[eid]);
}
return ndoutputs;
}
-inline std::vector<OpReqType> NodeReq(const nnvm::IndexedGraph& idx,
- const int node_idx,
- const std::vector<OpReqType> array_reqs)
{
+std::vector<OpReqType> NodeReq(const nnvm::IndexedGraph& idx,
+ const int node_idx,
+ const std::vector<OpReqType>& array_reqs) {
const nnvm::IndexedGraph::Node& node = idx[node_idx];
const size_t num_outputs = node.source->num_outputs();
std::vector<OpReqType> req;
req.reserve(num_outputs);
for (size_t j = 0; j < num_outputs; ++j) {
- size_t eid = idx.entry_id(node_idx, j);
+ const size_t eid = idx.entry_id(node_idx, j);
req.push_back(array_reqs[eid]);
}
return req;
}
-inline void InvokeOperator(const nnvm::IndexedGraph& idx,
- const int node_idx,
- const bool retain_graph,
- const std::vector<NDArray*> arrays,
- Context ctx,
- std::vector<OpStatePtr>* p_states,
- std::vector<NDArray*> ndinputs,
- std::vector<NDArray*> ndoutputs,
- std::vector<OpReqType> *p_req,
- std::vector<uint32_t> *p_ref_count,
- std::function<void(const OpStatePtr &state)>
invoke) {
+void InvokeOperator(const nnvm::IndexedGraph& idx,
+ const int node_idx,
+ const bool retain_graph,
+ const std::vector<NDArray*>& arrays,
+ Context ctx,
+ std::vector<OpStatePtr>* p_states,
+ const std::vector<NDArray*>& ndinputs,
+ const std::vector<NDArray*>& ndoutputs,
+ std::vector<OpReqType> *p_req,
+ std::vector<uint32_t> *p_ref_count,
+ std::function<void(const OpStatePtr &state)> invoke) {
static const auto bwd_cached_op = Op::Get("_backward_CachedOp");
static auto& createop = nnvm::Op::GetAttr<FCreateOpState>("FCreateOpState");
static auto& is_layer_backward = Op::GetAttr<bool>("TIsLayerOpBackward");
@@ -122,10 +121,15 @@ inline void InvokeOperator(const nnvm::IndexedGraph& idx,
}
}
+} // namespace
+
+namespace mxnet {
+namespace imperative {
+
void RunGraph(
const bool retain_graph,
const nnvm::IndexedGraph& idx,
- const std::vector<NDArray*> arrays,
+ const std::vector<NDArray*>& arrays,
size_t node_start, size_t node_end,
std::vector<OpReqType>&& array_reqs,
std::vector<uint32_t>&& ref_count,
@@ -161,7 +165,7 @@ void NaiveRunGraph(
const bool retain_graph,
const Context& default_ctx,
const nnvm::IndexedGraph& idx,
- const std::vector<NDArray*> arrays,
+ const std::vector<NDArray*>& arrays,
size_t node_start, size_t node_end,
std::vector<OpReqType>&& array_reqs,
std::vector<uint32_t>&& ref_count,
diff --git a/src/imperative/imperative_utils.h
b/src/imperative/imperative_utils.h
index 071f4fa..d134d47 100644
--- a/src/imperative/imperative_utils.h
+++ b/src/imperative/imperative_utils.h
@@ -999,7 +999,7 @@ inline void CreateEngineOpSeg(
void RunGraph(const bool retain_graph,
const nnvm::IndexedGraph& idx,
- const std::vector<NDArray*> arrays,
+ const std::vector<NDArray*>& arrays,
size_t node_start, size_t node_end,
std::vector<OpReqType>&& array_reqs,
std::vector<uint32_t>&& ref_count,
@@ -1011,7 +1011,7 @@ void RunGraph(const bool retain_graph,
void NaiveRunGraph(const bool retain_graph,
const Context& default_ctx,
const nnvm::IndexedGraph& idx,
- const std::vector<NDArray*> arrays,
+ const std::vector<NDArray*>& arrays,
size_t node_start, size_t node_end,
std::vector<OpReqType>&& array_reqs,
std::vector<uint32_t>&& ref_count,
