From c69fca77d6b9b9f56a3d02a43b7c78488a51b3a4 Mon Sep 17 00:00:00 2001 From: yangdsh Date: Sat, 8 Feb 2020 23:05:05 +0000 Subject: [PATCH] address dana's comment --- client/driver/fabfile.py | 6 +----- server/website/website/tasks/async_tasks.py | 7 +++++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/client/driver/fabfile.py b/client/driver/fabfile.py index b6f8ffa..3a50638 100644 --- a/client/driver/fabfile.py +++ b/client/driver/fabfile.py @@ -663,12 +663,8 @@ def _http_content_to_json(content): return json_content, decoded -def _parse_bool(val): - return str(val).lower() == 'true' - - def _modify_website_object(obj_name, action, verbose=False, **kwargs): - verbose = _parse_bool(verbose) + verbose = parse_bool(verbose) if obj_name == 'project': valid_actions = ('create', 'edit') elif obj_name == 'session': diff --git a/server/website/website/tasks/async_tasks.py b/server/website/website/tasks/async_tasks.py index fc066d9..3e98cd6 100644 --- a/server/website/website/tasks/async_tasks.py +++ b/server/website/website/tasks/async_tasks.py @@ -170,12 +170,15 @@ def aggregate_target_results(result_id, algorithm): has_pipeline_data = PipelineData.objects.filter(workload=newest_result.workload).exists() if not has_pipeline_data or newest_result.session.tuning_session == 'lhs': if not has_pipeline_data and newest_result.session.tuning_session == 'tuning_session': - LOG.debug("Background tasks haven't ran for this workload yet, picking random data.") + LOG.debug("Background tasks haven't ran for this workload yet, picking data with lhs.") all_samples = JSONUtil.loads(newest_result.session.lhs_samples) if len(all_samples) == 0: knobs = SessionKnob.objects.get_knobs_for_session(newest_result.session) - all_samples = gen_lhs_samples(knobs, 10) + if newest_result.session.tuning_session == 'lhs': + all_samples = gen_lhs_samples(knobs, 100) + else: + all_samples = gen_lhs_samples(knobs, 10) LOG.debug('%s: Generated LHS.\n\ndata=%s\n', AlgorithmType.name(algorithm), JSONUtil.dumps(all_samples[:5], pprint=True)) samples = all_samples.pop()