Add disable attr to subgraph property (apache#15926)

larroy · Aug 17, 2019 · a8b9728 · a8b9728
1 parent 5a4c01b
commit a8b9728
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 16 deletions.
diff --git a/docs/tutorials/c++/subgraphAPI.md b/docs/tutorials/c++/subgraphAPI.md
@@ -105,9 +105,11 @@ class SgProperty : public SubgraphProperty {
 };
 ```
 `SetAttr` is optional and developer can define their own attributes to control property behavior.
-There're 2 built-in attributes that used by MXNet executor.
+There're some built-in attributes that used by MXNet executor.
 
-`property_name`  : std::string, name of this property.
+`property_name`  : std::string, name of this property, used for diagnose.
+
+`disable` : bool, whther to disable this property.
 
 `inference_only` : bool, apply this property only for inference. Property will be skiped when need_grad=True. Default `false` if this attribute isn't defined.
 

diff --git a/src/c_api/c_api_symbolic.cc b/src/c_api/c_api_symbolic.cc
@@ -1142,6 +1142,14 @@ int MXGenBackendSubgraph(SymbolHandle sym_handle, const char *backend_name,
   auto backend = mxnet::op::SubgraphBackendRegistry::Get()->GetSubgraphBackend(backend_name);
   const auto& subgraph_prop_list = backend->GetSubgraphProperties();
   for (auto property : subgraph_prop_list) {
+    if (property->HasAttr("disable") && property->GetAttr<bool>("disable") == true) {
+      auto full_name = property->HasAttr("property_name")
+                           ? property->GetAttr<std::string>("property_name")
+                           : std::string();
+      LOG(INFO) << "subgraph property " << full_name << " from backend " << backend_name
+                << " is disabled.";
+      continue;
+    }
     nnvm::Graph g = Symbol2Graph(*s);
     property->SetAttr("graph", g);
     g.attrs["subgraph_property"] = std::make_shared<nnvm::any>(property);

diff --git a/src/executor/graph_executor.cc b/src/executor/graph_executor.cc
@@ -1659,10 +1659,15 @@ static bool SubgraphBackendCheck(const op::SubgraphBackendPtr& backend,
 static bool SubgraphPropertyCheck(const std::string& backend_name,
                                   const op::SubgraphPropertyPtr& prop, bool need_grad,
                                   bool verbose = false) {
+  auto full_name =
+      prop->HasAttr("property_name") ? prop->GetAttr<std::string>("property_name") : std::string();
+  if (prop->HasAttr("disable") && prop->GetAttr<bool>("disable") == true) {
+    LOG(INFO) << "subgraph property " << full_name << " from backend " << backend_name
+              << " is disabled.";
+    return false;
+  }
   if (prop->HasAttr("inference_only") && prop->GetAttr<bool>("inference_only") == true) {
     if (need_grad) {
-      auto full_name = prop->HasAttr("property_name") ? prop->GetAttr<std::string>("property_name")
-                                                      : std::string();
       if (verbose) {
         LOG(INFO) << "skip partitioning graph with subgraph property " << full_name
                   << " from backend " << backend_name << " as it requires `grad_req=null`.";

diff --git a/src/operator/subgraph/mkldnn/mkldnn_conv_property.h b/src/operator/subgraph/mkldnn/mkldnn_conv_property.h
@@ -177,13 +177,12 @@ class SgMKLDNNConvProperty : public SubgraphProperty {
   }
   static SubgraphPropertyPtr Create() {
     static const std::string &name = "MKLDNN convolution optimization pass";
-    if (dmlc::GetEnv("MXNET_DISABLE_MKLDNN_CONV_OPT", 0)) {
-      LOG(INFO) << name << " is disabled.";
-      return nullptr;
-    }
     auto property = std::make_shared<SgMKLDNNConvProperty>();
     property->SetAttr<std::string>("property_name", name);
     property->SetAttr<bool>("inference_only", true);
+    if (dmlc::GetEnv("MXNET_DISABLE_MKLDNN_CONV_OPT", 0)) {
+      property->SetAttr<bool>("disable", true);
+    }
     return property;
   }
   nnvm::NodePtr CreateSubgraphNode(const nnvm::Symbol &sym,

diff --git a/src/operator/subgraph/mkldnn/mkldnn_fc_property.h b/src/operator/subgraph/mkldnn/mkldnn_fc_property.h
@@ -132,13 +132,12 @@ class SgMKLDNNFCProperty : public SubgraphProperty {
 
   static SubgraphPropertyPtr Create() {
     static const std::string &name = "MKLDNN FullyConnected optimization pass";
-    if (dmlc::GetEnv("MXNET_DISABLE_MKLDNN_FC_OPT", 0)) {
-      LOG(INFO) << name << " is disabled.";
-      return nullptr;
-    }
     auto property = std::make_shared<SgMKLDNNFCProperty>();
     property->SetAttr<std::string>("property_name", name);
     property->SetAttr<bool>("inference_only", true);
+    if (dmlc::GetEnv("MXNET_DISABLE_MKLDNN_FC_OPT", 0)) {
+      property->SetAttr<bool>("disable", true);
+    }
     return property;
   }
 

diff --git a/src/operator/subgraph/subgraph_property.h b/src/operator/subgraph/subgraph_property.h
@@ -357,7 +357,7 @@ class SubgraphPropertyEntry {
 
   template<typename T>
   SubgraphPropertyEntry set_attr(const std::string& name, const T value) const {
-    entry_->SetAttr<T>(name, value);
+    if (entry_) entry_->SetAttr<T>(name, value);
     return *this;
   }
 
@@ -403,9 +403,12 @@ class SubgraphBackend {
     }
   }
 
-  SubgraphPropertyPtr& RegisterSubgraphProperty(const SubgraphPropertyPtr prop) {
-    prop_ptr_.push_back(prop);
-    return prop_ptr_.back();
+  SubgraphPropertyPtr RegisterSubgraphProperty(SubgraphPropertyPtr prop) {
+    if (prop) {
+      prop_ptr_.push_back(prop);
+      return prop_ptr_.back();
+    }
+    return prop;
   }
 
   const std::string& GetName() const { return name_; }