From a76c329ebce82d1a1f7a3d46df95e9b3fdf33aa5 Mon Sep 17 00:00:00 2001 From: zhoupengcheng Date: Sat, 28 Oct 2023 17:24:50 +0800 Subject: [PATCH] bugfix for tuning --restore (cherry picked from commit ef44a3a05745644f4d43aded48cbcd1aaf1ed860) --- ...e-of-the-parameter-with-the-suffix-0.patch | 37 +++++++++++++++++++ atune.spec | 6 ++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 The-primary-node-changes-the-parameter-to-be-optimized-to-the-value-of-the-parameter-with-the-suffix-0.patch diff --git a/The-primary-node-changes-the-parameter-to-be-optimized-to-the-value-of-the-parameter-with-the-suffix-0.patch b/The-primary-node-changes-the-parameter-to-be-optimized-to-the-value-of-the-parameter-with-the-suffix-0.patch new file mode 100644 index 0000000..97cb97b --- /dev/null +++ b/The-primary-node-changes-the-parameter-to-be-optimized-to-the-value-of-the-parameter-with-the-suffix-0.patch @@ -0,0 +1,37 @@ +From e03c6c0b6fd470e0f927c9c218aee350508e086c Mon Sep 17 00:00:00 2001 +From: tanghan +Date: Wed, 17 Aug 2022 08:48:04 +0000 +Subject: [PATCH] The primary node changes the parameter to be optimized to the value of the parameter with the suffix - 0. +--- + common/project/projet.go | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/common/project/projet.go b/common/project/projet.go +index e10b3b2..22396dd 100644 +--- a/common/project/projet.go ++++ b/common/project/projet.go +@@ -353,12 +353,16 @@ func (y *YamlPrjSvr) RunSet(optStr string) (error, string) { + } + + newScript = strings.Replace(newScript, "$name", objName, -1) +- log.Info("set script:", newScript) +- _, err = ExecCommand(newScript) +- if err != nil { +- return fmt.Errorf("failed to exec %s, err: %v", newScript, err), "" ++ obj_len := len(obj.Name) ++ if obj.Name[obj_len-1:obj_len] == "0" { ++ log.Infof("set script for %s: %s", obj.Name, newScript) ++ _, err = ExecCommand(newScript) ++ if err != nil { ++ return fmt.Errorf("failed to exec %s, err: %v", newScript, err), "" ++ } ++ } else { ++ scripts = append(scripts, newScript) + } +- scripts = append(scripts, newScript) + } + log.Infof("after change paraMap: %+v\n", paraMap) + return nil, strings.Join(scripts, ",") +-- +2.33.0 + diff --git a/atune.spec b/atune.spec index 1349d31..8d11de5 100755 --- a/atune.spec +++ b/atune.spec @@ -3,7 +3,7 @@ Summary: AI auto tuning system Name: atune Version: 1.0.0 -Release: 7 +Release: 8 License: Mulan PSL v2 URL: https://gitee.com/openeuler/A-Tune Source: https://gitee.com/openeuler/A-Tune/repository/archive/v%{version}.tar.gz @@ -15,6 +15,7 @@ Patch9003: change-Makefile-A-Tune-version-to-1.0.0.patch Patch9004: 0001-bugfix-transfer-can-only-save-file-to-specified-dir.patch Patch9005: 0002-bugfix-training-model-can-only-save-file-to-specifie.patch Patch9006: 0003-bugfix-collection-res-can-only-save-file-to-specifie.patch +Patch9007: The-primary-node-changes-the-parameter-to-be-optimized-to-the-value-of-the-parameter-with-the-suffix-0.patch BuildRequires: rpm-build golang-bin procps-ng BuildRequires: sqlite >= 3.24.0 openssl @@ -150,6 +151,9 @@ atune engine tool for manage atuned AI tuning system. %systemd_postun_with_restart atuned.service %changelog +* Sat Oct 28 2023 zhoupengcheng - 1.0.0-8 +- bugfix for tuning --restore (https://gitee.com/openeuler/A-Tune/issues/I6AY86) + * Thu Aug 10 2023 gaoruoshu - 1.0.0-7 - bugfix set collection/transfer/train dir to specific dir