diff --git a/omniadvisor/src/omniadvisor/interface/config_tuning.py b/omniadvisor/src/omniadvisor/interface/config_tuning.py index 6d9e064988f841d70ac4e1c9378b0bbd75ffefc6..059f84be1d219b5824dab549e34cbd7eb51e12cb 100644 --- a/omniadvisor/src/omniadvisor/interface/config_tuning.py +++ b/omniadvisor/src/omniadvisor/interface/config_tuning.py @@ -2,10 +2,10 @@ import argparse import signal from typing import Optional -from algo.expert.tuning import ExpertTuning -from algo.iterative.tuning import SmacAppendTuning -from algo.native.tuning import NativeTuning -from algo.transfer.tuning import TransferTuning +from algo.expert.tuning import ExpertTuner +from algo.iterative.tuning import IterativeTunner +from algo.native.tuning import NativeTuner +from algo.transfer.tuning import TransferTuner from common.constant import OA_CONF from common.exceptions import NoOptimalConfigError, SystemKilledError, TuningPreconditionError from omniadvisor.repository.model.load import Load @@ -32,7 +32,7 @@ def handler(signum: int, frame) -> None: :param frame: 当前栈帧，可能为 None :raises SystemKilledError: 当接收到终止信号时抛出该异常 """ - raise SystemKilledError(f'System is terminated, because of catching signal %s', signum) + raise SystemKilledError(f'System is terminated, because of catching signal {signum}') def _parse_tuning_args() -> argparse.Namespace: @@ -135,20 +135,20 @@ def _get_next_config(load: Load, tuning_method: str) -> tuple[dict, str]: # AI迭代调优 if tuning_method == OA_CONF.TuningMethod.iterative: global_logger.info("Use AI iterative optimization method to tuning.") - tuner = SmacAppendTuning(tuning_history=tuning_result_history.to_tuning_data_list()) + tuner = IterativeTunner(tuning_history=tuning_result_history.to_tuning_data_list()) # 专家规则调优 elif tuning_method == OA_CONF.TuningMethod.expert: global_logger.info("Use expert rule optimization method to tuning.") - tuner = ExpertTuning(tuning_history=tuning_result_history.to_tuning_data_list()) + tuner = ExpertTuner(tuning_history=tuning_result_history.to_tuning_data_list()) # Native特性使能 elif tuning_method == OA_CONF.TuningMethod.native: global_logger.info("Use native operator acceleration feature to tuning.") - tuner = NativeTuning(tuning_history=tuning_result_history.to_tuning_data_list()) + tuner = NativeTuner(tuning_history=tuning_result_history.to_tuning_data_list()) # 迁移泛化调优 elif tuning_method == OA_CONF.TuningMethod.transfer: global_logger.info("Use migration generalization optimization method to tuning.") other_history = get_other_tuning_result_history(load) - tuner = TransferTuning( + tuner = TransferTuner( tuning_history=tuning_result_history.to_tuning_data_list(), # 可能存在负载没有调优记录或调优记录状态为empty，导致to_tuning_data_list()输出列表为空 other_histories=[other.to_tuning_data_list() for other in other_history if other.to_tuning_data_list()] diff --git a/omniadvisor/tests/conftest.py b/omniadvisor/tests/conftest.py index 8110177177d50f18dfd316ccc64bf655701a19eb..413cf1eb9866555da8a04ee6074b8c924b3ad162 100644 --- a/omniadvisor/tests/conftest.py +++ b/omniadvisor/tests/conftest.py @@ -32,11 +32,11 @@ def dot_expansion(s): to_registers = { 'algo.expert.tuning.Trace', 'algo.common.model.Trace', - 'algo.expert.tuning.ExpertTuning', - 'algo.iterative.tuning.SmacAppendTuning', + 'algo.expert.tuning.ExpertTuner', + 'algo.iterative.tuning.IterativeTunner', 'algo.common.model.TuningData', - 'algo.native.tuning.NativeTuning', - 'algo.transfer.tuning.TransferTuning', + 'algo.native.tuning.NativeTuner', + 'algo.transfer.tuning.TransferTuner', } # 注册顶层包： @@ -44,7 +44,7 @@ sys.modules['algo'] = ModuleType('algo') for to_register in to_registers: expansions = dot_expansion(to_register) - # 注册父子间的链式关系，如algo.iterative.tuning.SmacAppendTuning，先注册一个module 'algo.iterative'，并建立与module 'algo'关系 + # 注册父子间的链式关系，如algo.iterative.tuning.IterativeTunner，先注册一个module 'algo.iterative'，并建立与module 'algo'关系 for idx, expansion in enumerate(expansions): current_node_name, pathlike = expansion if pathlike in sys.modules: diff --git a/omniadvisor/tests/omniadvisor/interface/test_config_tuning.py b/omniadvisor/tests/omniadvisor/interface/test_config_tuning.py index 7a5f972a00d2c8fc2368909ab4e269a6a59ebe43..6c93ad5575ce6845ed76e7ffe36f6a9b7c146b17 100644 --- a/omniadvisor/tests/omniadvisor/interface/test_config_tuning.py +++ b/omniadvisor/tests/omniadvisor/interface/test_config_tuning.py @@ -22,7 +22,7 @@ class TestTuning: @patch('omniadvisor.service.retest_service.float_format') @patch('omniadvisor.interface.config_tuning.float_format') - @patch('algo.iterative.tuning.SmacAppendTuning.tune') + @patch('algo.iterative.tuning.IterativeTunner.tune') @patch('omniadvisor.interface.config_tuning.get_tuning_result_history') @patch('omniadvisor.interface.config_tuning.get_tuning_result') @patch('omniadvisor.service.retest_service.spark_run') @@ -61,7 +61,7 @@ class TestTuning: @patch('omniadvisor.service.retest_service.float_format') @patch('omniadvisor.interface.config_tuning.float_format') @patch('omniadvisor.repository.load_repository.LoadRepository.update_best_config') - @patch('algo.iterative.tuning.SmacAppendTuning.tune') + @patch('algo.iterative.tuning.IterativeTunner.tune') @patch('omniadvisor.interface.config_tuning.remove_tuning_result') @patch('omniadvisor.service.retest_service.get_tuning_result') @patch('omniadvisor.interface.config_tuning.get_tuning_result_history') @@ -110,7 +110,7 @@ class TestTuning: mock_remove_tuning_result.assert_not_called() @patch('omniadvisor.interface.config_tuning.remove_tuning_result') - @patch('algo.iterative.tuning.SmacAppendTuning.tune') + @patch('algo.iterative.tuning.IterativeTunner.tune') @patch('omniadvisor.repository.load_repository.LoadRepository.update_best_config') @patch('omniadvisor.interface.config_tuning.get_tuning_result_history') @patch('omniadvisor.service.retest_service.spark_run', side_effect=RuntimeError) @@ -167,7 +167,7 @@ class TestTuning: with pytest.raises(TuningPreconditionError, match='Cannot find load id'): main() - @patch('algo.iterative.tuning.SmacAppendTuning.tune') + @patch('algo.iterative.tuning.IterativeTunner.tune') @patch('omniadvisor.repository.load_repository.LoadRepository.update_test_config') @patch('omniadvisor.interface.config_tuning.get_tuning_result_history') @patch('omniadvisor.repository.tuning_record_repository.TuningRecordRepository.create')