Browse Source

存算联动修改

Former-commit-id: d8b82e03b9
pull/9/head
tzwang 2 years ago
parent
commit
696d7a7520
2 changed files with 2 additions and 10 deletions
  1. +1
    -5
      api/internal/storeLink/octopus.go
  2. +1
    -5
      api/internal/storeLink/shuguangai.go

+ 1
- 5
api/internal/storeLink/octopus.go View File

@@ -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{
{


+ 1
- 5
api/internal/storeLink/shuguangai.go View File

@@ -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,


Loading…
Cancel
Save