Integrate torchgen exception boundary with ExecuTorch#8321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
swolchok merged 2 commits into from
Feb 11, 2025
Merged

Integrate torchgen exception boundary with ExecuTorch #8321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f76731
Use c10 version of half/bfloat16 in executorch
Feb 7, 2025
5704dae
Integrate torchgen exception boundary with ExecuTorch
Feb 7, 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
4 changes: 4 additions & 0 deletions .lintrunner.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,8 @@ exclude_patterns = [
# File contains @generated
'extension/llm/custom_ops/spinquant/fast_hadamard_transform_special.h',
'extension/llm/custom_ops/spinquant/test/fast_hadamard_transform_special_unstrided_cpu.h',
# Want to be able to keep c10 in sync with PyTorch core.
'runtime/core/portable_type/c10/**',
]
command = [
'python',
Expand DownExpand Up@@ -261,6 +263,8 @@ exclude_patterns = [
'extension/**',
'kernels/optimized/**',
'runtime/core/exec_aten/**',
# Want to be able to keep c10 in sync with PyTorch core.
'runtime/core/portable_type/c10/**',
'runtime/executor/tensor_parser_aten.cpp',
'scripts/**',
'test/**',
Expand Down
13 changes: 12 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -366,7 +366,7 @@ if(NOT "${_repo_dir_name}" STREQUAL "executorch")
"fix for this restriction."
)
endif()
set(_common_include_directories ${CMAKE_CURRENT_SOURCE_DIR}/..)
set(_common_include_directories ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/runtime/core/portable_type)

#
# The `_<target>_srcs` lists are defined by including ${EXECUTORCH_SRCS_FILE}.
Expand DownExpand Up@@ -549,6 +549,7 @@ endif()
target_include_directories(
executorch_core PUBLIC ${_common_include_directories}
)
target_compile_definitions(executorch_core PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
target_compile_options(executorch_core PUBLIC ${_common_compile_options})
if(MAX_KERNEL_NUM)
target_compile_definitions(
Expand All@@ -569,6 +570,7 @@ if(EXECUTORCH_BUILD_PYBIND AND APPLE)
target_include_directories(
executorch_core_shared PUBLIC ${_common_include_directories}
)
target_compile_definitions(executorch_core_shared PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
target_compile_options(
executorch_core_shared PUBLIC ${_common_compile_options}
)
Expand All@@ -589,6 +591,7 @@ endif()
add_library(executorch ${_executorch__srcs})
target_link_libraries(executorch PRIVATE executorch_core)
target_include_directories(executorch PUBLIC ${_common_include_directories})
target_compile_definitions(executorch PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
target_compile_options(executorch PUBLIC ${_common_compile_options})
target_link_options_shared_lib(executorch)

Expand DownExpand Up@@ -622,6 +625,12 @@ endif()

# Install `executorch` library as well as `executorch-config.cmake` under
# ${CMAKE_INSTALL_PREFIX}/
install(DIRECTORY runtime/core/ DESTINATION include/executorch/runtime/core FILES_MATCHING PATTERN "*.h")
install(DIRECTORY runtime/kernel/ DESTINATION include/executorch/runtime/kernel FILES_MATCHING PATTERN "*.h")
install(DIRECTORY runtime/platform/ DESTINATION include/executorch/runtime/platform FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/kernel_util/ DESTINATION include/executorch/extension/kernel_util FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/tensor/ DESTINATION include/executorch/extension/tensor FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/threadpool/ DESTINATION include/executorch/extension/threadpool FILES_MATCHING PATTERN "*.h")
install(
TARGETS executorch executorch_core
DESTINATION lib
Expand DownExpand Up@@ -780,6 +789,8 @@ if(EXECUTORCH_BUILD_PYBIND)
target_include_directories(
util PUBLIC ${_common_include_directories} ${TORCH_INCLUDE_DIRS}
)
target_compile_definitions(util PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)

target_compile_options(util PUBLIC ${_pybind_compile_options})
target_link_libraries(util PRIVATE torch c10 executorch extension_tensor)

Expand Down
2 changes: 2 additions & 0 deletions backends/apple/coreml/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,8 @@ target_include_directories(
coremldelegate PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util
)
target_include_directories(coremldelegate PRIVATE ${EXECUTORCH_ROOT}/..)
target_include_directories(coremldelegate PRIVATE ${EXECUTORCH_ROOT}/runtime/core/portable_type)
target_compile_definitions(coremldelegate PRIVATE C10_USING_CUSTOM_GENERATED_MACROS)
target_link_libraries(coremldelegate PRIVATE executorch_core)

if(EXECUTORCH_BUILD_DEVTOOLS)
Expand Down
4 changes: 4 additions & 0 deletions backends/apple/coreml/runtime/workspace/executorchcoreml.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -830,6 +830,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"C10_USING_CUSTOM_GENERATED_MACROS",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand DownExpand Up@@ -911,6 +912,7 @@
DEVELOPMENT_TEAM = "";
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"C10_USING_CUSTOM_GENERATED_MACROS",
"ET_EVENT_TRACER_ENABLED=1",
"$(inherited)",
);
Expand All@@ -920,6 +922,7 @@
"$(SRCROOT)/../kvstore",
"$(SRCROOT)/../inmemoryfs",
"$(SRCROOT)/../include",
"$(SRCROOT)/../include/executorch/runtime/core/portable_type",
"$(SRCROOT)/../sdk",
"$(SRCROOT)/../util",
"$(SRCROOT)/../../third-party/nlohmann_json/single_include",
Expand DownExpand Up@@ -951,6 +954,7 @@
"$(SRCROOT)/../kvstore",
"$(SRCROOT)/../inmemoryfs",
"$(SRCROOT)/../include",
"$(SRCROOT)/../include/executorch/runtime/core/portable_type",
"$(SRCROOT)/../sdk",
"$(SRCROOT)/../util",
"$(SRCROOT)/../../third-party/nlohmann_json/single_include",
Expand Down
3 changes: 2 additions & 1 deletion backends/arm/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,8 @@ endif()

include(${EXECUTORCH_ROOT}/build/Utils.cmake)

set(_common_include_directories ${EXECUTORCH_ROOT}/..)
set(_common_include_directories ${EXECUTORCH_ROOT}/.. ${EXECUTORCH_ROOT}/runtime/core/portable_type)
add_compile_definitions(C10_USING_CUSTOM_GENERATED_MACROS)

# Third-party folder and Ethos-U driver inclued
set(THIRD_PARTY_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/third-party")
Expand Down
2 changes: 2 additions & 0 deletions backends/qualcomm/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ add_custom_command(
)

add_compile_options("-Wall" "-Werror" "-Wno-sign-compare")
add_compile_definitions(C10_USING_CUSTOM_GENERATED_MACROS)

# GNU emit wanring for ignored attributes Unfortunately, we use [[maybe_unused]]
# which can be ignored by GNU. So we make it a warning, not an error in GNU.
Expand All@@ -73,6 +74,7 @@ endif()
include_directories(
BEFORE ${_common_include_directories} ${QNN_SDK_ROOT}/include/QNN
${EXECUTORCH_SOURCE_DIR}/third-party/flatbuffers/include
${EXECUTORCH_SOURCE_DIR}/runtime/core/portable_type
)

set(_qnn_schema__srcs
Expand Down
2 changes: 1 addition & 1 deletion backends/xnnpack/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ target_include_directories(
target_compile_options(xnnpack_backend PUBLIC ${_common_compile_options})
target_link_options_shared_lib(xnnpack_backend)

list(APPEND xnn_executor_runner_libs xnnpack_backend)
list(APPEND xnn_executor_runner_libs xnnpack_backend executorch)

# ios can only build library but not binary
if(NOT CMAKE_TOOLCHAIN_FILE MATCHES ".*(iOS|ios\.toolchain)\.cmake$")
Expand Down
9 changes: 7 additions & 2 deletions build/Codegen.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,13 +59,15 @@ endfunction()
# Invoked as generate_bindings_for_kernels( LIB_NAME lib_name FUNCTIONS_YAML
# functions_yaml CUSTOM_OPS_YAML custom_ops_yaml )
function(generate_bindings_for_kernels)
set(options ADD_EXCEPTION_BOUNDARY)
set(arg_names LIB_NAME FUNCTIONS_YAML CUSTOM_OPS_YAML)
cmake_parse_arguments(GEN "" "${arg_names}" "" ${ARGN})
cmake_parse_arguments(GEN "${options}" "${arg_names}" "" ${ARGN})

message(STATUS "Generating kernel bindings:")
message(STATUS " LIB_NAME: ${GEN_LIB_NAME}")
message(STATUS " FUNCTIONS_YAML: ${GEN_FUNCTIONS_YAML}")
message(STATUS " CUSTOM_OPS_YAML: ${GEN_CUSTOM_OPS_YAML}")
message(STATUS " ADD_EXCEPTION_BOUNDARY: ${GEN_ADD_EXCEPTION_BOUNDARY}")

# Command to generate selected_operators.yaml from custom_ops.yaml.
file(GLOB_RECURSE _codegen_templates "${EXECUTORCH_ROOT}/codegen/templates/*")
Expand DownExpand Up@@ -93,7 +95,10 @@ function(generate_bindings_for_kernels)
--tags-path=${site-packages-out}/torchgen/packaged/ATen/native/tags.yaml
--aten-yaml-path=${site-packages-out}/torchgen/packaged/ATen/native/native_functions.yaml
--op-selection-yaml-path=${_oplist_yaml}
)
)
if(GEN_ADD_EXCEPTION_BOUNDARY)
set(_gen_command "${_gen_command}" --add-exception-boundary)
endif()

set(_gen_command_sources
${_out_dir}/RegisterCodegenUnboxedKernelsEverything.cpp
Expand Down
14 changes: 14 additions & 0 deletions build/build_apple_frameworks.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,20 @@ check_command "$BUCK2"
//extension/tensor: \
| rsync -av --files-from=- "$SOURCE_ROOT_DIR" "$HEADERS_PATH/executorch"

# HACK: XCFrameworks don't appear to support exporting any build
# options, but we need the following:
# - runtime/core/portable/type/c10 reachable with `#include <c10/...>`
# - exported -DC10_USING_CUSTOM_GENERATED_MACROS compiler flag
# So, just patch our generated framework to do that.
sed -i '' '1i\
#define C10_USING_CUSTOM_GENERATED_MACROS
' $HEADERS_PATH/executorch/runtime/core/portable_type/c10/macros/Macros.h
sed -i '' '1i\
#define C10_USING_CUSTOM_GENERATED_MACROS
' $HEADERS_PATH/executorch/runtime/core/portable_type/c10/macros/Export.h
ln -s $HEADERS_PATH/executorch/runtime/core/portable_type/c10 "$HEADERS_PATH/"


cp "$SOURCE_ROOT_DIR/extension/apple/ExecuTorch/Exported/"*.h "$HEADERS_PATH/executorch"
cp "$SOURCE_ROOT_DIR/extension/apple/ExecuTorch/Exported/"*.modulemap "$HEADERS_PATH"

Expand Down
13 changes: 7 additions & 6 deletions build/executorch-config.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,20 +26,21 @@

cmake_minimum_required(VERSION 3.19)

set(_root "${CMAKE_CURRENT_LIST_DIR}/../..")
set(_root "${CMAKE_CURRENT_LIST_DIR}/../../..")
set(required_lib_list executorch executorch_core portable_kernels)
set(EXECUTORCH_LIBRARIES)
set(EXECUTORCH_INCLUDE_DIRS ${_root})
set(EXECUTORCH_INCLUDE_DIRS ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
foreach(lib ${required_lib_list})
set(lib_var "LIB_${lib}")
add_library(${lib} STATIC IMPORTED)
find_library(
${lib_var} ${lib}
HINTS "${_root}"
HINTS "${_root}/lib"
CMAKE_FIND_ROOT_PATH_BOTH
)
set_target_properties(${lib} PROPERTIES IMPORTED_LOCATION "${${lib_var}}")
target_include_directories(${lib} INTERFACE ${_root})
target_compile_definitions(${lib} INTERFACE C10_USING_CUSTOM_GENERATED_MACROS)
target_include_directories(${lib} INTERFACE ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
list(APPEND EXECUTORCH_LIBRARIES ${lib})
endforeach()

Expand DownExpand Up@@ -93,7 +94,7 @@ foreach(lib ${lib_list})
set(lib_var "LIB_${lib}")
find_library(
${lib_var} ${lib}
HINTS "${_root}"
HINTS "${_root}/lib"
CMAKE_FIND_ROOT_PATH_BOTH
)
if(NOT ${lib_var})
Expand All@@ -109,7 +110,7 @@ foreach(lib ${lib_list})
add_library(${lib} STATIC IMPORTED)
endif()
set_target_properties(${lib} PROPERTIES IMPORTED_LOCATION "${${lib_var}}")
target_include_directories(${lib} INTERFACE ${_root})
target_include_directories(${lib} INTERFACE ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
list(APPEND EXECUTORCH_LIBRARIES ${lib})
endif()
endforeach()
2 changes: 1 addition & 1 deletion configurations/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED)

generate_bindings_for_kernels(
LIB_NAME "optimized_native_cpu_ops_lib" FUNCTIONS_YAML
${CMAKE_CURRENT_BINARY_DIR}/merged.yaml
${CMAKE_CURRENT_BINARY_DIR}/merged.yaml ADD_EXCEPTION_BOUNDARY
)
message("Generated files ${gen_command_sources}")

Expand Down
15 changes: 13 additions & 2 deletions examples/apple/coreml/executor_runner/coreml_executor_runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"C10_USING_CUSTOM_GENERATED_MACROS",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand DownExpand Up@@ -271,6 +272,10 @@
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
"C10_USING_CUSTOM_GENERATED_MACROS",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand All@@ -291,7 +296,10 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/include";
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/include",
"$(SRCROOT)/include/executorch/runtime/core/portable_type",
);
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LIBRARY_SEARCH_PATHS = (
"$(SRCROOT)/libraries",
Expand All@@ -310,7 +318,10 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/include";
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/include",
"$(SRCROOT)/include/executorch/runtime/core/portable_type",
);
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LIBRARY_SEARCH_PATHS = (
"$(SRCROOT)/libraries",
Expand Down
3 changes: 2 additions & 1 deletion examples/arm/executor_runner/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -382,8 +382,9 @@ target_link_options( arm_executor_runner PUBLIC LINKER:-Map=arm_executor_runner.

# ET headers and generated headers includes
target_include_directories(
arm_executor_runner PRIVATE ${ET_INCLUDE_PATH} ${CMAKE_CURRENT_BINARY_DIR}
arm_executor_runner PRIVATE ${ET_INCLUDE_PATH} ${ET_DIR_PATH}/runtime/core/portable_type ${CMAKE_CURRENT_BINARY_DIR}
)
target_compile_definitions(arm_executor_runner PRIVATE C10_USING_CUSTOM_GENERATED_MACROS)

if(SEMIHOSTING)
target_compile_definitions(arm_executor_runner PUBLIC SEMIHOSTING)
Expand Down
1 change: 1 addition & 0 deletions kernels/optimized/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ gen_selected_ops(LIB_NAME "optimized_ops_lib" OPS_SCHEMA_YAML "${_yaml}")
generate_bindings_for_kernels(
LIB_NAME "optimized_ops_lib" FUNCTIONS_YAML
${CMAKE_CURRENT_SOURCE_DIR}/optimized-oss.yaml
ADD_EXCEPTION_BOUNDARY
)
message("Generated files ${gen_command_sources}")

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Integrate torchgen exception boundary with ExecuTorch#8321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

swolchok
merged 2 commits into

from

Feb 11, 2025
 Merged


Integrate torchgen exception boundary with ExecuTorch
#8321
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
0f76731

Use c10 version of half/bfloat16 in executorch

Feb 7, 2025
5704dae

Integrate torchgen exception boundary with ExecuTorch

Feb 7, 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


4 changes: 4 additions & 0 deletions
.lintrunner.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,8 @@ exclude_patterns = [
 # File contains @generated
 'extension/llm/custom_ops/spinquant/fast_hadamard_transform_special.h',
 'extension/llm/custom_ops/spinquant/test/fast_hadamard_transform_special_unstrided_cpu.h',
 # Want to be able to keep c10 in sync with PyTorch core.
 'runtime/core/portable_type/c10/**',
]
command = [
 'python',
Expand DownExpand Up@@ -261,6 +263,8 @@ exclude_patterns = [
 'extension/**',
 'kernels/optimized/**',
 'runtime/core/exec_aten/**',
 # Want to be able to keep c10 in sync with PyTorch core.
 'runtime/core/portable_type/c10/**',
 'runtime/executor/tensor_parser_aten.cpp',
 'scripts/**',
 'test/**',
Expand Down

13 changes: 12 additions & 1 deletion
CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -366,7 +366,7 @@ if(NOT "${_repo_dir_name}" STREQUAL "executorch")
 "fix for this restriction."
 )
endif()
set(_common_include_directories ${CMAKE_CURRENT_SOURCE_DIR}/..)
set(_common_include_directories ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/runtime/core/portable_type)

#
# The `_<target>_srcs` lists are defined by including ${EXECUTORCH_SRCS_FILE}.
Expand DownExpand Up@@ -549,6 +549,7 @@ endif()
target_include_directories(
 executorch_core PUBLIC ${_common_include_directories}
)
target_compile_definitions(executorch_core PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
target_compile_options(executorch_core PUBLIC ${_common_compile_options})
if(MAX_KERNEL_NUM)
 target_compile_definitions(
Expand All@@ -569,6 +570,7 @@ if(EXECUTORCH_BUILD_PYBIND AND APPLE)
 target_include_directories(
 executorch_core_shared PUBLIC ${_common_include_directories}
 )
 target_compile_definitions(executorch_core_shared PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
 target_compile_options(
 executorch_core_shared PUBLIC ${_common_compile_options}
 )
Expand All@@ -589,6 +591,7 @@ endif()
add_library(executorch ${_executorch__srcs})
target_link_libraries(executorch PRIVATE executorch_core)
target_include_directories(executorch PUBLIC ${_common_include_directories})
target_compile_definitions(executorch PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
target_compile_options(executorch PUBLIC ${_common_compile_options})
target_link_options_shared_lib(executorch)

Expand DownExpand Up@@ -622,6 +625,12 @@ endif()

# Install `executorch` library as well as `executorch-config.cmake` under
# ${CMAKE_INSTALL_PREFIX}/
install(DIRECTORY runtime/core/ DESTINATION include/executorch/runtime/core FILES_MATCHING PATTERN "*.h")
install(DIRECTORY runtime/kernel/ DESTINATION include/executorch/runtime/kernel FILES_MATCHING PATTERN "*.h")
install(DIRECTORY runtime/platform/ DESTINATION include/executorch/runtime/platform FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/kernel_util/ DESTINATION include/executorch/extension/kernel_util FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/tensor/ DESTINATION include/executorch/extension/tensor FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/threadpool/ DESTINATION include/executorch/extension/threadpool FILES_MATCHING PATTERN "*.h")
install(
 TARGETS executorch executorch_core
 DESTINATION lib
Expand DownExpand Up@@ -780,6 +789,8 @@ if(EXECUTORCH_BUILD_PYBIND)
 target_include_directories(
 util PUBLIC ${_common_include_directories} ${TORCH_INCLUDE_DIRS}
 )
 target_compile_definitions(util PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)

 target_compile_options(util PUBLIC ${_pybind_compile_options})
 target_link_libraries(util PRIVATE torch c10 executorch extension_tensor)

Expand Down

2 changes: 2 additions & 0 deletions
backends/apple/coreml/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,8 @@ target_include_directories(
 coremldelegate PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util
)
target_include_directories(coremldelegate PRIVATE ${EXECUTORCH_ROOT}/..)
target_include_directories(coremldelegate PRIVATE ${EXECUTORCH_ROOT}/runtime/core/portable_type)
target_compile_definitions(coremldelegate PRIVATE C10_USING_CUSTOM_GENERATED_MACROS)
target_link_libraries(coremldelegate PRIVATE executorch_core)

if(EXECUTORCH_BUILD_DEVTOOLS)
Expand Down

4 changes: 4 additions & 0 deletions
backends/apple/coreml/runtime/workspace/executorchcoreml.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -830,6 +830,7 @@
 GCC_OPTIMIZATION_LEVEL = 0;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "$(inherited)",
 );
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand DownExpand Up@@ -911,6 +912,7 @@
 DEVELOPMENT_TEAM = "";
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "ET_EVENT_TRACER_ENABLED=1",
 "$(inherited)",
 );
Expand All@@ -920,6 +922,7 @@
 "$(SRCROOT)/../kvstore",
 "$(SRCROOT)/../inmemoryfs",
 "$(SRCROOT)/../include",
 "$(SRCROOT)/../include/executorch/runtime/core/portable_type",
 "$(SRCROOT)/../sdk",
 "$(SRCROOT)/../util",
 "$(SRCROOT)/../../third-party/nlohmann_json/single_include",
Expand DownExpand Up@@ -951,6 +954,7 @@
 "$(SRCROOT)/../kvstore",
 "$(SRCROOT)/../inmemoryfs",
 "$(SRCROOT)/../include",
 "$(SRCROOT)/../include/executorch/runtime/core/portable_type",
 "$(SRCROOT)/../sdk",
 "$(SRCROOT)/../util",
 "$(SRCROOT)/../../third-party/nlohmann_json/single_include",
Expand Down

3 changes: 2 additions & 1 deletion
backends/arm/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,8 @@ endif()

include(${EXECUTORCH_ROOT}/build/Utils.cmake)

set(_common_include_directories ${EXECUTORCH_ROOT}/..)
set(_common_include_directories ${EXECUTORCH_ROOT}/.. ${EXECUTORCH_ROOT}/runtime/core/portable_type)
add_compile_definitions(C10_USING_CUSTOM_GENERATED_MACROS)

# Third-party folder and Ethos-U driver inclued
set(THIRD_PARTY_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/third-party")
Expand Down

2 changes: 2 additions & 0 deletions
backends/qualcomm/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ add_custom_command(
)

add_compile_options("-Wall" "-Werror" "-Wno-sign-compare")
add_compile_definitions(C10_USING_CUSTOM_GENERATED_MACROS)

# GNU emit wanring for ignored attributes Unfortunately, we use [[maybe_unused]]
# which can be ignored by GNU. So we make it a warning, not an error in GNU.
Expand All@@ -73,6 +74,7 @@ endif()
include_directories(
 BEFORE ${_common_include_directories} ${QNN_SDK_ROOT}/include/QNN
 ${EXECUTORCH_SOURCE_DIR}/third-party/flatbuffers/include
 ${EXECUTORCH_SOURCE_DIR}/runtime/core/portable_type
)

set(_qnn_schema__srcs
Expand Down

2 changes: 1 addition & 1 deletion
backends/xnnpack/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ target_include_directories(
target_compile_options(xnnpack_backend PUBLIC ${_common_compile_options})
target_link_options_shared_lib(xnnpack_backend)

list(APPEND xnn_executor_runner_libs xnnpack_backend)
list(APPEND xnn_executor_runner_libs xnnpack_backend executorch)

# ios can only build library but not binary
if(NOT CMAKE_TOOLCHAIN_FILE MATCHES ".*(iOS|ios\.toolchain)\.cmake$")
Expand Down

9 changes: 7 additions & 2 deletions
build/Codegen.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,13 +59,15 @@ endfunction()
# Invoked as generate_bindings_for_kernels( LIB_NAME lib_name FUNCTIONS_YAML
# functions_yaml CUSTOM_OPS_YAML custom_ops_yaml )
function(generate_bindings_for_kernels)
 set(options ADD_EXCEPTION_BOUNDARY)
 set(arg_names LIB_NAME FUNCTIONS_YAML CUSTOM_OPS_YAML)
 cmake_parse_arguments(GEN "" "${arg_names}" "" ${ARGN})
 cmake_parse_arguments(GEN "${options}" "${arg_names}" "" ${ARGN})

 message(STATUS "Generating kernel bindings:")
 message(STATUS " LIB_NAME: ${GEN_LIB_NAME}")
 message(STATUS " FUNCTIONS_YAML: ${GEN_FUNCTIONS_YAML}")
 message(STATUS " CUSTOM_OPS_YAML: ${GEN_CUSTOM_OPS_YAML}")
 message(STATUS " ADD_EXCEPTION_BOUNDARY: ${GEN_ADD_EXCEPTION_BOUNDARY}")

 # Command to generate selected_operators.yaml from custom_ops.yaml.
 file(GLOB_RECURSE _codegen_templates "${EXECUTORCH_ROOT}/codegen/templates/*")
Expand DownExpand Up@@ -93,7 +95,10 @@ function(generate_bindings_for_kernels)
 --tags-path=${site-packages-out}/torchgen/packaged/ATen/native/tags.yaml
 --aten-yaml-path=${site-packages-out}/torchgen/packaged/ATen/native/native_functions.yaml
 --op-selection-yaml-path=${_oplist_yaml}
 )
 )
 if(GEN_ADD_EXCEPTION_BOUNDARY)
 set(_gen_command "${_gen_command}" --add-exception-boundary)
 endif()

 set(_gen_command_sources
 ${_out_dir}/RegisterCodegenUnboxedKernelsEverything.cpp
Expand Down

14 changes: 14 additions & 0 deletions
build/build_apple_frameworks.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,20 @@ check_command "$BUCK2"
 //extension/tensor: \
| rsync -av --files-from=- "$SOURCE_ROOT_DIR" "$HEADERS_PATH/executorch"

# HACK: XCFrameworks don't appear to support exporting any build
# options, but we need the following:
# - runtime/core/portable/type/c10 reachable with `#include <c10/...>`
# - exported -DC10_USING_CUSTOM_GENERATED_MACROS compiler flag
# So, just patch our generated framework to do that.
sed -i '' '1i\
#define C10_USING_CUSTOM_GENERATED_MACROS
' $HEADERS_PATH/executorch/runtime/core/portable_type/c10/macros/Macros.h
sed -i '' '1i\
#define C10_USING_CUSTOM_GENERATED_MACROS
' $HEADERS_PATH/executorch/runtime/core/portable_type/c10/macros/Export.h
ln -s $HEADERS_PATH/executorch/runtime/core/portable_type/c10 "$HEADERS_PATH/"


cp "$SOURCE_ROOT_DIR/extension/apple/ExecuTorch/Exported/"*.h "$HEADERS_PATH/executorch"
cp "$SOURCE_ROOT_DIR/extension/apple/ExecuTorch/Exported/"*.modulemap "$HEADERS_PATH"

Expand Down

13 changes: 7 additions & 6 deletions
build/executorch-config.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,20 +26,21 @@

cmake_minimum_required(VERSION 3.19)

set(_root "${CMAKE_CURRENT_LIST_DIR}/../..")
set(_root "${CMAKE_CURRENT_LIST_DIR}/../../..")
set(required_lib_list executorch executorch_core portable_kernels)
set(EXECUTORCH_LIBRARIES)
set(EXECUTORCH_INCLUDE_DIRS ${_root})
set(EXECUTORCH_INCLUDE_DIRS ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
foreach(lib ${required_lib_list})
 set(lib_var "LIB_${lib}")
 add_library(${lib} STATIC IMPORTED)
 find_library(
 ${lib_var} ${lib}
 HINTS "${_root}"
 HINTS "${_root}/lib"
 CMAKE_FIND_ROOT_PATH_BOTH
 )
 set_target_properties(${lib} PROPERTIES IMPORTED_LOCATION "${${lib_var}}")
 target_include_directories(${lib} INTERFACE ${_root})
 target_compile_definitions(${lib} INTERFACE C10_USING_CUSTOM_GENERATED_MACROS)
 target_include_directories(${lib} INTERFACE ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
 list(APPEND EXECUTORCH_LIBRARIES ${lib})
endforeach()

Expand DownExpand Up@@ -93,7 +94,7 @@ foreach(lib ${lib_list})
 set(lib_var "LIB_${lib}")
 find_library(
 ${lib_var} ${lib}
 HINTS "${_root}"
 HINTS "${_root}/lib"
 CMAKE_FIND_ROOT_PATH_BOTH
 )
 if(NOT ${lib_var})
Expand All@@ -109,7 +110,7 @@ foreach(lib ${lib_list})
 add_library(${lib} STATIC IMPORTED)
 endif()
 set_target_properties(${lib} PROPERTIES IMPORTED_LOCATION "${${lib_var}}")
 target_include_directories(${lib} INTERFACE ${_root})
 target_include_directories(${lib} INTERFACE ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
 list(APPEND EXECUTORCH_LIBRARIES ${lib})
 endif()
endforeach()

2 changes: 1 addition & 1 deletion
configurations/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED)

 generate_bindings_for_kernels(
 LIB_NAME "optimized_native_cpu_ops_lib" FUNCTIONS_YAML
 ${CMAKE_CURRENT_BINARY_DIR}/merged.yaml
 ${CMAKE_CURRENT_BINARY_DIR}/merged.yaml ADD_EXCEPTION_BOUNDARY
 )
 message("Generated files ${gen_command_sources}")

Expand Down

15 changes: 13 additions & 2 deletions
examples/apple/coreml/executor_runner/coreml_executor_runner.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,7 @@
 GCC_OPTIMIZATION_LEVEL = 0;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "$(inherited)",
 );
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand DownExpand Up@@ -271,6 +272,10 @@
 ENABLE_USER_SCRIPT_SANDBOXING = YES;
 GCC_C_LANGUAGE_STANDARD = gnu17;
 GCC_NO_COMMON_BLOCKS = YES;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "$(inherited)",
 );
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand All@@ -291,7 +296,10 @@
 CODE_SIGN_STYLE = Automatic;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 HEADER_SEARCH_PATHS = "$(SRCROOT)/include";
 HEADER_SEARCH_PATHS = (
 "$(SRCROOT)/include",
 "$(SRCROOT)/include/executorch/runtime/core/portable_type",
 );
 IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 LIBRARY_SEARCH_PATHS = (
 "$(SRCROOT)/libraries",
Expand All@@ -310,7 +318,10 @@
 CODE_SIGN_STYLE = Automatic;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 HEADER_SEARCH_PATHS = "$(SRCROOT)/include";
 HEADER_SEARCH_PATHS = (
 "$(SRCROOT)/include",
 "$(SRCROOT)/include/executorch/runtime/core/portable_type",
 );
 IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 LIBRARY_SEARCH_PATHS = (
 "$(SRCROOT)/libraries",
Expand Down

3 changes: 2 additions & 1 deletion
examples/arm/executor_runner/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -382,8 +382,9 @@ target_link_options( arm_executor_runner PUBLIC LINKER:-Map=arm_executor_runner.

# ET headers and generated headers includes
target_include_directories(
 arm_executor_runner PRIVATE ${ET_INCLUDE_PATH} ${CMAKE_CURRENT_BINARY_DIR}
 arm_executor_runner PRIVATE ${ET_INCLUDE_PATH} ${ET_DIR_PATH}/runtime/core/portable_type ${CMAKE_CURRENT_BINARY_DIR}
)
target_compile_definitions(arm_executor_runner PRIVATE C10_USING_CUSTOM_GENERATED_MACROS)

if(SEMIHOSTING)
 target_compile_definitions(arm_executor_runner PUBLIC SEMIHOSTING)
Expand Down

1 change: 1 addition & 0 deletions
kernels/optimized/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ gen_selected_ops(LIB_NAME "optimized_ops_lib" OPS_SCHEMA_YAML "${_yaml}")
generate_bindings_for_kernels(
 LIB_NAME "optimized_ops_lib" FUNCTIONS_YAML
 ${CMAKE_CURRENT_SOURCE_DIR}/optimized-oss.yaml
 ADD_EXCEPTION_BOUNDARY
)
message("Generated files ${gen_command_sources}")

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Integrate torchgen exception boundary with ExecuTorch#8321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

swolchok
merged 2 commits into

from

Feb 11, 2025
 Merged


Integrate torchgen exception boundary with ExecuTorch
#8321
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
0f76731

Use c10 version of half/bfloat16 in executorch

Feb 7, 2025
5704dae

Integrate torchgen exception boundary with ExecuTorch

Feb 7, 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


4 changes: 4 additions & 0 deletions
.lintrunner.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,8 @@ exclude_patterns = [
 # File contains @generated
 'extension/llm/custom_ops/spinquant/fast_hadamard_transform_special.h',
 'extension/llm/custom_ops/spinquant/test/fast_hadamard_transform_special_unstrided_cpu.h',
 # Want to be able to keep c10 in sync with PyTorch core.
 'runtime/core/portable_type/c10/**',
]
command = [
 'python',
Expand DownExpand Up@@ -261,6 +263,8 @@ exclude_patterns = [
 'extension/**',
 'kernels/optimized/**',
 'runtime/core/exec_aten/**',
 # Want to be able to keep c10 in sync with PyTorch core.
 'runtime/core/portable_type/c10/**',
 'runtime/executor/tensor_parser_aten.cpp',
 'scripts/**',
 'test/**',
Expand Down

13 changes: 12 additions & 1 deletion
CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -366,7 +366,7 @@ if(NOT "${_repo_dir_name}" STREQUAL "executorch")
 "fix for this restriction."
 )
endif()
set(_common_include_directories ${CMAKE_CURRENT_SOURCE_DIR}/..)
set(_common_include_directories ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/runtime/core/portable_type)

#
# The `_<target>_srcs` lists are defined by including ${EXECUTORCH_SRCS_FILE}.
Expand DownExpand Up@@ -549,6 +549,7 @@ endif()
target_include_directories(
 executorch_core PUBLIC ${_common_include_directories}
)
target_compile_definitions(executorch_core PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
target_compile_options(executorch_core PUBLIC ${_common_compile_options})
if(MAX_KERNEL_NUM)
 target_compile_definitions(
Expand All@@ -569,6 +570,7 @@ if(EXECUTORCH_BUILD_PYBIND AND APPLE)
 target_include_directories(
 executorch_core_shared PUBLIC ${_common_include_directories}
 )
 target_compile_definitions(executorch_core_shared PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
 target_compile_options(
 executorch_core_shared PUBLIC ${_common_compile_options}
 )
Expand All@@ -589,6 +591,7 @@ endif()
add_library(executorch ${_executorch__srcs})
target_link_libraries(executorch PRIVATE executorch_core)
target_include_directories(executorch PUBLIC ${_common_include_directories})
target_compile_definitions(executorch PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
target_compile_options(executorch PUBLIC ${_common_compile_options})
target_link_options_shared_lib(executorch)

Expand DownExpand Up@@ -622,6 +625,12 @@ endif()

# Install `executorch` library as well as `executorch-config.cmake` under
# ${CMAKE_INSTALL_PREFIX}/
install(DIRECTORY runtime/core/ DESTINATION include/executorch/runtime/core FILES_MATCHING PATTERN "*.h")
install(DIRECTORY runtime/kernel/ DESTINATION include/executorch/runtime/kernel FILES_MATCHING PATTERN "*.h")
install(DIRECTORY runtime/platform/ DESTINATION include/executorch/runtime/platform FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/kernel_util/ DESTINATION include/executorch/extension/kernel_util FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/tensor/ DESTINATION include/executorch/extension/tensor FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/threadpool/ DESTINATION include/executorch/extension/threadpool FILES_MATCHING PATTERN "*.h")
install(
 TARGETS executorch executorch_core
 DESTINATION lib
Expand DownExpand Up@@ -780,6 +789,8 @@ if(EXECUTORCH_BUILD_PYBIND)
 target_include_directories(
 util PUBLIC ${_common_include_directories} ${TORCH_INCLUDE_DIRS}
 )
 target_compile_definitions(util PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)

 target_compile_options(util PUBLIC ${_pybind_compile_options})
 target_link_libraries(util PRIVATE torch c10 executorch extension_tensor)

Expand Down

2 changes: 2 additions & 0 deletions
backends/apple/coreml/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,8 @@ target_include_directories(
 coremldelegate PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util
)
target_include_directories(coremldelegate PRIVATE ${EXECUTORCH_ROOT}/..)
target_include_directories(coremldelegate PRIVATE ${EXECUTORCH_ROOT}/runtime/core/portable_type)
target_compile_definitions(coremldelegate PRIVATE C10_USING_CUSTOM_GENERATED_MACROS)
target_link_libraries(coremldelegate PRIVATE executorch_core)

if(EXECUTORCH_BUILD_DEVTOOLS)
Expand Down

4 changes: 4 additions & 0 deletions
backends/apple/coreml/runtime/workspace/executorchcoreml.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -830,6 +830,7 @@
 GCC_OPTIMIZATION_LEVEL = 0;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "$(inherited)",
 );
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand DownExpand Up@@ -911,6 +912,7 @@
 DEVELOPMENT_TEAM = "";
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "ET_EVENT_TRACER_ENABLED=1",
 "$(inherited)",
 );
Expand All@@ -920,6 +922,7 @@
 "$(SRCROOT)/../kvstore",
 "$(SRCROOT)/../inmemoryfs",
 "$(SRCROOT)/../include",
 "$(SRCROOT)/../include/executorch/runtime/core/portable_type",
 "$(SRCROOT)/../sdk",
 "$(SRCROOT)/../util",
 "$(SRCROOT)/../../third-party/nlohmann_json/single_include",
Expand DownExpand Up@@ -951,6 +954,7 @@
 "$(SRCROOT)/../kvstore",
 "$(SRCROOT)/../inmemoryfs",
 "$(SRCROOT)/../include",
 "$(SRCROOT)/../include/executorch/runtime/core/portable_type",
 "$(SRCROOT)/../sdk",
 "$(SRCROOT)/../util",
 "$(SRCROOT)/../../third-party/nlohmann_json/single_include",
Expand Down

3 changes: 2 additions & 1 deletion
backends/arm/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,8 @@ endif()

include(${EXECUTORCH_ROOT}/build/Utils.cmake)

set(_common_include_directories ${EXECUTORCH_ROOT}/..)
set(_common_include_directories ${EXECUTORCH_ROOT}/.. ${EXECUTORCH_ROOT}/runtime/core/portable_type)
add_compile_definitions(C10_USING_CUSTOM_GENERATED_MACROS)

# Third-party folder and Ethos-U driver inclued
set(THIRD_PARTY_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/third-party")
Expand Down

2 changes: 2 additions & 0 deletions
backends/qualcomm/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ add_custom_command(
)

add_compile_options("-Wall" "-Werror" "-Wno-sign-compare")
add_compile_definitions(C10_USING_CUSTOM_GENERATED_MACROS)

# GNU emit wanring for ignored attributes Unfortunately, we use [[maybe_unused]]
# which can be ignored by GNU. So we make it a warning, not an error in GNU.
Expand All@@ -73,6 +74,7 @@ endif()
include_directories(
 BEFORE ${_common_include_directories} ${QNN_SDK_ROOT}/include/QNN
 ${EXECUTORCH_SOURCE_DIR}/third-party/flatbuffers/include
 ${EXECUTORCH_SOURCE_DIR}/runtime/core/portable_type
)

set(_qnn_schema__srcs
Expand Down

2 changes: 1 addition & 1 deletion
backends/xnnpack/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ target_include_directories(
target_compile_options(xnnpack_backend PUBLIC ${_common_compile_options})
target_link_options_shared_lib(xnnpack_backend)

list(APPEND xnn_executor_runner_libs xnnpack_backend)
list(APPEND xnn_executor_runner_libs xnnpack_backend executorch)

# ios can only build library but not binary
if(NOT CMAKE_TOOLCHAIN_FILE MATCHES ".*(iOS|ios\.toolchain)\.cmake$")
Expand Down

9 changes: 7 additions & 2 deletions
build/Codegen.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,13 +59,15 @@ endfunction()
# Invoked as generate_bindings_for_kernels( LIB_NAME lib_name FUNCTIONS_YAML
# functions_yaml CUSTOM_OPS_YAML custom_ops_yaml )
function(generate_bindings_for_kernels)
 set(options ADD_EXCEPTION_BOUNDARY)
 set(arg_names LIB_NAME FUNCTIONS_YAML CUSTOM_OPS_YAML)
 cmake_parse_arguments(GEN "" "${arg_names}" "" ${ARGN})
 cmake_parse_arguments(GEN "${options}" "${arg_names}" "" ${ARGN})

 message(STATUS "Generating kernel bindings:")
 message(STATUS " LIB_NAME: ${GEN_LIB_NAME}")
 message(STATUS " FUNCTIONS_YAML: ${GEN_FUNCTIONS_YAML}")
 message(STATUS " CUSTOM_OPS_YAML: ${GEN_CUSTOM_OPS_YAML}")
 message(STATUS " ADD_EXCEPTION_BOUNDARY: ${GEN_ADD_EXCEPTION_BOUNDARY}")

 # Command to generate selected_operators.yaml from custom_ops.yaml.
 file(GLOB_RECURSE _codegen_templates "${EXECUTORCH_ROOT}/codegen/templates/*")
Expand DownExpand Up@@ -93,7 +95,10 @@ function(generate_bindings_for_kernels)
 --tags-path=${site-packages-out}/torchgen/packaged/ATen/native/tags.yaml
 --aten-yaml-path=${site-packages-out}/torchgen/packaged/ATen/native/native_functions.yaml
 --op-selection-yaml-path=${_oplist_yaml}
 )
 )
 if(GEN_ADD_EXCEPTION_BOUNDARY)
 set(_gen_command "${_gen_command}" --add-exception-boundary)
 endif()

 set(_gen_command_sources
 ${_out_dir}/RegisterCodegenUnboxedKernelsEverything.cpp
Expand Down

14 changes: 14 additions & 0 deletions
build/build_apple_frameworks.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,20 @@ check_command "$BUCK2"
 //extension/tensor: \
| rsync -av --files-from=- "$SOURCE_ROOT_DIR" "$HEADERS_PATH/executorch"

# HACK: XCFrameworks don't appear to support exporting any build
# options, but we need the following:
# - runtime/core/portable/type/c10 reachable with `#include <c10/...>`
# - exported -DC10_USING_CUSTOM_GENERATED_MACROS compiler flag
# So, just patch our generated framework to do that.
sed -i '' '1i\
#define C10_USING_CUSTOM_GENERATED_MACROS
' $HEADERS_PATH/executorch/runtime/core/portable_type/c10/macros/Macros.h
sed -i '' '1i\
#define C10_USING_CUSTOM_GENERATED_MACROS
' $HEADERS_PATH/executorch/runtime/core/portable_type/c10/macros/Export.h
ln -s $HEADERS_PATH/executorch/runtime/core/portable_type/c10 "$HEADERS_PATH/"


cp "$SOURCE_ROOT_DIR/extension/apple/ExecuTorch/Exported/"*.h "$HEADERS_PATH/executorch"
cp "$SOURCE_ROOT_DIR/extension/apple/ExecuTorch/Exported/"*.modulemap "$HEADERS_PATH"

Expand Down

13 changes: 7 additions & 6 deletions
build/executorch-config.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,20 +26,21 @@

cmake_minimum_required(VERSION 3.19)

set(_root "${CMAKE_CURRENT_LIST_DIR}/../..")
set(_root "${CMAKE_CURRENT_LIST_DIR}/../../..")
set(required_lib_list executorch executorch_core portable_kernels)
set(EXECUTORCH_LIBRARIES)
set(EXECUTORCH_INCLUDE_DIRS ${_root})
set(EXECUTORCH_INCLUDE_DIRS ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
foreach(lib ${required_lib_list})
 set(lib_var "LIB_${lib}")
 add_library(${lib} STATIC IMPORTED)
 find_library(
 ${lib_var} ${lib}
 HINTS "${_root}"
 HINTS "${_root}/lib"
 CMAKE_FIND_ROOT_PATH_BOTH
 )
 set_target_properties(${lib} PROPERTIES IMPORTED_LOCATION "${${lib_var}}")
 target_include_directories(${lib} INTERFACE ${_root})
 target_compile_definitions(${lib} INTERFACE C10_USING_CUSTOM_GENERATED_MACROS)
 target_include_directories(${lib} INTERFACE ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
 list(APPEND EXECUTORCH_LIBRARIES ${lib})
endforeach()

Expand DownExpand Up@@ -93,7 +94,7 @@ foreach(lib ${lib_list})
 set(lib_var "LIB_${lib}")
 find_library(
 ${lib_var} ${lib}
 HINTS "${_root}"
 HINTS "${_root}/lib"
 CMAKE_FIND_ROOT_PATH_BOTH
 )
 if(NOT ${lib_var})
Expand All@@ -109,7 +110,7 @@ foreach(lib ${lib_list})
 add_library(${lib} STATIC IMPORTED)
 endif()
 set_target_properties(${lib} PROPERTIES IMPORTED_LOCATION "${${lib_var}}")
 target_include_directories(${lib} INTERFACE ${_root})
 target_include_directories(${lib} INTERFACE ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
 list(APPEND EXECUTORCH_LIBRARIES ${lib})
 endif()
endforeach()

2 changes: 1 addition & 1 deletion
configurations/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED)

 generate_bindings_for_kernels(
 LIB_NAME "optimized_native_cpu_ops_lib" FUNCTIONS_YAML
 ${CMAKE_CURRENT_BINARY_DIR}/merged.yaml
 ${CMAKE_CURRENT_BINARY_DIR}/merged.yaml ADD_EXCEPTION_BOUNDARY
 )
 message("Generated files ${gen_command_sources}")

Expand Down

15 changes: 13 additions & 2 deletions
examples/apple/coreml/executor_runner/coreml_executor_runner.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,7 @@
 GCC_OPTIMIZATION_LEVEL = 0;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "$(inherited)",
 );
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand DownExpand Up@@ -271,6 +272,10 @@
 ENABLE_USER_SCRIPT_SANDBOXING = YES;
 GCC_C_LANGUAGE_STANDARD = gnu17;
 GCC_NO_COMMON_BLOCKS = YES;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "$(inherited)",
 );
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand All@@ -291,7 +296,10 @@
 CODE_SIGN_STYLE = Automatic;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 HEADER_SEARCH_PATHS = "$(SRCROOT)/include";
 HEADER_SEARCH_PATHS = (
 "$(SRCROOT)/include",
 "$(SRCROOT)/include/executorch/runtime/core/portable_type",
 );
 IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 LIBRARY_SEARCH_PATHS = (
 "$(SRCROOT)/libraries",
Expand All@@ -310,7 +318,10 @@
 CODE_SIGN_STYLE = Automatic;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 HEADER_SEARCH_PATHS = "$(SRCROOT)/include";
 HEADER_SEARCH_PATHS = (
 "$(SRCROOT)/include",
 "$(SRCROOT)/include/executorch/runtime/core/portable_type",
 );
 IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 LIBRARY_SEARCH_PATHS = (
 "$(SRCROOT)/libraries",
Expand Down

3 changes: 2 additions & 1 deletion
examples/arm/executor_runner/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -382,8 +382,9 @@ target_link_options( arm_executor_runner PUBLIC LINKER:-Map=arm_executor_runner.

# ET headers and generated headers includes
target_include_directories(
 arm_executor_runner PRIVATE ${ET_INCLUDE_PATH} ${CMAKE_CURRENT_BINARY_DIR}
 arm_executor_runner PRIVATE ${ET_INCLUDE_PATH} ${ET_DIR_PATH}/runtime/core/portable_type ${CMAKE_CURRENT_BINARY_DIR}
)
target_compile_definitions(arm_executor_runner PRIVATE C10_USING_CUSTOM_GENERATED_MACROS)

if(SEMIHOSTING)
 target_compile_definitions(arm_executor_runner PUBLIC SEMIHOSTING)
Expand Down

1 change: 1 addition & 0 deletions
kernels/optimized/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ gen_selected_ops(LIB_NAME "optimized_ops_lib" OPS_SCHEMA_YAML "${_yaml}")
generate_bindings_for_kernels(
 LIB_NAME "optimized_ops_lib" FUNCTIONS_YAML
 ${CMAKE_CURRENT_SOURCE_DIR}/optimized-oss.yaml
 ADD_EXCEPTION_BOUNDARY
)
message("Generated files ${gen_command_sources}")

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Integrate torchgen exception boundary with ExecuTorch#8321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

swolchok
merged 2 commits into

from

Feb 11, 2025
 Merged


Integrate torchgen exception boundary with ExecuTorch
#8321
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
0f76731

Use c10 version of half/bfloat16 in executorch

Feb 7, 2025
5704dae

Integrate torchgen exception boundary with ExecuTorch

Feb 7, 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


4 changes: 4 additions & 0 deletions
.lintrunner.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,8 @@ exclude_patterns = [
 # File contains @generated
 'extension/llm/custom_ops/spinquant/fast_hadamard_transform_special.h',
 'extension/llm/custom_ops/spinquant/test/fast_hadamard_transform_special_unstrided_cpu.h',
 # Want to be able to keep c10 in sync with PyTorch core.
 'runtime/core/portable_type/c10/**',
]
command = [
 'python',
Expand DownExpand Up@@ -261,6 +263,8 @@ exclude_patterns = [
 'extension/**',
 'kernels/optimized/**',
 'runtime/core/exec_aten/**',
 # Want to be able to keep c10 in sync with PyTorch core.
 'runtime/core/portable_type/c10/**',
 'runtime/executor/tensor_parser_aten.cpp',
 'scripts/**',
 'test/**',
Expand Down

13 changes: 12 additions & 1 deletion
CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -366,7 +366,7 @@ if(NOT "${_repo_dir_name}" STREQUAL "executorch")
 "fix for this restriction."
 )
endif()
set(_common_include_directories ${CMAKE_CURRENT_SOURCE_DIR}/..)
set(_common_include_directories ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/runtime/core/portable_type)

#
# The `_<target>_srcs` lists are defined by including ${EXECUTORCH_SRCS_FILE}.
Expand DownExpand Up@@ -549,6 +549,7 @@ endif()
target_include_directories(
 executorch_core PUBLIC ${_common_include_directories}
)
target_compile_definitions(executorch_core PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
target_compile_options(executorch_core PUBLIC ${_common_compile_options})
if(MAX_KERNEL_NUM)
 target_compile_definitions(
Expand All@@ -569,6 +570,7 @@ if(EXECUTORCH_BUILD_PYBIND AND APPLE)
 target_include_directories(
 executorch_core_shared PUBLIC ${_common_include_directories}
 )
 target_compile_definitions(executorch_core_shared PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
 target_compile_options(
 executorch_core_shared PUBLIC ${_common_compile_options}
 )
Expand All@@ -589,6 +591,7 @@ endif()
add_library(executorch ${_executorch__srcs})
target_link_libraries(executorch PRIVATE executorch_core)
target_include_directories(executorch PUBLIC ${_common_include_directories})
target_compile_definitions(executorch PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
target_compile_options(executorch PUBLIC ${_common_compile_options})
target_link_options_shared_lib(executorch)

Expand DownExpand Up@@ -622,6 +625,12 @@ endif()

# Install `executorch` library as well as `executorch-config.cmake` under
# ${CMAKE_INSTALL_PREFIX}/
install(DIRECTORY runtime/core/ DESTINATION include/executorch/runtime/core FILES_MATCHING PATTERN "*.h")
install(DIRECTORY runtime/kernel/ DESTINATION include/executorch/runtime/kernel FILES_MATCHING PATTERN "*.h")
install(DIRECTORY runtime/platform/ DESTINATION include/executorch/runtime/platform FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/kernel_util/ DESTINATION include/executorch/extension/kernel_util FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/tensor/ DESTINATION include/executorch/extension/tensor FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/threadpool/ DESTINATION include/executorch/extension/threadpool FILES_MATCHING PATTERN "*.h")
install(
 TARGETS executorch executorch_core
 DESTINATION lib
Expand DownExpand Up@@ -780,6 +789,8 @@ if(EXECUTORCH_BUILD_PYBIND)
 target_include_directories(
 util PUBLIC ${_common_include_directories} ${TORCH_INCLUDE_DIRS}
 )
 target_compile_definitions(util PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)

 target_compile_options(util PUBLIC ${_pybind_compile_options})
 target_link_libraries(util PRIVATE torch c10 executorch extension_tensor)

Expand Down

2 changes: 2 additions & 0 deletions
backends/apple/coreml/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,8 @@ target_include_directories(
 coremldelegate PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util
)
target_include_directories(coremldelegate PRIVATE ${EXECUTORCH_ROOT}/..)
target_include_directories(coremldelegate PRIVATE ${EXECUTORCH_ROOT}/runtime/core/portable_type)
target_compile_definitions(coremldelegate PRIVATE C10_USING_CUSTOM_GENERATED_MACROS)
target_link_libraries(coremldelegate PRIVATE executorch_core)

if(EXECUTORCH_BUILD_DEVTOOLS)
Expand Down

4 changes: 4 additions & 0 deletions
backends/apple/coreml/runtime/workspace/executorchcoreml.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -830,6 +830,7 @@
 GCC_OPTIMIZATION_LEVEL = 0;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "$(inherited)",
 );
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand DownExpand Up@@ -911,6 +912,7 @@
 DEVELOPMENT_TEAM = "";
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "ET_EVENT_TRACER_ENABLED=1",
 "$(inherited)",
 );
Expand All@@ -920,6 +922,7 @@
 "$(SRCROOT)/../kvstore",
 "$(SRCROOT)/../inmemoryfs",
 "$(SRCROOT)/../include",
 "$(SRCROOT)/../include/executorch/runtime/core/portable_type",
 "$(SRCROOT)/../sdk",
 "$(SRCROOT)/../util",
 "$(SRCROOT)/../../third-party/nlohmann_json/single_include",
Expand DownExpand Up@@ -951,6 +954,7 @@
 "$(SRCROOT)/../kvstore",
 "$(SRCROOT)/../inmemoryfs",
 "$(SRCROOT)/../include",
 "$(SRCROOT)/../include/executorch/runtime/core/portable_type",
 "$(SRCROOT)/../sdk",
 "$(SRCROOT)/../util",
 "$(SRCROOT)/../../third-party/nlohmann_json/single_include",
Expand Down

3 changes: 2 additions & 1 deletion
backends/arm/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,8 @@ endif()

include(${EXECUTORCH_ROOT}/build/Utils.cmake)

set(_common_include_directories ${EXECUTORCH_ROOT}/..)
set(_common_include_directories ${EXECUTORCH_ROOT}/.. ${EXECUTORCH_ROOT}/runtime/core/portable_type)
add_compile_definitions(C10_USING_CUSTOM_GENERATED_MACROS)

# Third-party folder and Ethos-U driver inclued
set(THIRD_PARTY_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/third-party")
Expand Down

2 changes: 2 additions & 0 deletions
backends/qualcomm/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ add_custom_command(
)

add_compile_options("-Wall" "-Werror" "-Wno-sign-compare")
add_compile_definitions(C10_USING_CUSTOM_GENERATED_MACROS)

# GNU emit wanring for ignored attributes Unfortunately, we use [[maybe_unused]]
# which can be ignored by GNU. So we make it a warning, not an error in GNU.
Expand All@@ -73,6 +74,7 @@ endif()
include_directories(
 BEFORE ${_common_include_directories} ${QNN_SDK_ROOT}/include/QNN
 ${EXECUTORCH_SOURCE_DIR}/third-party/flatbuffers/include
 ${EXECUTORCH_SOURCE_DIR}/runtime/core/portable_type
)

set(_qnn_schema__srcs
Expand Down

2 changes: 1 addition & 1 deletion
backends/xnnpack/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ target_include_directories(
target_compile_options(xnnpack_backend PUBLIC ${_common_compile_options})
target_link_options_shared_lib(xnnpack_backend)

list(APPEND xnn_executor_runner_libs xnnpack_backend)
list(APPEND xnn_executor_runner_libs xnnpack_backend executorch)

# ios can only build library but not binary
if(NOT CMAKE_TOOLCHAIN_FILE MATCHES ".*(iOS|ios\.toolchain)\.cmake$")
Expand Down

9 changes: 7 additions & 2 deletions
build/Codegen.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,13 +59,15 @@ endfunction()
# Invoked as generate_bindings_for_kernels( LIB_NAME lib_name FUNCTIONS_YAML
# functions_yaml CUSTOM_OPS_YAML custom_ops_yaml )
function(generate_bindings_for_kernels)
 set(options ADD_EXCEPTION_BOUNDARY)
 set(arg_names LIB_NAME FUNCTIONS_YAML CUSTOM_OPS_YAML)
 cmake_parse_arguments(GEN "" "${arg_names}" "" ${ARGN})
 cmake_parse_arguments(GEN "${options}" "${arg_names}" "" ${ARGN})

 message(STATUS "Generating kernel bindings:")
 message(STATUS " LIB_NAME: ${GEN_LIB_NAME}")
 message(STATUS " FUNCTIONS_YAML: ${GEN_FUNCTIONS_YAML}")
 message(STATUS " CUSTOM_OPS_YAML: ${GEN_CUSTOM_OPS_YAML}")
 message(STATUS " ADD_EXCEPTION_BOUNDARY: ${GEN_ADD_EXCEPTION_BOUNDARY}")

 # Command to generate selected_operators.yaml from custom_ops.yaml.
 file(GLOB_RECURSE _codegen_templates "${EXECUTORCH_ROOT}/codegen/templates/*")
Expand DownExpand Up@@ -93,7 +95,10 @@ function(generate_bindings_for_kernels)
 --tags-path=${site-packages-out}/torchgen/packaged/ATen/native/tags.yaml
 --aten-yaml-path=${site-packages-out}/torchgen/packaged/ATen/native/native_functions.yaml
 --op-selection-yaml-path=${_oplist_yaml}
 )
 )
 if(GEN_ADD_EXCEPTION_BOUNDARY)
 set(_gen_command "${_gen_command}" --add-exception-boundary)
 endif()

 set(_gen_command_sources
 ${_out_dir}/RegisterCodegenUnboxedKernelsEverything.cpp
Expand Down

14 changes: 14 additions & 0 deletions
build/build_apple_frameworks.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,20 @@ check_command "$BUCK2"
 //extension/tensor: \
| rsync -av --files-from=- "$SOURCE_ROOT_DIR" "$HEADERS_PATH/executorch"

# HACK: XCFrameworks don't appear to support exporting any build
# options, but we need the following:
# - runtime/core/portable/type/c10 reachable with `#include <c10/...>`
# - exported -DC10_USING_CUSTOM_GENERATED_MACROS compiler flag
# So, just patch our generated framework to do that.
sed -i '' '1i\
#define C10_USING_CUSTOM_GENERATED_MACROS
' $HEADERS_PATH/executorch/runtime/core/portable_type/c10/macros/Macros.h
sed -i '' '1i\
#define C10_USING_CUSTOM_GENERATED_MACROS
' $HEADERS_PATH/executorch/runtime/core/portable_type/c10/macros/Export.h
ln -s $HEADERS_PATH/executorch/runtime/core/portable_type/c10 "$HEADERS_PATH/"


cp "$SOURCE_ROOT_DIR/extension/apple/ExecuTorch/Exported/"*.h "$HEADERS_PATH/executorch"
cp "$SOURCE_ROOT_DIR/extension/apple/ExecuTorch/Exported/"*.modulemap "$HEADERS_PATH"

Expand Down

13 changes: 7 additions & 6 deletions
build/executorch-config.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,20 +26,21 @@

cmake_minimum_required(VERSION 3.19)

set(_root "${CMAKE_CURRENT_LIST_DIR}/../..")
set(_root "${CMAKE_CURRENT_LIST_DIR}/../../..")
set(required_lib_list executorch executorch_core portable_kernels)
set(EXECUTORCH_LIBRARIES)
set(EXECUTORCH_INCLUDE_DIRS ${_root})
set(EXECUTORCH_INCLUDE_DIRS ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
foreach(lib ${required_lib_list})
 set(lib_var "LIB_${lib}")
 add_library(${lib} STATIC IMPORTED)
 find_library(
 ${lib_var} ${lib}
 HINTS "${_root}"
 HINTS "${_root}/lib"
 CMAKE_FIND_ROOT_PATH_BOTH
 )
 set_target_properties(${lib} PROPERTIES IMPORTED_LOCATION "${${lib_var}}")
 target_include_directories(${lib} INTERFACE ${_root})
 target_compile_definitions(${lib} INTERFACE C10_USING_CUSTOM_GENERATED_MACROS)
 target_include_directories(${lib} INTERFACE ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
 list(APPEND EXECUTORCH_LIBRARIES ${lib})
endforeach()

Expand DownExpand Up@@ -93,7 +94,7 @@ foreach(lib ${lib_list})
 set(lib_var "LIB_${lib}")
 find_library(
 ${lib_var} ${lib}
 HINTS "${_root}"
 HINTS "${_root}/lib"
 CMAKE_FIND_ROOT_PATH_BOTH
 )
 if(NOT ${lib_var})
Expand All@@ -109,7 +110,7 @@ foreach(lib ${lib_list})
 add_library(${lib} STATIC IMPORTED)
 endif()
 set_target_properties(${lib} PROPERTIES IMPORTED_LOCATION "${${lib_var}}")
 target_include_directories(${lib} INTERFACE ${_root})
 target_include_directories(${lib} INTERFACE ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
 list(APPEND EXECUTORCH_LIBRARIES ${lib})
 endif()
endforeach()

2 changes: 1 addition & 1 deletion
configurations/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED)

 generate_bindings_for_kernels(
 LIB_NAME "optimized_native_cpu_ops_lib" FUNCTIONS_YAML
 ${CMAKE_CURRENT_BINARY_DIR}/merged.yaml
 ${CMAKE_CURRENT_BINARY_DIR}/merged.yaml ADD_EXCEPTION_BOUNDARY
 )
 message("Generated files ${gen_command_sources}")

Expand Down

15 changes: 13 additions & 2 deletions
examples/apple/coreml/executor_runner/coreml_executor_runner.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,7 @@
 GCC_OPTIMIZATION_LEVEL = 0;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "$(inherited)",
 );
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand DownExpand Up@@ -271,6 +272,10 @@
 ENABLE_USER_SCRIPT_SANDBOXING = YES;
 GCC_C_LANGUAGE_STANDARD = gnu17;
 GCC_NO_COMMON_BLOCKS = YES;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "$(inherited)",
 );
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand All@@ -291,7 +296,10 @@
 CODE_SIGN_STYLE = Automatic;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 HEADER_SEARCH_PATHS = "$(SRCROOT)/include";
 HEADER_SEARCH_PATHS = (
 "$(SRCROOT)/include",
 "$(SRCROOT)/include/executorch/runtime/core/portable_type",
 );
 IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 LIBRARY_SEARCH_PATHS = (
 "$(SRCROOT)/libraries",
Expand All@@ -310,7 +318,10 @@
 CODE_SIGN_STYLE = Automatic;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 HEADER_SEARCH_PATHS = "$(SRCROOT)/include";
 HEADER_SEARCH_PATHS = (
 "$(SRCROOT)/include",
 "$(SRCROOT)/include/executorch/runtime/core/portable_type",
 );
 IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 LIBRARY_SEARCH_PATHS = (
 "$(SRCROOT)/libraries",
Expand Down

3 changes: 2 additions & 1 deletion
examples/arm/executor_runner/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -382,8 +382,9 @@ target_link_options( arm_executor_runner PUBLIC LINKER:-Map=arm_executor_runner.

# ET headers and generated headers includes
target_include_directories(
 arm_executor_runner PRIVATE ${ET_INCLUDE_PATH} ${CMAKE_CURRENT_BINARY_DIR}
 arm_executor_runner PRIVATE ${ET_INCLUDE_PATH} ${ET_DIR_PATH}/runtime/core/portable_type ${CMAKE_CURRENT_BINARY_DIR}
)
target_compile_definitions(arm_executor_runner PRIVATE C10_USING_CUSTOM_GENERATED_MACROS)

if(SEMIHOSTING)
 target_compile_definitions(arm_executor_runner PUBLIC SEMIHOSTING)
Expand Down

1 change: 1 addition & 0 deletions
kernels/optimized/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ gen_selected_ops(LIB_NAME "optimized_ops_lib" OPS_SCHEMA_YAML "${_yaml}")
generate_bindings_for_kernels(
 LIB_NAME "optimized_ops_lib" FUNCTIONS_YAML
 ${CMAKE_CURRENT_SOURCE_DIR}/optimized-oss.yaml
 ADD_EXCEPTION_BOUNDARY
)
message("Generated files ${gen_command_sources}")

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Integrate torchgen exception boundary with ExecuTorch#8321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

swolchok
merged 2 commits into

from

Feb 11, 2025
 Merged


Integrate torchgen exception boundary with ExecuTorch
#8321
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
0f76731

Use c10 version of half/bfloat16 in executorch

Feb 7, 2025
5704dae

Integrate torchgen exception boundary with ExecuTorch

Feb 7, 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


4 changes: 4 additions & 0 deletions
.lintrunner.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,8 @@ exclude_patterns = [
 # File contains @generated
 'extension/llm/custom_ops/spinquant/fast_hadamard_transform_special.h',
 'extension/llm/custom_ops/spinquant/test/fast_hadamard_transform_special_unstrided_cpu.h',
 # Want to be able to keep c10 in sync with PyTorch core.
 'runtime/core/portable_type/c10/**',
]
command = [
 'python',
Expand DownExpand Up@@ -261,6 +263,8 @@ exclude_patterns = [
 'extension/**',
 'kernels/optimized/**',
 'runtime/core/exec_aten/**',
 # Want to be able to keep c10 in sync with PyTorch core.
 'runtime/core/portable_type/c10/**',
 'runtime/executor/tensor_parser_aten.cpp',
 'scripts/**',
 'test/**',
Expand Down

13 changes: 12 additions & 1 deletion
CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -366,7 +366,7 @@ if(NOT "${_repo_dir_name}" STREQUAL "executorch")
 "fix for this restriction."
 )
endif()
set(_common_include_directories ${CMAKE_CURRENT_SOURCE_DIR}/..)
set(_common_include_directories ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/runtime/core/portable_type)

#
# The `_<target>_srcs` lists are defined by including ${EXECUTORCH_SRCS_FILE}.
Expand DownExpand Up@@ -549,6 +549,7 @@ endif()
target_include_directories(
 executorch_core PUBLIC ${_common_include_directories}
)
target_compile_definitions(executorch_core PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
target_compile_options(executorch_core PUBLIC ${_common_compile_options})
if(MAX_KERNEL_NUM)
 target_compile_definitions(
Expand All@@ -569,6 +570,7 @@ if(EXECUTORCH_BUILD_PYBIND AND APPLE)
 target_include_directories(
 executorch_core_shared PUBLIC ${_common_include_directories}
 )
 target_compile_definitions(executorch_core_shared PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
 target_compile_options(
 executorch_core_shared PUBLIC ${_common_compile_options}
 )
Expand All@@ -589,6 +591,7 @@ endif()
add_library(executorch ${_executorch__srcs})
target_link_libraries(executorch PRIVATE executorch_core)
target_include_directories(executorch PUBLIC ${_common_include_directories})
target_compile_definitions(executorch PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
target_compile_options(executorch PUBLIC ${_common_compile_options})
target_link_options_shared_lib(executorch)

Expand DownExpand Up@@ -622,6 +625,12 @@ endif()

# Install `executorch` library as well as `executorch-config.cmake` under
# ${CMAKE_INSTALL_PREFIX}/
install(DIRECTORY runtime/core/ DESTINATION include/executorch/runtime/core FILES_MATCHING PATTERN "*.h")
install(DIRECTORY runtime/kernel/ DESTINATION include/executorch/runtime/kernel FILES_MATCHING PATTERN "*.h")
install(DIRECTORY runtime/platform/ DESTINATION include/executorch/runtime/platform FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/kernel_util/ DESTINATION include/executorch/extension/kernel_util FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/tensor/ DESTINATION include/executorch/extension/tensor FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/threadpool/ DESTINATION include/executorch/extension/threadpool FILES_MATCHING PATTERN "*.h")
install(
 TARGETS executorch executorch_core
 DESTINATION lib
Expand DownExpand Up@@ -780,6 +789,8 @@ if(EXECUTORCH_BUILD_PYBIND)
 target_include_directories(
 util PUBLIC ${_common_include_directories} ${TORCH_INCLUDE_DIRS}
 )
 target_compile_definitions(util PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)

 target_compile_options(util PUBLIC ${_pybind_compile_options})
 target_link_libraries(util PRIVATE torch c10 executorch extension_tensor)

Expand Down

2 changes: 2 additions & 0 deletions
backends/apple/coreml/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,8 @@ target_include_directories(
 coremldelegate PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util
)
target_include_directories(coremldelegate PRIVATE ${EXECUTORCH_ROOT}/..)
target_include_directories(coremldelegate PRIVATE ${EXECUTORCH_ROOT}/runtime/core/portable_type)
target_compile_definitions(coremldelegate PRIVATE C10_USING_CUSTOM_GENERATED_MACROS)
target_link_libraries(coremldelegate PRIVATE executorch_core)

if(EXECUTORCH_BUILD_DEVTOOLS)
Expand Down

4 changes: 4 additions & 0 deletions
backends/apple/coreml/runtime/workspace/executorchcoreml.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -830,6 +830,7 @@
 GCC_OPTIMIZATION_LEVEL = 0;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "$(inherited)",
 );
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand DownExpand Up@@ -911,6 +912,7 @@
 DEVELOPMENT_TEAM = "";
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "ET_EVENT_TRACER_ENABLED=1",
 "$(inherited)",
 );
Expand All@@ -920,6 +922,7 @@
 "$(SRCROOT)/../kvstore",
 "$(SRCROOT)/../inmemoryfs",
 "$(SRCROOT)/../include",
 "$(SRCROOT)/../include/executorch/runtime/core/portable_type",
 "$(SRCROOT)/../sdk",
 "$(SRCROOT)/../util",
 "$(SRCROOT)/../../third-party/nlohmann_json/single_include",
Expand DownExpand Up@@ -951,6 +954,7 @@
 "$(SRCROOT)/../kvstore",
 "$(SRCROOT)/../inmemoryfs",
 "$(SRCROOT)/../include",
 "$(SRCROOT)/../include/executorch/runtime/core/portable_type",
 "$(SRCROOT)/../sdk",
 "$(SRCROOT)/../util",
 "$(SRCROOT)/../../third-party/nlohmann_json/single_include",
Expand Down

3 changes: 2 additions & 1 deletion
backends/arm/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,8 @@ endif()

include(${EXECUTORCH_ROOT}/build/Utils.cmake)

set(_common_include_directories ${EXECUTORCH_ROOT}/..)
set(_common_include_directories ${EXECUTORCH_ROOT}/.. ${EXECUTORCH_ROOT}/runtime/core/portable_type)
add_compile_definitions(C10_USING_CUSTOM_GENERATED_MACROS)

# Third-party folder and Ethos-U driver inclued
set(THIRD_PARTY_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/third-party")
Expand Down

2 changes: 2 additions & 0 deletions
backends/qualcomm/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ add_custom_command(
)

add_compile_options("-Wall" "-Werror" "-Wno-sign-compare")
add_compile_definitions(C10_USING_CUSTOM_GENERATED_MACROS)

# GNU emit wanring for ignored attributes Unfortunately, we use [[maybe_unused]]
# which can be ignored by GNU. So we make it a warning, not an error in GNU.
Expand All@@ -73,6 +74,7 @@ endif()
include_directories(
 BEFORE ${_common_include_directories} ${QNN_SDK_ROOT}/include/QNN
 ${EXECUTORCH_SOURCE_DIR}/third-party/flatbuffers/include
 ${EXECUTORCH_SOURCE_DIR}/runtime/core/portable_type
)

set(_qnn_schema__srcs
Expand Down

2 changes: 1 addition & 1 deletion
backends/xnnpack/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ target_include_directories(
target_compile_options(xnnpack_backend PUBLIC ${_common_compile_options})
target_link_options_shared_lib(xnnpack_backend)

list(APPEND xnn_executor_runner_libs xnnpack_backend)
list(APPEND xnn_executor_runner_libs xnnpack_backend executorch)

# ios can only build library but not binary
if(NOT CMAKE_TOOLCHAIN_FILE MATCHES ".*(iOS|ios\.toolchain)\.cmake$")
Expand Down

9 changes: 7 additions & 2 deletions
build/Codegen.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,13 +59,15 @@ endfunction()
# Invoked as generate_bindings_for_kernels( LIB_NAME lib_name FUNCTIONS_YAML
# functions_yaml CUSTOM_OPS_YAML custom_ops_yaml )
function(generate_bindings_for_kernels)
 set(options ADD_EXCEPTION_BOUNDARY)
 set(arg_names LIB_NAME FUNCTIONS_YAML CUSTOM_OPS_YAML)
 cmake_parse_arguments(GEN "" "${arg_names}" "" ${ARGN})
 cmake_parse_arguments(GEN "${options}" "${arg_names}" "" ${ARGN})

 message(STATUS "Generating kernel bindings:")
 message(STATUS " LIB_NAME: ${GEN_LIB_NAME}")
 message(STATUS " FUNCTIONS_YAML: ${GEN_FUNCTIONS_YAML}")
 message(STATUS " CUSTOM_OPS_YAML: ${GEN_CUSTOM_OPS_YAML}")
 message(STATUS " ADD_EXCEPTION_BOUNDARY: ${GEN_ADD_EXCEPTION_BOUNDARY}")

 # Command to generate selected_operators.yaml from custom_ops.yaml.
 file(GLOB_RECURSE _codegen_templates "${EXECUTORCH_ROOT}/codegen/templates/*")
Expand DownExpand Up@@ -93,7 +95,10 @@ function(generate_bindings_for_kernels)
 --tags-path=${site-packages-out}/torchgen/packaged/ATen/native/tags.yaml
 --aten-yaml-path=${site-packages-out}/torchgen/packaged/ATen/native/native_functions.yaml
 --op-selection-yaml-path=${_oplist_yaml}
 )
 )
 if(GEN_ADD_EXCEPTION_BOUNDARY)
 set(_gen_command "${_gen_command}" --add-exception-boundary)
 endif()

 set(_gen_command_sources
 ${_out_dir}/RegisterCodegenUnboxedKernelsEverything.cpp
Expand Down

14 changes: 14 additions & 0 deletions
build/build_apple_frameworks.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,20 @@ check_command "$BUCK2"
 //extension/tensor: \
| rsync -av --files-from=- "$SOURCE_ROOT_DIR" "$HEADERS_PATH/executorch"

# HACK: XCFrameworks don't appear to support exporting any build
# options, but we need the following:
# - runtime/core/portable/type/c10 reachable with `#include <c10/...>`
# - exported -DC10_USING_CUSTOM_GENERATED_MACROS compiler flag
# So, just patch our generated framework to do that.
sed -i '' '1i\
#define C10_USING_CUSTOM_GENERATED_MACROS
' $HEADERS_PATH/executorch/runtime/core/portable_type/c10/macros/Macros.h
sed -i '' '1i\
#define C10_USING_CUSTOM_GENERATED_MACROS
' $HEADERS_PATH/executorch/runtime/core/portable_type/c10/macros/Export.h
ln -s $HEADERS_PATH/executorch/runtime/core/portable_type/c10 "$HEADERS_PATH/"


cp "$SOURCE_ROOT_DIR/extension/apple/ExecuTorch/Exported/"*.h "$HEADERS_PATH/executorch"
cp "$SOURCE_ROOT_DIR/extension/apple/ExecuTorch/Exported/"*.modulemap "$HEADERS_PATH"

Expand Down

13 changes: 7 additions & 6 deletions
build/executorch-config.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,20 +26,21 @@

cmake_minimum_required(VERSION 3.19)

set(_root "${CMAKE_CURRENT_LIST_DIR}/../..")
set(_root "${CMAKE_CURRENT_LIST_DIR}/../../..")
set(required_lib_list executorch executorch_core portable_kernels)
set(EXECUTORCH_LIBRARIES)
set(EXECUTORCH_INCLUDE_DIRS ${_root})
set(EXECUTORCH_INCLUDE_DIRS ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
foreach(lib ${required_lib_list})
 set(lib_var "LIB_${lib}")
 add_library(${lib} STATIC IMPORTED)
 find_library(
 ${lib_var} ${lib}
 HINTS "${_root}"
 HINTS "${_root}/lib"
 CMAKE_FIND_ROOT_PATH_BOTH
 )
 set_target_properties(${lib} PROPERTIES IMPORTED_LOCATION "${${lib_var}}")
 target_include_directories(${lib} INTERFACE ${_root})
 target_compile_definitions(${lib} INTERFACE C10_USING_CUSTOM_GENERATED_MACROS)
 target_include_directories(${lib} INTERFACE ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
 list(APPEND EXECUTORCH_LIBRARIES ${lib})
endforeach()

Expand DownExpand Up@@ -93,7 +94,7 @@ foreach(lib ${lib_list})
 set(lib_var "LIB_${lib}")
 find_library(
 ${lib_var} ${lib}
 HINTS "${_root}"
 HINTS "${_root}/lib"
 CMAKE_FIND_ROOT_PATH_BOTH
 )
 if(NOT ${lib_var})
Expand All@@ -109,7 +110,7 @@ foreach(lib ${lib_list})
 add_library(${lib} STATIC IMPORTED)
 endif()
 set_target_properties(${lib} PROPERTIES IMPORTED_LOCATION "${${lib_var}}")
 target_include_directories(${lib} INTERFACE ${_root})
 target_include_directories(${lib} INTERFACE ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
 list(APPEND EXECUTORCH_LIBRARIES ${lib})
 endif()
endforeach()

2 changes: 1 addition & 1 deletion
configurations/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED)

 generate_bindings_for_kernels(
 LIB_NAME "optimized_native_cpu_ops_lib" FUNCTIONS_YAML
 ${CMAKE_CURRENT_BINARY_DIR}/merged.yaml
 ${CMAKE_CURRENT_BINARY_DIR}/merged.yaml ADD_EXCEPTION_BOUNDARY
 )
 message("Generated files ${gen_command_sources}")

Expand Down

15 changes: 13 additions & 2 deletions
examples/apple/coreml/executor_runner/coreml_executor_runner.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,7 @@
 GCC_OPTIMIZATION_LEVEL = 0;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "$(inherited)",
 );
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand DownExpand Up@@ -271,6 +272,10 @@
 ENABLE_USER_SCRIPT_SANDBOXING = YES;
 GCC_C_LANGUAGE_STANDARD = gnu17;
 GCC_NO_COMMON_BLOCKS = YES;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "$(inherited)",
 );
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand All@@ -291,7 +296,10 @@
 CODE_SIGN_STYLE = Automatic;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 HEADER_SEARCH_PATHS = "$(SRCROOT)/include";
 HEADER_SEARCH_PATHS = (
 "$(SRCROOT)/include",
 "$(SRCROOT)/include/executorch/runtime/core/portable_type",
 );
 IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 LIBRARY_SEARCH_PATHS = (
 "$(SRCROOT)/libraries",
Expand All@@ -310,7 +318,10 @@
 CODE_SIGN_STYLE = Automatic;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 HEADER_SEARCH_PATHS = "$(SRCROOT)/include";
 HEADER_SEARCH_PATHS = (
 "$(SRCROOT)/include",
 "$(SRCROOT)/include/executorch/runtime/core/portable_type",
 );
 IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 LIBRARY_SEARCH_PATHS = (
 "$(SRCROOT)/libraries",
Expand Down

3 changes: 2 additions & 1 deletion
examples/arm/executor_runner/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -382,8 +382,9 @@ target_link_options( arm_executor_runner PUBLIC LINKER:-Map=arm_executor_runner.

# ET headers and generated headers includes
target_include_directories(
 arm_executor_runner PRIVATE ${ET_INCLUDE_PATH} ${CMAKE_CURRENT_BINARY_DIR}
 arm_executor_runner PRIVATE ${ET_INCLUDE_PATH} ${ET_DIR_PATH}/runtime/core/portable_type ${CMAKE_CURRENT_BINARY_DIR}
)
target_compile_definitions(arm_executor_runner PRIVATE C10_USING_CUSTOM_GENERATED_MACROS)

if(SEMIHOSTING)
 target_compile_definitions(arm_executor_runner PUBLIC SEMIHOSTING)
Expand Down

1 change: 1 addition & 0 deletions
kernels/optimized/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ gen_selected_ops(LIB_NAME "optimized_ops_lib" OPS_SCHEMA_YAML "${_yaml}")
generate_bindings_for_kernels(
 LIB_NAME "optimized_ops_lib" FUNCTIONS_YAML
 ${CMAKE_CURRENT_SOURCE_DIR}/optimized-oss.yaml
 ADD_EXCEPTION_BOUNDARY
)
message("Generated files ${gen_command_sources}")

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Integrate torchgen exception boundary with ExecuTorch#8321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

swolchok
merged 2 commits into

from

Feb 11, 2025
 Merged


Integrate torchgen exception boundary with ExecuTorch
#8321
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
0f76731

Use c10 version of half/bfloat16 in executorch

Feb 7, 2025
5704dae

Integrate torchgen exception boundary with ExecuTorch

Feb 7, 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


4 changes: 4 additions & 0 deletions
.lintrunner.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,8 @@ exclude_patterns = [
 # File contains @generated
 'extension/llm/custom_ops/spinquant/fast_hadamard_transform_special.h',
 'extension/llm/custom_ops/spinquant/test/fast_hadamard_transform_special_unstrided_cpu.h',
 # Want to be able to keep c10 in sync with PyTorch core.
 'runtime/core/portable_type/c10/**',
]
command = [
 'python',
Expand DownExpand Up@@ -261,6 +263,8 @@ exclude_patterns = [
 'extension/**',
 'kernels/optimized/**',
 'runtime/core/exec_aten/**',
 # Want to be able to keep c10 in sync with PyTorch core.
 'runtime/core/portable_type/c10/**',
 'runtime/executor/tensor_parser_aten.cpp',
 'scripts/**',
 'test/**',
Expand Down

13 changes: 12 additions & 1 deletion
CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -366,7 +366,7 @@ if(NOT "${_repo_dir_name}" STREQUAL "executorch")
 "fix for this restriction."
 )
endif()
set(_common_include_directories ${CMAKE_CURRENT_SOURCE_DIR}/..)
set(_common_include_directories ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/runtime/core/portable_type)

#
# The `_<target>_srcs` lists are defined by including ${EXECUTORCH_SRCS_FILE}.
Expand DownExpand Up@@ -549,6 +549,7 @@ endif()
target_include_directories(
 executorch_core PUBLIC ${_common_include_directories}
)
target_compile_definitions(executorch_core PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
target_compile_options(executorch_core PUBLIC ${_common_compile_options})
if(MAX_KERNEL_NUM)
 target_compile_definitions(
Expand All@@ -569,6 +570,7 @@ if(EXECUTORCH_BUILD_PYBIND AND APPLE)
 target_include_directories(
 executorch_core_shared PUBLIC ${_common_include_directories}
 )
 target_compile_definitions(executorch_core_shared PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
 target_compile_options(
 executorch_core_shared PUBLIC ${_common_compile_options}
 )
Expand All@@ -589,6 +591,7 @@ endif()
add_library(executorch ${_executorch__srcs})
target_link_libraries(executorch PRIVATE executorch_core)
target_include_directories(executorch PUBLIC ${_common_include_directories})
target_compile_definitions(executorch PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
target_compile_options(executorch PUBLIC ${_common_compile_options})
target_link_options_shared_lib(executorch)

Expand DownExpand Up@@ -622,6 +625,12 @@ endif()

# Install `executorch` library as well as `executorch-config.cmake` under
# ${CMAKE_INSTALL_PREFIX}/
install(DIRECTORY runtime/core/ DESTINATION include/executorch/runtime/core FILES_MATCHING PATTERN "*.h")
install(DIRECTORY runtime/kernel/ DESTINATION include/executorch/runtime/kernel FILES_MATCHING PATTERN "*.h")
install(DIRECTORY runtime/platform/ DESTINATION include/executorch/runtime/platform FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/kernel_util/ DESTINATION include/executorch/extension/kernel_util FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/tensor/ DESTINATION include/executorch/extension/tensor FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/threadpool/ DESTINATION include/executorch/extension/threadpool FILES_MATCHING PATTERN "*.h")
install(
 TARGETS executorch executorch_core
 DESTINATION lib
Expand DownExpand Up@@ -780,6 +789,8 @@ if(EXECUTORCH_BUILD_PYBIND)
 target_include_directories(
 util PUBLIC ${_common_include_directories} ${TORCH_INCLUDE_DIRS}
 )
 target_compile_definitions(util PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)

 target_compile_options(util PUBLIC ${_pybind_compile_options})
 target_link_libraries(util PRIVATE torch c10 executorch extension_tensor)

Expand Down

2 changes: 2 additions & 0 deletions
backends/apple/coreml/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,8 @@ target_include_directories(
 coremldelegate PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util
)
target_include_directories(coremldelegate PRIVATE ${EXECUTORCH_ROOT}/..)
target_include_directories(coremldelegate PRIVATE ${EXECUTORCH_ROOT}/runtime/core/portable_type)
target_compile_definitions(coremldelegate PRIVATE C10_USING_CUSTOM_GENERATED_MACROS)
target_link_libraries(coremldelegate PRIVATE executorch_core)

if(EXECUTORCH_BUILD_DEVTOOLS)
Expand Down

4 changes: 4 additions & 0 deletions
backends/apple/coreml/runtime/workspace/executorchcoreml.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -830,6 +830,7 @@
 GCC_OPTIMIZATION_LEVEL = 0;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "$(inherited)",
 );
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand DownExpand Up@@ -911,6 +912,7 @@
 DEVELOPMENT_TEAM = "";
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "ET_EVENT_TRACER_ENABLED=1",
 "$(inherited)",
 );
Expand All@@ -920,6 +922,7 @@
 "$(SRCROOT)/../kvstore",
 "$(SRCROOT)/../inmemoryfs",
 "$(SRCROOT)/../include",
 "$(SRCROOT)/../include/executorch/runtime/core/portable_type",
 "$(SRCROOT)/../sdk",
 "$(SRCROOT)/../util",
 "$(SRCROOT)/../../third-party/nlohmann_json/single_include",
Expand DownExpand Up@@ -951,6 +954,7 @@
 "$(SRCROOT)/../kvstore",
 "$(SRCROOT)/../inmemoryfs",
 "$(SRCROOT)/../include",
 "$(SRCROOT)/../include/executorch/runtime/core/portable_type",
 "$(SRCROOT)/../sdk",
 "$(SRCROOT)/../util",
 "$(SRCROOT)/../../third-party/nlohmann_json/single_include",
Expand Down

3 changes: 2 additions & 1 deletion
backends/arm/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,8 @@ endif()

include(${EXECUTORCH_ROOT}/build/Utils.cmake)

set(_common_include_directories ${EXECUTORCH_ROOT}/..)
set(_common_include_directories ${EXECUTORCH_ROOT}/.. ${EXECUTORCH_ROOT}/runtime/core/portable_type)
add_compile_definitions(C10_USING_CUSTOM_GENERATED_MACROS)

# Third-party folder and Ethos-U driver inclued
set(THIRD_PARTY_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/third-party")
Expand Down

2 changes: 2 additions & 0 deletions
backends/qualcomm/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ add_custom_command(
)

add_compile_options("-Wall" "-Werror" "-Wno-sign-compare")
add_compile_definitions(C10_USING_CUSTOM_GENERATED_MACROS)

# GNU emit wanring for ignored attributes Unfortunately, we use [[maybe_unused]]
# which can be ignored by GNU. So we make it a warning, not an error in GNU.
Expand All@@ -73,6 +74,7 @@ endif()
include_directories(
 BEFORE ${_common_include_directories} ${QNN_SDK_ROOT}/include/QNN
 ${EXECUTORCH_SOURCE_DIR}/third-party/flatbuffers/include
 ${EXECUTORCH_SOURCE_DIR}/runtime/core/portable_type
)

set(_qnn_schema__srcs
Expand Down

2 changes: 1 addition & 1 deletion
backends/xnnpack/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ target_include_directories(
target_compile_options(xnnpack_backend PUBLIC ${_common_compile_options})
target_link_options_shared_lib(xnnpack_backend)

list(APPEND xnn_executor_runner_libs xnnpack_backend)
list(APPEND xnn_executor_runner_libs xnnpack_backend executorch)

# ios can only build library but not binary
if(NOT CMAKE_TOOLCHAIN_FILE MATCHES ".*(iOS|ios\.toolchain)\.cmake$")
Expand Down

9 changes: 7 additions & 2 deletions
build/Codegen.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,13 +59,15 @@ endfunction()
# Invoked as generate_bindings_for_kernels( LIB_NAME lib_name FUNCTIONS_YAML
# functions_yaml CUSTOM_OPS_YAML custom_ops_yaml )
function(generate_bindings_for_kernels)
 set(options ADD_EXCEPTION_BOUNDARY)
 set(arg_names LIB_NAME FUNCTIONS_YAML CUSTOM_OPS_YAML)
 cmake_parse_arguments(GEN "" "${arg_names}" "" ${ARGN})
 cmake_parse_arguments(GEN "${options}" "${arg_names}" "" ${ARGN})

 message(STATUS "Generating kernel bindings:")
 message(STATUS " LIB_NAME: ${GEN_LIB_NAME}")
 message(STATUS " FUNCTIONS_YAML: ${GEN_FUNCTIONS_YAML}")
 message(STATUS " CUSTOM_OPS_YAML: ${GEN_CUSTOM_OPS_YAML}")
 message(STATUS " ADD_EXCEPTION_BOUNDARY: ${GEN_ADD_EXCEPTION_BOUNDARY}")

 # Command to generate selected_operators.yaml from custom_ops.yaml.
 file(GLOB_RECURSE _codegen_templates "${EXECUTORCH_ROOT}/codegen/templates/*")
Expand DownExpand Up@@ -93,7 +95,10 @@ function(generate_bindings_for_kernels)
 --tags-path=${site-packages-out}/torchgen/packaged/ATen/native/tags.yaml
 --aten-yaml-path=${site-packages-out}/torchgen/packaged/ATen/native/native_functions.yaml
 --op-selection-yaml-path=${_oplist_yaml}
 )
 )
 if(GEN_ADD_EXCEPTION_BOUNDARY)
 set(_gen_command "${_gen_command}" --add-exception-boundary)
 endif()

 set(_gen_command_sources
 ${_out_dir}/RegisterCodegenUnboxedKernelsEverything.cpp
Expand Down

14 changes: 14 additions & 0 deletions
build/build_apple_frameworks.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,20 @@ check_command "$BUCK2"
 //extension/tensor: \
| rsync -av --files-from=- "$SOURCE_ROOT_DIR" "$HEADERS_PATH/executorch"

# HACK: XCFrameworks don't appear to support exporting any build
# options, but we need the following:
# - runtime/core/portable/type/c10 reachable with `#include <c10/...>`
# - exported -DC10_USING_CUSTOM_GENERATED_MACROS compiler flag
# So, just patch our generated framework to do that.
sed -i '' '1i\
#define C10_USING_CUSTOM_GENERATED_MACROS
' $HEADERS_PATH/executorch/runtime/core/portable_type/c10/macros/Macros.h
sed -i '' '1i\
#define C10_USING_CUSTOM_GENERATED_MACROS
' $HEADERS_PATH/executorch/runtime/core/portable_type/c10/macros/Export.h
ln -s $HEADERS_PATH/executorch/runtime/core/portable_type/c10 "$HEADERS_PATH/"


cp "$SOURCE_ROOT_DIR/extension/apple/ExecuTorch/Exported/"*.h "$HEADERS_PATH/executorch"
cp "$SOURCE_ROOT_DIR/extension/apple/ExecuTorch/Exported/"*.modulemap "$HEADERS_PATH"

Expand Down

13 changes: 7 additions & 6 deletions
build/executorch-config.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,20 +26,21 @@

cmake_minimum_required(VERSION 3.19)

set(_root "${CMAKE_CURRENT_LIST_DIR}/../..")
set(_root "${CMAKE_CURRENT_LIST_DIR}/../../..")
set(required_lib_list executorch executorch_core portable_kernels)
set(EXECUTORCH_LIBRARIES)
set(EXECUTORCH_INCLUDE_DIRS ${_root})
set(EXECUTORCH_INCLUDE_DIRS ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
foreach(lib ${required_lib_list})
 set(lib_var "LIB_${lib}")
 add_library(${lib} STATIC IMPORTED)
 find_library(
 ${lib_var} ${lib}
 HINTS "${_root}"
 HINTS "${_root}/lib"
 CMAKE_FIND_ROOT_PATH_BOTH
 )
 set_target_properties(${lib} PROPERTIES IMPORTED_LOCATION "${${lib_var}}")
 target_include_directories(${lib} INTERFACE ${_root})
 target_compile_definitions(${lib} INTERFACE C10_USING_CUSTOM_GENERATED_MACROS)
 target_include_directories(${lib} INTERFACE ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
 list(APPEND EXECUTORCH_LIBRARIES ${lib})
endforeach()

Expand DownExpand Up@@ -93,7 +94,7 @@ foreach(lib ${lib_list})
 set(lib_var "LIB_${lib}")
 find_library(
 ${lib_var} ${lib}
 HINTS "${_root}"
 HINTS "${_root}/lib"
 CMAKE_FIND_ROOT_PATH_BOTH
 )
 if(NOT ${lib_var})
Expand All@@ -109,7 +110,7 @@ foreach(lib ${lib_list})
 add_library(${lib} STATIC IMPORTED)
 endif()
 set_target_properties(${lib} PROPERTIES IMPORTED_LOCATION "${${lib_var}}")
 target_include_directories(${lib} INTERFACE ${_root})
 target_include_directories(${lib} INTERFACE ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
 list(APPEND EXECUTORCH_LIBRARIES ${lib})
 endif()
endforeach()

2 changes: 1 addition & 1 deletion
configurations/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED)

 generate_bindings_for_kernels(
 LIB_NAME "optimized_native_cpu_ops_lib" FUNCTIONS_YAML
 ${CMAKE_CURRENT_BINARY_DIR}/merged.yaml
 ${CMAKE_CURRENT_BINARY_DIR}/merged.yaml ADD_EXCEPTION_BOUNDARY
 )
 message("Generated files ${gen_command_sources}")

Expand Down

15 changes: 13 additions & 2 deletions
examples/apple/coreml/executor_runner/coreml_executor_runner.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,7 @@
 GCC_OPTIMIZATION_LEVEL = 0;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "$(inherited)",
 );
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand DownExpand Up@@ -271,6 +272,10 @@
 ENABLE_USER_SCRIPT_SANDBOXING = YES;
 GCC_C_LANGUAGE_STANDARD = gnu17;
 GCC_NO_COMMON_BLOCKS = YES;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "$(inherited)",
 );
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand All@@ -291,7 +296,10 @@
 CODE_SIGN_STYLE = Automatic;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 HEADER_SEARCH_PATHS = "$(SRCROOT)/include";
 HEADER_SEARCH_PATHS = (
 "$(SRCROOT)/include",
 "$(SRCROOT)/include/executorch/runtime/core/portable_type",
 );
 IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 LIBRARY_SEARCH_PATHS = (
 "$(SRCROOT)/libraries",
Expand All@@ -310,7 +318,10 @@
 CODE_SIGN_STYLE = Automatic;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 HEADER_SEARCH_PATHS = "$(SRCROOT)/include";
 HEADER_SEARCH_PATHS = (
 "$(SRCROOT)/include",
 "$(SRCROOT)/include/executorch/runtime/core/portable_type",
 );
 IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 LIBRARY_SEARCH_PATHS = (
 "$(SRCROOT)/libraries",
Expand Down

3 changes: 2 additions & 1 deletion
examples/arm/executor_runner/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -382,8 +382,9 @@ target_link_options( arm_executor_runner PUBLIC LINKER:-Map=arm_executor_runner.

# ET headers and generated headers includes
target_include_directories(
 arm_executor_runner PRIVATE ${ET_INCLUDE_PATH} ${CMAKE_CURRENT_BINARY_DIR}
 arm_executor_runner PRIVATE ${ET_INCLUDE_PATH} ${ET_DIR_PATH}/runtime/core/portable_type ${CMAKE_CURRENT_BINARY_DIR}
)
target_compile_definitions(arm_executor_runner PRIVATE C10_USING_CUSTOM_GENERATED_MACROS)

if(SEMIHOSTING)
 target_compile_definitions(arm_executor_runner PUBLIC SEMIHOSTING)
Expand Down

1 change: 1 addition & 0 deletions
kernels/optimized/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ gen_selected_ops(LIB_NAME "optimized_ops_lib" OPS_SCHEMA_YAML "${_yaml}")
generate_bindings_for_kernels(
 LIB_NAME "optimized_ops_lib" FUNCTIONS_YAML
 ${CMAKE_CURRENT_SOURCE_DIR}/optimized-oss.yaml
 ADD_EXCEPTION_BOUNDARY
)
message("Generated files ${gen_command_sources}")

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Integrate torchgen exception boundary with ExecuTorch#8321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

swolchok
merged 2 commits into

from

Feb 11, 2025
 Merged


Integrate torchgen exception boundary with ExecuTorch
#8321
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
0f76731

Use c10 version of half/bfloat16 in executorch

Feb 7, 2025
5704dae

Integrate torchgen exception boundary with ExecuTorch

Feb 7, 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


4 changes: 4 additions & 0 deletions
.lintrunner.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,8 @@ exclude_patterns = [
 # File contains @generated
 'extension/llm/custom_ops/spinquant/fast_hadamard_transform_special.h',
 'extension/llm/custom_ops/spinquant/test/fast_hadamard_transform_special_unstrided_cpu.h',
 # Want to be able to keep c10 in sync with PyTorch core.
 'runtime/core/portable_type/c10/**',
]
command = [
 'python',
Expand DownExpand Up@@ -261,6 +263,8 @@ exclude_patterns = [
 'extension/**',
 'kernels/optimized/**',
 'runtime/core/exec_aten/**',
 # Want to be able to keep c10 in sync with PyTorch core.
 'runtime/core/portable_type/c10/**',
 'runtime/executor/tensor_parser_aten.cpp',
 'scripts/**',
 'test/**',
Expand Down

13 changes: 12 additions & 1 deletion
CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -366,7 +366,7 @@ if(NOT "${_repo_dir_name}" STREQUAL "executorch")
 "fix for this restriction."
 )
endif()
set(_common_include_directories ${CMAKE_CURRENT_SOURCE_DIR}/..)
set(_common_include_directories ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/runtime/core/portable_type)

#
# The `_<target>_srcs` lists are defined by including ${EXECUTORCH_SRCS_FILE}.
Expand DownExpand Up@@ -549,6 +549,7 @@ endif()
target_include_directories(
 executorch_core PUBLIC ${_common_include_directories}
)
target_compile_definitions(executorch_core PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
target_compile_options(executorch_core PUBLIC ${_common_compile_options})
if(MAX_KERNEL_NUM)
 target_compile_definitions(
Expand All@@ -569,6 +570,7 @@ if(EXECUTORCH_BUILD_PYBIND AND APPLE)
 target_include_directories(
 executorch_core_shared PUBLIC ${_common_include_directories}
 )
 target_compile_definitions(executorch_core_shared PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
 target_compile_options(
 executorch_core_shared PUBLIC ${_common_compile_options}
 )
Expand All@@ -589,6 +591,7 @@ endif()
add_library(executorch ${_executorch__srcs})
target_link_libraries(executorch PRIVATE executorch_core)
target_include_directories(executorch PUBLIC ${_common_include_directories})
target_compile_definitions(executorch PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
target_compile_options(executorch PUBLIC ${_common_compile_options})
target_link_options_shared_lib(executorch)

Expand DownExpand Up@@ -622,6 +625,12 @@ endif()

# Install `executorch` library as well as `executorch-config.cmake` under
# ${CMAKE_INSTALL_PREFIX}/
install(DIRECTORY runtime/core/ DESTINATION include/executorch/runtime/core FILES_MATCHING PATTERN "*.h")
install(DIRECTORY runtime/kernel/ DESTINATION include/executorch/runtime/kernel FILES_MATCHING PATTERN "*.h")
install(DIRECTORY runtime/platform/ DESTINATION include/executorch/runtime/platform FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/kernel_util/ DESTINATION include/executorch/extension/kernel_util FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/tensor/ DESTINATION include/executorch/extension/tensor FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/threadpool/ DESTINATION include/executorch/extension/threadpool FILES_MATCHING PATTERN "*.h")
install(
 TARGETS executorch executorch_core
 DESTINATION lib
Expand DownExpand Up@@ -780,6 +789,8 @@ if(EXECUTORCH_BUILD_PYBIND)
 target_include_directories(
 util PUBLIC ${_common_include_directories} ${TORCH_INCLUDE_DIRS}
 )
 target_compile_definitions(util PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)

 target_compile_options(util PUBLIC ${_pybind_compile_options})
 target_link_libraries(util PRIVATE torch c10 executorch extension_tensor)

Expand Down

2 changes: 2 additions & 0 deletions
backends/apple/coreml/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,8 @@ target_include_directories(
 coremldelegate PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util
)
target_include_directories(coremldelegate PRIVATE ${EXECUTORCH_ROOT}/..)
target_include_directories(coremldelegate PRIVATE ${EXECUTORCH_ROOT}/runtime/core/portable_type)
target_compile_definitions(coremldelegate PRIVATE C10_USING_CUSTOM_GENERATED_MACROS)
target_link_libraries(coremldelegate PRIVATE executorch_core)

if(EXECUTORCH_BUILD_DEVTOOLS)
Expand Down

4 changes: 4 additions & 0 deletions
backends/apple/coreml/runtime/workspace/executorchcoreml.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -830,6 +830,7 @@
 GCC_OPTIMIZATION_LEVEL = 0;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "$(inherited)",
 );
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand DownExpand Up@@ -911,6 +912,7 @@
 DEVELOPMENT_TEAM = "";
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "ET_EVENT_TRACER_ENABLED=1",
 "$(inherited)",
 );
Expand All@@ -920,6 +922,7 @@
 "$(SRCROOT)/../kvstore",
 "$(SRCROOT)/../inmemoryfs",
 "$(SRCROOT)/../include",
 "$(SRCROOT)/../include/executorch/runtime/core/portable_type",
 "$(SRCROOT)/../sdk",
 "$(SRCROOT)/../util",
 "$(SRCROOT)/../../third-party/nlohmann_json/single_include",
Expand DownExpand Up@@ -951,6 +954,7 @@
 "$(SRCROOT)/../kvstore",
 "$(SRCROOT)/../inmemoryfs",
 "$(SRCROOT)/../include",
 "$(SRCROOT)/../include/executorch/runtime/core/portable_type",
 "$(SRCROOT)/../sdk",
 "$(SRCROOT)/../util",
 "$(SRCROOT)/../../third-party/nlohmann_json/single_include",
Expand Down

3 changes: 2 additions & 1 deletion
backends/arm/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,8 @@ endif()

include(${EXECUTORCH_ROOT}/build/Utils.cmake)

set(_common_include_directories ${EXECUTORCH_ROOT}/..)
set(_common_include_directories ${EXECUTORCH_ROOT}/.. ${EXECUTORCH_ROOT}/runtime/core/portable_type)
add_compile_definitions(C10_USING_CUSTOM_GENERATED_MACROS)

# Third-party folder and Ethos-U driver inclued
set(THIRD_PARTY_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/third-party")
Expand Down

2 changes: 2 additions & 0 deletions
backends/qualcomm/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ add_custom_command(
)

add_compile_options("-Wall" "-Werror" "-Wno-sign-compare")
add_compile_definitions(C10_USING_CUSTOM_GENERATED_MACROS)

# GNU emit wanring for ignored attributes Unfortunately, we use [[maybe_unused]]
# which can be ignored by GNU. So we make it a warning, not an error in GNU.
Expand All@@ -73,6 +74,7 @@ endif()
include_directories(
 BEFORE ${_common_include_directories} ${QNN_SDK_ROOT}/include/QNN
 ${EXECUTORCH_SOURCE_DIR}/third-party/flatbuffers/include
 ${EXECUTORCH_SOURCE_DIR}/runtime/core/portable_type
)

set(_qnn_schema__srcs
Expand Down

2 changes: 1 addition & 1 deletion
backends/xnnpack/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ target_include_directories(
target_compile_options(xnnpack_backend PUBLIC ${_common_compile_options})
target_link_options_shared_lib(xnnpack_backend)

list(APPEND xnn_executor_runner_libs xnnpack_backend)
list(APPEND xnn_executor_runner_libs xnnpack_backend executorch)

# ios can only build library but not binary
if(NOT CMAKE_TOOLCHAIN_FILE MATCHES ".*(iOS|ios\.toolchain)\.cmake$")
Expand Down

9 changes: 7 additions & 2 deletions
build/Codegen.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,13 +59,15 @@ endfunction()
# Invoked as generate_bindings_for_kernels( LIB_NAME lib_name FUNCTIONS_YAML
# functions_yaml CUSTOM_OPS_YAML custom_ops_yaml )
function(generate_bindings_for_kernels)
 set(options ADD_EXCEPTION_BOUNDARY)
 set(arg_names LIB_NAME FUNCTIONS_YAML CUSTOM_OPS_YAML)
 cmake_parse_arguments(GEN "" "${arg_names}" "" ${ARGN})
 cmake_parse_arguments(GEN "${options}" "${arg_names}" "" ${ARGN})

 message(STATUS "Generating kernel bindings:")
 message(STATUS " LIB_NAME: ${GEN_LIB_NAME}")
 message(STATUS " FUNCTIONS_YAML: ${GEN_FUNCTIONS_YAML}")
 message(STATUS " CUSTOM_OPS_YAML: ${GEN_CUSTOM_OPS_YAML}")
 message(STATUS " ADD_EXCEPTION_BOUNDARY: ${GEN_ADD_EXCEPTION_BOUNDARY}")

 # Command to generate selected_operators.yaml from custom_ops.yaml.
 file(GLOB_RECURSE _codegen_templates "${EXECUTORCH_ROOT}/codegen/templates/*")
Expand DownExpand Up@@ -93,7 +95,10 @@ function(generate_bindings_for_kernels)
 --tags-path=${site-packages-out}/torchgen/packaged/ATen/native/tags.yaml
 --aten-yaml-path=${site-packages-out}/torchgen/packaged/ATen/native/native_functions.yaml
 --op-selection-yaml-path=${_oplist_yaml}
 )
 )
 if(GEN_ADD_EXCEPTION_BOUNDARY)
 set(_gen_command "${_gen_command}" --add-exception-boundary)
 endif()

 set(_gen_command_sources
 ${_out_dir}/RegisterCodegenUnboxedKernelsEverything.cpp
Expand Down

14 changes: 14 additions & 0 deletions
build/build_apple_frameworks.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,20 @@ check_command "$BUCK2"
 //extension/tensor: \
| rsync -av --files-from=- "$SOURCE_ROOT_DIR" "$HEADERS_PATH/executorch"

# HACK: XCFrameworks don't appear to support exporting any build
# options, but we need the following:
# - runtime/core/portable/type/c10 reachable with `#include <c10/...>`
# - exported -DC10_USING_CUSTOM_GENERATED_MACROS compiler flag
# So, just patch our generated framework to do that.
sed -i '' '1i\
#define C10_USING_CUSTOM_GENERATED_MACROS
' $HEADERS_PATH/executorch/runtime/core/portable_type/c10/macros/Macros.h
sed -i '' '1i\
#define C10_USING_CUSTOM_GENERATED_MACROS
' $HEADERS_PATH/executorch/runtime/core/portable_type/c10/macros/Export.h
ln -s $HEADERS_PATH/executorch/runtime/core/portable_type/c10 "$HEADERS_PATH/"


cp "$SOURCE_ROOT_DIR/extension/apple/ExecuTorch/Exported/"*.h "$HEADERS_PATH/executorch"
cp "$SOURCE_ROOT_DIR/extension/apple/ExecuTorch/Exported/"*.modulemap "$HEADERS_PATH"

Expand Down

13 changes: 7 additions & 6 deletions
build/executorch-config.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,20 +26,21 @@

cmake_minimum_required(VERSION 3.19)

set(_root "${CMAKE_CURRENT_LIST_DIR}/../..")
set(_root "${CMAKE_CURRENT_LIST_DIR}/../../..")
set(required_lib_list executorch executorch_core portable_kernels)
set(EXECUTORCH_LIBRARIES)
set(EXECUTORCH_INCLUDE_DIRS ${_root})
set(EXECUTORCH_INCLUDE_DIRS ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
foreach(lib ${required_lib_list})
 set(lib_var "LIB_${lib}")
 add_library(${lib} STATIC IMPORTED)
 find_library(
 ${lib_var} ${lib}
 HINTS "${_root}"
 HINTS "${_root}/lib"
 CMAKE_FIND_ROOT_PATH_BOTH
 )
 set_target_properties(${lib} PROPERTIES IMPORTED_LOCATION "${${lib_var}}")
 target_include_directories(${lib} INTERFACE ${_root})
 target_compile_definitions(${lib} INTERFACE C10_USING_CUSTOM_GENERATED_MACROS)
 target_include_directories(${lib} INTERFACE ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
 list(APPEND EXECUTORCH_LIBRARIES ${lib})
endforeach()

Expand DownExpand Up@@ -93,7 +94,7 @@ foreach(lib ${lib_list})
 set(lib_var "LIB_${lib}")
 find_library(
 ${lib_var} ${lib}
 HINTS "${_root}"
 HINTS "${_root}/lib"
 CMAKE_FIND_ROOT_PATH_BOTH
 )
 if(NOT ${lib_var})
Expand All@@ -109,7 +110,7 @@ foreach(lib ${lib_list})
 add_library(${lib} STATIC IMPORTED)
 endif()
 set_target_properties(${lib} PROPERTIES IMPORTED_LOCATION "${${lib_var}}")
 target_include_directories(${lib} INTERFACE ${_root})
 target_include_directories(${lib} INTERFACE ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
 list(APPEND EXECUTORCH_LIBRARIES ${lib})
 endif()
endforeach()

2 changes: 1 addition & 1 deletion
configurations/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED)

 generate_bindings_for_kernels(
 LIB_NAME "optimized_native_cpu_ops_lib" FUNCTIONS_YAML
 ${CMAKE_CURRENT_BINARY_DIR}/merged.yaml
 ${CMAKE_CURRENT_BINARY_DIR}/merged.yaml ADD_EXCEPTION_BOUNDARY
 )
 message("Generated files ${gen_command_sources}")

Expand Down

15 changes: 13 additions & 2 deletions
examples/apple/coreml/executor_runner/coreml_executor_runner.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,7 @@
 GCC_OPTIMIZATION_LEVEL = 0;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "$(inherited)",
 );
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand DownExpand Up@@ -271,6 +272,10 @@
 ENABLE_USER_SCRIPT_SANDBOXING = YES;
 GCC_C_LANGUAGE_STANDARD = gnu17;
 GCC_NO_COMMON_BLOCKS = YES;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "$(inherited)",
 );
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand All@@ -291,7 +296,10 @@
 CODE_SIGN_STYLE = Automatic;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 HEADER_SEARCH_PATHS = "$(SRCROOT)/include";
 HEADER_SEARCH_PATHS = (
 "$(SRCROOT)/include",
 "$(SRCROOT)/include/executorch/runtime/core/portable_type",
 );
 IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 LIBRARY_SEARCH_PATHS = (
 "$(SRCROOT)/libraries",
Expand All@@ -310,7 +318,10 @@
 CODE_SIGN_STYLE = Automatic;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 HEADER_SEARCH_PATHS = "$(SRCROOT)/include";
 HEADER_SEARCH_PATHS = (
 "$(SRCROOT)/include",
 "$(SRCROOT)/include/executorch/runtime/core/portable_type",
 );
 IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 LIBRARY_SEARCH_PATHS = (
 "$(SRCROOT)/libraries",
Expand Down

3 changes: 2 additions & 1 deletion
examples/arm/executor_runner/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -382,8 +382,9 @@ target_link_options( arm_executor_runner PUBLIC LINKER:-Map=arm_executor_runner.

# ET headers and generated headers includes
target_include_directories(
 arm_executor_runner PRIVATE ${ET_INCLUDE_PATH} ${CMAKE_CURRENT_BINARY_DIR}
 arm_executor_runner PRIVATE ${ET_INCLUDE_PATH} ${ET_DIR_PATH}/runtime/core/portable_type ${CMAKE_CURRENT_BINARY_DIR}
)
target_compile_definitions(arm_executor_runner PRIVATE C10_USING_CUSTOM_GENERATED_MACROS)

if(SEMIHOSTING)
 target_compile_definitions(arm_executor_runner PUBLIC SEMIHOSTING)
Expand Down

1 change: 1 addition & 0 deletions
kernels/optimized/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ gen_selected_ops(LIB_NAME "optimized_ops_lib" OPS_SCHEMA_YAML "${_yaml}")
generate_bindings_for_kernels(
 LIB_NAME "optimized_ops_lib" FUNCTIONS_YAML
 ${CMAKE_CURRENT_SOURCE_DIR}/optimized-oss.yaml
 ADD_EXCEPTION_BOUNDARY
)
message("Generated files ${gen_command_sources}")

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Integrate torchgen exception boundary with ExecuTorch#8321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

swolchok
merged 2 commits into

from

Feb 11, 2025
 Merged


Integrate torchgen exception boundary with ExecuTorch
#8321
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
0f76731

Use c10 version of half/bfloat16 in executorch

Feb 7, 2025
5704dae

Integrate torchgen exception boundary with ExecuTorch

Feb 7, 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


4 changes: 4 additions & 0 deletions
.lintrunner.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,8 @@ exclude_patterns = [
 # File contains @generated
 'extension/llm/custom_ops/spinquant/fast_hadamard_transform_special.h',
 'extension/llm/custom_ops/spinquant/test/fast_hadamard_transform_special_unstrided_cpu.h',
 # Want to be able to keep c10 in sync with PyTorch core.
 'runtime/core/portable_type/c10/**',
]
command = [
 'python',
Expand DownExpand Up@@ -261,6 +263,8 @@ exclude_patterns = [
 'extension/**',
 'kernels/optimized/**',
 'runtime/core/exec_aten/**',
 # Want to be able to keep c10 in sync with PyTorch core.
 'runtime/core/portable_type/c10/**',
 'runtime/executor/tensor_parser_aten.cpp',
 'scripts/**',
 'test/**',
Expand Down

13 changes: 12 additions & 1 deletion
CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -366,7 +366,7 @@ if(NOT "${_repo_dir_name}" STREQUAL "executorch")
 "fix for this restriction."
 )
endif()
set(_common_include_directories ${CMAKE_CURRENT_SOURCE_DIR}/..)
set(_common_include_directories ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/runtime/core/portable_type)

#
# The `_<target>_srcs` lists are defined by including ${EXECUTORCH_SRCS_FILE}.
Expand DownExpand Up@@ -549,6 +549,7 @@ endif()
target_include_directories(
 executorch_core PUBLIC ${_common_include_directories}
)
target_compile_definitions(executorch_core PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
target_compile_options(executorch_core PUBLIC ${_common_compile_options})
if(MAX_KERNEL_NUM)
 target_compile_definitions(
Expand All@@ -569,6 +570,7 @@ if(EXECUTORCH_BUILD_PYBIND AND APPLE)
 target_include_directories(
 executorch_core_shared PUBLIC ${_common_include_directories}
 )
 target_compile_definitions(executorch_core_shared PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
 target_compile_options(
 executorch_core_shared PUBLIC ${_common_compile_options}
 )
Expand All@@ -589,6 +591,7 @@ endif()
add_library(executorch ${_executorch__srcs})
target_link_libraries(executorch PRIVATE executorch_core)
target_include_directories(executorch PUBLIC ${_common_include_directories})
target_compile_definitions(executorch PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
target_compile_options(executorch PUBLIC ${_common_compile_options})
target_link_options_shared_lib(executorch)

Expand DownExpand Up@@ -622,6 +625,12 @@ endif()

# Install `executorch` library as well as `executorch-config.cmake` under
# ${CMAKE_INSTALL_PREFIX}/
install(DIRECTORY runtime/core/ DESTINATION include/executorch/runtime/core FILES_MATCHING PATTERN "*.h")
install(DIRECTORY runtime/kernel/ DESTINATION include/executorch/runtime/kernel FILES_MATCHING PATTERN "*.h")
install(DIRECTORY runtime/platform/ DESTINATION include/executorch/runtime/platform FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/kernel_util/ DESTINATION include/executorch/extension/kernel_util FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/tensor/ DESTINATION include/executorch/extension/tensor FILES_MATCHING PATTERN "*.h")
install(DIRECTORY extension/threadpool/ DESTINATION include/executorch/extension/threadpool FILES_MATCHING PATTERN "*.h")
install(
 TARGETS executorch executorch_core
 DESTINATION lib
Expand DownExpand Up@@ -780,6 +789,8 @@ if(EXECUTORCH_BUILD_PYBIND)
 target_include_directories(
 util PUBLIC ${_common_include_directories} ${TORCH_INCLUDE_DIRS}
 )
 target_compile_definitions(util PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)

 target_compile_options(util PUBLIC ${_pybind_compile_options})
 target_link_libraries(util PRIVATE torch c10 executorch extension_tensor)

Expand Down

2 changes: 2 additions & 0 deletions
backends/apple/coreml/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,8 @@ target_include_directories(
 coremldelegate PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util
)
target_include_directories(coremldelegate PRIVATE ${EXECUTORCH_ROOT}/..)
target_include_directories(coremldelegate PRIVATE ${EXECUTORCH_ROOT}/runtime/core/portable_type)
target_compile_definitions(coremldelegate PRIVATE C10_USING_CUSTOM_GENERATED_MACROS)
target_link_libraries(coremldelegate PRIVATE executorch_core)

if(EXECUTORCH_BUILD_DEVTOOLS)
Expand Down

4 changes: 4 additions & 0 deletions
backends/apple/coreml/runtime/workspace/executorchcoreml.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -830,6 +830,7 @@
 GCC_OPTIMIZATION_LEVEL = 0;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "$(inherited)",
 );
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand DownExpand Up@@ -911,6 +912,7 @@
 DEVELOPMENT_TEAM = "";
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "ET_EVENT_TRACER_ENABLED=1",
 "$(inherited)",
 );
Expand All@@ -920,6 +922,7 @@
 "$(SRCROOT)/../kvstore",
 "$(SRCROOT)/../inmemoryfs",
 "$(SRCROOT)/../include",
 "$(SRCROOT)/../include/executorch/runtime/core/portable_type",
 "$(SRCROOT)/../sdk",
 "$(SRCROOT)/../util",
 "$(SRCROOT)/../../third-party/nlohmann_json/single_include",
Expand DownExpand Up@@ -951,6 +954,7 @@
 "$(SRCROOT)/../kvstore",
 "$(SRCROOT)/../inmemoryfs",
 "$(SRCROOT)/../include",
 "$(SRCROOT)/../include/executorch/runtime/core/portable_type",
 "$(SRCROOT)/../sdk",
 "$(SRCROOT)/../util",
 "$(SRCROOT)/../../third-party/nlohmann_json/single_include",
Expand Down

3 changes: 2 additions & 1 deletion
backends/arm/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,8 @@ endif()

include(${EXECUTORCH_ROOT}/build/Utils.cmake)

set(_common_include_directories ${EXECUTORCH_ROOT}/..)
set(_common_include_directories ${EXECUTORCH_ROOT}/.. ${EXECUTORCH_ROOT}/runtime/core/portable_type)
add_compile_definitions(C10_USING_CUSTOM_GENERATED_MACROS)

# Third-party folder and Ethos-U driver inclued
set(THIRD_PARTY_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/third-party")
Expand Down

2 changes: 2 additions & 0 deletions
backends/qualcomm/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ add_custom_command(
)

add_compile_options("-Wall" "-Werror" "-Wno-sign-compare")
add_compile_definitions(C10_USING_CUSTOM_GENERATED_MACROS)

# GNU emit wanring for ignored attributes Unfortunately, we use [[maybe_unused]]
# which can be ignored by GNU. So we make it a warning, not an error in GNU.
Expand All@@ -73,6 +74,7 @@ endif()
include_directories(
 BEFORE ${_common_include_directories} ${QNN_SDK_ROOT}/include/QNN
 ${EXECUTORCH_SOURCE_DIR}/third-party/flatbuffers/include
 ${EXECUTORCH_SOURCE_DIR}/runtime/core/portable_type
)

set(_qnn_schema__srcs
Expand Down

2 changes: 1 addition & 1 deletion
backends/xnnpack/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ target_include_directories(
target_compile_options(xnnpack_backend PUBLIC ${_common_compile_options})
target_link_options_shared_lib(xnnpack_backend)

list(APPEND xnn_executor_runner_libs xnnpack_backend)
list(APPEND xnn_executor_runner_libs xnnpack_backend executorch)

# ios can only build library but not binary
if(NOT CMAKE_TOOLCHAIN_FILE MATCHES ".*(iOS|ios\.toolchain)\.cmake$")
Expand Down

9 changes: 7 additions & 2 deletions
build/Codegen.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,13 +59,15 @@ endfunction()
# Invoked as generate_bindings_for_kernels( LIB_NAME lib_name FUNCTIONS_YAML
# functions_yaml CUSTOM_OPS_YAML custom_ops_yaml )
function(generate_bindings_for_kernels)
 set(options ADD_EXCEPTION_BOUNDARY)
 set(arg_names LIB_NAME FUNCTIONS_YAML CUSTOM_OPS_YAML)
 cmake_parse_arguments(GEN "" "${arg_names}" "" ${ARGN})
 cmake_parse_arguments(GEN "${options}" "${arg_names}" "" ${ARGN})

 message(STATUS "Generating kernel bindings:")
 message(STATUS " LIB_NAME: ${GEN_LIB_NAME}")
 message(STATUS " FUNCTIONS_YAML: ${GEN_FUNCTIONS_YAML}")
 message(STATUS " CUSTOM_OPS_YAML: ${GEN_CUSTOM_OPS_YAML}")
 message(STATUS " ADD_EXCEPTION_BOUNDARY: ${GEN_ADD_EXCEPTION_BOUNDARY}")

 # Command to generate selected_operators.yaml from custom_ops.yaml.
 file(GLOB_RECURSE _codegen_templates "${EXECUTORCH_ROOT}/codegen/templates/*")
Expand DownExpand Up@@ -93,7 +95,10 @@ function(generate_bindings_for_kernels)
 --tags-path=${site-packages-out}/torchgen/packaged/ATen/native/tags.yaml
 --aten-yaml-path=${site-packages-out}/torchgen/packaged/ATen/native/native_functions.yaml
 --op-selection-yaml-path=${_oplist_yaml}
 )
 )
 if(GEN_ADD_EXCEPTION_BOUNDARY)
 set(_gen_command "${_gen_command}" --add-exception-boundary)
 endif()

 set(_gen_command_sources
 ${_out_dir}/RegisterCodegenUnboxedKernelsEverything.cpp
Expand Down

14 changes: 14 additions & 0 deletions
build/build_apple_frameworks.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,20 @@ check_command "$BUCK2"
 //extension/tensor: \
| rsync -av --files-from=- "$SOURCE_ROOT_DIR" "$HEADERS_PATH/executorch"

# HACK: XCFrameworks don't appear to support exporting any build
# options, but we need the following:
# - runtime/core/portable/type/c10 reachable with `#include <c10/...>`
# - exported -DC10_USING_CUSTOM_GENERATED_MACROS compiler flag
# So, just patch our generated framework to do that.
sed -i '' '1i\
#define C10_USING_CUSTOM_GENERATED_MACROS
' $HEADERS_PATH/executorch/runtime/core/portable_type/c10/macros/Macros.h
sed -i '' '1i\
#define C10_USING_CUSTOM_GENERATED_MACROS
' $HEADERS_PATH/executorch/runtime/core/portable_type/c10/macros/Export.h
ln -s $HEADERS_PATH/executorch/runtime/core/portable_type/c10 "$HEADERS_PATH/"


cp "$SOURCE_ROOT_DIR/extension/apple/ExecuTorch/Exported/"*.h "$HEADERS_PATH/executorch"
cp "$SOURCE_ROOT_DIR/extension/apple/ExecuTorch/Exported/"*.modulemap "$HEADERS_PATH"

Expand Down

13 changes: 7 additions & 6 deletions
build/executorch-config.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,20 +26,21 @@

cmake_minimum_required(VERSION 3.19)

set(_root "${CMAKE_CURRENT_LIST_DIR}/../..")
set(_root "${CMAKE_CURRENT_LIST_DIR}/../../..")
set(required_lib_list executorch executorch_core portable_kernels)
set(EXECUTORCH_LIBRARIES)
set(EXECUTORCH_INCLUDE_DIRS ${_root})
set(EXECUTORCH_INCLUDE_DIRS ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
foreach(lib ${required_lib_list})
 set(lib_var "LIB_${lib}")
 add_library(${lib} STATIC IMPORTED)
 find_library(
 ${lib_var} ${lib}
 HINTS "${_root}"
 HINTS "${_root}/lib"
 CMAKE_FIND_ROOT_PATH_BOTH
 )
 set_target_properties(${lib} PROPERTIES IMPORTED_LOCATION "${${lib_var}}")
 target_include_directories(${lib} INTERFACE ${_root})
 target_compile_definitions(${lib} INTERFACE C10_USING_CUSTOM_GENERATED_MACROS)
 target_include_directories(${lib} INTERFACE ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
 list(APPEND EXECUTORCH_LIBRARIES ${lib})
endforeach()

Expand DownExpand Up@@ -93,7 +94,7 @@ foreach(lib ${lib_list})
 set(lib_var "LIB_${lib}")
 find_library(
 ${lib_var} ${lib}
 HINTS "${_root}"
 HINTS "${_root}/lib"
 CMAKE_FIND_ROOT_PATH_BOTH
 )
 if(NOT ${lib_var})
Expand All@@ -109,7 +110,7 @@ foreach(lib ${lib_list})
 add_library(${lib} STATIC IMPORTED)
 endif()
 set_target_properties(${lib} PROPERTIES IMPORTED_LOCATION "${${lib_var}}")
 target_include_directories(${lib} INTERFACE ${_root})
 target_include_directories(${lib} INTERFACE ${_root}/include ${_root}/include/executorch/runtime/core/portable_type ${_root}/lib)
 list(APPEND EXECUTORCH_LIBRARIES ${lib})
 endif()
endforeach()

2 changes: 1 addition & 1 deletion
configurations/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED)

 generate_bindings_for_kernels(
 LIB_NAME "optimized_native_cpu_ops_lib" FUNCTIONS_YAML
 ${CMAKE_CURRENT_BINARY_DIR}/merged.yaml
 ${CMAKE_CURRENT_BINARY_DIR}/merged.yaml ADD_EXCEPTION_BOUNDARY
 )
 message("Generated files ${gen_command_sources}")

Expand Down

15 changes: 13 additions & 2 deletions
examples/apple/coreml/executor_runner/coreml_executor_runner.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,7 @@
 GCC_OPTIMIZATION_LEVEL = 0;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "$(inherited)",
 );
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand DownExpand Up@@ -271,6 +272,10 @@
 ENABLE_USER_SCRIPT_SANDBOXING = YES;
 GCC_C_LANGUAGE_STANDARD = gnu17;
 GCC_NO_COMMON_BLOCKS = YES;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "C10_USING_CUSTOM_GENERATED_MACROS",
 "$(inherited)",
 );
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand All@@ -291,7 +296,10 @@
 CODE_SIGN_STYLE = Automatic;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 HEADER_SEARCH_PATHS = "$(SRCROOT)/include";
 HEADER_SEARCH_PATHS = (
 "$(SRCROOT)/include",
 "$(SRCROOT)/include/executorch/runtime/core/portable_type",
 );
 IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 LIBRARY_SEARCH_PATHS = (
 "$(SRCROOT)/libraries",
Expand All@@ -310,7 +318,10 @@
 CODE_SIGN_STYLE = Automatic;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 HEADER_SEARCH_PATHS = "$(SRCROOT)/include";
 HEADER_SEARCH_PATHS = (
 "$(SRCROOT)/include",
 "$(SRCROOT)/include/executorch/runtime/core/portable_type",
 );
 IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 LIBRARY_SEARCH_PATHS = (
 "$(SRCROOT)/libraries",
Expand Down

3 changes: 2 additions & 1 deletion
examples/arm/executor_runner/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -382,8 +382,9 @@ target_link_options( arm_executor_runner PUBLIC LINKER:-Map=arm_executor_runner.

# ET headers and generated headers includes
target_include_directories(
 arm_executor_runner PRIVATE ${ET_INCLUDE_PATH} ${CMAKE_CURRENT_BINARY_DIR}
 arm_executor_runner PRIVATE ${ET_INCLUDE_PATH} ${ET_DIR_PATH}/runtime/core/portable_type ${CMAKE_CURRENT_BINARY_DIR}
)
target_compile_definitions(arm_executor_runner PRIVATE C10_USING_CUSTOM_GENERATED_MACROS)

if(SEMIHOSTING)
 target_compile_definitions(arm_executor_runner PUBLIC SEMIHOSTING)
Expand Down

1 change: 1 addition & 0 deletions
kernels/optimized/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ gen_selected_ops(LIB_NAME "optimized_ops_lib" OPS_SCHEMA_YAML "${_yaml}")
generate_bindings_for_kernels(
 LIB_NAME "optimized_ops_lib" FUNCTIONS_YAML
 ${CMAKE_CURRENT_SOURCE_DIR}/optimized-oss.yaml
 ADD_EXCEPTION_BOUNDARY
)
message("Generated files ${gen_command_sources}")

Expand Down
Loading