Skip to content

Commit 7964bca

Browse files
lucylqlucylq
authored
[BE] Cmake clean up (#8448)
cmake update
1 parent d0b74cb commit 7964bca

File tree

4 files changed

+69
-51
lines changed

4 files changed

+69
-51
lines changed

‎extension/flat_tensor/CMakeLists.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ endif()
1919
list(TRANSFORM _extension_flat_tensor__srcs PREPEND "${EXECUTORCH_ROOT}/")
2020
add_library(extension_flat_tensor ${_extension_flat_tensor__srcs})
2121
target_link_libraries(extension_flat_tensor executorch extension_data_loader)
22-
target_include_directories(extension_flat_tensor PUBLIC
23-
${EXECUTORCH_ROOT}/..
24-
"${CMAKE_BINARY_DIR}/extension/flat_tensor/include"
25-
"${EXECUTORCH_ROOT}/third-party/flatbuffers/include"
26-
${_common_include_directories})
22+
target_include_directories(
23+
extension_flat_tensor
24+
PUBLIC ${EXECUTORCH_ROOT}/..
25+
"${CMAKE_BINARY_DIR}/extension/flat_tensor/include"
26+
"${EXECUTORCH_ROOT}/third-party/flatbuffers/include"
27+
${_common_include_directories}
28+
)
2729
target_compile_options(extension_flat_tensor PUBLIC ${_common_compile_options})
2830

2931
# Install libraries

‎extension/flat_tensor/test/CMakeLists.txt

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,31 @@ include(${EXECUTORCH_ROOT}/build/Test.cmake)
2121
add_custom_command(
2222
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.pte"
2323
"${CMAKE_CURRENT_BINARY_DIR}/_default_external_constant.ptd"
24-
2524
COMMAND
26-
python -m test.models.export_program --modules "ModuleLinear" --external-constants --outdir "${CMAKE_CURRENT_BINARY_DIR}" 2> /dev/null
27-
25+
python -m test.models.export_program --modules "ModuleLinear"
26+
--external-constants --outdir "${CMAKE_CURRENT_BINARY_DIR}" 2> /dev/null
2827
WORKING_DIRECTORY ${EXECUTORCH_ROOT}
2928
)
3029

3130
add_custom_target(
32-
program_data_files
31+
extension_flat_tensor_test_resources
3332
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.pte"
3433
"${CMAKE_CURRENT_BINARY_DIR}/_default_external_constant.ptd"
3534
)
3635

37-
set(test_env_
36+
set(test_env
3837
"ET_MODULE_LINEAR_PROGRAM_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.pte"
3938
"ET_MODULE_LINEAR_DATA_PATH=${CMAKE_CURRENT_BINARY_DIR}/_default_external_constant.ptd"
4039
)
4140

4241
set(_test_srcs flat_tensor_data_map_test.cpp flat_tensor_header_test.cpp)
4342

44-
et_cxx_test(extension_flat_tensor_test SOURCES ${_test_srcs} EXTRA_LIBS extension_flat_tensor extension_data_loader)
43+
et_cxx_test(
44+
extension_flat_tensor_test SOURCES ${_test_srcs} EXTRA_LIBS
45+
extension_flat_tensor extension_data_loader
46+
)
4547

46-
add_dependencies(extension_flat_tensor_test program_data_files)
47-
set_property(TEST extension_flat_tensor_test PROPERTY ENVIRONMENT ${test_env_})
48+
add_dependencies(
49+
extension_flat_tensor_test extension_flat_tensor_test_resources
50+
)
51+
set_property(TEST extension_flat_tensor_test PROPERTY ENVIRONMENT ${test_env})

‎extension/runner_util/test/CMakeLists.txt

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,20 @@ set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
1717

1818
include(${EXECUTORCH_ROOT}/build/Test.cmake)
1919

20+
add_custom_command(
21+
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ModuleAdd.pte"
22+
COMMAND python3 -m test.models.export_program --modules "ModuleAdd" --outdir
23+
"${CMAKE_CURRENT_BINARY_DIR}" 2> /dev/null
24+
WORKING_DIRECTORY ${EXECUTORCH_ROOT}
25+
)
26+
27+
add_custom_target(
28+
executorch_runner_util_test_resources
29+
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/ModuleAdd.pte"
30+
)
31+
32+
set(test_env "ET_MODULE_ADD_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleAdd.pte")
33+
2034
set(_test_srcs inputs_test.cpp)
2135

2236
et_cxx_test(
@@ -29,7 +43,6 @@ et_cxx_test(
2943
portable_kernels
3044
portable_ops_lib
3145
)
32-
set_property(
33-
TEST extension_runner_util_test
34-
PROPERTY ENVIRONMENT "ET_MODULE_ADD_PATH=${CMAKE_BINARY_DIR}/ModuleAdd.pte"
35-
)
46+
47+
add_dependencies(extension_runner_util_test executorch_runner_util_test_resources)
48+
set_property(TEST extension_runner_util_test PROPERTY ENVIRONMENT ${test_env})

‎runtime/executor/test/CMakeLists.txt

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -18,53 +18,52 @@ set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
1818
include(${EXECUTORCH_ROOT}/build/Test.cmake)
1919

2020
add_custom_command(
21-
OUTPUT "${CMAKE_BINARY_DIR}/ModuleAddHalf.pte"
22-
"${CMAKE_BINARY_DIR}/ModuleAdd.pte"
23-
"${CMAKE_BINARY_DIR}/ModuleDynamicCatUnallocatedIO.pte"
24-
"${CMAKE_BINARY_DIR}/ModuleIndex.pte"
25-
"${CMAKE_BINARY_DIR}/ModuleLinear.pte"
26-
"${CMAKE_BINARY_DIR}/ModuleLinearProgram.pte"
27-
"${CMAKE_BINARY_DIR}/_default_external_constant.ptd"
28-
"${CMAKE_BINARY_DIR}/ModuleMultipleEntry.pte"
29-
"${CMAKE_BINARY_DIR}/ModuleSimpleTrain.pte"
21+
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ModuleAddHalf.pte"
22+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleAdd.pte"
23+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleDynamicCatUnallocatedIO.pte"
24+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleIndex.pte"
25+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleLinear.pte"
26+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.pte"
27+
"${CMAKE_CURRENT_BINARY_DIR}/_default_external_constant.ptd"
28+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleMultipleEntry.pte"
29+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleSimpleTrain.pte"
3030
COMMAND
31-
python -m test.models.export_program --modules
31+
python3 -m test.models.export_program --modules
3232
"ModuleAdd,ModuleAddHalf,ModuleDynamicCatUnallocatedIO,ModuleIndex,ModuleLinear,ModuleMultipleEntry,ModuleSimpleTrain"
33-
--outdir "${CMAKE_BINARY_DIR}" 2> /dev/null
33+
--outdir "${CMAKE_CURRENT_BINARY_DIR}" 2> /dev/null
3434
COMMAND
35-
python3 -m test.models.export_program --modules
36-
"ModuleLinear" --external-constants
37-
--outdir "${CMAKE_BINARY_DIR}" 2> /dev/null
35+
python3 -m test.models.export_program --modules "ModuleLinear"
36+
--external-constants --outdir "${CMAKE_CURRENT_BINARY_DIR}" 2> /dev/null
3837
COMMAND
39-
python -m test.models.export_delegated_program --modules "ModuleAddMul"
40-
--backend_id "StubBackend" --outdir "${CMAKE_BINARY_DIR}" || true
38+
python3 -m test.models.export_delegated_program --modules "ModuleAddMul"
39+
--backend_id "StubBackend" --outdir "${CMAKE_CURRENT_BINARY_DIR}" || true
4140
WORKING_DIRECTORY ${EXECUTORCH_ROOT}
4241
)
4342

4443
add_custom_target(
4544
generated_pte_files
46-
DEPENDS "${CMAKE_BINARY_DIR}/ModuleAddHalf.pte"
47-
"${CMAKE_BINARY_DIR}/ModuleAdd.pte"
48-
"${CMAKE_BINARY_DIR}/ModuleDynamicCatUnallocatedIO.pte"
49-
"${CMAKE_BINARY_DIR}/ModuleIndex.pte"
50-
"${CMAKE_BINARY_DIR}/ModuleLinear.pte"
51-
"${CMAKE_BINARY_DIR}/ModuleLinearProgram.pte"
52-
"${CMAKE_BINARY_DIR}/_default_external_constant.ptd"
53-
"${CMAKE_BINARY_DIR}/ModuleMultipleEntry.pte"
54-
"${CMAKE_BINARY_DIR}/ModuleSimpleTrain.pte"
45+
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/ModuleAddHalf.pte"
46+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleAdd.pte"
47+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleDynamicCatUnallocatedIO.pte"
48+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleIndex.pte"
49+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleLinear.pte"
50+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.pte"
51+
"${CMAKE_CURRENT_BINARY_DIR}/_default_external_constant.ptd"
52+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleMultipleEntry.pte"
53+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleSimpleTrain.pte"
5554
)
5655

5756
set(test_env
5857
"DEPRECATED_ET_MODULE_LINEAR_CONSTANT_BUFFER_PATH=${EXECUTORCH_ROOT}/test/models/deprecated/ModuleLinear-no-constant-segment.pte"
59-
"ET_MODULE_ADD_HALF_PATH=${CMAKE_BINARY_DIR}/ModuleAddHalf.pte"
60-
"ET_MODULE_ADD_PATH=${CMAKE_BINARY_DIR}/ModuleAdd.pte"
61-
"ET_MODULE_DYNAMIC_CAT_UNALLOCATED_IO_PATH=${CMAKE_BINARY_DIR}/ModuleDynamicCatUnallocatedIO.pte"
62-
"ET_MODULE_INDEX_PATH=${CMAKE_BINARY_DIR}/ModuleIndex.pte"
63-
"ET_MODULE_LINEAR_PATH=${CMAKE_BINARY_DIR}/ModuleLinear.pte"
64-
"ET_MODULE_LINEAR_PROGRAM_PATH=${CMAKE_BINARY_DIR}/ModuleLinearProgram.pte"
65-
"ET_MODULE_LINEAR_DATA_PATH=${CMAKE_BINARY_DIR}/_default_external_constant.ptd"
66-
"ET_MODULE_MULTI_ENTRY_PATH=${CMAKE_BINARY_DIR}/ModuleMultipleEntry.pte"
67-
"ET_MODULE_SIMPLE_TRAIN_PATH=${CMAKE_BINARY_DIR}/ModuleSimpleTrain.pte"
58+
"ET_MODULE_ADD_HALF_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleAddHalf.pte"
59+
"ET_MODULE_ADD_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleAdd.pte"
60+
"ET_MODULE_DYNAMIC_CAT_UNALLOCATED_IO_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleDynamicCatUnallocatedIO.pte"
61+
"ET_MODULE_INDEX_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleIndex.pte"
62+
"ET_MODULE_LINEAR_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleLinear.pte"
63+
"ET_MODULE_LINEAR_PROGRAM_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.pte"
64+
"ET_MODULE_LINEAR_DATA_PATH=${CMAKE_CURRENT_BINARY_DIR}/_default_external_constant.ptd"
65+
"ET_MODULE_MULTI_ENTRY_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleMultipleEntry.pte"
66+
"ET_MODULE_SIMPLE_TRAIN_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleSimpleTrain.pte"
6867
)
6968

7069
et_cxx_test(

0 commit comments

Comments
 (0)