Skip to content

Commit 7f0ea7b

Browse files
Respond to review requests.
1 parent c4883b6 commit 7f0ea7b

File tree

3 files changed

+36
-38
lines changed

3 files changed

+36
-38
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ jobs:
226226
frontend_bench:
227227
name: Run Frontend Benchmarks
228228
continue-on-error: true
229-
timeout-minutes: 2
229+
timeout-minutes: 5
230230
needs:
231231
- build
232232
strategy:

console_backend/benches/benchmarks.py

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -91,26 +91,25 @@ def get_nested_key(nested_dict: dict, key_path: str) -> Optional[Any]:
9191
def run_validate_benchmarks():
9292
"""Runner for a suite of benchmark validations.
9393
"""
94-
for os_, benchmarks in RUST_BENCHMARKS.items():
95-
if os_ != sys.platform:
96-
continue
97-
for bench in benchmarks:
98-
with open(bench[FILE_PATH]) as fileo:
99-
bench_result = json.load(fileo)
100-
bench_value = get_nested_key(bench_result, bench[KEY_LOCATION])
101-
assert bench_value is not None, f"Test:{bench[NAME]} retrieved bench value None."
102-
if bench[SUCCESS]:
103-
assert bench_value - bench[EXPECTED] <= bench[ERROR_MARGIN_FRAC] * bench[EXPECTED], (
104-
f"Success Test:{bench[NAME]} Bench Value:{bench_value} not within "
105-
f"{bench[ERROR_MARGIN_FRAC]} of {bench[EXPECTED]}."
106-
)
107-
print(f"PASS - {os_}:{bench[NAME]} MARGIN={bench_value - bench[EXPECTED]}")
108-
else:
109-
assert bench_value - bench[EXPECTED] > bench[ERROR_MARGIN_FRAC] * bench[EXPECTED], (
110-
f"Failure Test:{bench[NAME]} Bench Value:{bench_value} not outside of "
111-
f"{bench[ERROR_MARGIN_FRAC]} of {bench[EXPECTED]}."
112-
)
113-
print(f"PASS(Fail Test) - {os_}:{bench[NAME]} MARGIN={bench_value - bench[EXPECTED]}")
94+
os_ = sys.platform
95+
benchmarks = RUST_BENCHMARKS.get(os_, [])
96+
for bench in benchmarks:
97+
with open(bench[FILE_PATH]) as fileo:
98+
bench_result = json.load(fileo)
99+
bench_value = get_nested_key(bench_result, bench[KEY_LOCATION])
100+
assert bench_value is not None, f"Test:{bench[NAME]} retrieved bench value None."
101+
if bench[SUCCESS]:
102+
assert bench_value - bench[EXPECTED] <= bench[ERROR_MARGIN_FRAC] * bench[EXPECTED], (
103+
f"Success Test:{bench[NAME]} Bench Value:{bench_value} not within "
104+
f"{bench[ERROR_MARGIN_FRAC]} of {bench[EXPECTED]}."
105+
)
106+
print(f"PASS - {os_}:{bench[NAME]} MARGIN={bench_value - bench[EXPECTED]}")
107+
else:
108+
assert bench_value - bench[EXPECTED] > bench[ERROR_MARGIN_FRAC] * bench[EXPECTED], (
109+
f"Failure Test:{bench[NAME]} Bench Value:{bench_value} not outside of "
110+
f"{bench[ERROR_MARGIN_FRAC]} of {bench[EXPECTED]}."
111+
)
112+
print(f"PASS(Fail Test) - {os_}:{bench[NAME]} MARGIN={bench_value - bench[EXPECTED]}")
114113

115114

116115
if __name__ == "__main__":

src/main/benches/frontend_bench.py

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -55,24 +55,23 @@ def run_frontend_benchmark(binary: str):
5555
binary (str): Path to the binary location to run the benchmark on.
5656
"""
5757
prepped_command = f"{binary}"
58-
for os_, benchmarks in FRONTEND_BENCHMARKS.items():
59-
if os_ != sys.platform:
60-
continue
61-
for bench in benchmarks:
62-
bench_command = (
63-
f"{HYPERFINE_COMMAND(DEFAULT_JSON_FILEPATH)} \"{prepped_command} "
64-
f"{BENCHMARK_COMMAND_ARGS(bench[FILE_PATH])}\""
58+
os_ = sys.platform
59+
benchmarks = FRONTEND_BENCHMARKS.get(sys.platform, [])
60+
for bench in benchmarks:
61+
bench_command = (
62+
f"{HYPERFINE_COMMAND(DEFAULT_JSON_FILEPATH)} \"{prepped_command} "
63+
f"{BENCHMARK_COMMAND_ARGS(bench[FILE_PATH])}\""
64+
)
65+
subprocess.call(bench_command, shell=True)
66+
with open(DEFAULT_JSON_FILEPATH) as fileo:
67+
bench_result = json.load(fileo)
68+
bench_value = bench_result[RESULTS][0].get(bench[KEY_LOCATION], None)
69+
assert bench_value is not None, f"Test:{bench[NAME]} retrieved bench value None."
70+
assert bench_value - bench[EXPECTED] <= bench[ERROR_MARGIN_FRAC] * bench[EXPECTED], ( # type: ignore
71+
f"Test:{bench[NAME]} Bench Value:{bench_value} not within "
72+
f"{bench[ERROR_MARGIN_FRAC]} of {bench[EXPECTED]}."
6573
)
66-
subprocess.call(bench_command, shell=True)
67-
with open(DEFAULT_JSON_FILEPATH) as fileo:
68-
bench_result = json.load(fileo)
69-
bench_value = bench_result[RESULTS][0].get(bench[KEY_LOCATION], None)
70-
assert bench_value is not None, f"Test:{bench[NAME]} retrieved bench value None."
71-
assert bench_value - bench[EXPECTED] <= bench[ERROR_MARGIN_FRAC] * bench[EXPECTED], ( # type: ignore
72-
f"Test:{bench[NAME]} Bench Value:{bench_value} not within "
73-
f"{bench[ERROR_MARGIN_FRAC]} of {bench[EXPECTED]}."
74-
)
75-
print(f"PASS - {os_}:{bench[NAME]} MARGIN={bench_value - bench[EXPECTED]}")
74+
print(f"PASS - {os_}:{bench[NAME]} MARGIN={bench_value - bench[EXPECTED]}")
7675

7776

7877
if __name__ == "__main__":

0 commit comments

Comments
 (0)