From eb6d1cbe4ab12b48e5ce2d8725b84a7b07e3f889 Mon Sep 17 00:00:00 2001
From: Scott Wolchok <swolchok@fb.com>
Date: Tue, 12 Nov 2024 11:56:23 -0800
Subject: [PATCH] [ExecuTorch] Remove PATTERNLINT suppressions

Pull Request resolved: https://github.com/pytorch/executorch/pull/6692

The linter these are suppressing was removed in D63859186.
ghstack-source-id: 253169885

Differential Revision: [D65507718](https://our.internmc.facebook.com/intern/diff/D65507718/)
---
 extension/llm/custom_ops/op_sdpa.cpp                 | 1 -
 extension/llm/runner/image.h                         | 3 +--
 extension/llm/runner/multimodal_runner.h             | 3 ---
 extension/llm/runner/stats.h                         | 1 -
 extension/llm/runner/text_decoder_runner.h           | 1 -
 extension/llm/runner/text_prefiller.h                | 1 -
 extension/llm/tokenizer/tokenizer.h                  | 2 --
 extension/parallel/thread_parallel.h                 | 1 -
 kernels/optimized/vec/vec_base.h                     | 2 --
 runtime/core/exec_aten/testing_util/tensor_factory.h | 4 +---
 10 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/extension/llm/custom_ops/op_sdpa.cpp b/extension/llm/custom_ops/op_sdpa.cpp
index 8afec156d5..50fa933833 100644
--- a/extension/llm/custom_ops/op_sdpa.cpp
+++ b/extension/llm/custom_ops/op_sdpa.cpp
@@ -16,7 +16,6 @@
 #include <executorch/runtime/core/exec_aten/util/scalar_type_util.h>
 
 #include <array>
-// patternlint-disable-next-line executorch-cpp-nostdinc
 #include <vector>
 
 #ifdef ET_USE_THREADPOOL
diff --git a/extension/llm/runner/image.h b/extension/llm/runner/image.h
index d3c4e8d945..67fb893951 100644
--- a/extension/llm/runner/image.h
+++ b/extension/llm/runner/image.h
@@ -9,9 +9,8 @@
 // A simple image struct.
 
 #pragma once
-#include <cstdint>
-// patternlint-disable-next-line executorch-cpp-nostdinc
 #include <executorch/runtime/platform/compiler.h>
+#include <cstdint>
 #include <vector>
 
 namespace executorch {
diff --git a/extension/llm/runner/multimodal_runner.h b/extension/llm/runner/multimodal_runner.h
index 1af9cb6fa2..94539c65cc 100644
--- a/extension/llm/runner/multimodal_runner.h
+++ b/extension/llm/runner/multimodal_runner.h
@@ -13,13 +13,10 @@
 #pragma once
 
 #include <cstdint>
-// patternlint-disable-next-line executorch-cpp-nostdinc
 #include <functional>
 #include <memory>
-// patternlint-disable-next-line executorch-cpp-nostdinc
 #include <string>
 #include <type_traits>
-// patternlint-disable-next-line executorch-cpp-nostdinc
 #include <unordered_map>
 
 #include <executorch/extension/llm/runner/image.h>
diff --git a/extension/llm/runner/stats.h b/extension/llm/runner/stats.h
index f9462d24cd..79c5781e33 100644
--- a/extension/llm/runner/stats.h
+++ b/extension/llm/runner/stats.h
@@ -12,7 +12,6 @@
 #include <executorch/runtime/platform/log.h>
 #include <cinttypes>
 #include <sstream>
-// patternlint-disable-next-line executorch-cpp-nostdinc
 #include <string>
 
 namespace executorch {
diff --git a/extension/llm/runner/text_decoder_runner.h b/extension/llm/runner/text_decoder_runner.h
index c6f8a0ca67..ca4d127e51 100644
--- a/extension/llm/runner/text_decoder_runner.h
+++ b/extension/llm/runner/text_decoder_runner.h
@@ -14,7 +14,6 @@
 #include <executorch/extension/module/module.h>
 #include <executorch/extension/tensor/tensor.h>
 #include <executorch/runtime/platform/compiler.h>
-// patternlint-disable-next-line executorch-cpp-nostdinc
 #include <functional>
 
 namespace executorch {
diff --git a/extension/llm/runner/text_prefiller.h b/extension/llm/runner/text_prefiller.h
index 9dbaec40e6..2f1d5ae2b7 100644
--- a/extension/llm/runner/text_prefiller.h
+++ b/extension/llm/runner/text_prefiller.h
@@ -13,7 +13,6 @@
 
 #include <executorch/extension/llm/runner/text_decoder_runner.h>
 #include <executorch/extension/llm/tokenizer/tokenizer.h>
-// patternlint-disable-next-line executorch-cpp-nostdinc
 #include <functional>
 
 namespace executorch {
diff --git a/extension/llm/tokenizer/tokenizer.h b/extension/llm/tokenizer/tokenizer.h
index 52983d9075..c987857a30 100644
--- a/extension/llm/tokenizer/tokenizer.h
+++ b/extension/llm/tokenizer/tokenizer.h
@@ -9,9 +9,7 @@
 #pragma once
 
 #include <cinttypes>
-// patternlint-disable-next-line executorch-cpp-nostdinc
 #include <string>
-// patternlint-disable-next-line executorch-cpp-nostdinc
 #include <vector>
 
 #include <executorch/runtime/core/error.h>
diff --git a/extension/parallel/thread_parallel.h b/extension/parallel/thread_parallel.h
index bbce211597..8b174075ae 100644
--- a/extension/parallel/thread_parallel.h
+++ b/extension/parallel/thread_parallel.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include <cstdint>
-// @nolint PATTERNLINT Ok to use stdlib for this optional library
 #include <functional>
 
 namespace executorch {
diff --git a/kernels/optimized/vec/vec_base.h b/kernels/optimized/vec/vec_base.h
index 4a386f9e8c..5ff4327e6f 100644
--- a/kernels/optimized/vec/vec_base.h
+++ b/kernels/optimized/vec/vec_base.h
@@ -1,7 +1,5 @@
 #pragma once
 
-// @nolint PATTERNLINT <functional> is required for std::equal_to, etc.
-
 #include <cassert>
 #include <cstdint>
 #include <cstring>
diff --git a/runtime/core/exec_aten/testing_util/tensor_factory.h b/runtime/core/exec_aten/testing_util/tensor_factory.h
index 2ea21e9583..9f8f7e9db7 100644
--- a/runtime/core/exec_aten/testing_util/tensor_factory.h
+++ b/runtime/core/exec_aten/testing_util/tensor_factory.h
@@ -14,10 +14,8 @@
 #ifdef USE_ATEN_LIB
 #include <ATen/ATen.h>
 #else // !USE_ATEN_LIB
-#include <numeric>
-// @nolint PATTERNLINT Ok to use stdlib for this test framework
 #include <memory>
-// @nolint PATTERNLINT Ok to use stdlib for this test framework
+#include <numeric>
 #include <vector>
 #endif // !USE_ATEN_LIB