Update on "Delete NativeFunctions.h include from Functions.h"

ezyang · ezyang · commit c409ae7f6dbf · 2020-12-01T18:19:35.000-08:00
Only one header needed to be updated to now include NativeFunctions.h

Signed-off-by: Edward Z. Yang &lt;ezyang@fb.com&gt;

[ghstack-poisoned]
diff --git a/aten/src/ATen/templates/Functions.h b/aten/src/ATen/templates/Functions.h
@@ -18,6 +18,29 @@
 
 namespace at {
 
+// These functions are defined in ATen/Utils.cpp.
+#define TENSOR(T, S)                                                          \
+  CAFFE2_API Tensor tensor(ArrayRef<T> values, const TensorOptions& options); \
+  inline Tensor tensor(                                                       \
+      std::initializer_list<T> values, const TensorOptions& options) {        \
+    return at::tensor(ArrayRef<T>(values), options);                          \
+  }                                                                           \
+  inline Tensor tensor(T value, const TensorOptions& options) {               \
+    return at::tensor(ArrayRef<T>(value), options);                           \
+  }                                                                           \
+  inline Tensor tensor(ArrayRef<T> values) {                                  \
+    return at::tensor(std::move(values), at::dtype(k##S));                    \
+  }                                                                           \
+  inline Tensor tensor(std::initializer_list<T> values) {                     \
+    return at::tensor(ArrayRef<T>(values));                                   \
+  }                                                                           \
+  inline Tensor tensor(T value) {                                             \
+    return at::tensor(ArrayRef<T>(value));                                    \
+  }
+AT_FORALL_SCALAR_TYPES_AND3(Bool, Half, BFloat16, TENSOR)
+AT_FORALL_COMPLEX_TYPES(TENSOR)
+#undef TENSOR
+
 ${function_declarations}
 
 // Special C++ only overloads for std()-like functions (See gh-40287)
diff --git a/aten/src/ATen/templates/NativeFunctions.h b/aten/src/ATen/templates/NativeFunctions.h
@@ -23,29 +23,6 @@ struct Type;
 } // namespace at
 
 namespace at {
-// These functions are defined in ATen/Utils.cpp.
-#define TENSOR(T, S)                                                          \
-  CAFFE2_API Tensor tensor(ArrayRef<T> values, const TensorOptions& options); \
-  inline Tensor tensor(                                                       \
-      std::initializer_list<T> values, const TensorOptions& options) {        \
-    return at::tensor(ArrayRef<T>(values), options);                          \
-  }                                                                           \
-  inline Tensor tensor(T value, const TensorOptions& options) {               \
-    return at::tensor(ArrayRef<T>(value), options);                           \
-  }                                                                           \
-  inline Tensor tensor(ArrayRef<T> values) {                                  \
-    return at::tensor(std::move(values), at::dtype(k##S));                    \
-  }                                                                           \
-  inline Tensor tensor(std::initializer_list<T> values) {                     \
-    return at::tensor(ArrayRef<T>(values));                                   \
-  }                                                                           \
-  inline Tensor tensor(T value) {                                             \
-    return at::tensor(ArrayRef<T>(value));                                    \
-  }
-AT_FORALL_SCALAR_TYPES_AND3(Bool, Half, BFloat16, TENSOR)
-AT_FORALL_COMPLEX_TYPES(TENSOR)
-#undef TENSOR
-
 namespace native {
 
 ${native_function_declarations}
