Revert "[1/N] Cleanup header inclusions in torch_cpu by iwyu (pytorch…

…#101178)" This reverts commit b7a95f4. Reverted pytorch#101178 on behalf of https://github.com/atalman due to Break internal CI ([comment](pytorch#101178 (comment)))
rui-ren · Sep 25, 2023 · 83deaa1 · 83deaa1
1 parent d6cc3ac
commit 83deaa1
Show file tree

Hide file tree

Showing 91 changed files with 137 additions and 101 deletions.
diff --git a/aten/src/ATen/ATen.h b/aten/src/ATen/ATen.h
@@ -4,8 +4,6 @@
 #error C++17 or later compatible compiler is required to use ATen.
 #endif
 
-// IWYU pragma: begin_exports
-
 #include <ATen/Context.h>
 #include <ATen/Device.h>
 #include <ATen/DeviceGuard.h>
@@ -34,4 +32,6 @@
 #include <c10/core/TensorOptions.h>
 #include <c10/util/Exception.h>
 
-// IWYU pragma: end_exports
+// TODO: try to remove this
+// There is some back story, see https://github.com/pytorch/pytorch/issues/48684
+#include <ATen/NativeFunctions.h>
diff --git a/aten/src/ATen/Dispatch.cpp b/aten/src/ATen/Dispatch.cpp
@@ -1,15 +1,15 @@
 #include <ATen/Dispatch.h>
-#if defined ENABLE_RECORD_KERNEL_FUNCTION_DTYPE
 #include <ATen/record_function.h>
 
 namespace at::detail {
 
+#if defined ENABLE_RECORD_KERNEL_FUNCTION_DTYPE
 void record_kernel_function_dtype(std::string name) {
   RECORD_FUNCTION_WITH_SCOPE(
         at::RecordScope::KERNEL_FUNCTION_DTYPE,
         std::move(name),
         c10::ArrayRef<const c10::IValue>{});
 }
+#endif
 
 }  // namespace at::detail
-#endif
diff --git a/aten/src/ATen/ExpandUtils.h b/aten/src/ATen/ExpandUtils.h
@@ -14,6 +14,7 @@
 #include <c10/util/irange.h>
 
 #include <functional>
+#include <sstream>
 #include <tuple>
 #include <utility>
 

