Skip to content

Commit ea2264c

Browse files
committed
fix: replace incorrect CampaignCartesianProduct constructor parameter usage
Signed-off-by: Abel Stuker <stukerabel@gmail.com>
1 parent 87e35b3 commit ea2264c

9 files changed

Lines changed: 19 additions & 19 deletions

benchkit/core/compat/new2old.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
`subprocess.*` directly (or otherwise bypasses `ctx.exec`), wrappers/sharedlibs
6363
cannot be injected by this compatibility layer.
6464
- **Fetch arguments must be single-valued** in a legacy cartesian campaign. If a fetch
65-
parameter appears in `parameter_space`, it must have exactly one value because
65+
parameter appears in `variables`, it must have exactly one value because
6666
`fetch()` is executed once during `bootstrap()`.
6767
6868
API
@@ -81,13 +81,13 @@
8181
>>> from benchkit.benches.leveldb import LevelDBBench
8282
>>> from benchkit.core.compat.new2old import CampaignCartesianProduct
8383
>>>
84-
>>> parameter_space = {
84+
>>> variables = {
8585
... "bench_name": ["readrandom", "seekrandom"],
8686
... "nb_threads": [2, 4, 8],
8787
... }
8888
>>> campaign = CampaignCartesianProduct(
8989
... benchmark=LevelDBBench(),
90-
... parameter_space=parameter_space,
90+
... variables=variables,
9191
... nb_runs=1,
9292
... duration_s=5,
9393
... )
@@ -99,7 +99,7 @@
9999
such as `parent_dir`, `commit`, `patches`, etc. In a legacy cartesian campaign we
100100
expect fetch parameters to be fixed (single-valued). Therefore this adapter enforces:
101101
102-
- If a fetch parameter appears in the provided `parameter_space`, it must have exactly
102+
- If a fetch parameter appears in the provided `variables`, it must have exactly
103103
one value.
104104
105105
If you want to vary fetch parameters, use the new engine directly rather than the

tests/campaigns/campaign_perf_cartprod.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def main() -> None:
8484
campaign = CampaignCartesianProduct(
8585
name="strace",
8686
benchmark=SleepBench(),
87-
parameter_space={"duration_seconds": [3]},
87+
variables={"duration_seconds": [3]},
8888
nb_runs=1,
8989
command_wrappers=[perfstatwrap],
9090
post_run_hooks=[perfstatwrap.post_run_hook_update_results],

tests/core/compat/test_leveldb_new2old.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66

77

88
def main() -> None:
9-
parameter_space = {
9+
variables = {
1010
"bench_name": ["readrandom", "seekrandom"],
1111
"nb_threads": [2, 4, 8],
1212
}
1313

1414
campaign = CampaignCartesianProduct(
1515
benchmark=LevelDBBench(),
16-
parameter_space=parameter_space,
16+
variables=variables,
1717
)
1818

1919
campaign.run()

tests/core/compat/test_leveldb_new2old_hooks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ def postrun_hook(
3333

3434

3535
def main() -> None:
36-
parameter_space = {
36+
variables = {
3737
"bench_name": ["readrandom", "seekrandom"],
3838
"nb_threads": [2, 4, 8],
3939
}
4040

4141
campaign = CampaignCartesianProduct(
4242
benchmark=LevelDBBench(),
43-
parameter_space=parameter_space,
43+
variables=variables,
4444
pre_run_hooks=[prerun_hook],
4545
post_run_hooks=[postrun_hook],
4646
)

tests/core/compat/test_leveldb_new2old_wrap.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88

99
def main() -> None:
10-
parameter_space = {
10+
variables = {
1111
"bench_name": ["readrandom"],
1212
"nb_threads": [1],
1313
"master_thread_core": [0],
@@ -17,7 +17,7 @@ def main() -> None:
1717

1818
campaign = CampaignCartesianProduct(
1919
benchmark=LevelDBBench(),
20-
parameter_space=parameter_space,
20+
variables=variables,
2121
command_wrappers=[taskset_wrap],
2222
duration_s=5,
2323
)

tests/core/compat/test_new2old_hooks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ def __call__(self, *args, **kwargs) -> None:
6363

6464

6565
def main() -> None:
66-
parameter_space: dict[str, list[Any]] = {
66+
variables: dict[str, list[Any]] = {
6767
# no parameters needed; we just want one run
6868
}
6969

7070
bench = HooksBench()
7171

7272
campaign = CampaignCartesianProduct(
7373
benchmark=bench,
74-
parameter_space=parameter_space,
74+
variables=variables,
7575
pre_run_hooks=[PreMarkHook()],
7676
post_run_hooks=[PostMarkHook()],
7777
duration_s=1,

tests/core/compat/test_new2old_ldpreload.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def preload(
100100

101101

102102
def main() -> None:
103-
parameter_space = {
103+
variables = {
104104
"hook_enabled": [True, False],
105105
}
106106

@@ -109,7 +109,7 @@ def main() -> None:
109109

110110
campaign = CampaignCartesianProduct(
111111
benchmark=bench,
112-
parameter_space=parameter_space,
112+
variables=variables,
113113
shared_libs=[lib],
114114
duration_s=1,
115115
)

tests/core/compat/test_new2old_wrap_env.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def wrap(
7171

7272

7373
def main() -> None:
74-
parameter_space = {
74+
variables = {
7575
"wrap_enabled": [True, False],
7676
}
7777

@@ -80,7 +80,7 @@ def main() -> None:
8080

8181
campaign = CampaignCartesianProduct(
8282
benchmark=bench,
83-
parameter_space=parameter_space,
83+
variables=variables,
8484
command_wrappers=[wrapper],
8585
duration_s=1,
8686
)

tests/core/compat/test_new2old_wrap_taskset.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def collect(self, ctx) -> Dict[str, Any]:
8484

8585

8686
def main() -> None:
87-
parameter_space = {
87+
variables = {
8888
"master_thread_core": [None, 0, 1],
8989
}
9090

@@ -93,7 +93,7 @@ def main() -> None:
9393

9494
campaign = CampaignCartesianProduct(
9595
benchmark=bench,
96-
variables=parameter_space,
96+
variables=variables,
9797
command_wrappers=[wrapper],
9898
duration_s=1,
9999
)

0 commit comments

Comments
 (0)