[PyTorchEdge] Make aten function common to aten and torch_common (#66663)

pavithranrao · facebook-github-bot · commit 8beabffac3e6 · 2021-10-20T20:41:41.000-07:00
Summary: Pull Request resolved: #66663 fb: TensorCompare.cpp is in per-app, a target higher than torch_mobile Please read this doc to know about [Per-app ATen/native and Template Selective Build]( https://docs.google.com/document/d/1O5--mOAi_gGh2GkE-REo3qJRRQ_Lks69IfgszcB8ThI/edit) Create a filed called "prim_native_functions.cpp" in ATen, add it to aten_cpu, and cut-paste native::is_nonzero() to prim_native_functions.cpp. By doing this we move the function to lower layer which is more visible to all targets depending on it. Instruction count comparison new vs old https://www.internalfb.com/phabricator/paste/view/P463272302?view=diff Test Plan: fb: ``` (base) [pavithran@devvm1803.vll0 /data/users/pavithran/fbsource] buck build //xplat/caffe2:aten_cpu Building: finished in 0.4 sec (100%) 1/202 jobs, 0/202 updated Total time: 0.4 sec More details at https://www.internalfb.com/intern/buck/build/ea35300b-55be-4b9f-bc74-80cdd869c16a BUILD SUCCEEDED (base) [pavithran@devvm1803.vll0 /data/users/pavithran/fbsource] buck build //xplat/caffe2:aten_native_cpu Building: finished in 0.7 sec (100%) 1/1 jobs, 0/1 updated Total time: 0.8 sec More details at https://www.internalfb.com/intern/buck/build/ccd97d43-c59d-4f29-9418-485cd24575e2 BUILD SUCCEEDED ``` Reviewed By: iseeyuan Differential Revision: D31669536 fbshipit-source-id: d35f069f975db6dce0b678c5b5ddd74bd690f599
diff --git a/aten/src/ATen/native/TensorCompare.cpp b/aten/src/ATen/native/TensorCompare.cpp
@@ -228,24 +228,6 @@ Tensor isfinite(const Tensor& self) {
   });
 }
 
-bool is_nonzero(const Tensor& self) {
-  auto n = self.numel();
-  TORCH_CHECK(n != 0, "Boolean value of Tensor with no values is ambiguous");
-  TORCH_CHECK(n < 2, "Boolean value of Tensor with more than one value is ambiguous");
-
-  Scalar localScalar = self.item();
-  if (localScalar.isFloatingPoint()) {
-    return localScalar.to<double>() != 0;
-  } else if (localScalar.isComplex()) {
-     return localScalar.to<c10::complex<double>>() != c10::complex<double>(0.0, 0.0);
-  } else if (localScalar.isIntegral(false)){
-    return localScalar.to<int64_t>() != 0;
-  } else if (localScalar.isBoolean()) {
-    return localScalar.to<bool>();
-  }
-  TORCH_INTERNAL_ASSERT(false, "Expected non-Tensor backend scalar");
-}
-
 void _assert_async_cpu(const Tensor& self) {
   TORCH_CHECK(native::is_nonzero(self), "Expected Tensor with single nonzero value, but got zero");
 }
diff --git a/aten/src/ATen/native/prim_native_functions.cpp b/aten/src/ATen/native/prim_native_functions.cpp
@@ -0,0 +1,26 @@
+#include <ATen/ATen.h>
+
+namespace at {
+namespace native {
+
+bool is_nonzero(const Tensor& self) {
+  auto n = self.numel();
+  TORCH_CHECK(n != 0, "Boolean value of Tensor with no values is ambiguous");
+  TORCH_CHECK(
+      n < 2, "Boolean value of Tensor with more than one value is ambiguous");
+
+  Scalar localScalar = self.item();
+  if (localScalar.isFloatingPoint()) {
+    return localScalar.to<double>() != 0;
+  } else if (localScalar.isComplex()) {
+    return localScalar.to<c10::complex<double>>() !=
+        c10::complex<double>(0.0, 0.0);
+  } else if (localScalar.isIntegral(false)) {
+    return localScalar.to<int64_t>() != 0;
+  } else if (localScalar.isBoolean()) {
+    return localScalar.to<bool>();
+  }
+  TORCH_INTERNAL_ASSERT(false, "Expected non-Tensor backend scalar");
+}
+} // namespace meta
+} // namespace at
diff --git a/tools/build_variables.bzl b/tools/build_variables.bzl
@@ -938,6 +938,7 @@ aten_cpu_source_non_codegen_list = [
     "aten/src/ATen/nnapi/nnapi_bind.cpp",
     "aten/src/ATen/nnapi/nnapi_wrapper.cpp",
     "aten/src/ATen/nnapi/nnapi_model_loader.cpp",
+    "aten/src/ATen/native/prim_native_functions.cpp",
 ]
 
 aten_cpu_source_codegen_list = [

Original file line number	Diff line number	Diff line change
`@@ -938,6 +938,7 @@ aten_cpu_source_non_codegen_list = [`
`938`	`938`	`"aten/src/ATen/nnapi/nnapi_bind.cpp",`
`939`	`939`	`"aten/src/ATen/nnapi/nnapi_wrapper.cpp",`
`940`	`940`	`"aten/src/ATen/nnapi/nnapi_model_loader.cpp",`
	`941`	`+ "aten/src/ATen/native/prim_native_functions.cpp",`
`941`	`942`	`]`
`942`	`943`
`943`	`944`	`aten_cpu_source_codegen_list = [`