Skip to content

Commit 700e72e

Browse files
committed
Update on "[ExecuTorch] Arm Ethos: Add pass tests"
As title. Adds pytest.test_option["tosa_ref_model"] similar to "corestone_fvp". This is a hack. Once we buckify the reference model, we should remove this. It shouldn't have impact on the OSS test coverage. Differential Revision: [D69714010](https://our.internmc.facebook.com/intern/diff/D69714010/) [ghstack-poisoned]
2 parents affaee6 + d9e8e21 commit 700e72e

File tree

2 files changed

+29
-24
lines changed

2 files changed

+29
-24
lines changed

backends/arm/test/TARGETS

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ load(":targets.bzl", "define_arm_tests")
55
oncall("executorch")
66

77
python_library(
8-
name = "common",
9-
srcs = ["common.py"],
8+
name = "conftest",
9+
srcs = ["conftest.py"],
1010
deps = [
11-
"//executorch/backends/xnnpack/test/tester:tester",
12-
"//executorch/backends/arm:arm_backend",
1311
"//executorch/exir:lib",
1412
"//executorch/exir/backend:compile_spec_schema",
1513
"fbsource//third-party/pypi/pytest:pytest",
@@ -20,6 +18,7 @@ python_library(
2018
name = "runner_utils",
2119
srcs = ["runner_utils.py"],
2220
deps = [
21+
":conftest",
2322
"//executorch/backends/xnnpack/test/tester:tester",
2423
"//executorch/backends/arm:arm_backend",
2524
"//executorch/exir:lib",
@@ -28,10 +27,14 @@ python_library(
2827
)
2928

3029
python_library(
31-
name = "conftest",
32-
srcs = ["conftest.py"],
30+
name = "common",
31+
srcs = ["common.py"],
3332
deps = [
33+
":runner_utils",
34+
"//executorch/backends/xnnpack/test/tester:tester",
35+
"//executorch/backends/arm:arm_backend",
3436
"//executorch/exir:lib",
37+
"//executorch/exir/backend:compile_spec_schema",
3538
"fbsource//third-party/pypi/pytest:pytest",
3639
]
3740
)

backends/arm/test/targets.bzl

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
load("//caffe2/test/fb:defs.bzl", "define_tests")
1+
# load("//caffe2/test/fb:defs.bzl", "define_tests")
2+
load("@fbcode_macros//build_defs:python_pytest.bzl", "python_pytest")
23
load("@bazel_skylib//lib:paths.bzl", "paths")
34

45
def define_arm_tests():
@@ -13,21 +14,22 @@ def define_arm_tests():
1314
for test_file in test_files:
1415
test_file_name = paths.basename(test_file)
1516
test_name = test_file_name.replace("test_", "").replace(".py", "")
16-
TESTS[test_name] = [test_file]
1717

18-
define_tests(
19-
pytest = True,
20-
tests = TESTS,
21-
pytest_config = "pytest.ini",
22-
resources = ["conftest.py"],
23-
preload_deps = [
24-
"//executorch/kernels/quantized:custom_ops_generated_lib",
25-
],
26-
deps = [
27-
":arm_tester",
28-
":conftest",
29-
"//executorch/exir:lib",
30-
"fbsource//third-party/pypi/pytest:pytest",
31-
"fbsource//third-party/pypi/parameterized:parameterized",
32-
],
33-
)
18+
python_pytest(
19+
name = test_name,
20+
srcs = [test_file],
21+
pytest_config = "pytest.ini",
22+
resources = ["conftest.py"],
23+
compile = "with-source",
24+
typing = False,
25+
preload_deps = [
26+
"//executorch/kernels/quantized:custom_ops_generated_lib",
27+
],
28+
deps = [
29+
":arm_tester",
30+
":conftest",
31+
"//executorch/exir:lib",
32+
"fbsource//third-party/pypi/pytest:pytest",
33+
"fbsource//third-party/pypi/parameterized:parameterized",
34+
],
35+
)

0 commit comments

Comments
 (0)