Skip to content

Commit 47f1c53

Browse files
Megan0704-1Megan0704-1
authored
Merge branch 'pytorch:main' into etdump-file-data-sink-test-coverage
2 parents 853353e + 8c32da7 commit 47f1c53

File tree

45 files changed

+186
-103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+186
-103
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
cmake_minimum_required(VERSION 3.24)
4646
project(executorch)
47-
include(build/Utils.cmake)
47+
include(tools/cmake/Utils.cmake)
4848
include(CMakeDependentOption)
4949

5050
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

‎backends/apple/mps/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if(NOT EXECUTORCH_ROOT)
1616
set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
1717
endif()
1818

19-
include(${EXECUTORCH_ROOT}/build/Utils.cmake)
19+
include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
2020

2121
if(NOT PYTHON_EXECUTABLE)
2222
resolve_python_executable()

‎backends/arm/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if(NOT EXECUTORCH_ROOT)
1212
set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..)
1313
endif()
1414

15-
include(${EXECUTORCH_ROOT}/build/Utils.cmake)
15+
include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
1616

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

‎backends/cadence/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ if(NOT EXECUTORCH_ROOT)
1919
set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..)
2020
endif()
2121

22-
include(${EXECUTORCH_ROOT}/build/Utils.cmake)
22+
include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
2323

2424
# Let files say "include <executorch/path/to/header.h>".
2525
set(_common_include_directories ${EXECUTORCH_ROOT}/..

‎backends/cadence/fusion_g3/operators/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if(NOT CMAKE_CXX_STANDARD)
1111
set(CMAKE_CXX_STANDARD 17)
1212
endif()
1313

14-
include(${EXECUTORCH_ROOT}/build/Utils.cmake)
14+
include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
1515
include(${EXECUTORCH_ROOT}/tools/cmake/Codegen.cmake)
1616

1717
if(NOT PYTHON_EXECUTABLE)

‎backends/cadence/hifi/operators/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if(NOT CMAKE_CXX_STANDARD)
1111
set(CMAKE_CXX_STANDARD 17)
1212
endif()
1313

14-
include(${EXECUTORCH_ROOT}/build/Utils.cmake)
14+
include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
1515
include(${EXECUTORCH_ROOT}/tools/cmake/Codegen.cmake)
1616

1717
if(NOT PYTHON_EXECUTABLE)

‎backends/cadence/reference/operators/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if(NOT CMAKE_CXX_STANDARD)
1111
set(CMAKE_CXX_STANDARD 17)
1212
endif()
1313

14-
include(${EXECUTORCH_ROOT}/build/Utils.cmake)
14+
include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
1515
include(${EXECUTORCH_ROOT}/tools/cmake/Codegen.cmake)
1616

1717
if(NOT PYTHON_EXECUTABLE)

‎backends/vulkan/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ endif()
3232
# provide access to target_link_options_shared_lib which allows libraries to be
3333
# linked with the --whole-archive flag. This is required for libraries that
3434
# perform dynamic registration via static initialization.
35-
include(${EXECUTORCH_ROOT}/build/Utils.cmake)
35+
include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
3636

3737
include(cmake/ShaderLibrary.cmake)
3838

‎backends/vulkan/cmake/ShaderLibrary.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ else()
4141
endif()
4242

4343
# Required to enable linking with --whole-archive
44-
include(${EXECUTORCH_ROOT}/build/Utils.cmake)
44+
include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
4545

4646
function(gen_vulkan_shader_lib_cpp shaders_path)
4747
set(VULKAN_SHADERGEN_ENV "")

‎backends/vulkan/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if(LIB_VULKAN_BACKEND)
3737
# to provide access to target_link_options_shared_lib which allows libraries
3838
# to be linked with the --whole-archive flag. This is required for libraries
3939
# that perform dynamic registration via static initialization.
40-
include(${EXECUTORCH_ROOT}/build/Utils.cmake)
40+
include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
4141

4242
include(../cmake/ShaderLibrary.cmake)
4343

‎backends/xnnpack/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if(NOT EXECUTORCH_ROOT)
2323
set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..)
2424
endif()
2525

26-
include(${EXECUTORCH_ROOT}/build/Utils.cmake)
26+
include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
2727

2828
if(NOT PYTHON_EXECUTABLE)
2929
resolve_python_executable()

‎configurations/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ if(NOT EXECUTORCH_ROOT)
1616
set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/..)
1717
endif()
1818

19-
include(${EXECUTORCH_ROOT}/build/Utils.cmake)
19+
include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
2020

2121
if(NOT PYTHON_EXECUTABLE)
2222
resolve_python_executable()
2323
endif()
2424

2525
set(_common_compile_options -Wno-deprecated-declarations)
2626

27-
include(${EXECUTORCH_ROOT}/build/Utils.cmake)
27+
include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
2828
include(${EXECUTORCH_ROOT}/tools/cmake/Codegen.cmake)
2929

