Skip to content

Commit d2be80d

Browse files
kirklandsignkirklandsign
committed
Move env setup to cmake rule
1 parent 2835a24 commit d2be80d

File tree

5 files changed

+55
-77
lines changed

5 files changed

+55
-77
lines changed

‎extension/module/test/CMakeLists.txt‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
# This source code is licensed under the BSD-style license found in the
55
# LICENSE file in the root directory of this source tree.
66

7-
# @generated by test/utils/generate_gtest_cmakelists.py
8-
#
97
# This file should be formatted with
108
# ~~~
119
# cmake-format -i CMakeLists.txt
@@ -33,4 +31,10 @@ et_cxx_test(
3331
portable_ops_lib
3432
)
3533

36-
set_property(TEST extension_module_test PROPERTY ENVIRONMENT "RESOURCES_PATH=${EXECUTORCH_ROOT}/extension/module/test/resources")
34+
set(test_env "RESOURCES_PATH=${EXECUTORCH_ROOT}/extension/module/test/resources")
35+
36+
set_property(
37+
TEST extension_module_test
38+
PROPERTY ENVIRONMENT
39+
"${test_env}"
40+
)

‎extension/runner_util/test/CMakeLists.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
# This source code is licensed under the BSD-style license found in the
55
# LICENSE file in the root directory of this source tree.
66

7-
# @generated by test/utils/generate_gtest_cmakelists.py
8-
#
97
# This file should be formatted with
108
# ~~~
119
# cmake-format -i CMakeLists.txt
@@ -31,3 +29,7 @@ et_cxx_test(
3129
portable_kernels
3230
portable_ops_lib
3331
)
32+
set_property(
33+
TEST extension_runner_util_test
34+
PROPERTY ENVIRONMENT "ET_MODULE_ADD_PATH=${CMAKE_BINARY_DIR}/ModuleAdd.pte"
35+
)

‎runtime/executor/test/CMakeLists.txt‎

Lines changed: 43 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,50 @@ include(${EXECUTORCH_ROOT}/build/Test.cmake)
1919

2020
add_custom_command(
2121
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}/ModuleMultipleEntry.pte"
27-
"${CMAKE_BINARY_DIR}/ModuleSimpleTrain.pte"
28-
COMMAND python3 -m test.models.export_program --modules "ModuleAdd,ModuleAddHalf,ModuleDynamicCatUnallocatedIO,ModuleIndex,ModuleLinear,ModuleMultipleEntry,ModuleSimpleTrain" --outdir "${CMAKE_BINARY_DIR}" 2> /dev/null
29-
COMMAND python3 -m test.models.export_delegated_program --modules "ModuleAddMul" --backend_id "StubBackend" --outdir "${CMAKE_BINARY_DIR}" || true
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}/ModuleMultipleEntry.pte"
27+
"${CMAKE_BINARY_DIR}/ModuleSimpleTrain.pte"
28+
COMMAND
29+
python3 -m test.models.export_program --modules
30+
"ModuleAdd,ModuleAddHalf,ModuleDynamicCatUnallocatedIO,ModuleIndex,ModuleLinear,ModuleMultipleEntry,ModuleSimpleTrain"
31+
--outdir "${CMAKE_BINARY_DIR}" 2> /dev/null
32+
COMMAND
33+
python3 -m test.models.export_delegated_program --modules "ModuleAddMul"
34+
--backend_id "StubBackend" --outdir "${CMAKE_BINARY_DIR}" || true
3035
WORKING_DIRECTORY ${EXECUTORCH_ROOT}
3136
)
3237

