up

Author: metascroy

CMakeLists.txt

@@ -839,7 +839,7 @@ endif()
 if(EXECUTORCH_BUILD_TORCHAO)
   add_compile_options("-frtti")
   set(EXECUTORCH_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/..)
-  set(EXECUTORCH_LIBRARIES executorch extension_threadpool cpuinfo pthreadpool)
+  set(EXECUTORCH_LIBRARIES executorch extension_threadpool) # cpuinfo pthreadpool)
   set(TORCHAO_BUILD_EXECUTORCH_OPS ON)
   add_subdirectory(third-party/ao/torchao/experimental)
 endif()

examples/models/llama/CMakeLists.txt

@@ -122,8 +122,12 @@ if(EXECUTORCH_BUILD_KERNELS_CUSTOM)
 endif()
 
 if(EXECUTORCH_BUILD_TORCHAO)
-  list(APPEND link_libraries "$<LINK_LIBRARY:WHOLE_ARCHIVE,${CMAKE_CURRENT_BINARY_DIR}/../../../lib/libtorchao_ops_executorch.a>")
-  list(APPEND link_libraries "${CMAKE_CURRENT_BINARY_DIR}/../../../lib/libtorchao_kernels_aarch64.a")
+  set(torchao_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../../lib/cmake/torchao)
+  find_package(torchao REQUIRED)
+  target_link_options_shared_lib(torchao::torchao_ops_executorch)
+  list(APPEND link_libraries torchao::torchao_ops_executorch)
+  # list(APPEND link_libraries "$<LINK_LIBRARY:WHOLE_ARCHIVE,${CMAKE_CURRENT_BINARY_DIR}/../../../lib/libtorchao_ops_executorch.a>")
+  # list(APPEND link_libraries "${CMAKE_CURRENT_BINARY_DIR}/../../../lib/libtorchao_kernels_aarch64.a")
 endif()
 
 set(XNNPACK_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../../backends/xnnpack)