remoeved iostream from sycl headers

raaiq1 · raaiq1 · commit f2b5f896b156 · 2022-06-17T14:33:38.000-07:00
Signed-off-by: Rauf, Rana &lt;rana.rauf@intel.com&gt;
diff --git a/sycl/include/CL/sycl/backend_types.hpp b/sycl/include/CL/sycl/backend_types.hpp
@@ -10,9 +10,9 @@
 
 #include <CL/sycl/detail/defines.hpp>
 
-#include <fstream>
-#include <iostream>
-#include <istream>
+// #include <fstream>
+// #include <iostream>
+// #include <istream>
 #include <string>
 
 __SYCL_INLINE_NAMESPACE(cl) {
diff --git a/sycl/plugins/level_zero/pi_level_zero.hpp b/sycl/plugins/level_zero/pi_level_zero.hpp
@@ -23,7 +23,7 @@
 #include <cassert>
 #include <cstring>
 #include <functional>
-#include <iostream>
+//#include <iostream>
 #include <list>
 #include <map>
 #include <memory>
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 <cstdio>
 
 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,7 +12,7 @@
 #include <cassert>
 #include <cctype>
 #include <iomanip>
-#include <iostream>
+#include <cstdio>
 #include <list>
 #include <memory>
 #include <mutex>
@@ -24,7 +24,6 @@
 
 #include "usm_allocator.hpp"
 #include <CL/sycl/detail/spinlock.hpp>
-//#include <iostream>
 
 // USM allocations are a minimum of 4KB/64KB/2MB even when a smaller size is
 // requested. The implementation distinguishes between allocations of size
diff --git a/sycl/source/detail/persistent_device_code_cache.cpp b/sycl/source/detail/persistent_device_code_cache.cpp
@@ -12,6 +12,7 @@
 #include <detail/program_manager/program_manager.hpp>
 
 #include <cstdio>
+#include <fstream>
 #include <optional>
 
 #if defined(__SYCL_RT_OS_LINUX)
diff --git a/sycl/source/detail/pi.cpp b/sycl/source/detail/pi.cpp
@@ -26,7 +26,7 @@
 #include <bitset>
 #include <cstdarg>
 #include <cstring>
-#include <iostream>
+#include <cstdio>
 #include <map>
 #include <sstream>
 #include <stddef.h>
diff --git a/sycl/source/detail/plugin_printers.hpp b/sycl/source/detail/plugin_printers.hpp
@@ -19,44 +19,13 @@ namespace sycl {
 namespace detail {
 namespace pi {
 
-inline void __plugin__print(const bool val){
-  printf("%s",val?"true":"false");
-}
-// inline void __plugin__print(const float val){
-//   printf("%f",val);
-// }
-inline void __plugin__print(const double val){
-  printf("%lf",val);
-}
-inline void __plugin__print(const long double val){
-  printf("%Lf",val);
-}
-// inline void __plugin__print(const short val){
-//   printf("%hi",val);
-// }
-// inline void __plugin__print(const unsigned short val){
-//   printf("%hu",val);
-// }
-// inline void __puglin__print(const int val){
-//   printf("%d",val);
-// }
-// inline void __plugin__print(const unsigned int val){
-//   printf("%u",val);
-// }
-inline void __plugin__print(const long val){
-  printf("%ld",val);
-}
-inline void __plugin__print(const unsigned long val){
-  printf("%lu",val);
-}
-inline void __plugin__print(const std::string val){
-  printf("%s",val.c_str());
-}
+
+//Note:Casting val to unsigned long may not work for all function specializations
 template <typename T>
 inline typename std::enable_if<!std::is_pointer<T>::value, void>::type
 print(T val) {
   printf("<unknown> : ");
-  std::cout << val;
+  printf("%lu",(unsigned long)val);
   printf("\n");
 }
 template <typename T>
diff --git a/sycl/source/detail/program_impl.hpp b/sycl/source/detail/program_impl.hpp
@@ -20,7 +20,7 @@
 
 #include <algorithm>
 #include <cassert>
-#include <fstream>
+//#include <fstream>
 #include <memory>
 #include <mutex>
 
diff --git a/sycl/source/detail/program_manager/program_manager.cpp b/sycl/source/detail/program_manager/program_manager.cpp
@@ -32,6 +32,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <fstream>
+#include <iostream>
 #include <memory>
 #include <mutex>
 #include <sstream>
diff --git a/sycl/source/detail/spec_constant_impl.cpp b/sycl/source/detail/spec_constant_impl.cpp
@@ -14,7 +14,8 @@
 #include <CL/sycl/exception.hpp>
 
 #include <cstring>
-#include <iostream>
+#include <cstdio>
+//#include <iostream>
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {
diff --git a/sycl/test/basic_tests/accessor/atomic_zero_dimension_accessor.cpp b/sycl/test/basic_tests/accessor/atomic_zero_dimension_accessor.cpp
@@ -7,6 +7,7 @@
 // with the __ENABLE_USM_ADDR_SPACE__ macro.
 
 #include <CL/sycl.hpp>
+#include <iostream>
 
 using namespace sycl;
 
diff --git a/sycl/test/basic_tests/exceptions-SYCL-2020.cpp b/sycl/test/basic_tests/exceptions-SYCL-2020.cpp
@@ -2,6 +2,7 @@
 // RUN: %RUN_ON_HOST %t.out
 
 #include <CL/sycl.hpp>
+#include <iostream>
 
 using namespace cl::sycl;
 
diff --git a/sycl/test/basic_tests/offset-accessor-get_pointer.cpp b/sycl/test/basic_tests/offset-accessor-get_pointer.cpp
@@ -13,6 +13,7 @@
 
 #include <CL/sycl.hpp>
 #include <vector>
+#include <iostream>
 using namespace cl::sycl;
 
 void test_across_ranges() {
diff --git a/sycl/test/basic_tests/reduction_ctor.cpp b/sycl/test/basic_tests/reduction_ctor.cpp
@@ -7,6 +7,7 @@
 #include "reduction_utils.hpp"
 #include <CL/sycl.hpp>
 #include <cassert>
+#include <iostream>
 
 using namespace cl::sycl;
 
diff --git a/sycl/test/extensions/fpga.cpp b/sycl/test/extensions/fpga.cpp
@@ -4,6 +4,7 @@
 #include <sycl/ext/intel/fpga_extensions.hpp>
 
 #include <type_traits>
+#include <iostream>
 
 namespace intelfpga {
 template <unsigned ID> struct ethernet_pipe_id {
diff --git a/sycl/test/extensions/group-algorithm.cpp b/sycl/test/extensions/group-algorithm.cpp
@@ -16,6 +16,7 @@
 #include <cassert>
 #include <limits>
 #include <numeric>
+#include <iostream>
 using namespace sycl;
 using namespace sycl::ext::oneapi;
 
diff --git a/sycl/test/helpers.hpp b/sycl/test/helpers.hpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <CL/sycl.hpp>
-
+#include <iostream>
 
 using namespace cl;
 
diff --git a/sycl/unittests/config/ConfigTests.cpp b/sycl/unittests/config/ConfigTests.cpp
@@ -9,6 +9,7 @@
 #include <detail/config.hpp>
 #include <gtest/gtest.h>
 #include <regex>
+#include <fstream>
 
 TEST(ConfigTests, CheckConfigProcessing) {
 #ifdef _WIN32
diff --git a/sycl/unittests/kernel-and-program/PersistentDeviceCodeCache.cpp b/sycl/unittests/kernel-and-program/PersistentDeviceCodeCache.cpp
@@ -18,6 +18,7 @@
 #include <llvm/Support/FileSystem.h>
 #include <optional>
 #include <vector>
+#include <fstream>
 
 #define ASSERT_NO_ERROR(x)                                                     \
   if (std::error_code EC = x) {                                                \
diff --git a/sycl/unittests/pi/TestGetPlugin.hpp b/sycl/unittests/pi/TestGetPlugin.hpp
@@ -9,7 +9,7 @@
 #include <detail/plugin.hpp>
 #include <functional>
 #include <optional>
-
+#include <iostream>
 namespace pi {
 inline std::optional<cl::sycl::detail::plugin>
 initializeAndGet(cl::sycl::backend backend) {
