From dd0ef23a857a07981cad40e137dfa966332a5b80 Mon Sep 17 00:00:00 2001
From: Nikita Shulga <nshulga@fb.com>
Date: Thu, 29 Jul 2021 09:29:01 -0700
Subject: [PATCH] Delete .clang-tidy-oss (#62373)

Summary:
Pull Request resolved: https://github.com/pytorch/pytorch/pull/62373

Internal clang-tidy can handle all the options after  D29863426 was deployed

Test Plan: CI

Reviewed By: 1ntEgr8

Differential Revision: D29978471

fbshipit-source-id: ea531734ab4fc3e0a26552bd24846b22c2e5c745
---
 .clang-tidy                         |  3 ++
 .clang-tidy-oss                     | 45 -----------------------------
 tools/linter/clang_tidy/__main__.py |  2 +-
 3 files changed, 4 insertions(+), 46 deletions(-)
 delete mode 100644 .clang-tidy-oss

diff --git a/.clang-tidy b/.clang-tidy
index 3e6cb5db4d3..ae51e24acbb 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -9,6 +9,7 @@ bugprone-*,
 -bugprone-reserved-identifier,
 cppcoreguidelines-*,
 -cppcoreguidelines-avoid-magic-numbers,
+-cppcoreguidelines-avoid-non-const-global-variables,
 -cppcoreguidelines-interfaces-global-init,
 -cppcoreguidelines-macro-usage,
 -cppcoreguidelines-owning-memory,
@@ -21,6 +22,7 @@ cppcoreguidelines-*,
 -cppcoreguidelines-pro-type-union-access,
 -cppcoreguidelines-pro-type-vararg,
 -cppcoreguidelines-special-member-functions,
+-cppcoreguidelines-non-private-member-variables-in-classes,
 -facebook-hte-RelativeInclude,
 hicpp-exception-baseclass,
 hicpp-avoid-goto,
@@ -37,5 +39,6 @@ performance-*,
 '
 HeaderFilterRegex: 'torch/csrc/.*'
 AnalyzeTemporaryDtors: false
+WarningsAsErrors: '*'
 CheckOptions:
 ...
diff --git a/.clang-tidy-oss b/.clang-tidy-oss
deleted file mode 100644
index 230f3473343..00000000000
--- a/.clang-tidy-oss
+++ /dev/null
@@ -1,45 +0,0 @@
----
-# NOTE there must be no spaces before the '-', so put the comma last.
-# We are using a separate clang-tidy config because FB internal CI fails if we set 'WarningsAsErrors'
-InheritParentConfig: true
-Checks: '
-bugprone-*,
--bugprone-forward-declaration-namespace,
--bugprone-macro-parentheses,
--bugprone-lambda-function-name,
--bugprone-reserved-identifier,
-cppcoreguidelines-*,
--cppcoreguidelines-avoid-magic-numbers,
--cppcoreguidelines-avoid-non-const-global-variables,
--cppcoreguidelines-interfaces-global-init,
--cppcoreguidelines-macro-usage,
--cppcoreguidelines-owning-memory,
--cppcoreguidelines-pro-bounds-array-to-pointer-decay,
--cppcoreguidelines-pro-bounds-constant-array-index,
--cppcoreguidelines-pro-bounds-pointer-arithmetic,
--cppcoreguidelines-pro-type-cstyle-cast,
--cppcoreguidelines-pro-type-reinterpret-cast,
--cppcoreguidelines-pro-type-static-cast-downcast,
--cppcoreguidelines-pro-type-union-access,
--cppcoreguidelines-pro-type-vararg,
--cppcoreguidelines-special-member-functions,
--cppcoreguidelines-non-private-member-variables-in-classes,
--facebook-hte-RelativeInclude,
-hicpp-exception-baseclass,
-hicpp-avoid-goto,
-modernize-*,
--modernize-concat-nested-namespaces,
--modernize-return-braced-init-list,
--modernize-use-auto,
--modernize-use-default-member-init,
--modernize-use-using,
--modernize-use-trailing-return-type,
-performance-*,
--performance-noexcept-move-constructor,
--performance-unnecessary-value-param,
-'
-HeaderFilterRegex: 'torch/csrc/.*'
-AnalyzeTemporaryDtors: false
-WarningsAsErrors: '*'
-CheckOptions:
-...
diff --git a/tools/linter/clang_tidy/__main__.py b/tools/linter/clang_tidy/__main__.py
index e4584ef3b40..fc9f2ab4e66 100644
--- a/tools/linter/clang_tidy/__main__.py
+++ b/tools/linter/clang_tidy/__main__.py
@@ -79,7 +79,7 @@ DEFAULTS = {
     "include-dir": ["/usr/lib/llvm-11/include/openmp"] + clang_search_dirs(),
     "clang-tidy-exe": INSTALLATION_PATH,
     "compile-commands-dir": "build",
-    "config-file": ".clang-tidy-oss",
+    "config-file": ".clang-tidy",
     "disable-progress-bar": False,
 }