@@ -67,6 +67,7 @@ const ( | |||||
ActionChangeUserAvatar //38 | ActionChangeUserAvatar //38 | ||||
ActionCreateGrampusNPUDebugTask //39 | ActionCreateGrampusNPUDebugTask //39 | ||||
ActionCreateGrampusGPUDebugTask //40 | ActionCreateGrampusGPUDebugTask //40 | ||||
ActionCreateGrampusGCUDebugTask //41 | |||||
) | ) | ||||
// Action represents user operation type and other information to | // Action represents user operation type and other information to | ||||
@@ -39,6 +39,7 @@ func GetTaskTypeFromAction(a ActionType) TaskType { | |||||
ActionCreateGrampusGPUDebugTask, | ActionCreateGrampusGPUDebugTask, | ||||
ActionCreateGrampusNPUDebugTask, | ActionCreateGrampusNPUDebugTask, | ||||
ActionCreateGrampusNPUTrainTask, | ActionCreateGrampusNPUTrainTask, | ||||
ActionCreateGrampusGCUDebugTask, | |||||
ActionCreateGrampusGPUTrainTask: | ActionCreateGrampusGPUTrainTask: | ||||
return TaskCreateCloudbrainTask | return TaskCreateCloudbrainTask | ||||
case ActionCreateRepo: | case ActionCreateRepo: | ||||
@@ -156,7 +156,7 @@ func GenerateNotebookJob(ctx *context.Context, req *GenerateNotebookJobReq) (job | |||||
var codeGrampus models.GrampusDataset | var codeGrampus models.GrampusDataset | ||||
var cpCommand string | var cpCommand string | ||||
imageUrl := req.ImageUrl | imageUrl := req.ImageUrl | ||||
if ProcessorTypeNPU == req.ProcessType { | |||||
if ProcessorTypeNPU == req.ProcessType || ProcessorTypeGCU == req.ProcessType { | |||||
datasetGrampus = getDatasetGrampus(req.DatasetInfos) | datasetGrampus = getDatasetGrampus(req.DatasetInfos) | ||||
if len(req.ModelName) != 0 { | if len(req.ModelName) != 0 { | ||||
datasetGrampus = append(datasetGrampus, models.GrampusDataset{ | datasetGrampus = append(datasetGrampus, models.GrampusDataset{ | ||||
@@ -225,6 +225,7 @@ func GenerateNotebookJob(ctx *context.Context, req *GenerateNotebookJobReq) (job | |||||
AutoStopDuration: autoStopDurationMs, | AutoStopDuration: autoStopDurationMs, | ||||
Capacity: setting.Capacity, | Capacity: setting.Capacity, | ||||
Command: req.Command, | Command: req.Command, | ||||
CenterID: req.Spec.GetAvailableCenterIds(ctx.User.ID), | |||||
}, | }, | ||||
}, | }, | ||||
}) | }) | ||||
@@ -273,6 +274,8 @@ func GenerateNotebookJob(ctx *context.Context, req *GenerateNotebookJobReq) (job | |||||
actionType = models.ActionCreateGrampusNPUDebugTask | actionType = models.ActionCreateGrampusNPUDebugTask | ||||
} else if req.ComputeResource == models.GPUResource { | } else if req.ComputeResource == models.GPUResource { | ||||
actionType = models.ActionCreateGrampusGPUDebugTask | actionType = models.ActionCreateGrampusGPUDebugTask | ||||
} else if req.ComputeResource == models.GCUResource { | |||||
actionType = models.ActionCreateGrampusGCUDebugTask | |||||
} | } | ||||
notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, jobID, req.DisplayJobName, actionType) | notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, jobID, req.DisplayJobName, actionType) | ||||
@@ -74,7 +74,7 @@ func saveModelByParameters(jobId string, versionName string, name string, versio | |||||
cloudType := aiTask.Type | cloudType := aiTask.Type | ||||
modelSelectedFile := ctx.Query("modelSelectedFile") | modelSelectedFile := ctx.Query("modelSelectedFile") | ||||
//download model zip //train type | //download model zip //train type | ||||
if aiTask.ComputeResource == models.NPUResource { | |||||
if aiTask.ComputeResource == models.NPUResource || aiTask.ComputeResource == models.GCUResource { | |||||
cloudType = models.TypeCloudBrainTwo | cloudType = models.TypeCloudBrainTwo | ||||
} else if aiTask.ComputeResource == models.GPUResource { | } else if aiTask.ComputeResource == models.GPUResource { | ||||
cloudType = models.TypeCloudBrainOne | cloudType = models.TypeCloudBrainOne | ||||
@@ -288,7 +288,6 @@ func GrampusNotebookCreate(ctx *context.Context, form auth.CreateGrampusNotebook | |||||
req.ModelVersion = form.ModelVersion | req.ModelVersion = form.ModelVersion | ||||
req.PreTrainModelUrl = form.PreTrainModelUrl | req.PreTrainModelUrl = form.PreTrainModelUrl | ||||
req.PreTrainModelPath = getPreTrainModelPath(form.PreTrainModelUrl, form.CkptName) | req.PreTrainModelPath = getPreTrainModelPath(form.PreTrainModelUrl, form.CkptName) | ||||
} | } | ||||
_, err = grampus.GenerateNotebookJob(ctx, req) | _, err = grampus.GenerateNotebookJob(ctx, req) | ||||
@@ -1660,7 +1659,11 @@ func GrampusNotebookRestart(ctx *context.Context) { | |||||
if task.ComputeResource == models.NPUResource { | if task.ComputeResource == models.NPUResource { | ||||
computeSourceSimple = models.NPU | computeSourceSimple = models.NPU | ||||
action = models.ActionCreateGrampusNPUDebugTask | action = models.ActionCreateGrampusNPUDebugTask | ||||
} else if task.ComputeResource == models.GCUResource { | |||||
computeSourceSimple = models.GCU | |||||
action = models.ActionCreateGrampusGCUDebugTask | |||||
} | } | ||||
spec, err = resource.GetAndCheckSpec(ctx.User.ID, oldSpec.ID, models.FindSpecsOptions{ | spec, err = resource.GetAndCheckSpec(ctx.User.ID, oldSpec.ID, models.FindSpecsOptions{ | ||||
JobType: models.JobType(task.JobType), | JobType: models.JobType(task.JobType), | ||||
ComputeResource: computeSourceSimple, | ComputeResource: computeSourceSimple, | ||||
@@ -72,6 +72,11 @@ var StatusInfoDict = map[string]StatusInfo{string(models.JobTypeDebug) + "-" + s | |||||
JobType: []models.JobType{models.JobTypeDebug}, | JobType: []models.JobType{models.JobTypeDebug}, | ||||
NotFinalStatuses: GrampusNotFinalStatuses, | NotFinalStatuses: GrampusNotFinalStatuses, | ||||
ComputeResource: models.NPUResource, | ComputeResource: models.NPUResource, | ||||
}, string(models.JobTypeDebug) + "-" + strconv.Itoa(models.TypeC2Net) + "-" + models.GCUResource: { | |||||
CloudBrainTypes: []int{models.TypeC2Net}, | |||||
JobType: []models.JobType{models.JobTypeDebug}, | |||||
NotFinalStatuses: GrampusNotFinalStatuses, | |||||
ComputeResource: models.GCUResource, | |||||
}} | }} | ||||
func GetNotFinalStatusTaskCount(uid int64, cloudbrainType int, jobType string, computeResource ...string) (int, error) { | func GetNotFinalStatusTaskCount(uid int64, cloudbrainType int, jobType string, computeResource ...string) (int, error) { | ||||