commit 3669e45736176fc119c66717474378e9031cac3c
author Jerry Zhang <jerryzh@fb.com> Fri Jun 05 23:01:16 2020 -0700
committer Facebook GitHub Bot <facebook-github-bot@users.noreply.github.com> Fri Jun 05 23:03:38 2020 -0700
tree 63badd1017b91bb0d6f113bd41ffe4f522a7d08d
parent 856215509d89c935cd1768ce4b496d4fc0e919a6

[jit][subgraph_matcher] Enable regex matching for string attributes of node (#39454)

Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/39454

Test Plan: Imported from OSS

Differential Revision: D21876224

fbshipit-source-id: c0fdff3a4532d2a73b222353e2cad6cf52444697

test/cpp/jit/test_subgraph_matcher.cpp

diff --git a/test/cpp/jit/test_subgraph_matcher.cpp b/test/cpp/jit/test_subgraph_matcher.cpp
index ca03af0..2e398db 100644
--- a/test/cpp/jit/test_subgraph_matcher.cpp
+++ b/test/cpp/jit/test_subgraph_matcher.cpp
@@ -467,6 +467,16 @@
     // Lists are not supported yet, thus we shouldn't match for now.
     AT_ASSERT(findPatternMatches(pattern, graph).empty());
   }
+  {
+    Graph pattern;
+    parseIR(
+        R"IR(
+graph(%a, %b):
+  %c = a::c[myattr="q.*"](%a, %b)
+  return (%c))IR",
+        &pattern);
+    AT_ASSERT(!findPatternMatches(pattern, graph).empty());
+  }
 }
 
 void testBadPattern() {

torch/csrc/jit/ir/subgraph_matcher.cpp

diff --git a/torch/csrc/jit/ir/subgraph_matcher.cpp b/torch/csrc/jit/ir/subgraph_matcher.cpp
index 3a74f51..8319543 100644
--- a/torch/csrc/jit/ir/subgraph_matcher.cpp
+++ b/torch/csrc/jit/ir/subgraph_matcher.cpp
@@ -1,5 +1,6 @@
 #include <torch/csrc/jit/ir/subgraph_matcher.h>
 #include <torch/csrc/jit/jit_log.h>
+#include <regex>
 #include <stack>
 
 namespace torch {
@@ -133,7 +134,7 @@
     }
     switch (n1->kindOf(attr_name)) {
       case AttributeKind::s:
-        if (n1->s(attr_name) != n2->s(attr_name)) {
+        if (!std::regex_match(n2->s(attr_name), std::regex(n1->s(attr_name)))) {
           GRAPH_DEBUG(
               "Nodes did not match because attribute '",
               attr_name.toQualString(),