3030
if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED)

‎devtools/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if(NOT EXECUTORCH_ROOT)
3232
set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/..)
3333
endif()
3434

35-
include(${EXECUTORCH_ROOT}/build/Utils.cmake)
35+
include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
3636

3737
if(NOT PYTHON_EXECUTABLE)
3838
resolve_python_executable()

‎docs/source/kernel-library-custom-aten-kernel.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ Here's an example to do it:
267267

268268
```cmake
269269
# For target_link_options_shared_lib
270-
include(${EXECUTORCH_ROOT}/build/Utils.cmake)
270+
include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
271271
272272
# Add a custom op library
273273
add_library(custom_op_lib SHARED ${CMAKE_CURRENT_SOURCE_DIR}/custom_op.cpp)

‎docs/source/using-executorch-android.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The AAR artifact contains the Java library for users to integrate with their Jav
2828

2929
| Version | AAR | SHASUMS |
3030
| ------- | --- | ------- |
31-
| [v0.5.0](https://github.com/pytorch/executorch/releases/tag/v0.5.0) | [executorch.aar](https://ossci-android.s3.amazonaws.com/executorch/release/v0.5.0-rc3/executorch.aar) | [executorch.aar.sha256sums](https://ossci-android.s3.amazonaws.com/executorch/release/v0.5.0-rc3/executorch.aar) |
31+
| [v0.5.0](https://github.com/pytorch/executorch/releases/tag/v0.5.0) | [executorch.aar](https://ossci-android.s3.amazonaws.com/executorch/release/v0.5.0-rc3/executorch.aar) | [executorch.aar.sha256sums](https://ossci-android.s3.amazonaws.com/executorch/release/v0.5.0-rc3/executorch.aar.sha256sums) |
3232

3333
### Snapshots from main branch
3434

‎examples/apple/mps/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ if(NOT EXECUTORCH_ROOT)
2323
set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
2424
endif()
2525

26-
include(${EXECUTORCH_ROOT}/build/Utils.cmake)
26+
include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
2727

2828
if(NOT PYTHON_EXECUTABLE)
2929
resolve_python_executable()
3030
endif()
3131

3232
add_compile_options("-Wall" "-Werror")
3333

34-
include(${EXECUTORCH_ROOT}/build/Utils.cmake)
34+
include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
3535

3636
set(_common_compile_options -Wno-deprecated-declarations -fPIC
3737
-DET_EVENT_TRACER_ENABLED
@@ -58,7 +58,7 @@ if(NOT CMAKE_TOOLCHAIN_FILE MATCHES ".*(iOS|ios\.toolchain)\.cmake$")
5858
#
5959

6060
# portable_ops_lib
61-
include(${EXECUTORCH_ROOT}/build/Utils.cmake)
61+
include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
6262
include(${EXECUTORCH_ROOT}/tools/cmake/Codegen.cmake)
6363
gen_selected_ops(LIB_NAME "mps_portable_ops_lib" INCLUDE_ALL_OPS "ON")
6464
generate_bindings_for_kernels(

‎examples/arm/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if(NOT EXECUTORCH_ROOT)
2121
set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..)
2222
endif()
2323

24-
include(${EXECUTORCH_ROOT}/build/Utils.cmake)
24+
include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
2525

2626
if(NOT PYTHON_EXECUTABLE)
2727
resolve_python_executable()
@@ -35,7 +35,7 @@ set(_common_include_directories ${EXECUTORCH_ROOT}/..)
3535
find_package(executorch CONFIG REQUIRED HINTS ${CMAKE_INSTALL_PREFIX})
3636
target_include_directories(executorch INTERFACE ${_common_include_directories})
3737

38-
include(${EXECUTORCH_ROOT}/build/Utils.cmake)
38+
include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
3939
include(${EXECUTORCH_ROOT}/tools/cmake/Codegen.cmake)
4040

4141
# Generate C++ bindings to register kernels into both PyTorch (for AOT) and

‎examples/cadence/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ if(NOT EXECUTORCH_ROOT)
1919
set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..)
2020
endif()
2121

22-
include(${EXECUTORCH_ROOT}/build/Utils.cmake)
22+
include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
2323

2424
if(NOT PYTHON_EXECUTABLE)
2525
resolve_python_executable()

‎examples/demo-apps/apple_ios/ExecuTorchDemo/ExecuTorchDemo.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,7 @@
806806
isa = XCRemoteSwiftPackageReference;
807807
repositoryURL = "https://github.com/pytorch/executorch";
808808
requirement = {
809-
branch = "swiftpm-0.5.0.20250228";
809+
branch = "swiftpm-0.5.0.20250317";
810810
kind = branch;
811811
};
812812
};

0 commit comments

Comments
 (0)