From 2366746e14980b59e921a6ed8d7f34b7cf1a2529 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Wed, 7 May 2025 16:51:13 -0700 Subject: [PATCH] Tests use executorch_core --- examples/selective_build/CMakeLists.txt | 9 ++++----- runtime/kernel/test/CMakeLists.txt | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/examples/selective_build/CMakeLists.txt b/examples/selective_build/CMakeLists.txt index db570bb98c3..fc059c2cc68 100644 --- a/examples/selective_build/CMakeLists.txt +++ b/examples/selective_build/CMakeLists.txt @@ -43,7 +43,7 @@ find_package( gflags REQUIRED PATHS ${CMAKE_CURRENT_BINARY_DIR}/../../third-party ) -target_include_directories(executorch INTERFACE ${_common_include_directories}) +target_include_directories(executorch_core INTERFACE ${_common_include_directories}) # ------------------------------ OPTIONS BEGIN ------------------------------- @@ -91,7 +91,7 @@ if(EXECUTORCH_SELECT_OPS_YAML) # custom_kernels: C++ kernel implementations of custom ops # add_library(custom_kernels ${kernel_sources}) - target_link_libraries(custom_kernels PRIVATE executorch) + target_link_libraries(custom_kernels PRIVATE executorch_core) target_compile_options(custom_kernels PUBLIC ${_common_compile_options}) list(APPEND _kernel_lib custom_kernels) @@ -117,7 +117,7 @@ generate_bindings_for_kernels( ) gen_operators_lib( - LIB_NAME "select_build_lib" KERNEL_LIBS ${_kernel_lib} DEPS executorch + LIB_NAME "select_build_lib" KERNEL_LIBS ${_kernel_lib} DEPS executorch_core ) list(TRANSFORM _executor_runner__srcs PREPEND "${EXECUTORCH_ROOT}/") @@ -131,10 +131,9 @@ if(CMAKE_BUILD_TYPE EQUAL "Release") target_link_options(selective_build_test PRIVATE "LINKER:--gc-sections") endif() target_link_libraries( - selective_build_test PRIVATE executorch gflags select_build_lib + selective_build_test PRIVATE executorch_core gflags select_build_lib ) target_link_options_shared_lib(select_build_lib) -target_link_options_shared_lib(executorch) target_compile_options(selective_build_test PUBLIC ${_common_compile_options}) # Print all summary diff --git a/runtime/kernel/test/CMakeLists.txt b/runtime/kernel/test/CMakeLists.txt index 9ff47fbefd5..5a9c4f0febf 100644 --- a/runtime/kernel/test/CMakeLists.txt +++ b/runtime/kernel/test/CMakeLists.txt @@ -20,7 +20,7 @@ include(${EXECUTORCH_ROOT}/tools/cmake/Test.cmake) add_executable(operator_registry_test operator_registry_test.cpp) target_link_libraries( - operator_registry_test GTest::gtest GTest::gtest_main GTest::gmock executorch + operator_registry_test GTest::gtest GTest::gtest_main GTest::gmock executorch_core ) target_include_directories(operator_registry_test PRIVATE ${EXECUTORCH_ROOT}/..) add_test(operator_registry_test operator_registry_test) @@ -28,7 +28,7 @@ add_test(operator_registry_test operator_registry_test) add_executable(kernel_runtime_context_test kernel_runtime_context_test.cpp) target_link_libraries( kernel_runtime_context_test GTest::gtest GTest::gtest_main GTest::gmock - executorch + executorch_core ) target_include_directories( kernel_runtime_context_test PRIVATE ${EXECUTORCH_ROOT}/.. @@ -47,7 +47,7 @@ add_executable( ) target_link_libraries( operator_registry_max_kernel_num_test GTest::gtest GTest::gtest_main - GTest::gmock executorch + GTest::gmock executorch_core ) target_compile_definitions( operator_registry_max_kernel_num_test PRIVATE "-DMAX_KERNEL_NUM=1"