Remove redundant <fstream> includes (NVIDIA#563)

* Remove redundant <fstream> includes * Fix fstream in examples/ * Fix <fstream> in test/ * Use consistent order for <fstream> (always after <iostream>) * Remove an unneeded include in a file where std::ofstream usage is commented out Co-authored-by: Ivan Komarov <dfyz@yandex-team.ru>
pdh930105 · Jul 19, 2022 · 0b8cacd · 0b8cacd
1 parent e7a61c7
commit 0b8cacd
Show file tree

Hide file tree

Showing 35 changed files with 29 additions and 25 deletions.
diff --git a/examples/04_tile_iterator/tile_iterator.cu b/examples/04_tile_iterator/tile_iterator.cu
@@ -50,7 +50,6 @@
 #include <iostream>
 #include <sstream>
 #include <vector>
-#include <fstream>
 
 // CUTLASS includes
 #include "cutlass/transform/threadblock/predicated_tile_iterator.h"

diff --git a/examples/09_turing_tensorop_conv2dfprop/turing_tensorop_conv2dfprop.cu b/examples/09_turing_tensorop_conv2dfprop/turing_tensorop_conv2dfprop.cu
@@ -124,6 +124,7 @@ compare if the output from CUTLASS kernel is same as the reference implicit GEMM
 */
 
 #include <iostream>
+#include <fstream>
 #include <sstream>
 
 #include "cutlass/cutlass.h"

diff --git a/examples/10_planar_complex/planar_complex.cu b/examples/10_planar_complex/planar_complex.cu
@@ -74,7 +74,6 @@
 */
 
 #include <iostream>
-#include <fstream>
 #include <sstream>
 
 #include "cutlass/cutlass.h"

diff --git a/examples/11_planar_complex_array/planar_complex_array.cu b/examples/11_planar_complex_array/planar_complex_array.cu
@@ -72,7 +72,6 @@
 */
 
 #include <iostream>
-#include <fstream>
 #include <sstream>
 
 #include "cutlass/cutlass.h"

diff --git a/examples/16_ampere_tensorop_conv2dfprop/ampere_tensorop_conv2dfprop.cu b/examples/16_ampere_tensorop_conv2dfprop/ampere_tensorop_conv2dfprop.cu
@@ -111,6 +111,7 @@ compare if the output from CUTLASS kernel is same as the reference implicit GEMM
 */
 
 #include <iostream>
+#include <fstream>
 #include <sstream>
 
 #include "cutlass/cutlass.h"

diff --git a/examples/22_quaternion_conv/quaternion_conv.cu b/examples/22_quaternion_conv/quaternion_conv.cu
@@ -30,6 +30,7 @@
  **************************************************************************************************/
 
 #include <iostream>
+#include <fstream>
 #include <sstream>
 
 #include "cutlass/cutlass.h"

diff --git a/examples/23_ampere_gemm_operand_reduction_fusion/ampere_gemm_operand_reduction_fusion.cu b/examples/23_ampere_gemm_operand_reduction_fusion/ampere_gemm_operand_reduction_fusion.cu
@@ -41,6 +41,7 @@ epilogue/threadblock/epilogue_gemm_k_reduction.h
 */
 
 #include <iostream>
+#include <fstream>
 #include <sstream>
 
 #include "cutlass/cutlass.h"

diff --git a/examples/25_ampere_fprop_mainloop_fusion/ampere_fprop_mainloop_fusion.cu b/examples/25_ampere_fprop_mainloop_fusion/ampere_fprop_mainloop_fusion.cu
@@ -52,6 +52,7 @@ line is the same.
 */
 
 #include <iostream>
+#include <fstream>
 #include <sstream>
 
 #include "cutlass/cutlass.h"

diff --git a/examples/26_ampere_wgrad_mainloop_fusion/ampere_wgrad_mainloop_fusion.cu b/examples/26_ampere_wgrad_mainloop_fusion/ampere_wgrad_mainloop_fusion.cu
@@ -49,6 +49,7 @@ technical details.
 */
 
 #include <iostream>
+#include <fstream>
 #include <sstream>
 
 #include "cutlass/cutlass.h"

diff --git a/..._ampere_3xtf32_fast_accurate_tensorop_fprop/ampere_3xtf32_fast_accurate_tensorop_fprop.cu b/..._ampere_3xtf32_fast_accurate_tensorop_fprop/ampere_3xtf32_fast_accurate_tensorop_fprop.cu
@@ -36,6 +36,7 @@ compared with CUDA Cores.  See example 27 for the trick of 3xTF32.
 */
 
 #include <iostream>
+#include <fstream>
 #include <sstream>
 
 #include "cutlass/cutlass.h"

diff --git a/examples/30_wgrad_split_k/30_wgrad_split_k.cu b/examples/30_wgrad_split_k/30_wgrad_split_k.cu
@@ -40,6 +40,7 @@ to correctly instantiate the GEMM template.
 */
 
 #include <iostream>
+#include <fstream>
 #include <sstream>
 
 #include "cutlass/cutlass.h"

diff --git a/examples/36_gather_scatter_fusion/gather_scatter_fusion.cu b/examples/36_gather_scatter_fusion/gather_scatter_fusion.cu
@@ -69,6 +69,7 @@
 
 #include <algorithm>
 #include <iostream>
+#include <fstream>
 #include <random>
 #include <numeric>
 

diff --git a/test/unit/conv/device/conv2d_testbed.h b/test/unit/conv/device/conv2d_testbed.h
@@ -33,6 +33,8 @@
 */
 #pragma once
 
+#include <fstream>
+
 #include "../../common/cutlass_unit_test.h"
 #include "cutlass/cutlass.h"
 

diff --git a/test/unit/conv/device/conv2d_testbed_interleaved.h b/test/unit/conv/device/conv2d_testbed_interleaved.h
@@ -33,6 +33,8 @@
 */
 #pragma once
 
+#include <fstream>
+
 #include "../../common/cutlass_unit_test.h"
 #include "cutlass/cutlass.h"
 

diff --git a/test/unit/conv/device/conv2d_with_broadcast_testbed.h b/test/unit/conv/device/conv2d_with_broadcast_testbed.h
@@ -37,6 +37,8 @@
 */
 #pragma once
 
+#include <fstream>
+
 #include "../../common/cutlass_unit_test.h"
 #include "cutlass/cutlass.h"
 

diff --git a/test/unit/conv/device/conv2d_with_reduction_testbed.h b/test/unit/conv/device/conv2d_with_reduction_testbed.h
@@ -33,6 +33,8 @@
 */
 #pragma once
 
+#include <fstream>
+
 #include "../../common/cutlass_unit_test.h"
 #include "cutlass/cutlass.h"
 

diff --git a/test/unit/conv/device/conv3d_testbed.h b/test/unit/conv/device/conv3d_testbed.h
@@ -33,6 +33,8 @@
 */
 #pragma once
 
+#include <fstream>
+
 #include "../../common/cutlass_unit_test.h"
 #include "cutlass/cutlass.h"
 

diff --git a/test/unit/epilogue/threadblock/epilogue_planar_complex.cu b/test/unit/epilogue/threadblock/epilogue_planar_complex.cu
@@ -32,8 +32,6 @@
     \brief Unit tests for thread-level GEMM
 */
 
-#include <fstream>
-
 #include "../../common/cutlass_unit_test.h"
 
 #include "cutlass/aligned_buffer.h"

diff --git a/test/unit/epilogue/threadblock/epilogue_simt.cu b/test/unit/epilogue/threadblock/epilogue_simt.cu
@@ -32,8 +32,6 @@
     \brief Unit tests for thread-level GEMM
 */
 
-#include <fstream>
-
 #include "../../common/cutlass_unit_test.h"
 
 #include "cutlass/aligned_buffer.h"

diff --git a/test/unit/epilogue/threadblock/epilogue_simt_sm60.cu b/test/unit/epilogue/threadblock/epilogue_simt_sm60.cu
@@ -32,8 +32,6 @@
     \brief Unit tests for thread-level GEMM
 */
 
-#include <fstream>
-
 #include "../../common/cutlass_unit_test.h"
 
 #include "cutlass/aligned_buffer.h"

diff --git a/test/unit/epilogue/threadblock/epilogue_simt_sm61.cu b/test/unit/epilogue/threadblock/epilogue_simt_sm61.cu
@@ -32,8 +32,6 @@
     \brief Unit tests for thread-level GEMM
 */
 
-#include <fstream>
-
 #include "../../common/cutlass_unit_test.h"
 
 #include "cutlass/aligned_buffer.h"

diff --git a/test/unit/epilogue/threadblock/epilogue_tensor_op.cu b/test/unit/epilogue/threadblock/epilogue_tensor_op.cu
@@ -32,8 +32,6 @@
     \brief Unit tests for thread-level GEMM
 */
 
-#include <fstream>
-
 #include "../../common/cutlass_unit_test.h"
 
 #include "cutlass/aligned_buffer.h"

diff --git a/test/unit/epilogue/threadblock/epilogue_volta_tensor_op.cu b/test/unit/epilogue/threadblock/epilogue_volta_tensor_op.cu
@@ -32,8 +32,6 @@
     \brief Unit tests for thread-level GEMM
 */
 
-#include <fstream>
-
 #include "../../common/cutlass_unit_test.h"
 
 #include "cutlass/aligned_buffer.h"

diff --git a/test/unit/epilogue/threadblock/epilogue_with_reduction_tensor_op.cu b/test/unit/epilogue/threadblock/epilogue_with_reduction_tensor_op.cu
@@ -33,8 +33,6 @@
   \brief Unit tests for thread-level GEMM
 */
 
-#include <fstream>
-
 #include "../../common/cutlass_unit_test.h"
 
 #include "cutlass/aligned_buffer.h"

diff --git a/test/unit/epilogue/threadblock/epilogue_wmma_tensor_op_sm70.cu b/test/unit/epilogue/threadblock/epilogue_wmma_tensor_op_sm70.cu
@@ -35,8 +35,6 @@
 
 #ifdef CUTLASS_ARCH_WMMA_SM70_ENABLED
 
-#include <fstream>
-
 #include "../../common/cutlass_unit_test.h"
 
 #include "cutlass/aligned_buffer.h"

diff --git a/test/unit/epilogue/threadblock/output_tile_threadmap.cu b/test/unit/epilogue/threadblock/output_tile_threadmap.cu
@@ -32,8 +32,6 @@
     \brief Unit tests for thread-level GEMM
 */
 
-#include <fstream>
-
 #include "../../common/cutlass_unit_test.h"
 
 #include "cutlass/aligned_buffer.h"

diff --git a/test/unit/gemm/device/testbed_complex.h b/test/unit/gemm/device/testbed_complex.h
@@ -35,7 +35,6 @@
 #pragma once
 
 #include <iostream>
-#include <fstream>
 #include <sstream>
 #include <stdexcept>
 

diff --git a/test/unit/gemm/device/testbed_grouped.h b/test/unit/gemm/device/testbed_grouped.h
@@ -36,6 +36,7 @@
 #pragma once
 
 #include <iostream>
+#include <fstream>
 
 #include "../../common/cutlass_unit_test.h"
 #include "cutlass/cutlass.h"

diff --git a/test/unit/gemm/device/testbed_sanity.h b/test/unit/gemm/device/testbed_sanity.h
@@ -33,7 +33,6 @@
 */
 
 #include <iostream>
-#include <fstream>
 #include <sstream>
 
 #include "../../common/cutlass_unit_test.h"

diff --git a/test/unit/gemm/device/testbed_splitk.h b/test/unit/gemm/device/testbed_splitk.h
@@ -35,7 +35,6 @@
 #pragma once
 
 #include <iostream>
-#include <fstream>
 #include <sstream>
 
 #include "../../common/cutlass_unit_test.h"

diff --git a/test/unit/gemm/threadblock/mma_multistage_testbed_slicedk.h b/test/unit/gemm/threadblock/mma_multistage_testbed_slicedk.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <fstream>
+
 #include "../../common/cutlass_unit_test.h"
 
 #include "cutlass/aligned_buffer.h"

diff --git a/test/unit/gemm/threadblock/mma_pipelined_testbed.h b/test/unit/gemm/threadblock/mma_pipelined_testbed.h
@@ -34,6 +34,8 @@
 
 #pragma once
 
+#include <fstream>
+
 #include "../../common/cutlass_unit_test.h"
 
 #include "cutlass/aligned_buffer.h"

diff --git a/test/unit/gemm/threadblock/mma_pipelined_testbed_slicedk.h b/test/unit/gemm/threadblock/mma_pipelined_testbed_slicedk.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <fstream>
+
 #include "../../common/cutlass_unit_test.h"
 
 #include "cutlass/aligned_buffer.h"

diff --git a/test/unit/gemm/threadblock/mma_planar_complex_testbed.h b/test/unit/gemm/threadblock/mma_planar_complex_testbed.h
@@ -34,6 +34,8 @@
 
 #pragma once
 
+#include <fstream>
+
 #include "../../common/cutlass_unit_test.h"
 
 #include "cutlass/cutlass.h"

diff --git a/tools/util/include/cutlass/util/distribution.h b/tools/util/include/cutlass/util/distribution.h
@@ -34,7 +34,7 @@
     \brief This header contains a class to parametrize a statistical distribution function.
 */
 
-#include <fstream>
+#include <ostream>
 
 namespace cutlass {