From 81667522d93f44c751f715740efaa5bce37e380e Mon Sep 17 00:00:00 2001
From: Scott Wolchok <swolchok@meta.com>
Date: Wed, 12 Mar 2025 10:06:30 -0700
Subject: [PATCH 1/2] Update

[ghstack-poisoned]
---
 .ci/scripts/unittest-buck2.sh  | 4 +---
 kernels/optimized/lib_defs.bzl | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.ci/scripts/unittest-buck2.sh b/.ci/scripts/unittest-buck2.sh
index a2eb1e94e45..d5168cce0b2 100755
--- a/.ci/scripts/unittest-buck2.sh
+++ b/.ci/scripts/unittest-buck2.sh
@@ -17,10 +17,8 @@ buck2 query "//backends/apple/... + //backends/example/... + \
 //kernels/optimized/... + //kernels/portable/... + //kernels/quantized/... + \
 //kernels/test/... + //runtime/... + //schema/... + //test/... + //util/..."
 
-UNBUILDABLE_OPTIMIZED_OPS_REGEX="gelu|fft_r2c|log_softmax"
-BUILDABLE_OPTIMIZED_OPS=$(buck2 query //kernels/optimized/cpu/... | grep -E -v $UNBUILDABLE_OPTIMIZED_OPS_REGEX)
 # TODO: expand the covered scope of Buck targets.
 # //runtime/kernel/... is failing because //third-party:torchgen_files's shell script can't find python on PATH.
 # //runtime/test/... requires Python torch, which we don't have in our OSS buck setup.
-buck2 test $BUILDABLE_OPTIMIZED_OPS //kernels/portable/... //runtime/backend/... //runtime/core/... \
+buck2 test //kernels/portable/... //runtime/backend/... //runtime/core/... \
       //runtime/executor: //runtime/kernel/... //runtime/platform/...
diff --git a/kernels/optimized/lib_defs.bzl b/kernels/optimized/lib_defs.bzl
index 6e884457e35..dd246f38984 100644
--- a/kernels/optimized/lib_defs.bzl
+++ b/kernels/optimized/lib_defs.bzl
@@ -234,7 +234,6 @@ def define_libs(is_fbcode=False):
             exported_deps = [
                 "//executorch/kernels/optimized:libutils",
                 "//executorch/runtime/core/exec_aten:lib",
-                "//executorch/runtime/kernel:thread_parallel_interface",
             ],
             **get_apple_framework_deps_kwargs(is_fbcode),
         )

From 46e40a260f095fc181099b616d3c18f1ecab4690 Mon Sep 17 00:00:00 2001
From: Scott Wolchok <swolchok@meta.com>
Date: Wed, 12 Mar 2025 10:06:35 -0700
Subject: [PATCH 2/2] Update

[ghstack-poisoned]
---
 runtime/kernel/targets.bzl                 |  1 -
 runtime/kernel/thread_parallel_interface.h | 11 -----------
 2 files changed, 12 deletions(-)

diff --git a/runtime/kernel/targets.bzl b/runtime/kernel/targets.bzl
index 5c95f10276d..e67f76728b8 100644
--- a/runtime/kernel/targets.bzl
+++ b/runtime/kernel/targets.bzl
@@ -56,7 +56,6 @@ def define_common_targets():
         exported_headers = ["thread_parallel_interface.h"],
         exported_deps = [
             "//executorch/runtime/core:core",
-            "//executorch/runtime/core/portable_type/c10/c10:c10",
             "//executorch/runtime/platform:platform",
         ],
         visibility = [
diff --git a/runtime/kernel/thread_parallel_interface.h b/runtime/kernel/thread_parallel_interface.h
index 52100475c7b..1e79acc75a4 100644
--- a/runtime/kernel/thread_parallel_interface.h
+++ b/runtime/kernel/thread_parallel_interface.h
@@ -11,7 +11,6 @@
 #include <cstdint>
 #include <functional>
 
-#include <c10/util/irange.h>
 #include <executorch/runtime/core/error.h>
 #include <executorch/runtime/platform/assert.h>
 
@@ -30,17 +29,7 @@ inline bool parallel_for_no_threadpool(
       begin,
       end);
   ET_CHECK_OR_RETURN_FALSE(grain_size > 0, "grain_size = %" PRId64, grain_size);
-#ifndef NDEBUG
-  // Go backwards through the range elementwise to catch code that
-  // assumes parallel_for is in order like a regular for loop.
-  for (const auto i : c10::irange(begin, end)) {
-    const auto offset = i - begin;
-    const auto idx = end - offset - 1;
-    f(idx, idx + 1);
-  }
-#else // NDEBUG
   f(begin, end);
-#endif
   return true;
 }