Merge branch 'main' into jz/cpp-no-op-tokenizer

Author: jackzhxng

.buckconfig

@@ -39,3 +39,6 @@
 
 [buck2]
 restarter=true
+
+[oss]
+folly_cxx_tests = False

.ci/scripts/unittest-buck2.sh

@@ -8,10 +8,14 @@ set -eux
 
 # TODO: expand this to //...
 # TODO: can't query cadence & vulkan backends
+# TODO: can't query //kernels/prim_ops because of a cpp_unittest and
+# broken code in shim to read oss.folly_cxx_tests. Sending fix but it
+# needs to propagate and we need a submodule update.
 buck2 query "//backends/apple/... + //backends/example/... + \
 //backends/mediatek/... + //backends/test/... + //backends/transforms/... + \
-//backends/xnnpack/... + //configurations/... + //kernels/portable/cpu/... + \
-//runtime/... + //schema/... + //test/... + //util/..."
+//backends/xnnpack/... + //configurations/... + //kernels/aten/... + \
+//kernels/optimized/... + //kernels/portable/... + //kernels/quantized/... + \
+//kernels/test/... + //runtime/... + //schema/... + //test/... + //util/..."
 
 # 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.

backends/arm/test/passes/test_fuse_constant_ops_pass.py

@@ -4,6 +4,7 @@
 # LICENSE file in the root directory of this source tree.
 
 import operator
+import unittest
 from typing import Tuple
 
 import torch
@@ -107,6 +108,7 @@ def test_fuse_batchnorm_tosa_MI(module):
     pipeline.run()
 
 
+@unittest.skip("Test failing on internal CI")
 @common.parametrize("module", modules)
 def test_fuse_batchnorm_tosa_BI(module):
     pipeline = TosaPipelineBI[input_t](

backends/xnnpack/CMakeLists.txt

@@ -10,7 +10,7 @@
 # cmake-format -i CMakeLists.txt
 # ~~~
 
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.24)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
@@ -124,6 +124,10 @@ else()
   list(APPEND xnn_executor_runner_libs portable_ops_lib)
 endif()
 
+if(EXECUTORCH_BUILD_KERNELS_CUSTOM)
+  list(APPEND xnn_executor_runner_libs $<LINK_LIBRARY:WHOLE_ARCHIVE,custom_ops>)
+endif()
+
 list(APPEND xnn_executor_runner_libs xnnpack_backend executorch)
 
 # ios can only build library but not binary