add "aten::add.str" op and remove two duplicated ops

linbinyu · facebook-github-bot · commit cc29c192a648 · 2020-07-07T19:07:35.000-07:00
Summary: add "aten::add.str" op and remove two duplicated ops

Test Plan:
```
buck run //xplat/caffe2/fb/pytorch_predictor:converter /mnt/vol/gfsfblearner-altoona/flow/data/2020-06-29/1ca8a85f-dbd5-4181-b5fc-63d24465c1fc/201084299/2068673333/model.pt1 ~/model_f201084299.bc

buck run xplat/assistant/model_benchmark_tool/mobile/binary/:lite_predictor -- --model ~/model_f201084299.bc --input_file /tmp/gc_model_input.txt --model_input_args src_tokens,dict_feat,contextual_token_embedding --warmup 1 --iter 2
```

Reviewed By: pengtxiafb

Differential Revision: D22395604

fbshipit-source-id: 0ce21e8b8ae989d125f2f3739523e3c486590b9f
diff --git a/test/backward_compatibility/check_backward_compatibility.py b/test/backward_compatibility/check_backward_compatibility.py
@@ -115,6 +115,7 @@
     ('aten::__or__', datetime.date(2020, 6, 30)),
     ('aten::__xor__', datetime.date(2020, 6, 30)),
     ('aten::split', datetime.date(2020, 6, 30)),
+    ('aten::add', datetime.date(2020, 7, 30)),
 ]
 
 
diff --git a/torch/csrc/jit/runtime/register_ops_utils.h b/torch/csrc/jit/runtime/register_ops_utils.h
@@ -589,6 +589,14 @@ void listSetItem(Stack* stack);
         push(stack, op);                        \
       },                                        \
       aliasAnalysisFromSchema())
-
+#define DEFINE_STRING_OP(op_name, string_op, result) \
+  Operator(                                          \
+      #op_name ".str(str a, str b) ->" #result,      \
+      [](Stack* stack) {                             \
+        auto b = pop(stack).toStringRef();           \
+        auto a = pop(stack).toStringRef();           \
+        push(stack, string_op);                      \
+      },                                             \
+      aliasAnalysisFromSchema())
 } // namespace jit
 } // namespace torch
diff --git a/torch/csrc/jit/runtime/register_prim_ops.cpp b/torch/csrc/jit/runtime/register_prim_ops.cpp
@@ -322,32 +322,6 @@ RegisterOperators reg(
            pack(stack, result);
          },
          aliasAnalysisFromSchema()),
-     // only used internally in range() translation
-     Operator(
-         "aten::__range_length(int lo, int hi, int step) -> int",
-         [](Stack* stack) {
-           int64_t lo, hi, step;
-           pop(stack, lo, hi, step);
-           // error handling when step_val = 0 during runtime
-           if (step == 0) {
-             throw std::runtime_error("range() arg 3 must not be zero");
-           }
-           if (step > 0 && lo < hi)
-             push(stack, 1 + (hi - 1 - lo) / step);
-           else if (step < 0 && lo > hi)
-             push(stack, 1 + (lo - 1 - hi) / (0 - step));
-           else
-             push(stack, 0);
-         },
-         aliasAnalysisFromSchema()),
-     Operator(
-         "aten::__derive_index(int index, int start, int step) -> int",
-         [](Stack* stack) {
-           int64_t index, start, step;
-           pop(stack, index, start, step);
-           push(stack, start + index * step);
-         },
-         aliasAnalysisFromSchema()),
      // these ops are generic over the list element type.
      // CREATING GENERIC_LIST_OPS
      Operator(
@@ -450,6 +424,7 @@ RegisterOperators reg(
            handler(ss.str());
          },
          aliasAnalysisSpecialCase()),
+     DEFINE_STRING_OP(aten::add, a + b, str),
      DEFINE_COMPARISON_OP(aten::eq, a == b),
      DEFINE_COMPARISON_OP(aten::ne, a != b),
      DEFINE_COMPARISON_OP(aten::lt, a < b),
diff --git a/torch/csrc/jit/runtime/register_prim_ops_fulljit.cpp b/torch/csrc/jit/runtime/register_prim_ops_fulljit.cpp
@@ -687,20 +687,6 @@ void hashValue(Stack* stack) {
 
 RegisterOperators reg2({
 
-#define DEFINE_STRING_OP(op_name, string_op, result) \
-  Operator(                                          \
-      #op_name "(str a, str b) ->" #result,          \
-      [](Stack* stack) {                             \
-        auto b = pop(stack).toStringRef();           \
-        auto a = pop(stack).toStringRef();           \
-        push(stack, string_op);                      \
-      },                                             \
-      aliasAnalysisFromSchema())
-
-    DEFINE_STRING_OP(aten::eq, a == b, bool),
-    DEFINE_STRING_OP(aten::ne, a != b, bool),
-    DEFINE_STRING_OP(aten::add, a + b, str),
-#undef DEFINE_STRING_OP
     Operator(
         "aten::__getitem__.str(str s, int index) -> str",
         [](Stack* stack) {

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@`
`115`	`115`	`('aten::__or__', datetime.date(2020, 6, 30)),`
`116`	`116`	`('aten::__xor__', datetime.date(2020, 6, 30)),`
`117`	`117`	`('aten::split', datetime.date(2020, 6, 30)),`
	`118`	`+ ('aten::add', datetime.date(2020, 7, 30)),`
`118`	`119`	`]`
`119`	`120`
`120`	`121`