Update

[ghstack-poisoned]

Author: swolchok

CMakeLists.txt

@@ -570,6 +570,12 @@ endif()
 
 if(EXECUTORCH_BUILD_EXTENSION_DATA_LOADER)
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/extension/data_loader)
+  install(
+    DIRECTORY extension/data_loader/
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/executorch/extension/data_loader
+    FILES_MATCHING
+    PATTERN "*.h"
+  )
 endif()
 
 if(EXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR)

backends/vulkan/CMakeLists.txt

@@ -24,10 +24,10 @@ if(NOT RUNTIME_PATH)
   set(RUNTIME_PATH ${CMAKE_CURRENT_SOURCE_DIR}/runtime)
 endif()
 
-# Include this file to access executorch_target_link_options_shared_lib This is required to
-# provide access to executorch_target_link_options_shared_lib which allows libraries to be
-# linked with the --whole-archive flag. This is required for libraries that
-# perform dynamic registration via static initialization.
+# Include this file to access executorch_target_link_options_shared_lib This is
+# required to provide access to executorch_target_link_options_shared_lib which
+# allows libraries to be linked with the --whole-archive flag. This is required
+# for libraries that perform dynamic registration via static initialization.
 include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
 
 include(cmake/ShaderLibrary.cmake)
@@ -40,8 +40,10 @@ set(VULKAN_HEADERS_PATH ${VULKAN_THIRD_PARTY_PATH}/Vulkan-Headers)
 set(VOLK_PATH ${VULKAN_THIRD_PARTY_PATH}/volk)
 set(VMA_PATH ${VULKAN_THIRD_PARTY_PATH}/VulkanMemoryAllocator)
 
-set(COMMON_INCLUDES ${EXECUTORCH_ROOT}/.. ${VULKAN_HEADERS_PATH}/include
-                    ${VOLK_PATH} ${VMA_PATH}
+set(COMMON_INCLUDES
+    $<BUILD_INTERFACE:${EXECUTORCH_ROOT}/..>
+    $<BUILD_INTERFACE:${VULKAN_HEADERS_PATH}/include>
+    $<BUILD_INTERFACE:${VOLK_PATH}> $<BUILD_INTERFACE:${VMA_PATH}>
 )
 
 # Compile settings
@@ -96,8 +98,10 @@ add_library(vulkan_schema INTERFACE ${GENERATED_HEADER})
 set_target_properties(vulkan_schema PROPERTIES LINKER_LANGUAGE CXX)
 
 target_include_directories(
-  vulkan_schema INTERFACE ${SCHEMA_INCLUDE_DIR}
-                          ${EXECUTORCH_ROOT}/third-party/flatbuffers/include
+  vulkan_schema
+  INTERFACE
+    ${SCHEMA_INCLUDE_DIR}
+    $<BUILD_INTERFACE:${EXECUTORCH_ROOT}/third-party/flatbuffers/include>
 )
 
 # vulkan_backend
@@ -134,7 +138,7 @@ endif()
 # Test targets
 
 install(
-  TARGETS vulkan_backend
+  TARGETS vulkan_backend vulkan_schema
   EXPORT ExecuTorchTargets
   DESTINATION lib
   INCLUDES

test/CMakeLists.txt

@@ -26,11 +26,12 @@ set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/..)
 include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
 
 # Find prebuilt executorch library
-find_package(executorch CONFIG REQUIRED)
+
+list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_CURRENT_BINARY_DIR}/../)
+find_package(executorch CONFIG REQUIRED FIND_ROOT_PATH_BOTH)
 
 # Let files say "include <executorch/path/to/header.h>".
 set(_common_include_directories ${EXECUTORCH_ROOT}/..)
-target_include_directories(executorch INTERFACE ${_common_include_directories})
 
 #
 # The `_<target>_srcs` lists are defined by including ${EXECUTORCH_SRCS_FILE}.
@@ -60,7 +61,6 @@ endif()
 # size_test_all_ops: binary with portable ops and no delegate backend
 #
 add_executable(size_test_all_ops ${_size_test__srcs})
-executorch_target_link_options_shared_lib(portable_ops_lib)
 target_link_libraries(
   size_test_all_ops executorch portable_ops_lib portable_kernels
 )
@@ -73,7 +73,6 @@ endif()
 #
 if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED)
   add_executable(size_test_all_optimized_ops ${_size_test__srcs})
-  executorch_target_link_options_shared_lib(optimized_native_cpu_ops_lib)
   target_link_libraries(
     size_test_all_optimized_ops executorch optimized_native_cpu_ops_lib
   )

test/build_size_test.sh

@@ -6,7 +6,7 @@
 # LICENSE file in the root directory of this source tree.
 
 # Build size_test and show the size of it
-set -e
+set -ex
 
 # shellcheck source=/dev/null
 source "$(dirname "${BASH_SOURCE[0]}")/../.ci/scripts/utils.sh"
@@ -28,6 +28,7 @@ cmake_install_executorch_lib() {
           -DCMAKE_INSTALL_PREFIX=cmake-out \
           -DCMAKE_BUILD_TYPE=Release \
           -DEXECUTORCH_BUILD_EXECUTOR_RUNNER=OFF \
+          -DEXECUTORCH_BUILD_EXTENSION_DATA_LOADER=ON \
           -DEXECUTORCH_OPTIMIZE_SIZE=ON \
           -DPYTHON_EXECUTABLE="$PYTHON_EXECUTABLE" \
           ${EXTRA_BUILD_ARGS} \
@@ -37,7 +38,6 @@ cmake_install_executorch_lib() {
 
 test_cmake_size_test() {
     CXXFLAGS="$COMMON_CXXFLAGS" retry cmake -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_PREFIX_PATH=cmake-out \
         -DCMAKE_INSTALL_PREFIX=cmake-out \
         ${EXTRA_BUILD_ARGS} \
         -Bcmake-out/test test