Make add_relu an internal function (pytorch#46676) (pytorch#46765)

Summary:
Cleanup for 1.7

Pull Request resolved: pytorch#46676

Reviewed By: gchanan

Differential Revision: D24458565

Pulled By: albanD

fbshipit-source-id: b1e4b4630233d3f1a4bac20e3077411d1ae17f7b

# Conflicts:
#	test/backward_compatibility/check_backward_compatibility.py

Author: albanD

aten/src/ATen/core/NamedRegistrations.cpp

@@ -37,9 +37,9 @@ TORCH_LIBRARY_IMPL(aten, Named, m) {
   m.impl("add.out", CppFunction::makeFallthrough());
   m.impl("add_.Scalar", CppFunction::makeFallthrough());
   m.impl("add_.Tensor", CppFunction::makeFallthrough());
-  m.impl("add_relu.Tensor", CppFunction::makeFallthrough());
-  m.impl("add_relu.out", CppFunction::makeFallthrough());
-  m.impl("add_relu_.Tensor", CppFunction::makeFallthrough());
+  m.impl("_add_relu.Tensor", CppFunction::makeFallthrough());
+  m.impl("_add_relu.out", CppFunction::makeFallthrough());
+  m.impl("_add_relu_.Tensor", CppFunction::makeFallthrough());
   m.impl("addcdiv", CppFunction::makeFallthrough());
   m.impl("addcdiv.out", CppFunction::makeFallthrough());
   m.impl("addcdiv_", CppFunction::makeFallthrough());

aten/src/ATen/native/native_functions.yaml

@@ -368,19 +368,19 @@
     SparseCUDA: add_out_sparse_cuda
     MkldnnCPU: mkldnn_add_out
 
-- func: add_relu.Tensor(Tensor self, Tensor other, *, Scalar alpha=1) -> Tensor
+- func: _add_relu.Tensor(Tensor self, Tensor other, *, Scalar alpha=1) -> Tensor
   use_c10_dispatcher: full
   variants: function
   dispatch:
     CPU: add_relu
 
-- func: add_relu_.Tensor(Tensor(a!) self, Tensor other, *, Scalar alpha=1) -> Tensor(a!)
+- func: _add_relu_.Tensor(Tensor(a!) self, Tensor other, *, Scalar alpha=1) -> Tensor(a!)
   use_c10_dispatcher: full
   variants: function
   dispatch:
     CPU: add_relu_
 
-- func: add_relu.out(Tensor self, Tensor other, *, Scalar alpha=1, Tensor(a!) out) -> Tensor(a!)
+- func: _add_relu.out(Tensor self, Tensor other, *, Scalar alpha=1, Tensor(a!) out) -> Tensor(a!)
   variants: function
   dispatch:
     CPU: add_relu_out

test/backward_compatibility/check_backward_compatibility.py

@@ -118,6 +118,8 @@
     ('aten::contiguous', datetime.date(2020, 12, 1)),
     ('aten::to', datetime.date(2020, 12, 1)),
     ("tensorexpr::Group", datetime.date(2020, 12, 1)),
+    ("aten::add_relu", datetime.date(2020, 12, 1)),
+    ("aten::add_relu_", datetime.date(2020, 12, 1)),
 ]
 
 

test/test_jit.py

@@ -581,7 +581,7 @@ def forward(self, a, b, c):
         m = torch.jit.load(buffer)
         new_res = m(a, b, c)
         FileCheck().check_not("aten::relu(") \
-            .check("aten::add_relu(") \
+            .check("aten::_add_relu(") \
             .run(m.graph)
         torch.testing.assert_allclose(orig_res, new_res)
 
@@ -600,7 +600,7 @@ def forward(self, a, b, c):
         m = torch.jit.load(buffer)
         new_res = m(a, b, c)
         FileCheck().check_not("aten::relu_(") \
-            .check("aten::add_relu(") \
+            .check("aten::_add_relu(") \
             .run(m.graph)
         torch.testing.assert_allclose(orig_res, new_res)
 
@@ -631,10 +631,10 @@ def forward(self, a, b):
         new_res = m(a_copy, b)
         FileCheck().check_not("aten::add_(") \
             .check_not("aten::relu_(") \
-            .check("aten::add_relu_(") \
+            .check("aten::_add_relu_(") \
             .run(m.graph)
         torch.testing.assert_allclose(orig_res, new_res)
-        # Since add_relu_ does inplace mutation ensure
+        # Since _add_relu_ does inplace mutation ensure
         # a_copy is modified
         torch.testing.assert_allclose(orig_res, a_copy)
 
@@ -669,10 +669,10 @@ def forward(self, a, b):
         new_res = m(a_copy, b)
         FileCheck().check_not("aten::add(") \
             .check_not("aten::relu_(") \
-            .check("aten::add_relu(") \
+            .check("aten::_add_relu(") \
             .run(m.graph)
         torch.testing.assert_allclose(orig_res, new_res)
-        # Since add_relu_ with out=a does inplace mutation ensure
+        # Since _add_relu_ with out=a does inplace mutation ensure
         # a_copy is modified
         torch.testing.assert_allclose(orig_res, a_copy)
 

test/test_mobile_optimizer.py

@@ -95,7 +95,7 @@ def forward(self, x):
                    .check_count("prepacked::linear_clamp_run", 1, exactly=True) \
                    .check_not("aten::add(") \
                    .check_not("aten::relu(") \
-                   .check_count("aten::add_relu(", 1, exactly=True) \
+                   .check_count("aten::_add_relu(", 1, exactly=True) \
                    .run(optimized_scripted_model.graph)
         torch.testing.assert_allclose(initial_result, optimized_result, rtol=1e-2, atol=1e-3)
 

test/test_nn.py

@@ -9152,7 +9152,7 @@ def test_add_relu(self):
         a = a + 5
         add_res = a + b
         relu_res = torch.relu(add_res)
-        add_relu_res = torch.add_relu(a, b)
+        add_relu_res = torch._VF._add_relu(a, b)
 
         self.assertTrue(torch.allclose(add_relu_res, relu_res))
 

tools/code_analyzer/default_op_deps.yaml

@@ -1903,7 +1903,7 @@
   - name: aten::resize_as_
   - name: aten::scalar_tensor
   - name: aten::to
-- name: aten::add_relu
+- name: aten::_add_relu
   depends:
   - name: aten::as_strided_
   - name: aten::copy_
@@ -1915,7 +1915,7 @@
   - name: aten::resize_
   - name: aten::resize_as_
   - name: aten::to
-- name: aten::add_relu_
+- name: aten::_add_relu_
   depends:
   - name: aten::as_strided_
   - name: aten::copy_

torch/csrc/jit/passes/fuse_relu.cpp

@@ -17,7 +17,7 @@ void fuseAddReluImpl(std::shared_ptr<Graph>& graph) {
         return (%res))";
   std::string add_relu_fused = R"(
     graph(%a, %b, %alpha):
-        %res = aten::add_relu(%a, %b, %alpha)
+        %res = aten::_add_relu(%a, %b, %alpha)
         return (%res))";
   rewriter.RegisterRewritePattern(add_relu_0, add_relu_fused);
 
