Skip to content

Commit 48251a7

Browse files
committed
rebase from 7d3c5fc
1 parent 91725b7 commit 48251a7

File tree

7 files changed

+38
-0
lines changed

7 files changed

+38
-0
lines changed

mlos_bench/mlos_bench/tests/optimizers/conftest.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,28 @@ def mock_configs() -> list[dict]:
2121
"""Mock configurations of earlier experiments."""
2222
return [
2323
{
24+
"123": 2,
2425
"vmSize": "Standard_B4ms",
2526
"idle": "halt",
2627
"kernel_sched_migration_cost_ns": 50000,
2728
"kernel_sched_latency_ns": 1000000,
2829
},
2930
{
31+
"123": 1,
3032
"vmSize": "Standard_B4ms",
3133
"idle": "halt",
3234
"kernel_sched_migration_cost_ns": 40000,
3335
"kernel_sched_latency_ns": 2000000,
3436
},
3537
{
38+
"123": 3,
3639
"vmSize": "Standard_B4ms",
3740
"idle": "mwait",
3841
"kernel_sched_migration_cost_ns": -1, # Special value
3942
"kernel_sched_latency_ns": 3000000,
4043
},
4144
{
45+
"123": 2,
4246
"vmSize": "Standard_B2s",
4347
"idle": "mwait",
4448
"kernel_sched_migration_cost_ns": 200000,

mlos_bench/mlos_bench/tests/optimizers/mock_opt_test.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ def mock_configurations_no_defaults() -> list:
1818
return [
1919
(
2020
{
21+
"123": 2,
2122
"vmSize": "Standard_B4ms",
2223
"idle": "halt",
2324
"kernel_sched_migration_cost_ns": 13112,
@@ -27,6 +28,7 @@ def mock_configurations_no_defaults() -> list:
2728
),
2829
(
2930
{
31+
"123": 3,
3032
"vmSize": "Standard_B2ms",
3133
"idle": "halt",
3234
"kernel_sched_migration_cost_ns": 117026,
@@ -36,6 +38,7 @@ def mock_configurations_no_defaults() -> list:
3638
),
3739
(
3840
{
41+
"123": 1,
3942
"vmSize": "Standard_B4ms",
4043
"idle": "halt",
4144
"kernel_sched_migration_cost_ns": 354785,
@@ -52,6 +55,7 @@ def mock_configurations(mock_configurations_no_defaults: list) -> list:
5255
return [
5356
(
5457
{
58+
"123": 2,
5559
"vmSize": "Standard_B4ms",
5660
"idle": "halt",
5761
"kernel_sched_migration_cost_ns": -1,

mlos_bench/mlos_bench/tests/optimizers/opt_bulk_register_test.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ def _test_opt_update_max(
7676
assert score["score"] == pytest.approx(99.99, 0.01)
7777
assert tunables is not None
7878
assert tunables.get_param_values() == {
79+
"123": 2,
7980
"vmSize": "Standard_B2s",
8081
"idle": "mwait",
8182
"kernel_sched_migration_cost_ns": 200000,

mlos_bench/mlos_bench/tests/storage/exp_load_test.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ def test_exp_trial_update_categ(
107107
"kernel_sched_latency_ns": "2000000",
108108
"kernel_sched_migration_cost_ns": "-1",
109109
"vmSize": "Standard_B4ms",
110+
"123": 2,
110111
}
111112
],
112113
[{"score": "99.9", "benchmark": "test"}],

mlos_bench/mlos_bench/tests/tunable_groups_fixtures.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,17 @@
6666
"log": false
6767
}
6868
}
69+
},
70+
"integer_keyed": {
71+
"cost": 0,
72+
"params": {
73+
"123": {
74+
"description": "A parameter with an integer key",
75+
"type": "int",
76+
"default": 2,
77+
"range": [1, 3]
78+
}
79+
}
6980
}
7081
}
7182
"""

mlos_bench/mlos_bench/tests/tunables/tunable_to_configspace_test.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,12 @@ def configuration_space() -> ConfigurationSpace:
9191
weights=[0.5, 0.5],
9292
default_value=TunableValueKind.SPECIAL,
9393
),
94+
UniformIntegerHyperparameter(
95+
name="123",
96+
lower=1,
97+
upper=3,
98+
default_value=2,
99+
),
94100
]
95101
)
96102
spaces.add(

mlos_bench/mlos_bench/tests/tunables/tunables_str_test.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,17 @@ def test_tunable_groups_str(tunable_groups: TunableGroups) -> None:
1717
# Same as `tunable_groups` (defined in the `conftest.py` file), but in different order:
1818
tunables_other = TunableGroups(
1919
{
20+
"integer_keyed": {
21+
"cost": 0,
22+
"params": {
23+
"123": {
24+
"description": "A parameter with an integer key",
25+
"type": "int",
26+
"default": 2,
27+
"range": [1, 3],
28+
}
29+
},
30+
},
2031
"kernel": {
2132
"cost": 1,
2233
"params": {

0 commit comments

Comments
 (0)