RR[SYCL]emoved <iostream>from header and source files

raaiq1 · raaiq1 · commit 83ec9fa04f4b · 2022-07-22T13:30:06.000-07:00
Signed-off-by: Rauf, Rana &lt;rana.rauf@intel.com&gt;
diff --git a/sycl/include/sycl/backend_types.hpp b/sycl/include/sycl/backend_types.hpp
@@ -11,9 +11,9 @@
 #include <sycl/detail/defines.hpp>
 
 #include <fstream>
-#include <iostream>
 #include <istream>
 #include <string>
+#include <sycl/detail/iostream_proxy.hpp>
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {
diff --git a/sycl/include/sycl/detail/common.hpp b/sycl/include/sycl/detail/common.hpp
@@ -116,7 +116,7 @@ static inline std::string codeToString(pi_int32 code) {
                           "Native API returns: "
 
 #ifndef __SYCL_SUPPRESS_PI_ERROR_REPORT
-#include <iostream>
+#include <sycl/detail/iostream_proxy.hpp>
 // TODO: rename all names with direct use of OCL/OPENCL to be backend agnostic.
 #define __SYCL_REPORT_PI_ERR_TO_STREAM(expr)                                   \
   {                                                                            \
diff --git a/sycl/include/sycl/detail/device_filter.hpp b/sycl/include/sycl/detail/device_filter.hpp
@@ -12,8 +12,8 @@
 #include <sycl/detail/defines.hpp>
 #include <sycl/info/info_desc.hpp>
 
-#include <iostream>
 #include <string>
+#include <sycl/detail/iostream_proxy.hpp>
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {
diff --git a/sycl/include/sycl/detail/image_accessor_util.hpp b/sycl/include/sycl/detail/image_accessor_util.hpp
@@ -20,7 +20,7 @@
 #include <sycl/types.hpp>
 
 #include <cmath>
-#include <iostream>
+#include <sycl/detail/iostream_proxy.hpp>
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {
diff --git a/sycl/include/sycl/detail/iostream_proxy.hpp b/sycl/include/sycl/detail/iostream_proxy.hpp
@@ -0,0 +1,12 @@
+#ifndef IOSTREAM_PROXY_HPP
+#define IOSTREAM_PROXY_HPP 1
+#include <istream>
+#include <ostream>
+
+namespace std {
+extern istream cin;  /// Linked to standard input
+extern ostream cout; /// Linked to standard output
+extern ostream cerr; /// Linked to standard error (unbuffered)
+extern ostream clog; /// Linked to standard error (buffered)
+} // namespace std
+#endif
diff --git a/sycl/include/sycl/half_type.hpp b/sycl/include/sycl/half_type.hpp
@@ -13,8 +13,8 @@
 #include <sycl/detail/type_traits.hpp>
 
 #include <functional>
-#include <iostream>
 #include <limits>
+#include <sycl/detail/iostream_proxy.hpp>
 
 #if !__has_builtin(__builtin_expect)
 #define __builtin_expect(a, b) (a)
diff --git a/sycl/plugins/esimd_emulator/pi_esimd_emulator.cpp b/sycl/plugins/esimd_emulator/pi_esimd_emulator.cpp
@@ -42,6 +42,7 @@
 #include <utility>
 
 #include "pi_esimd_emulator.hpp"
+#include <iostream>
 
 #define ARG_UNUSED(x) (void)x
 
diff --git a/sycl/plugins/esimd_emulator/pi_esimd_emulator.hpp b/sycl/plugins/esimd_emulator/pi_esimd_emulator.hpp
@@ -16,8 +16,8 @@
 
 #include <atomic>
 #include <cassert>
-#include <iostream>
 #include <mutex>
+#include <sycl/detail/iostream_proxy.hpp>
 #include <sycl/detail/pi.h>
 #include <unordered_map>
 
diff --git a/sycl/plugins/level_zero/pi_level_zero.hpp b/sycl/plugins/level_zero/pi_level_zero.hpp
@@ -29,13 +29,13 @@
 #include <cassert>
 #include <cstring>
 #include <functional>
-#include <iostream>
 #include <list>
 #include <map>
 #include <memory>
 #include <mutex>
 #include <shared_mutex>
 #include <string>
+#include <sycl/detail/iostream_proxy.hpp>
 #include <sycl/detail/pi.h>
 #include <unordered_map>
 #include <unordered_set>
diff --git a/sycl/plugins/level_zero/tracing.cpp b/sycl/plugins/level_zero/tracing.cpp
@@ -12,7 +12,7 @@
 #include <level_zero/ze_api.h>
 #include <xpti/xpti_trace_framework.h>
 
-#include <iostream>
+#include <sycl/detail/iostream_proxy.hpp>
 
 constexpr auto ZE_CALL_STREAM_NAME = "sycl.experimental.level_zero.call";
 constexpr auto ZE_DEBUG_STREAM_NAME = "sycl.experimental.level_zero.debug";
diff --git a/sycl/plugins/level_zero/usm_allocator.cpp b/sycl/plugins/level_zero/usm_allocator.cpp
@@ -12,18 +12,17 @@
 #include <cassert>
 #include <cctype>
 #include <iomanip>
-#include <iostream>
 #include <list>
 #include <memory>
 #include <mutex>
 #include <shared_mutex>
 #include <string>
+#include <sycl/detail/iostream_proxy.hpp>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
 #include "usm_allocator.hpp"
-#include <iostream>
 #include <sycl/detail/spinlock.hpp>
 
 // USM allocations are a minimum of 4KB/64KB/2MB even when a smaller size is
diff --git a/sycl/plugins/opencl/pi_opencl.cpp b/sycl/plugins/opencl/pi_opencl.cpp
@@ -23,11 +23,11 @@
 #include <algorithm>
 #include <cassert>
 #include <cstring>
-#include <iostream>
 #include <limits>
 #include <map>
 #include <sstream>
 #include <string>
+#include <sycl/detail/iostream_proxy.hpp>
 #include <vector>
 
 #define CHECK_ERR_SET_NULL_RET(err, ptr, reterr)                               \
diff --git a/sycl/source/detail/config.cpp b/sycl/source/detail/config.cpp
@@ -13,8 +13,8 @@
 
 #include <cstring>
 #include <fstream>
-#include <iostream>
 #include <limits>
+#include <sycl/detail/iostream_proxy.hpp>
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {
diff --git a/sycl/source/detail/pi.cpp b/sycl/source/detail/pi.cpp
@@ -26,11 +26,11 @@
 #include <bitset>
 #include <cstdarg>
 #include <cstring>
-#include <iostream>
 #include <map>
 #include <sstream>
 #include <stddef.h>
 #include <string>
+#include <sycl/detail/iostream_proxy.hpp>
 
 #ifdef XPTI_ENABLE_INSTRUMENTATION
 // Include the headers necessary for emitting
diff --git a/sycl/source/detail/spec_constant_impl.cpp b/sycl/source/detail/spec_constant_impl.cpp
@@ -14,7 +14,7 @@
 #include <sycl/exception.hpp>
 
 #include <cstring>
-#include <iostream>
+#include <sycl/detail/iostream_proxy.hpp>
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {
diff --git a/sycl/source/detail/spec_constant_impl.hpp b/sycl/source/detail/spec_constant_impl.hpp
@@ -12,8 +12,8 @@
 #include <sycl/detail/util.hpp>
 #include <sycl/stl.hpp>
 
-#include <iostream>
 #include <map>
+#include <sycl/detail/iostream_proxy.hpp>
 #include <vector>
 
 __SYCL_INLINE_NAMESPACE(cl) {