@@ -35,7 +35,7 @@ void fuseAddReluImpl(std::shared_ptr<Graph>& graph) {
         return (%res))";
   std::string add_inplace_relu_fused = R"(
     graph(%a, %b, %alpha):
-        %res = aten::add_relu_(%a, %b, %alpha)
+        %res = aten::_add_relu_(%a, %b, %alpha)
         return (%res))";
   rewriter.RegisterRewritePattern(add_inplace_relu_1, add_inplace_relu_fused);
 
@@ -46,7 +46,7 @@ void fuseAddReluImpl(std::shared_ptr<Graph>& graph) {
         return (%res))";
   std::string add_out_relu_fused = R"(
     graph(%a, %b, %alpha, %out):
-        %res = aten::add_relu(%a, %b, %alpha, %out)
+        %res = aten::_add_relu(%a, %b, %alpha, %out)
         return (%res))";
 
   rewriter.RegisterRewritePattern(add_out_relu, add_out_relu_fused);

torch/overrides.py

@@ -211,7 +211,6 @@ def get_testing_overrides() -> Dict[Callable, Callable]:
         torch.arccos: lambda input, out=None: -1,
         torch.acosh: lambda input, out=None: -1,
         torch.arccosh: lambda input, out=None: -1,
-        torch.add_relu: lambda input, other, out=None: -1,
         torch.add: lambda input, other, out=None: -1,
         torch.addbmm: lambda input, batch1, batch2, alpha=1, beta=1, out=None: -1,
         torch.addcdiv: lambda input, tensor1, tensor2, value=1, out=None: -1,