Revert "Remove some unnecessary <iostream> includes from headers (#106914)"

This reverts commit a6c29b722772816804d54eed070fbb38450d3e6f. Reverted https://github.com/pytorch/pytorch/pull/106914 on behalf of https://github.com/izaitsevfb due to Causing metal breakage internally, see D48709279 ([comment](https://github.com/pytorch/pytorch/pull/106914#issuecomment-1696670027))
2025-10-20 21:14:14 +08:00 · 2023-08-29 02:22:33 +00:00
parent 2f226804a0
commit 378ffde8c1
57 changed files with 47 additions and 53 deletions
--- a/.github/ci_commit_pins/xla.txt
+++ b/.github/ci_commit_pins/xla.txt
@ -1 +1 @@
-c3c16ccac41cb2db6ba88fb31342f4af62c7e15a
+709c75a04d9b35d83a9509e1534a8aa2046b8912
--- a/aten/src/ATen/DLConvertor.cpp
+++ b/aten/src/ATen/DLConvertor.cpp
@ -1,6 +1,9 @@
 #include <ATen/DLConvertor.h>
 #include <ATen/Functions.h>

+#include <iostream>
+#include <sstream>
+
 using namespace std;
 namespace at {

--- a/aten/src/ATen/autocast_mode.cpp
+++ b/aten/src/ATen/autocast_mode.cpp
@ -1,5 +1,6 @@
 #include <ATen/autocast_mode.h>

+#include <iostream>
 #include <exception>
 #include <mutex>
 #include <ATen/CachedTensorUtils.h>
--- a/aten/src/ATen/core/Range.cpp
+++ b/aten/src/ATen/core/Range.cpp
@ -1,6 +1,6 @@
 #include <ATen/core/Range.h>

-#include <ostream>
+#include <iostream>

 namespace at {

--- a/aten/src/ATen/core/dispatch/Dispatcher.h
+++ b/aten/src/ATen/core/dispatch/Dispatcher.h
@ -18,10 +18,6 @@
 #include <ATen/core/grad_mode.h>
 #include <ATen/core/enum_tag.h>

-#ifndef NDEBUG
-#include <iostream>
-#endif
-
 namespace c10 {

 TORCH_API bool show_dispatch_trace();
--- a/aten/src/ATen/core/function_schema_inl.h
+++ b/aten/src/ATen/core/function_schema_inl.h
@ -1,6 +1,5 @@
 #pragma once
-#include <ostream>
-#include <sstream>
+#include <iostream>

 // note: windows build doesn't find symbols in operator files unless
 // this is a header file
--- a/aten/src/ATen/core/interned_strings.cpp
+++ b/aten/src/ATen/core/interned_strings.cpp
@ -4,6 +4,7 @@
 #include <ATen/core/interned_strings.h>
 #include <cstdint>
 #include <cstring>
+#include <iostream>
 #include <mutex>
 #include <sstream>
 #include <string>
--- a/aten/src/ATen/core/union_type.cpp
+++ b/aten/src/ATen/core/union_type.cpp
@ -7,8 +7,7 @@
 #include <ATen/core/type_factory.h>
 #include <c10/macros/Macros.h>
 #include <c10/util/irange.h>
-#include <ostream>
-#include <sstream>
+#include <iostream>
 #include <utility>

 namespace c10 {
--- a/aten/src/ATen/cpu/vec/vec256/vec256_int.h
+++ b/aten/src/ATen/cpu/vec/vec256/vec256_int.h
@ -7,6 +7,7 @@
 #include <ATen/cpu/vec/vec_base.h>
 #include <c10/macros/Macros.h>
 #include <c10/util/irange.h>
+#include <iostream>

 namespace at {
 namespace vec {
--- a/aten/src/ATen/cpu/vec/vec256/vec256_qint.h
+++ b/aten/src/ATen/cpu/vec/vec256/vec256_qint.h
@ -14,6 +14,7 @@

 #include <array>
 #include <cmath>
+#include <iostream>

 // This file defines Vectorized<> for the quantized types.
 //
--- a/aten/src/ATen/cpu/vec/vec512/vec512.h
+++ b/aten/src/ATen/cpu/vec/vec512/vec512.h
@ -18,7 +18,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
-#include <ostream>
+#include <iostream>

 namespace at {
 namespace vec {
--- a/aten/src/ATen/functorch/TensorWrapper.cpp
+++ b/aten/src/ATen/functorch/TensorWrapper.cpp
@ -11,8 +11,6 @@
 #include <torch/library.h>
 #include <ATen/core/dispatch/Dispatcher.h>

-#include <iostream>
-
 namespace at {
 namespace functorch {

--- a/c10/util/logging_is_not_google_glog.h
+++ b/c10/util/logging_is_not_google_glog.h
@ -4,9 +4,9 @@
 #include <chrono>
 #include <climits>
 #include <ctime>
+#include <fstream>
 #include <iomanip>
 #include <map>
-#include <ostream>
 #include <set>
 #include <sstream>
 #include <string>
--- a/functorch/csrc/dim/minpybind.h
+++ b/functorch/csrc/dim/minpybind.h
@ -8,7 +8,7 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <utility>
-#include <ostream>
+#include <iostream>
 #include <memory>

 #define PY_BEGIN try {
--- a/torch/csrc/Module.cpp
+++ b/torch/csrc/Module.cpp
@ -28,7 +28,6 @@
 #include <torch/csrc/THConcat.h>
 #include <torch/csrc/utils/pybind.h>
 #include <cstdlib>
-#include <iostream>
 #include <unordered_map>

 #include <ATen/ThreadLocalPythonObjects.h>
--- a/torch/csrc/dynamo/compiled_autograd.h
+++ b/torch/csrc/dynamo/compiled_autograd.h
@ -4,6 +4,7 @@
 #include <torch/csrc/autograd/engine.h>
 #include <torch/csrc/utils/python_stub.h>
 #include <torch/csrc/utils/torch_dispatch_mode.h>
+#include <iostream>
 #include <typeindex>
 #include <vector>

--- a/torch/csrc/functorch/init.cpp
+++ b/torch/csrc/functorch/init.cpp
@ -18,8 +18,6 @@
 #include <ATen/functorch/TensorWrapper.h>
 #include <c10/core/AutogradState.h>

-#include <iostream>
-
 // This file contains functorch's Python bindings.

 namespace torch {
--- a/torch/csrc/jit/api/module.cpp
+++ b/torch/csrc/jit/api/module.cpp
@ -19,8 +19,6 @@
 #include <torch/csrc/jit/passes/inliner.h>
 #include <torch/csrc/jit/runtime/operator.h>

-#include <iostream>
-
 namespace torch::jit {

 namespace {
--- a/torch/csrc/jit/codegen/fuser/codegen.h
+++ b/torch/csrc/jit/codegen/fuser/codegen.h
@ -6,7 +6,9 @@
 #include <torch/csrc/jit/codegen/fuser/tensor_desc.h>
 #include <torch/csrc/jit/ir/ir.h>

+#include <iostream>
 #include <string>
+#include <tuple>
 #include <vector>

 namespace torch {
--- a/torch/csrc/jit/codegen/fuser/tensor_desc.h
+++ b/torch/csrc/jit/codegen/fuser/tensor_desc.h
@ -7,7 +7,7 @@
 #include <torch/csrc/Export.h>

 #include <algorithm>
-#include <ostream>
+#include <iostream>
 #include <vector>

 namespace torch {
--- a/torch/csrc/jit/frontend/concrete_module_type.cpp
+++ b/torch/csrc/jit/frontend/concrete_module_type.cpp
@ -3,8 +3,6 @@
 #include <c10/util/irange.h>
 #include <torch/csrc/jit/python/pybind_utils.h>

-#include <iostream>
-
 namespace torch::jit {

 ClassTypePtr ConcreteModuleTypeBuilder::createTypeFromThis() const {
--- a/torch/csrc/jit/frontend/source_range.h
+++ b/torch/csrc/jit/frontend/source_range.h
@ -3,11 +3,10 @@
 #include <c10/util/Optional.h>

 #include <algorithm>
+#include <iostream>
 #include <iterator>
 #include <memory>
 #include <numeric>
-#include <ostream>
-#include <sstream>
 #include <unordered_map>

 namespace torch {
--- a/torch/csrc/jit/frontend/tracer.h
+++ b/torch/csrc/jit/frontend/tracer.h
@ -12,6 +12,7 @@
 #include <torch/csrc/utils/variadic.h>

 #include <cstdint>
+#include <iostream>
 #include <memory>
 #include <mutex>
 #include <unordered_map>
--- a/torch/csrc/jit/ir/alias_analysis.cpp
+++ b/torch/csrc/jit/ir/alias_analysis.cpp
@ -10,7 +10,6 @@
 #include <torch/csrc/jit/runtime/operator.h>
 #include <torch/csrc/utils/memory.h>
 #include <fstream>
-#include <iostream>

 namespace torch::jit {

--- a/torch/csrc/jit/ir/ir.h
+++ b/torch/csrc/jit/ir/ir.h
@ -23,7 +23,7 @@
 #include <c10/util/Optional.h>

 #include <functional>
-#include <iosfwd>
+#include <iostream>
 #include <unordered_set>
 #include <vector>

--- a/torch/csrc/jit/jit_log.cpp
+++ b/torch/csrc/jit/jit_log.cpp
@ -1,6 +1,5 @@
 #include <cstdlib>
 #include <iomanip>
-#include <iostream>
 #include <sstream>
 #include <string>
 #include <unordered_map>
--- a/torch/csrc/jit/mobile/model_tracer/MobileModelRunner.h
+++ b/torch/csrc/jit/mobile/model_tracer/MobileModelRunner.h
@ -1,5 +1,6 @@
 #pragma once

+#include <iostream>
 #include <mutex>
 #include <sstream>

--- a/torch/csrc/jit/mobile/register_ops_common_utils.h
+++ b/torch/csrc/jit/mobile/register_ops_common_utils.h
@ -7,6 +7,8 @@
 #include <torch/csrc/jit/runtime/jit_exception.h>
 #include <torch/csrc/jit/runtime/vararg_functions.h>

+#include <iostream>
+
 namespace torch {
 namespace jit {

--- a/torch/csrc/jit/operator_upgraders/upgraders.h
+++ b/torch/csrc/jit/operator_upgraders/upgraders.h
@ -1,6 +1,7 @@
 #pragma once
 #include <c10/macros/Export.h>
 #include <torch/csrc/jit/ir/ir.h>
+#include <iostream>
 #include <mutex>
 #include <string>
 #include <unordered_map>
--- a/torch/csrc/jit/operator_upgraders/upgraders_entry.h
+++ b/torch/csrc/jit/operator_upgraders/upgraders_entry.h
@ -1,8 +1,11 @@
 #pragma once
 #include <c10/macros/Export.h>
 #include <torch/csrc/jit/ir/ir.h>
+#include <iostream>
+#include <mutex>
 #include <string>
 #include <unordered_map>
+#include <vector>

 namespace torch {
 namespace jit {
--- a/torch/csrc/jit/operator_upgraders/utils.h
+++ b/torch/csrc/jit/operator_upgraders/utils.h
@ -2,6 +2,8 @@
 #include <c10/macros/Export.h>
 #include <c10/util/Optional.h>
 #include <torch/csrc/jit/operator_upgraders/version_map.h>
+#include <iostream>
+#include <regex>
 #include <string>
 #include <vector>

--- a/torch/csrc/jit/passes/liveness.cpp
+++ b/torch/csrc/jit/passes/liveness.cpp
@ -3,7 +3,6 @@
 #include <torch/csrc/jit/ir/alias_analysis.h>
 #include <torch/csrc/jit/ir/ir_views.h>
 #include <torch/csrc/jit/passes/constant_pooling.h>
-#include <iostream>
 #include <memory>

 namespace torch {
--- a/torch/csrc/jit/passes/onnx/pattern_conversion/pattern_conversion.cpp
+++ b/torch/csrc/jit/passes/onnx/pattern_conversion/pattern_conversion.cpp
@ -7,8 +7,6 @@

 #include <ATen/ScalarOps.h>

-#include <iostream>
-
 // EDITING THIS FILE? READ THIS FIRST!
 // see Note [Edit Pattern Conversion] in pattern_conversion.h

--- a/torch/csrc/jit/passes/remove_inplace_ops.cpp
+++ b/torch/csrc/jit/passes/remove_inplace_ops.cpp
@ -1,5 +1,4 @@
 #include <torch/csrc/jit/passes/remove_inplace_ops.h>
-#include <iostream>

 namespace torch {
 namespace jit {
--- a/torch/csrc/jit/runtime/argument_spec.cpp
+++ b/torch/csrc/jit/runtime/argument_spec.cpp
@ -1,8 +1,6 @@
 #include <c10/util/irange.h>
 #include <torch/csrc/jit/runtime/argument_spec.h>

-#include <iostream>
-
 namespace torch {
 namespace jit {

--- a/torch/csrc/jit/runtime/argument_spec.h
+++ b/torch/csrc/jit/runtime/argument_spec.h
@ -7,7 +7,7 @@
 #include <torch/csrc/Export.h>
 #include <torch/csrc/autograd/variable.h>
 #include <torch/csrc/jit/ir/ir.h>
-#include <ostream>
+#include <iostream>
 #include <vector>

 C10_CLANG_DIAGNOSTIC_PUSH()
--- a/torch/csrc/jit/runtime/print_handler.cpp
+++ b/torch/csrc/jit/runtime/print_handler.cpp
@ -1,6 +1,5 @@
 #include <torch/csrc/jit/runtime/print_handler.h>

-#include <atomic>
 #include <iostream>
 #include <string>

--- a/torch/csrc/jit/runtime/print_handler.h
+++ b/torch/csrc/jit/runtime/print_handler.h
@ -2,7 +2,9 @@

 #include <torch/csrc/Export.h>

-#include <string>
+#include <atomic>
+#include <functional>
+#include <iostream>

 namespace torch {
 namespace jit {
--- a/torch/csrc/jit/runtime/static/impl.cpp
+++ b/torch/csrc/jit/runtime/static/impl.cpp
@ -28,7 +28,6 @@
 #include <torch/csrc/jit/runtime/vararg_functions.h>
 #include <algorithm>
 #include <cstdint>
-#include <iostream>

 #ifndef AT_PER_OPERATOR_HEADERS
 #include <ATen/NativeFunctions.h>
--- a/torch/csrc/jit/serialization/python_print.h
+++ b/torch/csrc/jit/serialization/python_print.h
@ -2,6 +2,7 @@
 #include <torch/csrc/Export.h>
 #include <torch/csrc/jit/api/module.h>
 #include <torch/csrc/jit/ir/ir.h>
+#include <iostream>
 #include <vector>

 namespace torch {
--- a/torch/csrc/jit/tensorexpr/bounds_inference.cpp
+++ b/torch/csrc/jit/tensorexpr/bounds_inference.cpp
@ -10,8 +10,6 @@

 #include <c10/util/irange.h>

-#include <iostream>
-
 namespace torch::jit::tensorexpr {

 using namespace analysis;
--- a/torch/csrc/jit/tensorexpr/bounds_overlap.cpp
+++ b/torch/csrc/jit/tensorexpr/bounds_overlap.cpp
@ -3,8 +3,6 @@
 #include <torch/csrc/jit/tensorexpr/ir_visitor.h>
 #include <torch/csrc/jit/tensorexpr/stmt.h>

-#include <iostream>
-
 namespace torch::jit::tensorexpr::analysis {

 // Returns true if the given expression is guaranteed to be positive.
--- a/torch/csrc/jit/tensorexpr/ir_printer.cpp
+++ b/torch/csrc/jit/tensorexpr/ir_printer.cpp
@ -6,8 +6,6 @@

 #include <c10/util/irange.h>

-#include <iostream>
-
 namespace torch::jit::tensorexpr {

 std::string IRPrinter::dtypeToCppString(const Dtype& dtype) {
--- a/torch/csrc/jit/tensorexpr/ir_printer.h
+++ b/torch/csrc/jit/tensorexpr/ir_printer.h
@ -1,6 +1,6 @@
 #pragma once

-#include <ostream>
+#include <iostream>

 #include <torch/csrc/jit/tensorexpr/fwd_decls.h>
 #include <torch/csrc/jit/tensorexpr/ir.h>
--- a/torch/csrc/jit/tensorexpr/ir_verifier.h
+++ b/torch/csrc/jit/tensorexpr/ir_verifier.h
@ -1,5 +1,7 @@
 #pragma once

+#include <iostream>
+
 #include <torch/csrc/jit/tensorexpr/fwd_decls.h>
 #include <torch/csrc/jit/tensorexpr/ir_visitor.h>

--- a/torch/csrc/jit/tensorexpr/loopnest.cpp
+++ b/torch/csrc/jit/tensorexpr/loopnest.cpp
@ -1,7 +1,6 @@
 #include <torch/csrc/jit/tensorexpr/loopnest.h>

 #include <algorithm>
-#include <iostream>
 #include <stdexcept>
 #include <typeinfo>
 #include <unordered_map>
--- a/torch/csrc/jit/tensorexpr/loopnest_randomization.cpp
+++ b/torch/csrc/jit/tensorexpr/loopnest_randomization.cpp
@ -1,5 +1,4 @@
 #include <algorithm>
-#include <iostream>
 #include <random>
 #include <stdexcept>
 #include <typeinfo>
--- a/torch/csrc/jit/tensorexpr/mem_dependency_checker.cpp
+++ b/torch/csrc/jit/tensorexpr/mem_dependency_checker.cpp
@ -3,7 +3,6 @@
 #include <c10/util/irange.h>

 #include <fstream>
-#include <iostream>

 namespace torch::jit::tensorexpr::analysis {

--- a/torch/csrc/jit/tensorexpr/registerizer.cpp
+++ b/torch/csrc/jit/tensorexpr/registerizer.cpp
@ -1,5 +1,4 @@
 #include <torch/csrc/jit/tensorexpr/registerizer.h>
-#include <iostream>

 namespace torch::jit::tensorexpr {
 namespace registerizer {
--- a/torch/csrc/jit/tensorexpr/types.h
+++ b/torch/csrc/jit/tensorexpr/types.h
@ -1,7 +1,7 @@
 #pragma once

 #include <cstdint>
-#include <iosfwd>
+#include <iostream>

 #include <c10/core/ScalarType.h>
 #include <c10/util/Logging.h>
--- a/torch/csrc/lazy/core/debug_util.h
+++ b/torch/csrc/lazy/core/debug_util.h
@ -1,5 +1,6 @@
 #pragma once

+#include <iostream>
 #include <string>
 #include <vector>

--- a/torch/csrc/profiler/unwind/action.h
+++ b/torch/csrc/profiler/unwind/action.h
@ -1,6 +1,6 @@
 #pragma once
 #include <stdint.h>
-#include <ostream>
+#include <iostream>

 enum {
  A_UNDEFINED = 0x0,
--- a/torch/csrc/profiler/unwind/eh_frame_hdr.h
+++ b/torch/csrc/profiler/unwind/eh_frame_hdr.h
@ -1,6 +1,6 @@
 #pragma once
 #include <stdint.h>
-#include <ostream>
+#include <iostream>

 #include <torch/csrc/profiler/unwind/lexer.h>
 #include <torch/csrc/profiler/unwind/unwind_error.h>
--- a/torch/csrc/profiler/unwind/unwinder.h
+++ b/torch/csrc/profiler/unwind/unwinder.h
@ -2,6 +2,7 @@
 #include <stdint.h>
 #include <torch/csrc/profiler/unwind/action.h>
 #include <torch/csrc/profiler/unwind/unwind_error.h>
+#include <iostream>
 #include <limits>

 struct UnwindState {
--- a/torch/csrc/utils/throughput_benchmark.h
+++ b/torch/csrc/utils/throughput_benchmark.h
@ -7,7 +7,7 @@

 #include <torch/csrc/jit/python/pybind_utils.h>

-#include <iosfwd>
+#include <iostream>
 #include <memory>
 #include <string>
 #include <vector>
--- a/torch/custom_class.h
+++ b/torch/custom_class.h
@ -12,6 +12,7 @@
 #include <c10/util/TypeTraits.h>
 #include <torch/custom_class_detail.h>
 #include <torch/library.h>
+#include <iostream>
 #include <sstream>

 namespace torch {
--- a/torch/lib/libshm/socket.h
+++ b/torch/lib/libshm/socket.h
@ -9,6 +9,8 @@
 #include <cstddef>
 #include <cstdio>
 #include <cstring>
+#include <iostream>
+#include <sstream>
 #include <string>

 #include <libshm/alloc_info.h>