#4673 合入云脑2支持不联网的资源池代码。

Merged
ychao_1983 merged 6 commits from zouap_dev into V20230828 8 months ago
  1. +1
    -1
      services/ai_task_service/cluster/cloudbrain_two.go
  2. +10
    -3
      services/ai_task_service/task/cloudbrain_two_train_task.go

+ 1
- 1
services/ai_task_service/cluster/cloudbrain_two.go View File

@@ -425,6 +425,7 @@ func convertCloudbrainTwoTrainJobUserImageReq(req entity.CreateTrainTaskRequest,
trainUrl := JointCloudbrainTwoReqUrl(t.OutPut)
logUrl := JointCloudbrainTwoReqUrl(t.LogPath)
params := handleCloudbrainTwoParameter(req)

return models.CreateUserImageTrainJobParams{
JobName: req.Name,
Description: req.Description,
@@ -447,7 +448,6 @@ func convertCloudbrainTwoTrainJobUserImageReq(req entity.CreateTrainTaskRequest,
NasType: setting.ModelArtsNasType,
},
}

}

func getCloudbrainTwoDataUrl(data []entity.ContainerData) string {


+ 10
- 3
services/ai_task_service/task/cloudbrain_two_train_task.go View File

@@ -1,6 +1,9 @@
package task

import (
"encoding/json"
"strings"

"code.gitea.io/gitea/entity"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/log"
@@ -9,8 +12,6 @@ import (
"code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/routers/response"
"code.gitea.io/gitea/services/ai_task_service/context"
"encoding/json"
"strings"
)

type CloudbrainTwoTrainTaskTemplate struct {
@@ -107,6 +108,12 @@ func (g CloudbrainTwoTrainTaskTemplate) CallCreationAPI(ctx *context.CreationCon
log.Error("UresourcePools.Info is empty. %v", err)
return response.SYSTEM_ERROR
}
modelarts_poolid := resourcePools.Info[0].ID
for _, t := range resourcePools.Info {
if t.Value == ctx.Spec.QueueCode {
modelarts_poolid = t.ID
}
}
form := ctx.Request
req := entity.CreateTrainTaskRequest{
Name: form.JobName,
@@ -131,7 +138,7 @@ func (g CloudbrainTwoTrainTaskTemplate) CallCreationAPI(ctx *context.CreationCon
OutPut: ctx.GetContainerDataArray(entity.ContainerOutPutPath),
Params: form.ParamArray,
Spec: ctx.Spec,
PoolId: resourcePools.Info[0].ID,
PoolId: modelarts_poolid,
WorkServerNumber: form.WorkServerNumber,
},
},


Loading…
Cancel
Save