Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
166 commits
Select commit Hold shift + click to select a range
07adf1a
Update
swolchok Feb 8, 2025
bc3fd39
Update
swolchok Feb 9, 2025
00ce927
Update
swolchok Feb 10, 2025
6440d3d
Update
swolchok Feb 10, 2025
e62191a
Update
swolchok Feb 10, 2025
630bdd0
Update
swolchok Feb 10, 2025
098432f
Update
swolchok Feb 10, 2025
773ff37
Update
swolchok Feb 12, 2025
87513d8
Update
swolchok Feb 12, 2025
b61319b
Update
swolchok Feb 12, 2025
4265c31
Update
swolchok Feb 12, 2025
190bea8
Update
swolchok Feb 12, 2025
d4aaa36
Update
swolchok Feb 10, 2025
15bc325
Update
swolchok Feb 12, 2025
6b9b4cc
Update
swolchok Feb 12, 2025
ca4c14e
Update
swolchok Feb 12, 2025
372da45
Update
swolchok Feb 12, 2025
de924fe
Update
swolchok Feb 12, 2025
a0e9eb9
Update
swolchok Feb 12, 2025
4878a6b
Update
swolchok Feb 12, 2025
da6fd97
Update
swolchok Feb 12, 2025
ef00f3d
Update
swolchok Feb 12, 2025
e5edad6
Update
swolchok Feb 12, 2025
e9d552e
Update
swolchok Feb 12, 2025
8ed9894
Update
swolchok Feb 12, 2025
3f80407
Update
swolchok Feb 12, 2025
8ee4ee4
Update
swolchok Feb 12, 2025
4787a21
Update
swolchok Feb 12, 2025
8016e33
Update
swolchok Feb 12, 2025
a947148
Update
swolchok Feb 12, 2025
e3ae7b5
Update
swolchok Feb 12, 2025
827e9c5
Update
swolchok Feb 12, 2025
46df5cc
Update
swolchok Feb 12, 2025
a826c40
Update
swolchok Feb 12, 2025
6601683
Update
swolchok Feb 12, 2025
7a8397f
Update
swolchok Feb 12, 2025
d282727
Update
swolchok Feb 12, 2025
857bfa7
Update
swolchok Feb 12, 2025
f7c1205
Update
swolchok Feb 19, 2025
4b35d1e
Update
swolchok Feb 19, 2025
fe6b9c7
Update
swolchok Feb 19, 2025
6fe249c
Update
swolchok Feb 19, 2025
741d8a9
Update
swolchok Feb 19, 2025
ff128f7
Update
swolchok Feb 21, 2025
f06ee2f
Update
swolchok Feb 22, 2025
a1b9a76
Update
swolchok Feb 22, 2025
59355b9
Update
swolchok Feb 22, 2025
3c522ee
Update
swolchok Feb 22, 2025
9027194
Update
swolchok Feb 22, 2025
95cfe7d
Update
swolchok Feb 24, 2025
cb0234b
Update
swolchok Feb 24, 2025
0d53925
Update
swolchok Feb 24, 2025
3b24ef4
Update
swolchok Feb 24, 2025
5a920ed
Update
swolchok Feb 24, 2025
056ee1d
Update
swolchok Feb 24, 2025
9d8e434
Update
swolchok Feb 24, 2025
3a2d555
Update
swolchok Feb 24, 2025
b8f2a5b
Update
swolchok Feb 24, 2025
719b63d
Update
swolchok Feb 24, 2025
19bab0b
Update
swolchok Feb 24, 2025
4fde311
Update
swolchok Feb 24, 2025
f02844b
Update
swolchok Feb 25, 2025
1b47bf0
Update
swolchok Feb 25, 2025
61f045d
Update
swolchok Feb 25, 2025
4eb72d3
Update
swolchok Feb 25, 2025
9c7b3d1
Update
swolchok Feb 25, 2025
25a26e2
Update
swolchok Feb 25, 2025
aafa130
Update
swolchok Feb 25, 2025
8dc7ba0
Update
swolchok Feb 25, 2025
8d9394f
Update
swolchok Feb 25, 2025
71ef8af
Update
swolchok Feb 25, 2025
b52f223
Update
swolchok Feb 25, 2025
8df2f1d
Update
swolchok Feb 25, 2025
7f5cfd3
Update
swolchok Feb 25, 2025
832f410
Update
swolchok Feb 25, 2025
51478b5
Update
swolchok Feb 25, 2025
aa296c7
rebase
swolchok Aug 12, 2025
6e2be2b
rebase
swolchok Aug 12, 2025
4780849
rebase
swolchok Aug 12, 2025
4184f07
Update
swolchok Aug 13, 2025
da62330
Update
swolchok Aug 13, 2025
31f198c
Update
swolchok Aug 13, 2025
4d2bfd2
Update
swolchok Aug 13, 2025
d4f9a6f
Update
swolchok Aug 13, 2025
3ccf059
Update
swolchok Aug 13, 2025
c24a619
Update
swolchok Aug 13, 2025
69ed8e0
Update
swolchok Aug 13, 2025
850e288
Update
swolchok Aug 13, 2025
9dbb212
Update
swolchok Aug 13, 2025
91fb965
Update
swolchok Aug 13, 2025
800800c
Update
swolchok Aug 13, 2025
1ef7f54
Update
swolchok Aug 13, 2025
3f4950a
Update
swolchok Aug 13, 2025
9d94c80
Update
swolchok Aug 13, 2025
b5f879c
Update
swolchok Aug 13, 2025
a64229d
Update
swolchok Aug 13, 2025
152662a
Update
swolchok Aug 13, 2025
7f2ca6a
rebase atop revert to unbreak tests
swolchok Aug 13, 2025
5f78cd5
rebase atop revert to unbreak tests
swolchok Aug 13, 2025
6a89113
rebase atop revert to unbreak tests
swolchok Aug 13, 2025
8ea58c0
rebase atop revert to unbreak tests
swolchok Aug 13, 2025
f95f277
rebase atop revert to unbreak tests
swolchok Aug 13, 2025
0db46b1
rebase atop revert to unbreak tests
swolchok Aug 13, 2025
ea95ed2
rebase atop revert to unbreak tests
swolchok Aug 13, 2025
80a974a
rebase atop revert to unbreak tests
swolchok Aug 13, 2025
0bbfae4
rebase atop revert to unbreak tests
swolchok Aug 13, 2025
ce099c5
Update
swolchok Aug 13, 2025
0f13c9f
Update
swolchok Aug 13, 2025
04d167e
Update
swolchok Aug 13, 2025
222a087
Update
swolchok Aug 13, 2025
e9c78ed
Update
swolchok Aug 13, 2025
f959b51
Update
swolchok Aug 13, 2025
7d6c8c5
Update
swolchok Aug 13, 2025
276f39f
Update
swolchok Aug 13, 2025
97b2cdf
Update
swolchok Aug 13, 2025
689fdc3
Update
swolchok Aug 13, 2025
ef3c565
Update
swolchok Aug 13, 2025
d412422
Update
swolchok Aug 13, 2025
39c8753
Update
swolchok Aug 13, 2025
9fef931
rebase
swolchok Aug 14, 2025
878efc6
rebase
swolchok Aug 14, 2025
4473fb7
rebase
swolchok Aug 14, 2025
475ba13
rebase
swolchok Aug 14, 2025
b8ad6be
rebase
swolchok Aug 14, 2025
f6126e4
rebase
swolchok Aug 14, 2025
79bffad
rebase
swolchok Aug 14, 2025
e1db7c8
rebase
swolchok Aug 14, 2025
6278fa1
rebase
swolchok Aug 14, 2025
90bb993
rebase
swolchok Aug 14, 2025
a911797
rebase
swolchok Aug 14, 2025
6a12c42
rebase
swolchok Aug 14, 2025
3c90a4e
rebase
swolchok Aug 14, 2025
97ac217
rebase
swolchok Aug 14, 2025
0197f62
rebase
swolchok Aug 14, 2025
a3b4074
rebase
swolchok Aug 15, 2025
dec04ee
rebase
swolchok Aug 15, 2025
fbfa1ac
rebase
swolchok Aug 15, 2025
74c24fe
rebase
swolchok Aug 15, 2025
a774eaa
rebase
swolchok Aug 15, 2025
8faeaca
rebase
swolchok Aug 15, 2025
863a443
rebase
swolchok Aug 15, 2025
854f3ca
rebase
swolchok Aug 15, 2025
5304064
rebase
swolchok Aug 15, 2025
c054311
rebase
swolchok Aug 15, 2025
9e5ecf7
rebase
swolchok Aug 15, 2025
796338d
rebase
swolchok Aug 15, 2025
80bc1ed
rebase
swolchok Aug 15, 2025
0c4dd67
rebase
swolchok Aug 15, 2025
2344953
rebase
swolchok Aug 15, 2025
49afd80
Update
swolchok Aug 18, 2025
ad8f94e
Update
swolchok Aug 18, 2025
001ec28
Update
swolchok Aug 18, 2025
0515435
Update
swolchok Aug 18, 2025
9f16519
Update
swolchok Aug 18, 2025
158d573
Update
swolchok Aug 18, 2025
7b97a9f
Update
swolchok Aug 18, 2025
0114056
Update
swolchok Aug 18, 2025
2c92cba
rebase to pacify GitHub again
swolchok Aug 19, 2025
5c0be95
rebase to pacify GitHub again
swolchok Aug 19, 2025
3270089
rebase to pacify GitHub again
swolchok Aug 19, 2025
59e942d
rebase to pacify GitHub again
swolchok Aug 19, 2025
1e6caff
rebase to pacify GitHub again
swolchok Aug 19, 2025
7a6747f
Update
swolchok Aug 19, 2025
bd7694b
Update
swolchok Aug 19, 2025
7e4be82
Update
swolchok Aug 20, 2025
2df8439
Update
swolchok Aug 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .ci/scripts/unittest-macos-cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ ${CONDA_RUN} pytest -n auto --cov=./ --cov-report=xml
# Run gtest
LLVM_PROFDATA="xcrun llvm-profdata" LLVM_COV="xcrun llvm-cov" \
${CONDA_RUN} test/run_oss_cpp_tests.sh
${CONDA_RUN} test/check_for_installed_private_headers_in_cmake_out.sh
9 changes: 9 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -485,24 +485,29 @@ install(
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/executorch/runtime/core
FILES_MATCHING
PATTERN "*.h"
PATTERN "testing_util" EXCLUDE
)
install(
DIRECTORY runtime/executor/
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/executorch/runtime/executor
FILES_MATCHING
PATTERN "*.h"
PATTERN "test" EXCLUDE
PATTERN "platform_memory_allocator.h" EXCLUDE
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to follow up with Greg on what this even is used for.

)
install(
DIRECTORY runtime/kernel/
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/executorch/runtime/kernel
FILES_MATCHING
PATTERN "*.h"
PATTERN "test" EXCLUDE
)
install(
DIRECTORY runtime/platform/
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/executorch/runtime/platform
FILES_MATCHING
PATTERN "*.h"
PATTERN "test" EXCLUDE
)
install(
DIRECTORY extension/kernel_util/
Expand Down Expand Up @@ -587,11 +592,15 @@ endif()

if(EXECUTORCH_BUILD_EXTENSION_DATA_LOADER)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/extension/data_loader)
if(NOT WIN32)
set(data_loader_exclude_pattern "*mman_windows.h")
endif()
install(
DIRECTORY extension/data_loader/
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/executorch/extension/data_loader
FILES_MATCHING
PATTERN "*.h"
PATTERN ${data_loader_exclude_pattern} EXCLUDE
)
list(APPEND _executorch_extensions extension_data_loader)
endif()
Expand Down
44 changes: 44 additions & 0 deletions test/check_for_installed_private_headers_in_cmake_out.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
#!/bin/bash
# Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.

