floraachy
/
pcm-coordinator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix aitask status bugs 

Former-commit-id: 4f8466962405557bd85d51573dd79d86984cafce
This commit is contained in:
tzwang 2024-05-14 17:46:00 +08:00
parent bd3f60d62e
commit 3b5295a08e
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/internal/logic/core/pagelisttasklogic.go
View File

@ -122,6 +122,11 @@ func (l *PageListTaskLogic) updateAitaskStatus(tasks []*types.TaskModel, ch chan
break break
} }
if a.Status == constants.Pending {
status = a.Status
continue
}
if a.Status == constants.Running { if a.Status == constants.Running {
status = a.Status status = a.Status
continue continue

25
api/internal/storeLink/octopus.go
View File

@ -508,6 +508,8 @@ func (o *OctopusLink) GetTrainingTask(ctx context.Context, taskId string) (*coll
task.Status = constants.Running task.Status = constants.Running
case "stopped": case "stopped":
task.Status = constants.Stopped task.Status = constants.Stopped
case "pending":
task.Status = constants.Pending
default: default:
task.Status = "undefined" task.Status = "undefined"
} }
@ -585,7 +587,7 @@ func (o *OctopusLink) generateResourceId(ctx context.Context, option *option.AiO
} }
if option.ResourceType == CARD { if option.ResourceType == CARD {
err = setResourceIdByCard(option, specResp, GCU) err = setResourceIdByCard(option, specResp, option.ComputeCard)
if err != nil { if err != nil {
return err return err
} }
@ -662,10 +664,23 @@ func (o *OctopusLink) generateImageId(ctx context.Context, option *option.AiOpti
if option.ResourceType == CARD { if option.ResourceType == CARD {
for _, image := range preImgResp.Payload.Images { for _, image := range preImgResp.Payload.Images {
if strings.Contains(image.ImageName, cardAliasMap[option.ComputeCard]) { if strings.Contains(image.ImageName, cardAliasMap[strings.ToUpper(option.ComputeCard)]) {
switch strings.ToUpper(option.ComputeCard) {
case GCU:
if strings.HasPrefix(image.ImageVersion, "t20_") {
option.ImageId = image.Id option.ImageId = image.Id
return nil return nil
} }
case BIV100:
if strings.HasPrefix(image.ImageVersion, "bi_") {
option.ImageId = image.Id
return nil
}
case MLU:
option.ImageId = image.Id
return nil
}
}
} }
} }
@ -750,7 +765,7 @@ func setResourceIdByCard(option *option.AiOption, specs *octopus.GetResourceSpec
if spec.Price == 1 { if spec.Price == 1 {
ns := strings.Split(spec.Name, COMMA) ns := strings.Split(spec.Name, COMMA)
cardSpecs := strings.Split(ns[0], STAR) cardSpecs := strings.Split(ns[0], STAR)
if cardSpecs[1] == cardCnMap[computeCard] { if cardSpecs[1] == cardCnMap[strings.ToUpper(computeCard)] {
option.ResourceId = spec.Id option.ResourceId = spec.Id
option.ComputeCard = computeCard option.ComputeCard = computeCard
return nil return nil
@ -766,7 +781,7 @@ func setResourceIdByCard(option *option.AiOption, specs *octopus.GetResourceSpec
if spec.Price == 1 { if spec.Price == 1 {
ns := strings.Split(spec.Name, COMMA) ns := strings.Split(spec.Name, COMMA)
cardSpecs := strings.Split(ns[0], STAR) cardSpecs := strings.Split(ns[0], STAR)
if cardSpecs[1] == cardCnMap[computeCard] { if cardSpecs[1] == cardCnMap[strings.ToUpper(computeCard)] {
option.ResourceId = spec.Id option.ResourceId = spec.Id
option.ComputeCard = computeCard option.ComputeCard = computeCard
return nil return nil
@ -780,7 +795,7 @@ func setResourceIdByCard(option *option.AiOption, specs *octopus.GetResourceSpec
continue continue
} }
cardSpecs := strings.Split(ns[0], STAR) cardSpecs := strings.Split(ns[0], STAR)
if cardSpecs[1] != cardCnMap[computeCard] { if cardSpecs[1] != cardCnMap[strings.ToUpper(computeCard)] {
continue continue
} }
s, err := strconv.ParseFloat(cardSpecs[0], 64) s, err := strconv.ParseFloat(cardSpecs[0], 64)

2
api/internal/storeLink/storeLink.go
View File

@ -83,7 +83,7 @@ var (
"4": SHUGUANGHPC, "4": SHUGUANGHPC,
} }
resourceTypes = []string{CPU, CARD} resourceTypes = []string{CPU, CARD}
taskTypes = []string{PYTORCH_TASK, TENSORFLOW_TASK} taskTypes = []string{PYTORCH_TASK}
ERROR_RESP_EMPTY = errors.New("resp empty error") ERROR_RESP_EMPTY = errors.New("resp empty error")
ERROR_CONVERT_EMPTY = errors.New("convert empty error") ERROR_CONVERT_EMPTY = errors.New("convert empty error")