33-
add_custom_target(generated_pte_files DEPENDS "${CMAKE_BINARY_DIR}/ModuleAddHalf.pte"
34-
"${CMAKE_BINARY_DIR}/ModuleAdd.pte"
35-
"${CMAKE_BINARY_DIR}/ModuleDynamicCatUnallocatedIO.pte"
36-
"${CMAKE_BINARY_DIR}/ModuleIndex.pte"
37-
"${CMAKE_BINARY_DIR}/ModuleLinear.pte"
38-
"${CMAKE_BINARY_DIR}/ModuleMultipleEntry.pte"
39-
"${CMAKE_BINARY_DIR}/ModuleSimpleTrain.pte")
38+
add_custom_target(
39+
generated_pte_files
40+
DEPENDS "${CMAKE_BINARY_DIR}/ModuleAddHalf.pte"
41+
"${CMAKE_BINARY_DIR}/ModuleAdd.pte"
42+
"${CMAKE_BINARY_DIR}/ModuleDynamicCatUnallocatedIO.pte"
43+
"${CMAKE_BINARY_DIR}/ModuleIndex.pte"
44+
"${CMAKE_BINARY_DIR}/ModuleLinear.pte"
45+
"${CMAKE_BINARY_DIR}/ModuleMultipleEntry.pte"
46+
"${CMAKE_BINARY_DIR}/ModuleSimpleTrain.pte"
47+
)
48+
49+
set(test_env
50+
"DEPRECATED_ET_MODULE_LINEAR_CONSTANT_BUFFER_PATH=${EXECUTORCH_ROOT}/test/models/deprecated/ModuleLinear-no-constant-segment.pte"
51+
"ET_MODULE_ADD_HALF_PATH=${CMAKE_BINARY_DIR}/ModuleAddHalf.pte"
52+
"ET_MODULE_ADD_PATH=${CMAKE_BINARY_DIR}/ModuleAdd.pte"
53+
"ET_MODULE_DYNAMIC_CAT_UNALLOCATED_IO_PATH=${CMAKE_BINARY_DIR}/ModuleDynamicCatUnallocatedIO.pte"
54+
"ET_MODULE_INDEX_PATH=${CMAKE_BINARY_DIR}/ModuleIndex.pte"
55+
"ET_MODULE_LINEAR_PATH=${CMAKE_BINARY_DIR}/ModuleLinear.pte"
56+
"ET_MODULE_MULTI_ENTRY_PATH=${CMAKE_BINARY_DIR}/ModuleMultipleEntry.pte"
57+
"ET_MODULE_SIMPLE_TRAIN_PATH=${CMAKE_BINARY_DIR}/ModuleSimpleTrain.pte"
58+
)
4059

4160
et_cxx_test(
4261
runtime_executor_test SOURCES executor_test.cpp EXTRA_LIBS portable_ops_lib
4362
portable_kernels
4463
)
4564
add_dependencies(runtime_executor_test generated_pte_files)
65+
set_property(TEST runtime_executor_test PROPERTY ENVIRONMENT ${test_env})
4666

