Skip to content

Commit b5c1757

Browse files
eddiebergmaneddiebergman
authored
Fix: keyword arguments to submit (#384)
* Fix: keyword arguments to submit * Fix: Missing param for implementing AbstractTA * Fix: Typing of multi_objectives * Add: mutli_objectives to each ExecuteTaFucnWithQueue
1 parent bf264d6 commit b5c1757

File tree

4 files changed

+32
-0
lines changed

4 files changed

+32
-0
lines changed

‎autoPyTorch/api/base_task.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -690,6 +690,7 @@ def _do_dummy_prediction(self) -> None:
690690
backend=self._backend,
691691
seed=self.seed,
692692
metric=self._metric,
693+
multi_objectives=["cost"],
693694
logger_port=self._logger_port,
694695
cost_for_crash=get_cost_of_crash(self._metric),
695696
abort_on_first_run_crash=False,
@@ -773,6 +774,7 @@ def _do_traditional_prediction(self, time_left: int, func_eval_time_limit_secs:
773774
pynisher_context=self._multiprocessing_context,
774775
backend=self._backend,
775776
seed=self.seed,
777+
multi_objectives=["cost"],
776778
metric=self._metric,
777779
logger_port=self._logger_port,
778780
cost_for_crash=get_cost_of_crash(self._metric),
@@ -1575,6 +1577,7 @@ def fit_pipeline(
15751577
backend=self._backend,
15761578
seed=self.seed,
15771579
metric=metric,
1580+
multi_objectives=["cost"],
15781581
logger_port=self._logger_port,
15791582
cost_for_crash=get_cost_of_crash(metric),
15801583
abort_on_first_run_crash=False,

‎autoPyTorch/evaluation/tae.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ def __init__(
111111
cost_for_crash: float,
112112
abort_on_first_run_crash: bool,
113113
pynisher_context: str,
114+
multi_objectives: List[str],
114115
pipeline_config: Optional[Dict[str, Any]] = None,
115116
initial_num_run: int = 1,
116117
stats: Optional[Stats] = None,

‎autoPyTorch/utils/single_thread_client.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,24 @@ def submit(
6161
func: Callable,
6262
*args: List,
6363
priority: int = 0,
64+
key: Any = None,
65+
workers: Any = None,
66+
resources: Any = None,
67+
retries: Any = None,
68+
fifo_timeout: Any = "100 ms",
69+
allow_other_workers: Any = False,
70+
actor: Any = False,
71+
actors: Any = False,
72+
pure: Any = None,
6473
**kwargs: Any,
6574
) -> Any:
75+
"""
76+
Note
77+
----
78+
The keyword arguments caught in `dask.distributed.Client` need to
79+
be specified here so they don't get passed in as ``**kwargs`` to the
80+
``func``.
81+
"""
6682
return DummyFuture(func(*args, **kwargs))
6783

6884
def close(self) -> None:

‎test/test_evaluation/test_evaluation.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ def test_eval_with_limits_holdout(self, pynisher_mock):
9999
config.config_id = 198
100100
ta = ExecuteTaFuncWithQueue(backend=BackendMock(), seed=1,
101101
stats=self.stats,
102+
multi_objectives=["cost"],
102103
memory_limit=3072,
103104
metric=accuracy,
104105
cost_for_crash=get_cost_of_crash(accuracy),
@@ -120,6 +121,7 @@ def test_cutoff_lower_than_remaining_time(self, pynisher_mock):
120121
ta = ExecuteTaFuncWithQueue(backend=BackendMock(), seed=1,
121122
stats=self.stats,
122123
memory_limit=3072,
124+
multi_objectives=["cost"],
123125
metric=accuracy,
124126
cost_for_crash=get_cost_of_crash(accuracy),
125127
abort_on_first_run_crash=False,
@@ -146,6 +148,7 @@ def test_eval_with_limits_holdout_fail_timeout(self, pynisher_mock):
146148
ta = ExecuteTaFuncWithQueue(backend=BackendMock(), seed=1,
147149
stats=self.stats,
148150
memory_limit=3072,
151+
multi_objectives=["cost"],
149152
metric=accuracy,
150153
cost_for_crash=get_cost_of_crash(accuracy),
151154
abort_on_first_run_crash=False,
@@ -166,6 +169,7 @@ def test_zero_or_negative_cutoff(self, pynisher_mock):
166169
ta = ExecuteTaFuncWithQueue(backend=BackendMock(), seed=1,
167170
stats=self.stats,
168171
memory_limit=3072,
172+
multi_objectives=["cost"],
169173
metric=accuracy,
170174
cost_for_crash=get_cost_of_crash(accuracy),
171175
abort_on_first_run_crash=False,
@@ -187,6 +191,7 @@ def test_eval_with_limits_holdout_fail_silent(self, pynisher_mock):
187191
ta = ExecuteTaFuncWithQueue(backend=BackendMock(), seed=1,
188192
stats=self.stats,
189193
memory_limit=3072,
194+
multi_objectives=["cost"],
190195
metric=accuracy,
191196
cost_for_crash=get_cost_of_crash(accuracy),
192197
abort_on_first_run_crash=False,
@@ -228,6 +233,7 @@ def test_eval_with_limits_holdout_fail_memory_error(self, pynisher_mock):
228233
ta = ExecuteTaFuncWithQueue(backend=BackendMock(), seed=1,
229234
stats=self.stats,
230235
memory_limit=3072,
236+
multi_objectives=["cost"],
231237
metric=accuracy,
232238
cost_for_crash=get_cost_of_crash(accuracy),
233239
abort_on_first_run_crash=False,
@@ -266,6 +272,7 @@ def side_effect(**kwargs):
266272
ta = ExecuteTaFuncWithQueue(backend=BackendMock(), seed=1,
267273
stats=self.stats,
268274
memory_limit=3072,
275+
multi_objectives=["cost"],
269276
metric=accuracy,
270277
cost_for_crash=get_cost_of_crash(accuracy),
271278
abort_on_first_run_crash=False,
@@ -289,6 +296,7 @@ def side_effect(**kwargs):
289296
ta = ExecuteTaFuncWithQueue(backend=BackendMock(), seed=1,
290297
stats=self.stats,
291298
memory_limit=3072,
299+
multi_objectives=["cost"],
292300
metric=accuracy,
293301
cost_for_crash=get_cost_of_crash(accuracy),
294302
abort_on_first_run_crash=False,
@@ -316,6 +324,7 @@ def side_effect(*args, **kwargs):
316324
ta = ExecuteTaFuncWithQueue(backend=BackendMock(), seed=1,
317325
stats=self.stats,
318326
memory_limit=3072,
327+
multi_objectives=["cost"],
319328
metric=accuracy,
320329
cost_for_crash=get_cost_of_crash(accuracy),
321330
abort_on_first_run_crash=False,
@@ -340,6 +349,7 @@ def test_exception_in_target_function(self, eval_holdout_mock):
340349
ta = ExecuteTaFuncWithQueue(backend=BackendMock(), seed=1,
341350
stats=self.stats,
342351
memory_limit=3072,
352+
multi_objectives=["cost"],
343353
metric=accuracy,
344354
cost_for_crash=get_cost_of_crash(accuracy),
345355
abort_on_first_run_crash=False,
@@ -363,6 +373,7 @@ def test_silent_exception_in_target_function(self):
363373
ta = ExecuteTaFuncWithQueue(backend=BackendMock(), seed=1,
364374
stats=self.stats,
365375
memory_limit=3072,
376+
multi_objectives=["cost"],
366377
metric=accuracy,
367378
cost_for_crash=get_cost_of_crash(accuracy),
368379
abort_on_first_run_crash=False,
@@ -401,6 +412,7 @@ def test_eval_with_simple_intensification(self):
401412
ta = ExecuteTaFuncWithQueue(backend=BackendMock(), seed=1,
402413
stats=self.stats,
403414
memory_limit=3072,
415+
multi_objectives=["cost"],
404416
metric=accuracy,
405417
cost_for_crash=get_cost_of_crash(accuracy),
406418
abort_on_first_run_crash=False,

0 commit comments

Comments
 (0)