diff --git "a/msserviceprofiler/docs/\346\234\215\345\212\241\345\214\226\350\207\252\345\212\250\345\257\273\344\274\230\345\267\245\345\205\267.md" "b/msserviceprofiler/docs/\346\234\215\345\212\241\345\214\226\350\207\252\345\212\250\345\257\273\344\274\230\345\267\245\345\205\267.md" index b62962421edee008d26511ddc26a1742ceabf66d..721e6901c67bfd9f3932c89675bcbc2906ea6044 100644 --- "a/msserviceprofiler/docs/\346\234\215\345\212\241\345\214\226\350\207\252\345\212\250\345\257\273\344\274\230\345\267\245\345\205\267.md" +++ "b/msserviceprofiler/docs/\346\234\215\345\212\241\345\214\226\350\207\252\345\212\250\345\257\273\344\274\230\345\267\245\345\205\267.md" @@ -239,6 +239,7 @@ config_position = "default_d_rate" min = 1 max = 3 dtype = "share" +dtype_param = "default_p_rate" ``` ## 日志说明 寻优过程中默认日志为error级别,如果用户想看每一轮具体的日志,可以设置 diff --git a/msserviceprofiler/msserviceprofiler/modelevalstate/config/config.py b/msserviceprofiler/msserviceprofiler/modelevalstate/config/config.py index 29256b5e4d37199d7e814658348b743ae2cfbe12..17e44c3935a2a7772b9c909effbd0c4e3a662c26 100644 --- a/msserviceprofiler/msserviceprofiler/modelevalstate/config/config.py +++ b/msserviceprofiler/msserviceprofiler/modelevalstate/config/config.py @@ -170,7 +170,7 @@ def map_param_with_value(params: np.ndarray, params_field: Tuple[OptimizerConfig elif v.dtype == "share": for _op in _simulate_run_info: if _op.name == v.dtype_param: - _field.value = _op.min + _op.max - _op.value + _field.value = int(_op.min + _op.max - _op.value) else: try: _field.value = float(params[i]) diff --git a/msserviceprofiler/msserviceprofiler/modelevalstate/optimizer/simulator.py b/msserviceprofiler/msserviceprofiler/modelevalstate/optimizer/simulator.py index 71caf6a67e3765c5685ee123dac0e69f1a063273..480af558dd8d800d2c533e8bd5c4522167ed8dec 100644 --- a/msserviceprofiler/msserviceprofiler/modelevalstate/optimizer/simulator.py +++ b/msserviceprofiler/msserviceprofiler/modelevalstate/optimizer/simulator.py @@ -345,7 +345,7 @@ class DisaggregationSimulator(CustomProcess): try: # 发送 POST 请求 - response = requests.post(url, json=payload, headers=headers) + response = requests.post(url, json=payload, headers=headers, timeout=10) # 检查响应状态码 if response.status_code == 200: @@ -397,11 +397,13 @@ class DisaggregationSimulator(CustomProcess): if mindie_name[3] == 'Running': break time.sleep(1) - self.monitor_command.append(mindie_name[1]) + kubectl_monitor_command = self.KubectlCommand(self.mindie_config.command).monitor_command + kubectl_monitor_command.append(mindie_name[1]) logger.info(f"mindie_name: {mindie_name[1]}") - self.log_process = subprocess.Popen(self.monitor_command, stdout=self.mindie_log_fp, stderr=subprocess.STDOUT, - env=os.environ, text=True, cwd=self.mindie_config.kubectl_default_path) - logger.info(f"command: {' '.join(self.monitor_command)}, log file: {self.run_log}") + self.log_process = subprocess.Popen(kubectl_monitor_command, stdout=self.mindie_log_fp, + stderr=subprocess.STDOUT, env=os.environ, text=True, + cwd=self.mindie_config.kubectl_default_path) + logger.info(f"command: {' '.join(kubectl_monitor_command)}, log file: {self.run_log}") def run(self, run_params: Tuple[OptimizerConfigField]): logger.info(f'start run in simulator. run params: {run_params}')