Browse Source

fix-2454

tags/v1.22.7.2^2
liuzx 3 years ago
parent
commit
d9f2a9658a
1 changed files with 12 additions and 9 deletions
  1. +12
    -9
      models/cloudbrain.go

+ 12
- 9
models/cloudbrain.go View File

@@ -2083,13 +2083,16 @@ func getCardNumAndTypeByFlavorname(FlavorName string) (int, string, error) {
var beginIndex = strings.Index(FlavorName, ":")
var lastIndex = strings.LastIndex(FlavorName, ":")
var endIndex = strings.Index(FlavorName, "*")
cardNum, err := strconv.Atoi(strings.TrimSpace(FlavorName[beginIndex+1 : endIndex]))
if err != nil {
log.Error("strconv.Atoi failed: %v", err)
return 0, "", err
if endIndex >= (beginIndex+1) && lastIndex >= (endIndex+1) {
cardNum, err := strconv.Atoi(strings.TrimSpace(FlavorName[beginIndex+1 : endIndex]))
if err != nil {
log.Error("strconv.Atoi failed: %v", err)
return 0, "", err
}
cardType := strings.TrimSpace(FlavorName[endIndex+1 : lastIndex])
return cardNum, cardType, err
}
cardType := strings.TrimSpace(FlavorName[endIndex+1 : lastIndex])
return cardNum, cardType, err
return 0, "", nil
}
}

@@ -2109,9 +2112,9 @@ func GetCloudbrainCardNumAndType(task Cloudbrain) (int, string, error) {

func GetCloudbrainFlavorName(task Cloudbrain) (string, error) {
if task.Type == TypeCloudBrainOne {
ResourceSpec, GpuInfo, err := GetCloudBrainOneResourceSpec(task)
ResourceSpec, GpuInfo, err := getCloudBrainOneResourceSpec(task)
if err != nil {
log.Info("GetCloudBrainOneResourceSpec err:", err)
log.Info("getCloudBrainOneResourceSpec err:", err)
return "", err
} else {
if ResourceSpec == nil || GpuInfo == nil {
@@ -2141,7 +2144,7 @@ func GetCloudbrainFlavorName(task Cloudbrain) (string, error) {
return "", nil
}

func GetCloudBrainOneResourceSpec(task Cloudbrain) (*ResourceSpec, *GpuInfo, error) {
func getCloudBrainOneResourceSpec(task Cloudbrain) (*ResourceSpec, *GpuInfo, error) {
if task.ResourceSpecId >= 0 {
if task.JobType == string(JobTypeTrain) {
return CloudbrainTrainResourceSpecsMap[task.ResourceSpecId], CloudbrainTrainGpuInfosMap[task.GpuQueue], nil


Loading…
Cancel
Save