From 54c3d3c8bd1f610c44f7fd6ee86585fb6c881d0e Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Thu, 13 Mar 2025 16:13:46 -0700 Subject: [PATCH 1/2] Update [ghstack-poisoned] --- CMakeLists.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3385bfb6d3..f8f0fa4958 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ # It should also be cmake-lint clean. # -cmake_minimum_required(VERSION 3.19) +cmake_minimum_required(VERSION 3.24) project(executorch) include(build/Utils.cmake) include(CMakeDependentOption) @@ -914,6 +914,14 @@ if(EXECUTORCH_BUILD_EXECUTOR_RUNNER) list(APPEND _executor_runner_libs quantized_ops_lib) endif() + if(EXECUTORCH_BUILD_KERNELS_CUSTOM) + list(APPEND _executor_runner_libs $) + endif() + + if(EXECUTORCH_BUILD_XNNPACK) + list(APPEND _executor_runner_libs xnnpack_backend) + endif() + if(EXECUTORCH_ENABLE_EVENT_TRACER) if(EXECUTORCH_BUILD_DEVTOOLS) list(APPEND _executor_runner_libs etdump flatccrt) From d1b366477d39a8c5c1c850515fe58f5fd6d6f9bb Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Mon, 17 Mar 2025 08:37:30 -0700 Subject: [PATCH 2/2] Update [ghstack-poisoned] --- .ci/scripts/unittest-buck2.sh | 8 ++++---- kernels/test/targets.bzl | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci/scripts/unittest-buck2.sh b/.ci/scripts/unittest-buck2.sh index 59b8ac6ccd..efbf386ffa 100755 --- a/.ci/scripts/unittest-buck2.sh +++ b/.ci/scripts/unittest-buck2.sh @@ -8,9 +8,7 @@ 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. +# TODO: can't query //kernels/prim_ops because of non-buckified stuff in OSS. buck2 query "//backends/apple/... + //backends/example/... + \ //backends/mediatek/... + //backends/test/... + //backends/transforms/... + \ //backends/xnnpack/... + //configurations/... + //kernels/aten/... + \ @@ -20,7 +18,9 @@ buck2 query "//backends/apple/... + //backends/example/... + \ UNBUILDABLE_OPTIMIZED_OPS_REGEX="gelu|fft_r2c|log_softmax" BUILDABLE_OPTIMIZED_OPS=$(buck2 query //kernels/optimized/cpu/... | grep -E -v $UNBUILDABLE_OPTIMIZED_OPS_REGEX) -BUILDABLE_KERNELS_PRIM_OPS_TARGETS=$(buck2 query //kernels/prim_ops/... | grep -v prim_ops_test_py) +# TODO: build prim_ops_test_cpp again once supported_features works in +# OSS buck. +BUILDABLE_KERNELS_PRIM_OPS_TARGETS=$(buck2 query //kernels/prim_ops/... | grep -v prim_ops_test) # 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. diff --git a/kernels/test/targets.bzl b/kernels/test/targets.bzl index 7afc9aa1a5..18ab0ac2e2 100644 --- a/kernels/test/targets.bzl +++ b/kernels/test/targets.bzl @@ -37,7 +37,7 @@ def define_common_targets(): ], fbcode_exported_deps = [ "//common/gtest:gtest", - ], + ] if not runtime.is_oss else [], xplat_exported_deps = [ "//third-party/googletest:gtest_main", ], @@ -68,7 +68,7 @@ def define_common_targets(): fbcode_exported_deps = [ "//common/init:init", "//common/gtest:gtest", - ], + ] if not runtime.is_oss else [], xplat_exported_deps = [ "//xplat/folly:init_init", "//third-party/googletest:gtest_main",