Revert "Fix clang-tidy warnings in Caffe2 code (pytorch#134935)"

This reverts commit 7cfd236.

Reverted pytorch#134935 on behalf of https://github.com/izaitsevfb due to breaks internal builds, caffe2 is still used internally ([comment](pytorch#134935 (comment)))

Author: pytorchmergebot

.lintrunner.toml

@@ -210,8 +210,6 @@ include_patterns = [
     'aten/src/ATen/native/nested/*.h',
     'c10/**/*.cpp',
     'c10/**/*.h',
-    'caffe2/**/*.cc',
-    'caffe2/**/*.h',
     'torch/*.h',
     'torch/csrc/*.h',
     'torch/csrc/*.cpp',

BUCK.oss

@@ -65,6 +65,7 @@ cxx_library(
         "caffe2/serialize/file_adapter.cc",
         "caffe2/serialize/inline_container.cc",
         "caffe2/serialize/istream_adapter.cc",
+        "caffe2/serialize/read_adapter_interface.cc",
     ],
     visibility = ["PUBLIC"],
     deps = [

BUILD.bazel

@@ -473,6 +473,7 @@ filegroup(
         "caffe2/serialize/file_adapter.cc",
         "caffe2/serialize/inline_container.cc",
         "caffe2/serialize/istream_adapter.cc",
+        "caffe2/serialize/read_adapter_interface.cc",
     ],
 )
 

build.bzl

@@ -34,6 +34,7 @@ def define_targets(rules):
             "caffe2/serialize/file_adapter.cc",
             "caffe2/serialize/inline_container.cc",
             "caffe2/serialize/istream_adapter.cc",
+            "caffe2/serialize/read_adapter_interface.cc",
         ],
         copts = ["-fexceptions"],
         tags = [

caffe2/core/timer.h

@@ -3,7 +3,7 @@
 
 #include <chrono>
 
-#include <c10/macros/Macros.h>
+#include "caffe2/core/common.h"
 
 namespace caffe2 {
 

caffe2/perfkernels/common_avx.cc

@@ -2,7 +2,7 @@
 // example, if your compiler did not specify -mavx, you should not provide
 // the CAFFE2_PERF_WITH_AVX macro.
 
-#include "caffe2/core/macros.h"
+#include "caffe2/core/common.h"
 
 #ifdef CAFFE2_PERF_WITH_AVX
 #ifndef __AVX__

caffe2/perfkernels/common_avx2.cc

@@ -2,7 +2,7 @@
 // example, if your compiler did not specify -mavx2, you should not provide
 // the CAFFE2_PERF_WITH_AVX2 macro.
 
-#include "caffe2/core/macros.h"
+#include "caffe2/core/common.h"
 
 #ifdef CAFFE2_PERF_WITH_AVX2
 #ifndef __AVX2__

caffe2/serialize/CMakeLists.txt

@@ -6,7 +6,8 @@ list(APPEND Caffe2_CPU_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/inline_container.cc
   ${CMAKE_CURRENT_SOURCE_DIR}/istream_adapter.cc
   ${CMAKE_CURRENT_SOURCE_DIR}/file_adapter.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/crc.cc)
+  ${CMAKE_CURRENT_SOURCE_DIR}/crc.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/read_adapter_interface.cc)
 list(APPEND Caffe2_CPU_INCLUDE ${PROJECT_SOURCE_DIR}/third_party/miniz-2.1.0)
 
 set(Caffe2_CPU_TEST_SRCS ${Caffe2_CPU_TEST_SRCS} PARENT_SCOPE)

caffe2/serialize/crc_alt.h

@@ -25,7 +25,7 @@
 // using the aforementioned #defines the table is automatically fitted to your needs
 
 // uint8_t, uint32_t, int32_t
-#include <cstdint>
+#include <stdint.h>
 // size_t
 #include <cstddef>
 

caffe2/serialize/file_adapter.cc

@@ -3,11 +3,13 @@
 #include <cerrno>
 #include <cstdio>
 #include <string>
+#include "caffe2/core/common.h"
 
-namespace caffe2::serialize {
+namespace caffe2 {
+namespace serialize {
 
-FileAdapter::RAIIFile::RAIIFile(const std::string& file_name)
-    : fp_(fopen(file_name.c_str(), "rb")) {
+FileAdapter::RAIIFile::RAIIFile(const std::string& file_name) {
+  fp_ = fopen(file_name.c_str(), "rb");
   if (fp_ == nullptr) {
     auto old_errno = errno;
 #if defined(_WIN32) && (defined(__MINGW32__) || defined(_MSC_VER))
@@ -75,4 +77,5 @@ size_t FileAdapter::read(uint64_t pos, void* buf, size_t n, const char* what)
 
 FileAdapter::~FileAdapter() = default;
 
-} // namespace caffe2::serialize
+} // namespace serialize
+} // namespace caffe2