address comment

apache · Apr 10, 2020 · 13cfa83 · 13cfa83
1 parent e2b7a7e
commit 13cfa83
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/src/relay/analysis/annotated_region_set.cc b/src/relay/analysis/annotated_region_set.cc
@@ -79,7 +79,7 @@ void AnnotatedRegionSetNode::AddToRegion(AnnotatedRegion dest, const Expr& expr)
   }
 }
 
-AnnotatedRegion AnnotatedRegionSetNode::MakeRegion(std::string target) {
+AnnotatedRegion AnnotatedRegionSetNode::MakeRegion(const std::string& target) {
   auto ret = regions_.emplace(AnnotatedRegion());
   (*ret.first)->id_ = region_id_++;
   (*ret.first)->target_ = target;

diff --git a/src/relay/analysis/annotated_region_set.h b/src/relay/analysis/annotated_region_set.h
@@ -197,7 +197,7 @@ class AnnotatedRegionSetNode : public Object {
    *
    * \return The new region.
    */
-  AnnotatedRegion MakeRegion(std::string target);
+  AnnotatedRegion MakeRegion(const std::string& target);
 
   std::unordered_set<AnnotatedRegion, ObjectHash, ObjectEqual> regions_;
   /*! \brief The next region ID to assign. */

diff --git a/src/relay/transforms/annotate_target.cc b/src/relay/transforms/annotate_target.cc
@@ -158,11 +158,12 @@ class AnnotateTargetWrapper : public ExprMutator {
       // if it is in the target list.
       Function func = Downcast<Function>(cn->op);
       CHECK(func.defined());
-      auto comp_name = func->GetAttr<tir::StringImm>(attr::kComposite);
+      auto comp_name = func->GetAttr<String>(attr::kComposite);
       if (comp_name.defined()) {
-        size_t i = comp_name->value.find('.');
+        std::string comp_name_str = comp_name;
+        size_t i = comp_name_str.find('.');
         if (i != std::string::npos) {
-          std::string comp_target = comp_name->value.substr(0, i);
+          std::string comp_target = comp_name_str.substr(0, i);
           for (const auto& target : this->targets_) {
             if (std::string(target) == comp_target) {
               supported_targets.push_back(comp_target);

diff --git a/tests/python/relay/test_pass_annotate_target.py b/tests/python/relay/test_pass_annotate_target.py
@@ -365,10 +365,6 @@ def before():
 
 if __name__ == "__main__":
     test_extern_dnnl()
-<<<<<<< HEAD
-    #test_extern_dnnl_mobilenet()
-=======
->>>>>>> Skip e2e test
     test_composite_function()
     #test_extern_dnnl_mobilenet()
     test_multiple_ends()