4767
et_cxx_test(
4868
allocation_failure_stress_test
@@ -55,6 +75,9 @@ et_cxx_test(
5575
extension_runner_util
5676
)
5777
add_dependencies(allocation_failure_stress_test generated_pte_files)
78+
set_property(
79+
TEST allocation_failure_stress_test PROPERTY ENVIRONMENT ${test_env}
80+
)
5881

5982
et_cxx_test(
6083
method_test
@@ -67,6 +90,7 @@ et_cxx_test(
6790
extension_runner_util
6891
)
6992
add_dependencies(method_test generated_pte_files)
93+
set_property(TEST method_test PROPERTY ENVIRONMENT ${test_env})
7094

7195
# TODO(T191569140): Enable this test. et_cxx_test(method_meta_test SOURCES
7296
# method_meta_test.cpp EXTRA_LIBS extension_data_loader)
@@ -83,19 +107,22 @@ et_cxx_test(
83107
extension_data_loader
84108
)
85109
add_dependencies(kernel_resolution_test generated_pte_files)
110+
set_property(TEST kernel_resolution_test PROPERTY ENVIRONMENT ${test_env})
86111

87112
et_cxx_test(
88113
kernel_integration_test SOURCES kernel_integration_test.cpp EXTRA_LIBS
89114
extension_data_loader extension_runner_util
90115
)
91116
add_dependencies(kernel_integration_test generated_pte_files)
117+
set_property(TEST kernel_integration_test PROPERTY ENVIRONMENT ${test_env})
92118

93119
# TODO(T191569140): Enable this test. et_cxx_test( backend_integration_test
94120
# SOURCES backend_integration_test.cpp EXTRA_LIBS extension_data_loader
95121
# extension_runner_util )
96122

97123
et_cxx_test(memory_manager_test SOURCES memory_manager_test.cpp)
98124
add_dependencies(memory_manager_test generated_pte_files)
125+
set_property(TEST memory_manager_test PROPERTY ENVIRONMENT ${test_env})
99126

100127
et_cxx_test(
101128
tensor_parser_test
@@ -108,6 +135,7 @@ et_cxx_test(
108135
extension_runner_util
109136
)
110137
add_dependencies(tensor_parser_test generated_pte_files)
138+
set_property(TEST tensor_parser_test PROPERTY ENVIRONMENT ${test_env})
111139

112140
target_include_directories(
113141
tensor_parser_test

‎test/run_oss_cpp_tests.sh‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -44,43 +44,13 @@ build_executorch() {
4444
cmake --build cmake-out -j9 --target install
4545
}
4646

47-
export_test_model() {
48-
# python3 -m test.models.export_program --modules "ModuleAdd,ModuleAddHalf,ModuleDynamicCatUnallocatedIO,ModuleIndex,ModuleLinear,ModuleMultipleEntry,ModuleSimpleTrain" --outdir "cmake-out" 2> /dev/null
49-
# python3 -m test.models.export_delegated_program --modules "ModuleAddMul" --backend_id "StubBackend" --outdir "cmake-out" || true
50-
51-
DEPRECATED_ET_MODULE_LINEAR_CONSTANT_BUFFER_PATH="$(realpath test/models/deprecated/ModuleLinear-no-constant-segment.pte)"
52-
ET_MODULE_ADD_HALF_PATH="$(realpath cmake-out/ModuleAddHalf.pte)"
53-
ET_MODULE_ADD_PATH="$(realpath cmake-out/ModuleAdd.pte)"
54-
ET_MODULE_DYNAMIC_CAT_UNALLOCATED_IO_PATH="$(realpath cmake-out/ModuleDynamicCatUnallocatedIO.pte)"
55-
ET_MODULE_INDEX_PATH="$(realpath cmake-out/ModuleIndex.pte)"
56-
ET_MODULE_LINEAR_PATH="$(realpath cmake-out/ModuleLinear.pte)"
57-
ET_MODULE_MULTI_ENTRY_PATH="$(realpath cmake-out/ModuleMultipleEntry.pte)"
58-
ET_MODULE_ADD_MUL_NOSEGMENTS_DA1024_PATH="$(realpath cmake-out/ModuleAddMul-nosegments-da1024.pte)"
59-
ET_MODULE_ADD_MUL_NOSEGMENTS_PATH="$(realpath cmake-out/ModuleAddMul-nosegments.pte)"
60-
ET_MODULE_ADD_MUL_PATH="$(realpath cmake-out/ModuleAddMul.pte)"
61-
ET_MODULE_SIMPLE_TRAIN_PATH="$(realpath cmake-out/ModuleSimpleTrain.pte)"
62-
export DEPRECATED_ET_MODULE_LINEAR_CONSTANT_BUFFER_PATH
63-
export ET_MODULE_ADD_HALF_PATH
64-
export ET_MODULE_ADD_PATH
65-
export ET_MODULE_DYNAMIC_CAT_UNALLOCATED_IO_PATH
66-
export ET_MODULE_INDEX_PATH
67-
export ET_MODULE_LINEAR_PATH
68-
export ET_MODULE_MULTI_ENTRY_PATH
69-
export ET_MODULE_ADD_MUL_NOSEGMENTS_DA1024_PATH
70-
export ET_MODULE_ADD_MUL_NOSEGMENTS_PATH
71-
export ET_MODULE_ADD_MUL_PATH
72-
export ET_MODULE_SIMPLE_TRAIN_PATH
73-
}
74-
7547
build_and_run_test() {
7648
local test_dir=$1
7749

7850
if [[ "$test_dir" =~ .*examples/models/llama/tokenizer.* ]]; then
7951
RESOURCES_PATH=$(realpath examples/models/llama/tokenizer/test/resources)
8052
elif [[ "$test_dir" =~ .*extension/llm/tokenizer.* ]]; then
8153
RESOURCES_PATH=$(realpath extension/llm/tokenizer/test/resources)
82-
else
83-
RESOURCES_PATH=$(realpath extension/module/test/resources)
8454
fi
8555
export RESOURCES_PATH
8656

@@ -117,9 +87,8 @@ probe_additional_tests() {
11787
| sort -u
11888
}
11989

120-
# build_executorch
90+
build_executorch
12191
run_ctest
122-
export_test_model
12392

12493
if [ -z "$1" ]; then
12594
echo "Running all directories:"

‎test/utils/OSSTestConfig.json‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,38 +30,13 @@
3030
"malloc_memory_allocator_test.cpp"
3131
]
3232
},
33-
{
34-
"directory": "extension/module/test",
35-
"sources": [
36-
"module_test.cpp"
37-
],
38-
"additional_libs": [
39-
"extension_data_loader",
40-
"extension_module_static",
41-
"extension_tensor",
42-
"portable_kernels",
43-
"portable_ops_lib"
44-
]
45-
},
4633
{
4734
"directory": "extension/pytree/test",
4835
"sources": [
4936
"function_ref_test.cpp",
5037
"test_pytree.cpp"
5138
]
5239
},
53-
{
54-
"directory": "extension/runner_util/test",
55-
"sources": [
56-
"inputs_test.cpp"
57-
],
58-
"additional_libs": [
59-
"extension_data_loader",
60-
"extension_runner_util",
61-
"portable_kernels",
62-
"portable_ops_lib"
63-
]
64-
},
6540
{
6641
"directory": "extension/tensor/test",
6742
"sources": [

0 commit comments

Comments
 (0)