Last fix I swear

Summary:

Test Plan:

Reviewers:

Subscribers:

Tasks:

Tags:

Author: larryliu0820

examples/models/llama2/CMakeLists.txt

@@ -57,14 +57,6 @@ find_package(gflags REQUIRED)
 #
 # llama_main: test binary to run llama, with tokenizer and sampler integrated
 #
-add_executable(
-  llama_main
-  main.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../../backends/xnnpack/threadpool/cpuinfo_utils.cpp
-)
-if(CMAKE_BUILD_TYPE EQUAL "RELEASE")
-  target_link_options(llama_main PRIVATE "LINKER:--gc-sections")
-endif()
 
 # find `executorch` libraries Same as for gflags
 set(executorch_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../../lib/cmake/ExecuTorch)
@@ -81,18 +73,8 @@ endif()
 # llama_runner library
 add_subdirectory(runner)
 
-target_include_directories(
-  llama_main
-  PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../backends/xnnpack/third-party/cpuinfo/include
-)
-target_include_directories(
-  llama_main
-  PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../backends/xnnpack/third-party/pthreadpool/include
-)
-
 set(link_libraries)
+set(_srcs main.cpp)
 
 if(EXECUTORCH_BUILD_OPTIMIZED)
   list(
@@ -114,12 +96,25 @@ if(EXECUTORCH_BUILD_CUSTOM)
   list(APPEND link_libraries custom_ops)
 endif()
 
-target_link_libraries(llama_main PUBLIC gflags llama_runner)
-
 # XNNPACK pthreadpool cpuinfo
 if(TARGET xnnpack_backend)
   set(xnnpack_backend_libs xnnpack_backend XNNPACK pthreadpool cpuinfo)
   list(APPEND link_libraries ${xnnpack_backend_libs})
+  # HACK: main only include these when xnnpack backend is availabe, so that we
+  # have all the threadpool sources under xnnpack.
+  list(APPEND _common_compile_options -DET_USE_THREADPOOL)
+  list(
+    APPEND
+    _srcs
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../backends/xnnpack/threadpool/cpuinfo_utils.cpp
+  )
+  list(
+    APPEND
+    _common_include_directories
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../backends/xnnpack/third-party/cpuinfo/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../backends/xnnpack/third-party/pthreadpool/include
+  )
+  # end of hack
   target_link_options_shared_lib(xnnpack_backend)
 endif()
 
@@ -140,9 +135,14 @@ if(ANDROID)
   list(APPEND link_libraries log)
 endif()
 
-target_compile_options(llama_main PUBLIC ${_common_compile_options}
-                                         -DET_USE_THREADPOOL)
-target_link_libraries(llama_main PUBLIC ${link_libraries})
+add_executable(llama_main ${_srcs})
+if(CMAKE_BUILD_TYPE EQUAL "RELEASE")
+  target_link_options(llama_main PRIVATE "LINKER:--gc-sections")
+endif()
+
+target_include_directories(llama_main PUBLIC ${_common_include_directories})
+target_link_libraries(llama_main PUBLIC gflags llama_runner ${link_libraries})
+target_compile_options(llama_main PUBLIC ${_common_compile_options})
 
 if(APPLE)
   target_link_options_shared_lib(executorch)

examples/models/llama2/custom_ops/CMakeLists.txt

@@ -61,6 +61,8 @@ if(NOT EXECUTORCH_BUILD_XNNPACK)
     "${CMAKE_CURRENT_SOURCE_DIR}/../../../../backends/xnnpack/threadpool/threadpool.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/../../../../backends/xnnpack/threadpool/threadpool_guard.cpp"
   )
+else()
+  list(APPEND custom_ops_libs xnnpack_backend)
 endif()
 
 add_library(custom_ops ${_custom_ops__srcs})