Revert "Add vectorized_math.h (#11204)"

This reverts commit 1720f2f.

Author: JacobSzwejbka

.lintrunner.toml

@@ -271,8 +271,6 @@ exclude_patterns = [
     'examples/**',
     'exir/verification/bindings.cpp',
     'extension/**',
-    # Uses properly-gated (ET_USE_PYTORCH_HEADERS) ATen include.
-    'kernels/portable/cpu/util/vectorized_math.h',
     'kernels/optimized/**',
     'runtime/core/exec_aten/**',
     # Want to be able to keep c10 in sync with PyTorch core.

kernels/portable/cpu/util/targets.bzl

@@ -307,16 +307,6 @@ def define_common_targets():
         ],
     )
 
-    runtime.cxx_library(
-        name = "vectorized_math",
-        exported_headers = ["vectorized_math.h"],
-        visibility = ["//executorch/..."],
-        exported_deps = [
-            "//executorch/runtime/core/portable_type:portable_type",
-            "//executorch/runtime/core/exec_aten/util:scalar_type_util",
-        ],
-    )
-
     # Utility functions that can be used by operators that perform reduction
     for aten_mode in get_aten_mode_options():
         suffix = "_aten" if aten_mode else ""

kernels/portable/cpu/util/test/CMakeLists.txt

@@ -4,22 +4,26 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
+# @generated by test/utils/generate_gtest_cmakelists.py
+#
+# This file should be formatted with
+# ~~~
+# cmake-format -i CMakeLists.txt
+# ~~~
+# It should also be cmake-lint clean.
+#
+
 cmake_minimum_required(VERSION 3.19)
 
 set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../../../..)
 
 include(${EXECUTORCH_ROOT}/tools/cmake/Test.cmake)
-include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
 
 set(_test_srcs broadcast_indexes_range_test.cpp broadcast_test.cpp
-               reduce_test.cpp vectorized_math_test.cpp
+               reduce_test.cpp
 )
 
 et_cxx_test(
   kernels_portable_cpu_util_test SOURCES ${_test_srcs} EXTRA_LIBS
   portable_kernels portable_ops_lib
 )
-
-find_package_torch_headers()
-target_include_directories(kernels_portable_cpu_util_test PRIVATE ${TORCH_INCLUDE_DIRS})
-target_compile_definitions(kernels_portable_cpu_util_test PRIVATE ET_USE_PYTORCH_HEADERS)

kernels/portable/cpu/util/test/targets.bzl

@@ -32,14 +32,3 @@ def define_common_targets():
             "//executorch/kernels/portable/cpu/util:reduce_util",
         ],
     )
-
-    # this test requires ET_USE_PYTORCH_HEADERS, which doesn't work in OSS Buck.
-    if not runtime.is_oss:
-        runtime.cxx_test(
-            name = "vectorized_math_test",
-            srcs = ["vectorized_math_test.cpp"],
-            deps = [
-                "//executorch/kernels/portable/cpu/util:vectorized_math",
-                "//executorch/runtime/core/portable_type/c10/c10:c10",
-            ],
-        )

kernels/portable/cpu/util/test/vectorized_math_test.cpp

@@ -53,11 +53,7 @@ def define_common_targets():
     runtime.cxx_library(
         name = "aten_headers_for_executorch",
         srcs = [],
-        visibility = [
-            "//executorch/kernels/optimized/...",
-            "//executorch/kernels/portable/cpu/util/...",
-            "@EXECUTORCH_CLIENTS",
-        ],
+        visibility = ["//executorch/kernels/optimized/...", "@EXECUTORCH_CLIENTS"],
         exported_deps = select({
             "DEFAULT": [],
             "ovr_config//cpu:arm64": [

kernels/portable/cpu/util/vectorized_math.h

@@ -26,7 +26,6 @@ def define_common_targets():
         visibility = [
             "//executorch/backends/...",
             "//executorch/extension/fb/dynamic_shim/...",
-            "//executorch/kernels/portable/cpu/...",
             "//executorch/runtime/core/exec_aten/...",
             "//executorch/runtime/core/portable_type/test/...",
         ],

runtime/core/portable_type/c10/c10/targets.bzl

@@ -68,6 +68,18 @@
             "extension_threadpool"
         ]
     },
+    {
+        "directory": "kernels/portable/cpu/util/test",
+        "sources": [
+            "broadcast_indexes_range_test.cpp",
+            "broadcast_test.cpp",
+            "reduce_test.cpp"
+        ],
+        "additional_libs": [
+            "portable_kernels",
+            "portable_ops_lib"
+        ]
+    },
     {
         "directory": "runtime/core/portable_type/test",
         "sources": [