Skip to content

Commit 6b7f5e1

Browse files
lucylqlucylq
committed
Rename ModuleLinear -> ModuleAddMul
Pull Request resolved: #10529 In export_program, the `ModuleLinear` is a decomposed add mul. Renaming it to addmul, so that we can add a ModuleLinear that calls nn.Linear for backend program-data separation testing. ghstack-source-id: 282101505 Differential Revision: [D73679750](https://our.internmc.facebook.com/intern/diff/D73679750/)
1 parent cd3b53d commit 6b7f5e1

17 files changed

+67
-67
lines changed

‎codegen/tools/targets.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ def define_common_targets(is_fbcode = False):
179179
srcs = ["test/test_gen_oplist_real_model.py"],
180180
base_module = "",
181181
resources = {
182-
"//executorch/test/models:exported_programs[ModuleLinear.pte]": "test/ModuleLinear.pte",
182+
"//executorch/test/models:exported_programs[ModuleAddMul.pte]": "test/ModuleAddMul.pte",
183183
},
184184
visibility = [
185185
"//executorch/...",

‎codegen/tools/test/test_gen_oplist_real_model.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
from libfb.py import parutil # type: ignore[import-not-found]
1717

18-
MODEL_PATH: Final[str] = parutil.get_file_path("ModuleLinear.pte", pkg=__package__)
18+
MODEL_PATH: Final[str] = parutil.get_file_path("ModuleAddMul.pte", pkg=__package__)
1919

2020

2121
class TestGenOplistRealModel(unittest.TestCase):

‎extension/flat_tensor/test/CMakeLists.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@ set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
1919
include(${EXECUTORCH_ROOT}/tools/cmake/Test.cmake)
2020

2121
add_custom_command(
22-
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.pte"
23-
"${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.ptd"
22+
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMulProgram.pte"
23+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMulProgram.ptd"
2424
COMMAND
25-
python -m test.models.export_program --modules "ModuleLinear"
25+
python -m test.models.export_program --modules "ModuleAddMul"
2626
--external-constants --outdir "${CMAKE_CURRENT_BINARY_DIR}" 2> /dev/null
2727
WORKING_DIRECTORY ${EXECUTORCH_ROOT}
2828
)
2929

3030
add_custom_target(
3131
extension_flat_tensor_test_resources
32-
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.pte"
33-
"${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.ptd"
32+
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMulProgram.pte"
33+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMulProgram.ptd"
3434
)
3535

3636
set(test_env
37-
"ET_MODULE_LINEAR_PROGRAM_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.pte"
38-
"ET_MODULE_LINEAR_DATA_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.ptd"
37+
"ET_MODULE_ADD_MUL_PROGRAM_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMulProgram.pte"
38+
"ET_MODULE_ADD_MUL_DATA_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMulProgram.ptd"
3939
)
4040

4141
set(_test_srcs flat_tensor_data_map_test.cpp flat_tensor_header_test.cpp)

‎extension/flat_tensor/test/flat_tensor_data_map_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class FlatTensorDataMapTest : public ::testing::Test {
3535

3636
// Load data map. The eager linear model is defined at:
3737
// //executorch/test/models/linear_model.py
38-
const char* path = std::getenv("ET_MODULE_LINEAR_DATA_PATH");
38+
const char* path = std::getenv("ET_MODULE_ADD_MUL_DATA_PATH");
3939
Result<FileDataLoader> loader = FileDataLoader::from(path);
4040
ASSERT_EQ(loader.error(), Error::Ok);
4141

‎extension/flat_tensor/test/targets.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ def define_common_targets(is_fbcode=False):
3535
# The tests use this var to find the program file to load. This uses
3636
# an fbcode target path because the authoring/export tools
3737
# intentionally don't work in xplat (since they're host-only tools).
38-
"ET_MODULE_LINEAR_PROGRAM_PATH": "$(location fbcode//executorch/test/models:exported_program_and_data[ModuleLinear.pte])",
39-
"ET_MODULE_LINEAR_DATA_PATH": "$(location fbcode//executorch/test/models:exported_program_and_data[ModuleLinear.ptd])",
38+
"ET_MODULE_ADD_MUL_PROGRAM_PATH": "$(location fbcode//executorch/test/models:exported_program_and_data[ModuleAddMul.pte])",
39+
"ET_MODULE_ADD_MUL_DATA_PATH": "$(location fbcode//executorch/test/models:exported_program_and_data[ModuleAddMul.ptd])",
4040
}
4141

4242
runtime.cxx_test(

‎extension/module/test/CMakeLists.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,28 @@ set(_test_srcs module_test.cpp)
2121

2222
add_custom_command(
2323
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ModuleAdd.pte"
24-
"${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.pte"
25-
"${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.ptd"
24+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMulProgram.pte"
25+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMulProgram.ptd"
2626
COMMAND
2727
python3 -m test.models.export_program --modules "ModuleAdd"
2828
--outdir "${CMAKE_CURRENT_BINARY_DIR}" 2> /dev/null
2929
COMMAND
30-
python3 -m test.models.export_program --modules "ModuleLinear"
30+
python3 -m test.models.export_program --modules "ModuleAddMul"
3131
--external-constants --outdir "${CMAKE_CURRENT_BINARY_DIR}" 2> /dev/null
3232
WORKING_DIRECTORY ${EXECUTORCH_ROOT}
3333
)
3434

3535
add_custom_target(
3636
generated_module_test_files
3737
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/ModuleAdd.pte"
38-
"${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.pte"
39-
"${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.ptd"
38+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMulProgram.pte"
39+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMulProgram.ptd"
4040
)
4141

4242
set(test_env
4343
"ET_MODULE_ADD_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleAdd.pte"
44-
"ET_MODULE_LINEAR_PROGRAM_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.pte"
45-
"ET_MODULE_LINEAR_DATA_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.ptd"
44+
"ET_MODULE_ADD_MUL_PROGRAM_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMulProgram.pte"
45+
"ET_MODULE_ADD_MUL_DATA_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMulProgram.ptd"
4646
)
4747

4848
et_cxx_test(

‎extension/module/test/module_test.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ class ModuleTest : public ::testing::Test {
2424
protected:
2525
static void SetUpTestSuite() {
2626
model_path_ = std::getenv("ET_MODULE_ADD_PATH");
27-
linear_path_ = std::getenv("ET_MODULE_LINEAR_PROGRAM_PATH");
28-
linear_data_path_ = std::getenv("ET_MODULE_LINEAR_DATA_PATH");
27+
add_mul_path_ = std::getenv("ET_MODULE_ADD_MUL_PROGRAM_PATH");
28+
add_mul_data_path_ = std::getenv("ET_MODULE_ADD_MUL_DATA_PATH");
2929
}
3030

3131
static inline std::string model_path_;
32-
static inline std::string linear_path_;
33-
static inline std::string linear_data_path_;
32+
static inline std::string add_mul_path_;
33+
static inline std::string add_mul_data_path_;
3434
};
3535

3636
TEST_F(ModuleTest, TestLoad) {
@@ -449,7 +449,7 @@ TEST_F(ModuleTest, TestSetOutputInvalidType) {
449449
}
450450

451451
TEST_F(ModuleTest, TestPTD) {
452-
Module module(linear_path_, linear_data_path_);
452+
Module module(add_mul_path_, add_mul_data_path_);
453453

454454
ASSERT_EQ(module.load_method("forward"), Error::Ok);
455455

‎extension/module/test/targets.bzl

+2-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ def define_common_targets(is_fbcode=False):
1717
# an fbcode target path because the authoring/export tools
1818
# intentionally don't work in xplat (since they're host-only tools).
1919
"ET_MODULE_ADD_PATH": "$(location fbcode//executorch/test/models:exported_programs[ModuleAdd.pte])",
20-
"ET_MODULE_LINEAR_PROGRAM_PATH": "$(location fbcode//executorch/test/models:exported_program_and_data[ModuleLinear.pte])",
21-
"ET_MODULE_LINEAR_DATA_PATH": "$(location fbcode//executorch/test/models:exported_program_and_data[ModuleLinear.ptd])",
20+
"ET_MODULE_ADD_MUL_PROGRAM_PATH": "$(location fbcode//executorch/test/models:exported_program_and_data[ModuleAddMul.pte])",
21+
"ET_MODULE_ADD_MUL_DATA_PATH": "$(location fbcode//executorch/test/models:exported_program_and_data[ModuleAddMul.ptd])",
2222
}
2323

2424
for aten_mode in get_aten_mode_options():
@@ -42,5 +42,3 @@ def define_common_targets(is_fbcode=False):
4242
"-Wno-error=deprecated-declarations",
4343
],
4444
)
45-
46-

‎extension/training/module/test/state_dict_util_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class LoadStateDictTest : public ::testing::Test {
3636
// Load data map.
3737
// The eager linear model is defined at:
3838
// //executorch/test/models/linear_model.py
39-
const char* path = std::getenv("ET_MODULE_LINEAR_DATA_PATH");
39+
const char* path = std::getenv("ET_MODULE_ADD_MUL_DATA_PATH");
4040
Result<FileDataLoader> loader = FileDataLoader::from(path);
4141
ASSERT_EQ(loader.error(), Error::Ok);
4242

‎extension/training/module/test/targets.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ def define_common_targets(is_fbcode = False):
1616
# an fbcode target path because the authoring/export tools
1717
# intentionally don't work in xplat (since they're host-only tools).
1818
"ET_MODULE_ADD_PATH": "$(location fbcode//executorch/test/models:exported_programs[ModuleAdd.pte])",
19-
"ET_MODULE_LINEAR_DATA_PATH": "$(location fbcode//executorch/test/models:exported_program_and_data[ModuleLinear.ptd])",
20-
"ET_MODULE_LINEAR_PROGRAM_PATH": "$(location fbcode//executorch/test/models:exported_program_and_data[ModuleLinear.pte])",
19+
"ET_MODULE_ADD_MUL_DATA_PATH": "$(location fbcode//executorch/test/models:exported_program_and_data[ModuleAddMul.ptd])",
20+
"ET_MODULE_ADD_MUL_PROGRAM_PATH": "$(location fbcode//executorch/test/models:exported_program_and_data[ModuleAddMul.pte])",
2121
"ET_MODULE_TRAIN_DATA_PATH": "$(location fbcode//executorch/test/models:exported_program_and_data[ModuleSimpleTrain.ptd])",
2222
"ET_MODULE_TRAIN_PROGRAM_PATH": "$(location fbcode//executorch/test/models:exported_program_and_data[ModuleSimpleTrainProgram.pte])",
2323
"ET_MODULE_SIMPLE_TRAIN_PATH": "$(location fbcode//executorch/test/models:exported_programs[ModuleSimpleTrain.pte])",

‎runtime/executor/test/CMakeLists.txt

+19-17
Original file line numberDiff line numberDiff line change
@@ -18,55 +18,57 @@ set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
1818
include(${EXECUTORCH_ROOT}/tools/cmake/Test.cmake)
1919

2020
add_custom_command(
21-
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ModuleAddHalf.pte"
22-
"${CMAKE_CURRENT_BINARY_DIR}/ModuleAdd.pte"
21+
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ModuleAdd.pte"
22+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleAddHalf.pte"
23+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMul.pte"
24+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMulProgram.pte"
25+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMulProgram.ptd"
2326
"${CMAKE_CURRENT_BINARY_DIR}/ModuleDynamicCatUnallocatedIO.pte"
2427
"${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}/ModuleLinearProgram.ptd"
2828
"${CMAKE_CURRENT_BINARY_DIR}/ModuleMultipleEntry.pte"
2929
"${CMAKE_CURRENT_BINARY_DIR}/ModuleSimpleTrain.pte"
3030
"${CMAKE_CURRENT_BINARY_DIR}/ModuleStateful.pte"
31+
"${CMAKE_CURRENT_BINARY_DIR}/delegated/ModuleAddMul.pte"
3132
COMMAND
3233
python3 -m test.models.export_program --modules
33-
"ModuleAdd,ModuleAddHalf,ModuleDynamicCatUnallocatedIO,ModuleIndex,ModuleLinear,ModuleMultipleEntry,ModuleSimpleTrain,ModuleStateful"
34+
"ModuleAdd,ModuleAddHalf,ModuleAddMul,ModuleDynamicCatUnallocatedIO,ModuleIndex,ModuleMultipleEntry,ModuleSimpleTrain,ModuleStateful"
3435
--outdir "${CMAKE_CURRENT_BINARY_DIR}" 2> /dev/null
3536
COMMAND
36-
python3 -m test.models.export_program --modules "ModuleLinear"
37+
python3 -m test.models.export_program --modules "ModuleAddMul"
3738
--external-constants --outdir "${CMAKE_CURRENT_BINARY_DIR}" 2> /dev/null
3839
COMMAND
3940
python3 -m test.models.export_delegated_program --modules "ModuleAddMul"
40-
--backend_id "StubBackend" --outdir "${CMAKE_CURRENT_BINARY_DIR}" || true
41+
--backend_id "StubBackend" --outdir "${CMAKE_CURRENT_BINARY_DIR}/delegated/" || true
4142
WORKING_DIRECTORY ${EXECUTORCH_ROOT}
4243
)
4344

4445
add_custom_target(
4546
generated_pte_files
46-
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/ModuleAddHalf.pte"
47-
"${CMAKE_CURRENT_BINARY_DIR}/ModuleAdd.pte"
47+
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/ModuleAdd.pte"
48+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleAddHalf.pte"
49+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMul.pte"
50+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMulProgram.pte"
51+
"${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMulProgram.ptd"
4852
"${CMAKE_CURRENT_BINARY_DIR}/ModuleDynamicCatUnallocatedIO.pte"
4953
"${CMAKE_CURRENT_BINARY_DIR}/ModuleIndex.pte"
50-
"${CMAKE_CURRENT_BINARY_DIR}/ModuleLinear.pte"
51-
"${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.pte"
52-
"${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.ptd"
5354
"${CMAKE_CURRENT_BINARY_DIR}/ModuleMultipleEntry.pte"
5455
"${CMAKE_CURRENT_BINARY_DIR}/ModuleSimpleTrain.pte"
5556
"${CMAKE_CURRENT_BINARY_DIR}/ModuleStateful.pte"
5657
)
5758

5859
set(test_env
5960
"DEPRECATED_ET_MODULE_LINEAR_CONSTANT_BUFFER_PATH=${EXECUTORCH_ROOT}/test/models/deprecated/ModuleLinear-no-constant-segment.pte"
60-
"ET_MODULE_ADD_HALF_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleAddHalf.pte"
6161
"ET_MODULE_ADD_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleAdd.pte"
62+
"ET_MODULE_ADD_HALF_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleAddHalf.pte"
63+
"ET_MODULE_ADD_MUL_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMul.pte"
64+
"ET_MODULE_ADD_MUL_PROGRAM_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMulProgram.pte"
65+
"ET_MODULE_ADD_MUL_DATA_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMulProgram.ptd"
6266
"ET_MODULE_DYNAMIC_CAT_UNALLOCATED_IO_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleDynamicCatUnallocatedIO.pte"
6367
"ET_MODULE_INDEX_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleIndex.pte"
64-
"ET_MODULE_LINEAR_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleLinear.pte"
65-
"ET_MODULE_LINEAR_PROGRAM_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.pte"
66-
"ET_MODULE_LINEAR_DATA_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleLinearProgram.ptd"
6768
"ET_MODULE_MULTI_ENTRY_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleMultipleEntry.pte"
6869
"ET_MODULE_SIMPLE_TRAIN_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleSimpleTrain.pte"
6970
"ET_MODULE_STATEFUL_PATH=${CMAKE_CURRENT_BINARY_DIR}/ModuleStateful.pte"
71+
"ET_MODULE_ADD_MUL_DELEGATED_PATH=${CMAKE_CURRENT_BINARY_DIR}/delegated/ModuleAddMul.pte"
7072
)
7173

7274
et_cxx_test(

‎runtime/executor/test/backend_integration_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ class BackendIntegrationTest : public ::testing::TestWithParam<bool> {
289289
ASSERT_EQ(StubBackend::register_singleton(), Error::Ok);
290290

291291
// Paths to the test program files.
292-
program_path_ = std::getenv("ET_MODULE_ADD_MUL_PATH");
292+
program_path_ = std::getenv("ET_MODULE_ADD_MUL_DELEGATED_PATH");
293293
ASSERT_FALSE(program_path_.empty());
294294
program_nosegments_path_ = std::getenv("ET_MODULE_ADD_MUL_NOSEGMENTS_PATH");
295295
ASSERT_FALSE(program_nosegments_path_.empty());

‎runtime/executor/test/method_test.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@ class MethodTest : public ::testing::Test {
7878
load_program(std::getenv("ET_MODULE_INDEX_PATH"), "index");
7979
load_program(
8080
std::getenv("ET_MODULE_DYNAMIC_CAT_UNALLOCATED_IO_PATH"), "cat");
81-
load_program(std::getenv("ET_MODULE_LINEAR_PATH"), "linear");
81+
load_program(std::getenv("ET_MODULE_ADD_MUL_PATH"), "add_mul");
8282
load_program(std::getenv("ET_MODULE_STATEFUL_PATH"), "stateful");
8383
load_program(
8484
std::getenv("DEPRECATED_ET_MODULE_LINEAR_CONSTANT_BUFFER_PATH"),
8585
"linear_constant_buffer");
8686

8787
load_program(
88-
std::getenv("ET_MODULE_LINEAR_PROGRAM_PATH"), "linear_program");
89-
load_data_map(std::getenv("ET_MODULE_LINEAR_DATA_PATH"), "linear_data");
88+
std::getenv("ET_MODULE_ADD_MUL_PROGRAM_PATH"), "add_mul_program");
89+
load_data_map(std::getenv("ET_MODULE_ADD_MUL_DATA_PATH"), "add_mul_data");
9090
}
9191

9292
private:
@@ -309,7 +309,7 @@ TEST_F(MethodTest, ConstantSegmentTest) {
309309
// Execute model with constants stored in segment.
310310
ManagedMemoryManager mmm(kDefaultNonConstMemBytes, kDefaultRuntimeMemBytes);
311311
Result<Method> method =
312-
programs_["linear"]->load_method("forward", &mmm.get());
312+
programs_["add_mul"]->load_method("forward", &mmm.get());
313313
ASSERT_EQ(method.error(), Error::Ok);
314314

315315
// Can execute the method.
@@ -331,8 +331,8 @@ TEST_F(MethodTest, ConstantBufferTest) {
331331

332332
TEST_F(MethodTest, ProgramDataSeparationTest) {
333333
ManagedMemoryManager mmm(kDefaultNonConstMemBytes, kDefaultRuntimeMemBytes);
334-
Result<Method> method = programs_["linear_program"]->load_method(
335-
"forward", &mmm.get(), nullptr, data_maps_["linear_data"].get());
334+
Result<Method> method = programs_["add_mul_program"]->load_method(
335+
"forward", &mmm.get(), nullptr, data_maps_["add_mul_data"].get());
336336
ASSERT_EQ(method.error(), Error::Ok);
337337

338338
// Can execute the method.

‎runtime/executor/test/program_test.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,8 @@ TEST_F(ProgramTest, LoadConstantSegmentWithNoConstantSegment) {
415415
}
416416

417417
TEST_F(ProgramTest, LoadConstantSegment) {
418-
// Load the serialized ModuleLinear data, with constants in the segment.
419-
const char* linear_path = std::getenv("ET_MODULE_LINEAR_PATH");
418+
// Load the serialized ModuleAddMul data, with constants in the segment.
419+
const char* linear_path = std::getenv("ET_MODULE_ADD_MUL_PATH");
420420
Result<FileDataLoader> linear_loader = FileDataLoader::from(linear_path);
421421
ASSERT_EQ(linear_loader.error(), Error::Ok);
422422

@@ -458,7 +458,7 @@ TEST_F(ProgramTest, LoadConstantSegment) {
458458
}
459459

460460
TEST_F(ProgramTest, LoadConstantSegmentWhenConstantBufferExists) {
461-
// Load the serialized ModuleLinear data, with constants in the flatbuffer and
461+
// Load the serialized ModuleAddMul data, with constants in the flatbuffer and
462462
// no constants in the segment.
463463
const char* linear_path =
464464
std::getenv("DEPRECATED_ET_MODULE_LINEAR_CONSTANT_BUFFER_PATH");

‎runtime/executor/test/targets.bzl

+4-4
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@ def define_common_targets(is_fbcode = False):
119119
"ET_MODULE_ADD_PATH": "$(location fbcode//executorch/test/models:exported_programs[ModuleAdd.pte])",
120120
"ET_MODULE_DYNAMIC_CAT_UNALLOCATED_IO_PATH": "$(location fbcode//executorch/test/models:exported_programs[ModuleDynamicCatUnallocatedIO.pte])",
121121
"ET_MODULE_INDEX_PATH": "$(location fbcode//executorch/test/models:exported_programs[ModuleIndex.pte])",
122-
"ET_MODULE_LINEAR_PATH": "$(location fbcode//executorch/test/models:exported_programs[ModuleLinear.pte])",
122+
"ET_MODULE_ADD_MUL_PATH": "$(location fbcode//executorch/test/models:exported_programs[ModuleAddMul.pte])",
123123
"ET_MODULE_MULTI_ENTRY_PATH": "$(location fbcode//executorch/test/models:exported_programs[ModuleMultipleEntry.pte])",
124124
"ET_MODULE_SIMPLE_TRAIN_PATH": "$(location fbcode//executorch/test/models:exported_programs[ModuleSimpleTrain.pte])",
125125
"ET_MODULE_STATEFUL_PATH": "$(location fbcode//executorch/test/models:exported_programs[ModuleStateful.pte])",
126-
"ET_MODULE_LINEAR_PROGRAM_PATH": "$(location fbcode//executorch/test/models:exported_program_and_data[ModuleLinear.pte])",
127-
"ET_MODULE_LINEAR_DATA_PATH": "$(location fbcode//executorch/test/models:exported_program_and_data[ModuleLinear.ptd])",
126+
"ET_MODULE_ADD_MUL_PROGRAM_PATH": "$(location fbcode//executorch/test/models:exported_program_and_data[ModuleAddMul.pte])",
127+
"ET_MODULE_ADD_MUL_DATA_PATH": "$(location fbcode//executorch/test/models:exported_program_and_data[ModuleAddMul.ptd])",
128128
}
129129

130130
runtime.cxx_test(
@@ -236,7 +236,7 @@ def define_common_targets(is_fbcode = False):
236236
# tools).
237237
"ET_MODULE_ADD_MUL_NOSEGMENTS_DA1024_PATH": "$(location fbcode//executorch/test/models:exported_delegated_add_mul[ModuleAddMul-nosegments-da1024.pte])",
238238
"ET_MODULE_ADD_MUL_NOSEGMENTS_PATH": "$(location fbcode//executorch/test/models:exported_delegated_add_mul[ModuleAddMul-nosegments.pte])",
239-
"ET_MODULE_ADD_MUL_PATH": "$(location fbcode//executorch/test/models:exported_delegated_add_mul[ModuleAddMul.pte])",
239+
"ET_MODULE_ADD_MUL_DELEGATED_PATH": "$(location fbcode//executorch/test/models:exported_delegated_add_mul[ModuleAddMul.pte])",
240240
},
241241
)
242242

‎test/models/export_program.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def get_export_kwargs():
131131
return {"capture_config": CaptureConfig(pt2_mode=True, enable_aot=True)}
132132

133133

134-
class ModuleLinear(torch.nn.Module):
134+
class ModuleAddMul(torch.nn.Module):
135135
def __init__(self):
136136
super().__init__()
137137
self.a = 3 * torch.ones(2, 2, dtype=torch.float)

0 commit comments

Comments
 (0)