From 955d0f4d0569c31acc21d1df6eb2b8270abbe452 Mon Sep 17 00:00:00 2001 From: SWWBF <1152719547@qq.com> Date: Wed, 13 Sep 2023 21:30:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9python=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: SWWBF <1152719547@qq.com> --- analysis/engine/classification.py | 8 +++++--- tools/generate_models.py | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/analysis/engine/classification.py b/analysis/engine/classification.py index b2d6da9..f7c51ea 100644 --- a/analysis/engine/classification.py +++ b/analysis/engine/classification.py @@ -22,6 +22,7 @@ from flask_restful import Resource from flask_restful import marshal_with_field from analysis.optimizer.workload_characterization import WorkloadCharacterization +from analysis.optimizer.app_characterization import AppCharacterization from analysis.engine.field import CLASSIFICATION_POST_FIELD from analysis.engine.parser import CLASSIFICATION_POST_PARSER from analysis.engine.utils import utils @@ -48,14 +49,15 @@ class Classification(Resource): if data.empty: abort("data may be not exist") - classification = WorkloadCharacterization(model_path) + classification = AppCharacterization(model_path) resource_limit = "" if model is None: - resource_limit, workload_type, percentage = classification.identify(data) + bottleneck_binary, resource_limit, workload_type, percentage = classification.identify(data) else: - workload_type, percentage = classification.reidentify(data, model) + bottleneck_binary, workload_type, percentage = classification.reidentify(data, model) profile_name = {} + profile_name["bottleneck_binary"] = bottleneck_binary profile_name["workload_type"] = workload_type profile_name["percentage"] = percentage profile_name["resource_limit"] = resource_limit diff --git a/tools/generate_models.py b/tools/generate_models.py index 718c876..affb191 100755 --- a/tools/generate_models.py +++ b/tools/generate_models.py @@ -22,7 +22,8 @@ import sys FILE_PATH = os.path.realpath(os.path.dirname(__file__)) sys.path.insert(0, FILE_PATH + "/../") -from analysis.optimizer.workload_characterization import WorkloadCharacterization +# from analysis.optimizer.workload_characterization import WorkloadCharacterization +from analysis.optimizer.app_characterization import AppCharacterization def main(csv_path, model_path, feature_selection, search): @@ -34,7 +35,7 @@ def main(csv_path, model_path, feature_selection, search): :param search: enable the grid search for model train, default value is False :return: None """ - processor = WorkloadCharacterization(model_path) + processor = AppCharacterization(model_path, mode="train") processor.train(csv_path, feature_selection, search) -- Gitee