# This script verifies that all headers that are installed under
# cmake-out/include/executorch are exported_headers of some Buck
# target. (It does *not* verify the reverse, namely that all
# exported_headers of every Buck target that should have been built
# when that directory was installed are actually installed.)
#
# Ideally, "some Buck target" would include any target in the whole
# repo, but we cannot yet buck query the whole repo. (See
# .ci/scripts/unittest-buck2.sh.) Instead, we query a manually-curated
# list of targets.

set -euxo pipefail

BUCK_HEADERS_TEMPFILE=$(mktemp /tmp/check_private_headers_buck.txt.XXXXXX)
ACTUAL_HEADERS_TEMPFILE=$(mktemp /tmp/check_private_headers_installed.txt.XXXXXX)
SOURCE_ROOT_DIR=$(git rev-parse --show-toplevel)
BUCK2=$(python3 "${SOURCE_ROOT_DIR}/tools/cmake/resolve_buck.py" --cache_dir="${SOURCE_ROOT_DIR}/buck2-bin")
if [[ "$BUCK2" == "buck2" ]]; then
BUCK2=$(command -v buck2)
fi

"${SOURCE_ROOT_DIR}/scripts/print_exported_headers.py" \
--buck2=$(realpath "$BUCK2") --targets \
//extension/data_loader: //extension/evalue_util: \
//extension/flat_tensor: //extension/llm/runner: //extension/kernel_util: //extension/module: \
//extension/runner_util: //extension/tensor: //extension/threadpool: \
| sort > "${BUCK_HEADERS_TEMPFILE}"
find "${SOURCE_ROOT_DIR}/cmake-out/include/executorch" -name '*.h' | \
sed -e "s|${SOURCE_ROOT_DIR}/cmake-out/include/executorch/||" | \
# Don't complain about generated Functions.h \
grep -E -v 'Functions.h$' | sort > "${ACTUAL_HEADERS_TEMPFILE}"
ACTUAL_HEADERS_NOT_EXPORTED_IN_BUCK=$(comm -13 "${BUCK_HEADERS_TEMPFILE}" "${ACTUAL_HEADERS_TEMPFILE}")
if [[ -n "${ACTUAL_HEADERS_NOT_EXPORTED_IN_BUCK}" ]]; then
>&2 echo "The following non-exported headers were installed:
${ACTUAL_HEADERS_NOT_EXPORTED_IN_BUCK}"
exit 1
fi
Loading