diff --git a/aten/src/ATen/FuncTorchTLS.h b/aten/src/ATen/FuncTorchTLS.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <c10/macros/Export.h>
+#include <c10/macros/Macros.h>
 #include <memory>
 
 namespace at {

diff --git a/aten/src/ATen/LegacyBatchingRegistrations.cpp b/aten/src/ATen/LegacyBatchingRegistrations.cpp
@@ -1,10 +1,9 @@
 #include <torch/library.h>
-#include <ATen/ATen.h>
+#include <ATen/RedispatchFunctions.h>
 #include <ATen/LegacyVmapTransforms.h>
 #include <ATen/LegacyBatchedFallback.h>
-#include <ATen/NativeFunctions.h>
-#include <ATen/RedispatchFunctions.h>
 #include <ATen/native/ResizeCommon.h>
+#include <ATen/ATen.h>
 #include <ATen/core/IListRef.h>
 #include <c10/util/irange.h>
 #include <c10/core/SymIntArrayRef.h>

diff --git a/aten/src/ATen/MapAllocator.cpp b/aten/src/ATen/MapAllocator.cpp
@@ -8,9 +8,11 @@
 #endif
 
 #include <c10/core/CPUAllocator.h>
+#include <c10/util/Unicode.h>
 
+/* stuff for mapped files */
 #ifdef _WIN32
-#include <c10/util/Unicode.h>
+#include <c10/util/win32-headers.h>
 #endif
 
 #if defined(HAVE_MMAP)

diff --git a/aten/src/ATen/NestedTensorImpl.cpp b/aten/src/ATen/NestedTensorImpl.cpp
@@ -1,6 +1,7 @@
 #include <ATen/ATen.h>
 #include <ATen/NamedTensorUtils.h>
 #include <ATen/WrapDimUtils.h>
+#include <ATen/core/op_registration/op_registration.h>
 #include <ATen/NestedTensorImpl.h>
 #include <c10/core/DispatchKey.h>
 #include <c10/core/DispatchKeySet.h>

diff --git a/aten/src/ATen/TensorIterator.cpp b/aten/src/ATen/TensorIterator.cpp
@@ -22,7 +22,6 @@
 #endif
 
 #include <c10/util/irange.h>
-#include <c10/util/string_utils.h>
 #include <c10/util/SmallBuffer.h>
 
 #include <array>

diff --git a/aten/src/ATen/Utils.cpp b/aten/src/ATen/Utils.cpp
@@ -1,9 +1,13 @@
 #include <ATen/Context.h>
+#include <ATen/detail/CUDAHooksInterface.h>
 #include <ATen/Dispatch.h>
 #include <ATen/Functions.h>
 #include <ATen/Utils.h>
 #include <c10/util/accumulate.h>
 
+
+// NOLINTNEXTLINE(modernize-deprecated-headers)
+#include <stdarg.h>
 #include <cstdlib>
 #include <stdexcept>
 #include <typeinfo>

diff --git a/aten/src/ATen/autocast_mode.cpp b/aten/src/ATen/autocast_mode.cpp
@@ -1,5 +1,6 @@
 #include <ATen/autocast_mode.h>
 
+#include <exception>
 #include <mutex>
 #include <ATen/CachedTensorUtils.h>
 #include <c10/util/flat_hash_map.h>

diff --git a/aten/src/ATen/core/Formatting.cpp b/aten/src/ATen/core/Formatting.cpp
@@ -5,6 +5,7 @@
 #include <cstdint>
 #include <iomanip>
 #include <iostream>
+#include <sstream>
 #include <tuple>
 
 namespace c10 {

diff --git a/aten/src/ATen/core/GeneratorForPrivateuseone.h b/aten/src/ATen/core/GeneratorForPrivateuseone.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <ATen/core/Generator.h>
+#include <c10/util/intrusive_ptr.h>
 
 namespace at {
 

diff --git a/aten/src/ATen/core/NamedTensor.cpp b/aten/src/ATen/core/NamedTensor.cpp
@@ -2,6 +2,7 @@
 #include <ATen/core/NamedTensor.h>
 
 #include <ATen/core/TensorBase.h>
+#include <c10/util/C++17.h>
 
 namespace at {
 

diff --git a/aten/src/ATen/core/NamedTensor.h b/aten/src/ATen/core/NamedTensor.h
@@ -2,6 +2,7 @@
 
 #include <ATen/core/Dimname.h>
 #include <c10/core/TensorImpl.h>
+#include <c10/util/C++17.h>
 
 namespace at {
 

diff --git a/aten/src/ATen/core/Vitals.h b/aten/src/ATen/core/Vitals.h
@@ -1,4 +1,6 @@
 #pragma once
+#include <cstring>
+#include <map>
 #include <memory>
 #include <ostream>
 #include <sstream>

diff --git a/aten/src/ATen/core/blob.h b/aten/src/ATen/core/blob.h
@@ -3,13 +3,17 @@
 #include <cstddef>
 #include <sstream>
 #include <type_traits>
+#include <typeinfo>
+#include <vector>
 
 #include <c10/util/intrusive_ptr.h>
 #include <c10/util/typeid.h>
 #include <c10/macros/Macros.h>
 
 namespace caffe2 {
 
+class Tensor;
+
 /**
  * @brief Blob is a general container that hosts a typed pointer.
  *

diff --git a/aten/src/ATen/core/operator_name.cpp b/aten/src/ATen/core/operator_name.cpp
@@ -1,5 +1,7 @@
 #include <ATen/core/operator_name.h>
 
+#include <sstream>
+
 namespace c10 {
 
 std::string toString(const OperatorName& opName) {

diff --git a/aten/src/ATen/functorch/BatchRulesDecompositions.cpp b/aten/src/ATen/functorch/BatchRulesDecompositions.cpp
@@ -5,9 +5,8 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree.
 
-#include <ATen/FunctionalTensorWrapper.h>
 #include <ATen/Operators.h>
-#include <ATen/NativeFunctions.h>
+#include <ATen/FunctionalTensorWrapper.h>
 #include <ATen/core/dispatch/Dispatcher.h>
 #include <ATen/functorch/BatchRulesHelper.h>
 #include <ATen/functorch/BatchedFallback.h>

diff --git a/aten/src/ATen/functorch/BatchRulesHelper.cpp b/aten/src/ATen/functorch/BatchRulesHelper.cpp
@@ -5,7 +5,6 @@
 // LICENSE file in the root directory of this source tree.
 
 #include <ATen/functorch/BatchRulesHelper.h>
-#include <ATen/NativeFunctions.h>
 #include <ATen/WrapDimUtils.h>
 
 namespace at { namespace functorch {

diff --git a/aten/src/ATen/functorch/BatchRulesViews.cpp b/aten/src/ATen/functorch/BatchRulesViews.cpp
@@ -9,7 +9,6 @@
 #include <utility>
 
 #include <ATen/Operators.h>
-#include <ATen/NativeFunctions.h>
 #include <ATen/functorch/PlumbingHelper.h>
 #include <ATen/functorch/BatchedFallback.h>
 #include <ATen/core/dispatch/Dispatcher.h>

diff --git a/aten/src/ATen/mps/EmptyTensor.cpp b/aten/src/ATen/mps/EmptyTensor.cpp
@@ -1,7 +1,6 @@
 //  Copyright © 2022 Apple Inc.
 
 #include <ATen/ATen.h>
-#include <ATen/NativeFunctions.h>
 #include <ATen/Tensor.h>
 #include <ATen/Utils.h>
 #include <torch/library.h>

diff --git a/aten/src/ATen/native/Activation.cpp b/aten/src/ATen/native/Activation.cpp
@@ -79,6 +79,7 @@
 #include <ATen/ops/zeros_like.h>
 
 #include <utility>
+#include <vector>
 #endif
 
 namespace at {

diff --git a/aten/src/ATen/native/BlasKernel.cpp b/aten/src/ATen/native/BlasKernel.cpp
@@ -7,6 +7,7 @@
 #include <c10/util/irange.h>
 #include <algorithm>
 #include <climits>
+#include <iostream>
 #include <limits>
 
 namespace {

diff --git a/aten/src/ATen/native/CPUBlas.cpp b/aten/src/ATen/native/CPUBlas.cpp
@@ -5,6 +5,7 @@
 #include <ATen/Config.h>
 
 #include <c10/util/SmallBuffer.h>
+#include <c10/util/C++17.h>
 #include <c10/util/irange.h>
 
 #include <climits>

diff --git a/aten/src/ATen/native/CPUFallback.h b/aten/src/ATen/native/CPUFallback.h
@@ -1,8 +1,10 @@
 #pragma once
 
+#include <ATen/core/ivalue.h>
 #include <ATen/core/stack.h>
 #include <ATen/core/boxing/KernelFunction.h>
 #include <ATen/core/dispatch/Dispatcher.h>
+#include <c10/util/Metaprogramming.h>
 #include <torch/library.h>
 
 namespace at::native {

diff --git a/aten/src/ATen/native/ChanelShuffle.cpp b/aten/src/ATen/native/ChanelShuffle.cpp
@@ -5,6 +5,7 @@
 #endif
 #include <c10/util/Exception.h>
 
+#include <ATen/native/TensorTransformations.h>
 #include <ATen/native/cpu/ChannelShuffleKernel.h>
 
 #ifndef AT_PER_OPERATOR_HEADERS

diff --git a/aten/src/ATen/native/ComparisonUtils.cpp b/aten/src/ATen/native/ComparisonUtils.cpp
@@ -1,6 +1,7 @@
 #include <ATen/core/TensorBase.h>
-#include <ATen/core/TensorBody.h>
 #include <algorithm>
+#include <vector>
+#include <ATen/core/TensorBody.h>
 #include <c10/util/OptionalArrayRef.h>
 
 #ifdef AT_PER_OPERATOR_HEADERS

diff --git a/aten/src/ATen/native/DilatedMaxPool2d.cpp b/aten/src/ATen/native/DilatedMaxPool2d.cpp
@@ -11,6 +11,7 @@
 #else
 #include <ATen/ops/max_pool2d_with_indices_backward_native.h>
 #include <ATen/ops/max_pool2d_with_indices_native.h>
+#include <ATen/ops/zeros_like_ops.h>
 #endif
 
 namespace at {

diff --git a/aten/src/ATen/native/DilatedMaxPool3d.cpp b/aten/src/ATen/native/DilatedMaxPool3d.cpp
@@ -12,6 +12,7 @@
 #include <ATen/ops/empty.h>
 #include <ATen/ops/max_pool3d_with_indices_backward_native.h>
 #include <ATen/ops/max_pool3d_with_indices_native.h>
+#include <ATen/ops/zeros_like.h>
 #endif
 
 namespace at {

diff --git a/aten/src/ATen/native/DispatchStub.cpp b/aten/src/ATen/native/DispatchStub.cpp
@@ -1,8 +1,8 @@
 #define TORCH_ASSERT_ONLY_METHOD_OPERATORS
 #include <ATen/native/DispatchStub.h>
 
-#include <c10/core/DeviceType.h>
 #include <c10/util/Exception.h>
+#include <c10/macros/Macros.h>
 
 #include <cpuinfo.h>
 #include <cstdlib>

diff --git a/aten/src/ATen/native/ForeachOpsKernels.cpp b/aten/src/ATen/native/ForeachOpsKernels.cpp
@@ -58,6 +58,7 @@
 #include <ATen/ops/maximum.h>
 #include <ATen/ops/minimum.h>
 #include <ATen/ops/pow.h>
+#include <ATen/ops/zeros_like_ops.h>
 #endif
 
 namespace at::native {

diff --git a/aten/src/ATen/native/Itertools.cpp b/aten/src/ATen/native/Itertools.cpp
@@ -13,6 +13,7 @@
 #include <ATen/ops/full.h>
 #include <ATen/ops/meshgrid.h>
 #include <ATen/ops/stack.h>
+#include <ATen/ops/zeros_like_ops.h>
 #endif
 
 #include <vector>

diff --git a/aten/src/ATen/native/Linear.cpp b/aten/src/ATen/native/Linear.cpp
@@ -4,6 +4,7 @@
 #include <ATen/native/xnnpack/Engine.h>
 #include <ATen/WrapDimUtilsMulti.h>
 #include <ATen/TensorOperators.h>
+#include <ATen/native/xnnpack/Engine.h>
 #include <c10/util/irange.h>
 #include <c10/core/SymInt.h>
 #include <c10/util/MaybeOwned.h>
@@ -27,9 +28,11 @@
 #include <ATen/ops/mul.h>
 #include <ATen/ops/tensordot_native.h>
 #include <ATen/ops/zeros.h>
+#include <ATen/ops/zeros_like_ops.h>
 #endif
 
 #include <cctype>
+#include <sstream>
 #include <string>
 #include <utility>
 #include <vector>

diff --git a/aten/src/ATen/native/LinearAlgebra.h b/aten/src/ATen/native/LinearAlgebra.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <ATen/native/DispatchStub.h>
+#include <c10/util/Optional.h>
 
 namespace c10 {
 class Scalar;

diff --git a/aten/src/ATen/native/Pow.cpp b/aten/src/ATen/native/Pow.cpp
@@ -3,6 +3,7 @@
 
 #include <ATen/core/Tensor.h>
 #include <ATen/ScalarOps.h>
+#include <ATen/native/Resize.h>
 
 #ifndef AT_PER_OPERATOR_HEADERS
 #include <ATen/Functions.h>

diff --git a/aten/src/ATen/native/Pow.h b/aten/src/ATen/native/Pow.h
@@ -8,6 +8,7 @@ class Scalar;
 
 namespace at {
 
+struct TensorIterator;
 struct TensorIteratorBase;
 
 namespace native {

diff --git a/aten/src/ATen/native/TensorAdvancedIndexing.cpp b/aten/src/ATen/native/TensorAdvancedIndexing.cpp
@@ -116,10 +116,8 @@
 #include <ATen/ops/masked_scatter_native.h>
 #include <ATen/ops/masked_select_backward_native.h>
 #include <ATen/ops/masked_select_native.h>
-#include <ATen/ops/nested_to_padded_tensor_native.h>
 #include <ATen/ops/nonzero_native.h>
 #include <ATen/ops/nonzero_numpy_native.h>
-#include <ATen/ops/nonzero_static_native.h>
 #include <ATen/ops/ones_like.h>
 #include <ATen/ops/put_native.h>
 #include <ATen/ops/quantize_per_tensor.h>

diff --git a/aten/src/ATen/native/TensorConversions.cpp b/aten/src/ATen/native/TensorConversions.cpp
@@ -20,19 +20,13 @@
 #include <ATen/ops/_sparse_bsc_tensor_unsafe_native.h>
 #include <ATen/ops/_sparse_bsr_tensor_unsafe_native.h>
 #include <ATen/ops/_sparse_compressed_tensor_unsafe_native.h>
-#include <ATen/ops/_sparse_coo_tensor_with_dims_native.h>
 #include <ATen/ops/_sparse_coo_tensor_unsafe_native.h>
 #include <ATen/ops/_sparse_csc_tensor_unsafe_native.h>
 #include <ATen/ops/_sparse_csr_tensor_unsafe_native.h>
 #include <ATen/ops/_to_copy.h>
 #include <ATen/ops/_to_copy_native.h>
 #include <ATen/ops/_to_cpu_native.h>
 #include <ATen/ops/_to_dense_native.h>
-#include <ATen/ops/_to_sparse_bsc_native.h>
-#include <ATen/ops/_to_sparse_bsr_native.h>
-#include <ATen/ops/_to_sparse_csc_native.h>
-#include <ATen/ops/_to_sparse_csr_native.h>
-#include <ATen/ops/_to_sparse_native.h>
 #include <ATen/ops/arange_native.h>
 #include <ATen/ops/empty.h>
 #include <ATen/ops/empty_like.h>

diff --git a/aten/src/ATen/native/mkldnn/OpContext.cpp b/aten/src/ATen/native/mkldnn/OpContext.cpp
@@ -1,7 +1,7 @@
+#include <ATen/native/mkldnn/ConvPrepack.h>
 #include <ATen/native/mkldnn/OpContext.h>
 
 #if AT_MKLDNN_ENABLED()
-#include <ATen/native/mkldnn/ConvPrepack.h>
 
 namespace at {
 namespace native {