reminisce commented on a change in pull request #14277: Enhance PartitionGraph
URL: https://github.com/apache/incubator-mxnet/pull/14277#discussion_r268361081
##########
File path: src/executor/graph_executor.cc
##########
@@ -1500,91 +1473,220 @@ static nnvm::Symbol PartitionGraph(const
nnvm::Symbol& src,
const std::unordered_map<std::string, int>&
arg_stype_map,
const Context& default_ctx,
const std::map<std::string, Context>&
ctx_map,
- const std::vector<Context>& in_arg_ctxes,
- const std::vector<Context>& aux_state_ctxes,
- const std::vector<OpReqType>&
grad_req_types) {
- const std::vector<std::string> input_names =
src.ListInputNames(Symbol::kAll);
- mxnet::ShapeVector arg_shapes(input_names.size(), mxnet::TShape());
- nnvm::DTypeVector arg_dtypes(input_names.size(), -1);
- StorageTypeVector arg_stypes(input_names.size(), kUndefinedStorage);
- for (size_t i = 0; i < input_names.size(); ++i) {
- auto it1 = arg_shape_map.find(input_names[i]);
- if (arg_shape_map.end() != it1) {
- arg_shapes[i] = it1->second;
+ std::vector<Context>* in_arg_ctxes,
+ std::vector<Context>* arg_grad_ctxes,
+ std::vector<OpReqType>* grad_req_types,
+ std::vector<Context>* aux_state_ctxes) {
+ // setup map for in_arg_ctxes, arg_grad_ctxes, aux_state_ctxes and
grad_req_types
+ std::unordered_map<std::string, Context> in_arg_ctx_map;
+ std::unordered_map<std::string, Context> arg_grad_ctx_map;
+ std::unordered_map<std::string, Context> aux_state_ctx_map;
+ std::unordered_map<std::string, OpReqType> grad_req_type_map;
+
+ auto arg_names = src.ListInputNames(nnvm::Symbol::kReadOnlyArgs);
+ auto aux_names = src.ListInputNames(nnvm::Symbol::kAuxiliaryStates);
+ for (size_t i = 0; i < arg_names.size(); ++i) {
+ auto name = arg_names[i];
+ in_arg_ctx_map[name] = in_arg_ctxes->at(i);
+ arg_grad_ctx_map[name] = arg_grad_ctxes->at(i);
+ grad_req_type_map[name] = grad_req_types->at(i);
+ }
+
+ for (size_t i = 0; i < aux_names.size(); ++i) {
+ aux_state_ctx_map[aux_names[i]] = aux_state_ctxes->at(i);
+ }
+
+ bool need_grad = false;
+ for (OpReqType req : *grad_req_types) {
+ if (req != kNullOp) {
+ need_grad = true;
+ break;
}
- auto it2 = arg_dtype_map.find(input_names[i]);
- if (arg_dtype_map.end() != it2) {
- arg_dtypes[i] = it2->second;
+ }
+ nnvm::Symbol ret = src.Copy();
+ std::unordered_set<std::string> op_names_set;
+ auto it = op::SubgraphPropertyOpNameSet::Get()->find(prop_name);
+ // assign a op name set to the subgraph property if it has been provided by
users
+ if (it != op::SubgraphPropertyOpNameSet::Get()->end()) {
+ LOG(INFO) << "SubgraphPropertyOpNameSet for subgraph property " <<
prop_name
+ << " has been assigned a value. Please make sure it is
initialized"
+ " only for the testing purpose.";
+ op_names_set = it->second;
+ }
+ std::vector<mxnet::op::SubgraphPropertyPtr> properties =
+ op::SubgraphPropertyRegistry::Get()->CreateSubgraphProperty(prop_name);
+ for (auto subgraph_prop : properties) {
+ if (subgraph_prop->HasAttr("inference_only") &&
+ subgraph_prop->GetAttr<bool>("inference_only") == true) {
+ if (need_grad) {
+ auto full_name = subgraph_prop->HasAttr("property_name")
+ ?
subgraph_prop->GetAttr<std::string>("property_name")
+ : prop_name;
+ LOG(INFO) << "Skip subgraph " << full_name << " as it requires
`grad_req=null`.";
Review comment:
"skip subgraph" -> "skip partitioning graph with subgraph property " ...
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
