From 696d7a752084ec469f7ac16a794d56dd1512f5af Mon Sep 17 00:00:00 2001 From: tzwang Date: Tue, 31 Oct 2023 16:28:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=98=E7=AE=97=E8=81=94=E5=8A=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: d8b82e03b93052830863e2b335af4706d254c43b --- api/internal/storeLink/octopus.go | 6 +----- api/internal/storeLink/shuguangai.go | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/api/internal/storeLink/octopus.go b/api/internal/storeLink/octopus.go index e20f56e6..f69fea8d 100644 --- a/api/internal/storeLink/octopus.go +++ b/api/internal/storeLink/octopus.go @@ -5,10 +5,8 @@ import ( "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils/timeutils" "gitlink.org.cn/jcce-pcm/pcm-participant-octopus/octopus" "strings" - "time" ) type OctopusLink struct { @@ -122,13 +120,11 @@ func (o *OctopusLink) SubmitTask(imageId string, cmd string, params []string, re prms = append(prms, &p) } - dateStr := timeutils.UnixTimeToString(time.Now().Unix()) - req := &octopus.CreateTrainJobReq{ Platform: o.participant.Name, Params: &octopus.CreateTrainJobParam{ ImageId: imageId, - Name: TASK_NAME_PREFIX + UNDERSCORE + utils.RandomString(7) + UNDERSCORE + dateStr, + Name: TASK_NAME_PREFIX + UNDERSCORE + utils.RandomString(17), ResourcePool: RESOURCE_POOL, Config: []*octopus.Config{ { diff --git a/api/internal/storeLink/shuguangai.go b/api/internal/storeLink/shuguangai.go index 2383a015..80b9ea9b 100644 --- a/api/internal/storeLink/shuguangai.go +++ b/api/internal/storeLink/shuguangai.go @@ -6,10 +6,8 @@ import ( "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils/timeutils" "gitlink.org.cn/jcce-pcm/pcm-participant-ac/hpcAC" "strings" - "time" ) type ShuguangAi struct { @@ -74,8 +72,6 @@ func (s *ShuguangAi) SubmitTask(imageId string, cmd string, params []string, res return nil, err } - dateStr := timeutils.UnixTimeToString(time.Now().Unix()) - //python参数 var pythonArg string for _, param := range params { @@ -85,7 +81,7 @@ func (s *ShuguangAi) SubmitTask(imageId string, cmd string, params []string, res req := &hpcAC.SubmitPytorchTaskReq{ Params: &hpcAC.SubmitPytorchTaskParams{ - TaskName: TASK_PYTORCH_PREFIX + UNDERSCORE + utils.RandomString(7) + UNDERSCORE + dateStr, + TaskName: TASK_PYTORCH_PREFIX + UNDERSCORE + utils.RandomString(17), WorkPath: WorkPath, IsDistributed: false, IsHvd: false,