diff --git a/models/action.go b/models/action.go index 33b3b77a88..85fa2c184e 100755 --- a/models/action.go +++ b/models/action.go @@ -50,32 +50,34 @@ const ( ActionRejectPullRequest // 22 ActionCommentPull // 23 - ActionUploadAttachment //24 - ActionCreateDebugGPUTask //25 - ActionCreateDebugNPUTask //26 - ActionCreateTrainTask //27 - ActionCreateInferenceTask // 28 - ActionCreateBenchMarkTask //29 - ActionCreateNewModelTask //30 - ActionCreateGPUTrainTask //31 - ActionCreateGrampusNPUTrainTask //32 - ActionCreateGrampusGPUTrainTask //33 - ActionBindWechat //34 - ActionDatasetRecommended //35 - ActionCreateImage //36 - ActionImageRecommend //37 - ActionChangeUserAvatar //38 - ActionCreateGrampusNPUDebugTask //39 - ActionCreateGrampusGPUDebugTask //40 - ActionCreateGrampusGCUDebugTask //41 - ActionCreateGrampusGCUTrainTask //42 - ActionCreateGrampusMLUDebugTask //43 - ActionCreateGrampusMLUTrainTask //44 - ActionCreateGrampusGPUOnlineInferTask //45 - ActionCreateGrampusDCUDebugTask //46 - ActionCreateSuperComputeTask //47 - ActionCreateGrampusILUVATARDebugTask //48 - ActionCreateGrampusMETAXDebugTask //49 + ActionUploadAttachment //24 + ActionCreateDebugGPUTask //25 + ActionCreateDebugNPUTask //26 + ActionCreateTrainTask //27 + ActionCreateInferenceTask // 28 + ActionCreateBenchMarkTask //29 + ActionCreateNewModelTask //30 + ActionCreateGPUTrainTask //31 + ActionCreateGrampusNPUTrainTask //32 + ActionCreateGrampusGPUTrainTask //33 + ActionBindWechat //34 + ActionDatasetRecommended //35 + ActionCreateImage //36 + ActionImageRecommend //37 + ActionChangeUserAvatar //38 + ActionCreateGrampusNPUDebugTask //39 + ActionCreateGrampusGPUDebugTask //40 + ActionCreateGrampusGCUDebugTask //41 + ActionCreateGrampusGCUTrainTask //42 + ActionCreateGrampusMLUDebugTask //43 + ActionCreateGrampusMLUTrainTask //44 + ActionCreateGrampusGPUOnlineInferTask //45 + ActionCreateGrampusDCUDebugTask //46 + ActionCreateSuperComputeTask //47 + ActionCreateGrampusILUVATARDebugTask //48 + ActionCreateGrampusMETAXDebugTask //49 + ActionCreateGrampusGPUInferenceTask //50 + ActionCreateGrampusILUVATARInferenceTask //51 ) // Action represents user operation type and other information to @@ -431,7 +433,9 @@ func (a *Action) IsCloudbrainAction() bool { ActionCreateGrampusMLUDebugTask, ActionCreateGrampusILUVATARDebugTask, ActionCreateGrampusMETAXDebugTask, - ActionCreateSuperComputeTask: + ActionCreateSuperComputeTask, + ActionCreateGrampusILUVATARInferenceTask, + ActionCreateGrampusGPUInferenceTask: return true } return false diff --git a/models/task_config.go b/models/task_config.go index 803795c88a..efb31988bf 100644 --- a/models/task_config.go +++ b/models/task_config.go @@ -80,7 +80,9 @@ func GetTaskTypeFromAction(a ActionType) TaskType { ActionCreateGrampusMETAXDebugTask, ActionCreateSuperComputeTask, ActionCreateGrampusGPUOnlineInferTask, - ActionCreateGrampusGPUTrainTask: + ActionCreateGrampusGPUTrainTask, + ActionCreateGrampusGPUInferenceTask, + ActionCreateGrampusILUVATARInferenceTask: return TaskCreateCloudbrainTask case ActionCreateRepo: return TaskCreatePublicRepo diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 205ef2b9ba..f99ce63839 100755 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -105,7 +105,7 @@ func NewFuncMap() []template.FuncMap { return setting.UI.Reactions }, "DebugAttachSize": func() int { - return setting.DebugAttachSize * 1000 * 1000 * 1000 + return setting.DebugAttachSize * 1024 * 1024 * 1024 }, "LlmCommonKB": func() string { return setting.LLM_CHAT_API.COMMON_KB diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index c46394b025..29264a1ff8 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1300,7 +1300,7 @@ cloudbrain.morethanonejob2=You can view all your Cloud Brain tasks in initialized first ; debug_task_running_limit =Running time: no more than 4 hours, it will automatically stop if it exceeds 4 hours; @@ -3228,6 +3228,8 @@ task_c2ent_onlineinferjob=`created GPU type online inference task %s` task_nputrainjob=`created NPU training task %s` task_inferencejob=`created reasoning task %s` +task_c2net_gpu_inferencejob=`created GPU type inference task %s` +task_c2net_gpgpu_iluvatar_inferencejob=`created ILUVATAR-GPGPU type inference task %s` task_benchmark=`created profiling task %s` task_createmodel=`created new model %s` task_gputrainjob=`created CPU/GPU training task %s` diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 1a5df42fba..d3707a1f0c 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -3247,6 +3247,8 @@ task_c2ent_onlineinferjob=`创建了GPU类型在线推理任务 %s` task_nputrainjob=`创建了NPU类型训练任务 %s` task_inferencejob=`创建了推理任务 %s` +task_c2net_gpu_inferencejob=`创建了GPU类型推理任务 %s` +task_c2net_gpgpu_iluvatar_inferencejob=`创建了ILUVATAR-GPGPU类型推理任务 %s` task_benchmark=`创建了评测任务 %s` task_createmodel=`导入了新模型 %s` task_gputrainjob=`创建了CPU/GPU类型训练任务 %s` diff --git a/public/home/home.js b/public/home/home.js index 0cca1a38ea..de41b40def 100755 --- a/public/home/home.js +++ b/public/home/home.js @@ -243,8 +243,8 @@ document.onreadystatechange = function () { html += recordPrefix + actionName; html += " " + getRepotext(record) + "" } - else if(record.OpType == "24" || record.OpType == "26" || record.OpType == "27" || record.OpType == "28" || record.OpType == "30" - || record.OpType == "31" || record.OpType == "32" || record.OpType == "33" || record.OpType == "42" || record.OpType == "44"){ + else if(record.OpType == "24" || record.OpType == "26" || record.OpType == "27" || record.OpType == "28" || record.OpType == "50" || record.OpType == "51" + || record.OpType == "30" || record.OpType == "31" || record.OpType == "32" || record.OpType == "33" || record.OpType == "42" || record.OpType == "44"){ html += recordPrefix + actionName; const taskLink = getTaskLink(record); if (taskLink) { @@ -311,7 +311,17 @@ function getTaskLink(record){ re = ''; } }else if(record.OpType == 28){ - re = re + "/modelarts/inference-job/" + record.Content; + if (record.Cloudbrain) { + re = re + "/modelarts/inference-job/" + record.Cloudbrain.ID; + } else { + re = ''; + } + }else if(record.OpType == 50 || record.OpType == 51){ + if (record.Cloudbrain) { + re = re + "/grampus/inference-job/" + record.Cloudbrain.ID; + } else { + re = ''; + } }else if(record.OpType == 29){ re = re + "/cloudbrain/benchmark/" + record.Content; }else if(record.OpType == 30){ @@ -487,6 +497,8 @@ var actionNameZH={ "26":"创建了NPU类型调试任务", "27":"创建了NPU类型训练任务", "28":"创建了推理任务", + "50":"创建了GPU类型推理任务", + "51":"创建了ILUVATAR-GPGPU类型推理任务", "29":"创建了评测任务", "30":"导入了新模型", "31":"创建了CPU/GPU类型训练任务", @@ -528,7 +540,9 @@ var actionNameEN={ "25":" created CPU/GPU type debugging task ", "26":" created NPU type debugging task ", "27":" created NPU type training task", - "28":" created reasoning task", + "28":" created inference task", + "50":" created GPU type inference task", + "51":" created ILUVATAR-GPGPU type inference task", "29":" created profiling task", "30":" created new model", "31":" created CPU/GPU type training task", diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 4217dfd638..af415fe2ec 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -325,7 +325,7 @@ func cloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { for _, infos := range datasetInfos { attachSize += infos.Size } - if attachSize > int64(setting.DebugAttachSize*1000*1000*1000) { + if attachSize > int64(setting.DebugAttachSize*1024*1024*1024) { log.Error("The DatasetSize exceeds the limit (%dGB)", setting.DebugAttachSize) // GB cloudBrainNewDataPrepare(ctx, jobType) ctx.RenderWithErr(ctx.Tr("cloudbrain.error.debug_datasetsize", setting.DebugAttachSize), tpl, &form) @@ -3008,16 +3008,13 @@ func cloudBrainTrainJobCreate(ctx *context.Context) { } func InferenceCloudBrainJobNew(ctx *context.Context) { - err := cloudBrainNewDataPrepare(ctx, string(models.JobTypeInference)) - if err != nil { - ctx.ServerError("get new train-job info failed", err) - return - } + ctx.Data["PageIsCloudBrain"] = true ctx.HTML(http.StatusOK, tplCloudBrainInferenceJobNew) } func InferenceCloudBrainJobShow(ctx *context.Context) { - cloudBrainShow(ctx, tplCloudBrainInferenceJobShow, models.JobTypeInference) + ctx.Data["PageIsCloudBrain"] = true + ctx.HTML(http.StatusOK, tplCloudBrainInferenceJobShow) } func DownloadGPUInferenceResultFile(ctx *context.Context) { diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go index 42e5583db3..cad381228d 100755 --- a/routers/repo/grampus.go +++ b/routers/repo/grampus.go @@ -67,9 +67,23 @@ const ( tplGrampusTrainJobMLUNew base.TplName = "repo/grampus/trainjob/mlu/new" //C2NET notebook - tplGrampusNotebookNew base.TplName = "repo/grampus/notebook/new" + tplGrampusNotebookNew base.TplName = "repo/grampus/notebook/new" + + // Inference job + tplGrampusInferenceNew base.TplName = "repo/grampus/inference/new" + tplGrampusInferenceShow base.TplName = "repo/grampus/inference/show" ) +func GrampusInferenceNew(ctx *context.Context) { + ctx.Data["PageIsCloudBrain"] = true + ctx.HTML(http.StatusOK, tplGrampusInferenceNew) +} + +func GrampusInferenceShow(ctx *context.Context) { + ctx.Data["PageIsCloudBrain"] = true + ctx.HTML(http.StatusOK, tplGrampusInferenceShow) +} + func GrampusNotebookNew(ctx *context.Context) { ctx.Data["PageIsCloudBrain"] = true ctx.HTML(http.StatusOK, tplGrampusNotebookNew) @@ -256,7 +270,7 @@ func GrampusNotebookCreate(ctx *context.Context, form auth.CreateGrampusNotebook for _, infos := range datasetInfos { attachSize += infos.Size } - if attachSize > int64(setting.DebugAttachSize*1000*1000*1000) { + if attachSize > int64(setting.DebugAttachSize*1024*1024*1024) { log.Error("The DatasetSize exceeds the limit (%dGB)", setting.DebugAttachSize) // GB grampusNotebookNewDataPrepare(ctx, processType) ctx.RenderWithErr(ctx.Tr("cloudbrain.error.debug_datasetsize", setting.DebugAttachSize), tpl, &form) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index fab373deef..e835535174 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -254,7 +254,7 @@ func Notebook2Create(ctx *context.Context, form auth.CreateModelArtsNotebookForm for _, infos := range datasetInfos { attachSize += infos.Size } - if attachSize > int64(setting.DebugAttachSize*1000*1000*1000) { + if attachSize > int64(setting.DebugAttachSize*1024*1024*1024) { log.Error("The DatasetSize exceeds the limit (%dGB)", setting.DebugAttachSize) //GB notebookNewDataPrepare(ctx) ctx.RenderWithErr(ctx.Tr("cloudbrain.error.debug_datasetsize", setting.DebugAttachSize), tplModelArtsNotebookNew, &form) @@ -2544,91 +2544,11 @@ func checkModelArtsSpecialPool(ctx *context.Context, flavorCode string, jobType return "" } func InferenceJobIndex(ctx *context.Context) { - MustEnableModelArts(ctx) - - repo := ctx.Repo.Repository - page := ctx.QueryInt("page") - if page <= 0 { - page = 1 - } - - listType := ctx.Query("listType") - ctx.Data["ListType"] = listType - - if listType == models.AllResource { - listType = "" - } - - var jobTypes []string - jobTypes = append(jobTypes, string(models.JobTypeInference)) - tasks, count, err := models.Cloudbrains(&models.CloudbrainsOptions{ - ListOptions: models.ListOptions{ - Page: page, - PageSize: setting.UI.IssuePagingNum, - }, - RepoID: repo.ID, - ComputeResource: listType, - JobTypes: jobTypes, - Type: models.TypeCloudBrainAll, - }) - if err != nil { - ctx.ServerError("Cloudbrain", err) - return - } - - for i, task := range tasks { - tasks[i].CanDel = cloudbrain.CanDeleteJob(ctx, &task.Cloudbrain) - tasks[i].CanModify = cloudbrain.CanModifyJob(ctx, &task.Cloudbrain) - if tasks[i].ComputeResource == "" { - tasks[i].ComputeResource = models.NPUResource - } - if tasks[i].ModelId != "" { - model, err := models.QueryModelById(tasks[i].ModelId) - if err == nil && model != nil { - if model.RepoId != tasks[i].RepoID { - repo, err := models.GetRepositoryByID(model.RepoId) - if err == nil && repo != nil { - tasks[i].ModelRepoName = repo.Name - tasks[i].ModelRepoOwnerName = repo.OwnerName - } - } - } - } - } - isQueryPrivate := isQueryPrivateModel(ctx) - repoId := ctx.Repo.Repository.ID - Type := -1 - _, model_count, _ := models.QueryModel(&models.AiModelQueryOptions{ - ListOptions: models.ListOptions{ - Page: 1, - PageSize: 2, - }, - RepoID: repoId, - Type: Type, - New: MODEL_LATEST, - IsOnlyThisRepo: true, - Status: 0, - IsQueryPrivate: isQueryPrivate, - }) - ctx.Data["MODEL_COUNT"] = model_count - - pager := context.NewPagination(int(count), setting.UI.IssuePagingNum, page, 5) - pager.SetDefaultParams(ctx) - ctx.Data["Page"] = pager - ctx.Data["PageIsCloudBrain"] = true - ctx.Data["Tasks"] = tasks - ctx.Data["CanCreate"] = cloudbrain.CanCreateOrDebugJob(ctx) - ctx.Data["RepoIsEmpty"] = repo.IsEmpty ctx.HTML(200, tplModelArtsInferenceJobIndex) } func InferenceJobNew(ctx *context.Context) { - err := inferenceJobNewDataPrepare(ctx) - if err != nil { - ctx.ServerError("get new inference-job info failed", err) - return - } - + ctx.Data["PageIsCloudBrain"] = true ctx.HTML(200, tplModelArtsInferenceJobNew) } func inferenceJobNewDataPrepare(ctx *context.Context) error { @@ -2783,62 +2703,6 @@ func inferenceJobErrorNewDataPrepare(ctx *context.Context, form auth.CreateModel } func InferenceJobShow(ctx *context.Context) { ctx.Data["PageIsCloudBrain"] = true - var jobID = ctx.Params(":jobid") - - page := ctx.QueryInt("page") - if page <= 0 { - page = 1 - } - task, err := models.GetCloudbrainByJobID(jobID) - - if err != nil { - log.Error("GetInferenceTask(%s) failed:%v", jobID, err.Error()) - ctx.NotFound(ctx.Req.URL.RequestURI(), nil) - return - } - //设置权限 - canNewJob, err := canUserCreateTrainJobVersion(ctx, task.UserID) - if err != nil { - ctx.ServerError("canNewJob failed", err) - return - } - ctx.Data["canNewJob"] = canNewJob - - //将运行参数转化为epoch_size = 3, device_target = Ascend的格式 - var parameters models.Parameters - err = json.Unmarshal([]byte(task.Parameters), ¶meters) - if err != nil { - log.Error("Failed to Unmarshal Parameters: %s (%v)", task.Parameters, err) - trainJobNewDataPrepare(ctx) - return - } - - if len(parameters.Parameter) > 0 { - paramTemp := "" - for _, Parameter := range parameters.Parameter { - param := Parameter.Label + " = " + Parameter.Value + "; " - paramTemp = paramTemp + param - } - task.Parameters = paramTemp[:len(paramTemp)-2] - } else { - task.Parameters = "" - } - prepareSpec4Show(ctx, task) - LabelName := strings.Fields(task.LabelName) - ctx.Data["labelName"] = LabelName - ctx.Data["jobID"] = jobID - ctx.Data["jobName"] = task.JobName - ctx.Data["displayJobName"] = task.DisplayJobName - ctx.Data["task"] = task - ctx.Data["canDownload"] = cloudbrain.CanModifyJob(ctx, task) - ctx.Data["datasetDownload"] = GetCloudBrainDataSetInfo(task.Uuid, task.DatasetName, false) - tempUids := []int64{} - tempUids = append(tempUids, task.UserID) - JobCreater, err := models.GetUserNamesByIDs(tempUids) - if err != nil { - log.Error("GetUserNamesByIDs (WhitelistUserIDs): %v", err) - } - ctx.Data["userName"] = JobCreater[0] ctx.HTML(http.StatusOK, tplModelArtsInferenceJobShow) } diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 0cbd591ebe..2f897f7573 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -1388,6 +1388,13 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/create", reqWechatBind, reqRepoCloudBrainWriter, bindIgnErr(auth.CreateGrampusTrainJobForm{}), context.PointAccount(), repo.GrampusTrainJobGcuCreate) }) }) + + m.Group("/inference-job", func() { + m.Get("/create", reqWechatBind, reqRepoCloudBrainWriter, context.PointAccount(), repo.GrampusInferenceNew) + m.Group("/:id", func() { + m.Get("", reqRepoCloudBrainReader, repo.GrampusInferenceShow) + }) + }) }, context.RepoRef()) m.Group("/modelmanage", func() { m.Get("/create_local_model", repo.CreateLocalModel) diff --git a/services/ai_task_service/cluster/c2net.go b/services/ai_task_service/cluster/c2net.go index 2fc4df53af..795519e609 100644 --- a/services/ai_task_service/cluster/c2net.go +++ b/services/ai_task_service/cluster/c2net.go @@ -36,6 +36,7 @@ func (c C2NetClusterAdapter) CreateNoteBook(req entity.CreateNoteBookTaskRequest newReq, err := convertNoteBookReq2Grampus(req) if err != nil { log.Error("CreateNoteBook err.req=%+v err=%v", req, err) + return nil, err } jobResult, err := grampus.CreateNotebookJob(newReq) if err != nil { @@ -778,7 +779,7 @@ func (c C2NetClusterAdapter) DeleteTrainJob(opts entity.JobIdAndVersionId) error } func (c C2NetClusterAdapter) StopTrainJob(opts entity.JobIdAndVersionId) error { - _, err := grampus.StopJob(opts.JobID, string(models.JobTypeDebug)) + _, err := grampus.StopJob(opts.JobID) if err != nil { log.Error("StopNoteBook(%s) failed:%v", opts, err) return err diff --git a/services/ai_task_service/cluster/cloudbrain_two.go b/services/ai_task_service/cluster/cloudbrain_two.go index 4b6eb8982f..c721c36033 100644 --- a/services/ai_task_service/cluster/cloudbrain_two.go +++ b/services/ai_task_service/cluster/cloudbrain_two.go @@ -482,6 +482,11 @@ func handleCloudbrainTwoParameter(req entity.CreateTrainTaskRequest) models.Para }) } + param.Parameter = append(param.Parameter, models.Parameter{ + Label: modelarts.ResultUrl, + Value: t.OutPut[0].S3DownloadUrl, + }) + existDeviceTarget := false for _, parameter := range t.Params.Parameter { if parameter.Label == modelarts.DeviceTarget { diff --git a/services/ai_task_service/container_builder/output_path_builder.go b/services/ai_task_service/container_builder/output_path_builder.go index 98f4d86697..e3b1a84efd 100644 --- a/services/ai_task_service/container_builder/output_path_builder.go +++ b/services/ai_task_service/container_builder/output_path_builder.go @@ -1,13 +1,14 @@ package container_builder import ( + "path" + "code.gitea.io/gitea/entity" "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/routers/response" "code.gitea.io/gitea/services/ai_task_service/context" "code.gitea.io/gitea/services/ai_task_service/storage_helper" - "path" ) type OutputPathBuilder struct { @@ -67,6 +68,7 @@ func (b *OutputPathBuilder) Build(ctx *context.CreationContext) ([]entity.Contai GetBackEndpoint: uploader.GetEndpoint(), IsDir: true, StorageType: storageTypes[0], + S3DownloadUrl: uploader.GetS3DownloadUrl(remoteDir), }}, nil } diff --git a/services/ai_task_service/task/cloudbrain_two_inference_task.go b/services/ai_task_service/task/cloudbrain_two_inference_task.go new file mode 100644 index 0000000000..c63c98d7c1 --- /dev/null +++ b/services/ai_task_service/task/cloudbrain_two_inference_task.go @@ -0,0 +1,139 @@ +package task + +import ( + "strings" + + "code.gitea.io/gitea/entity" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/timeutil" + "code.gitea.io/gitea/routers/response" + "code.gitea.io/gitea/services/ai_task_service/context" +) + +type CloudbrainTwoInferenceTaskTemplate struct { + DefaultAITaskTemplate +} + +func init() { + t := &CloudbrainTwoInferenceTaskTemplate{ + DefaultAITaskTemplate: DefaultAITaskTemplate{ + ClusterType: entity.OpenICloudbrainTwo, + JobType: models.JobTypeInference, + Config: GetCloudbrainTwoInferenceConfig, + }, + } + RegisterTask(models.JobTypeInference, entity.OpenICloudbrainTwo, t) +} + +func GetCloudbrainTwoInferenceConfig(opts entity.AITaskConfigKey) *entity.AITaskBaseConfig { + var config = &entity.AITaskBaseConfig{ + ActionType: models.ActionCreateInferenceTask, + IsActionUseJobId: true, + ContainerSteps: map[entity.ContainerDataType]*entity.ContainerBuildOpts{ + entity.ContainerCode: { + ContainerPath: "/code", + ReadOnly: false, + AcceptStorageType: []entity.StorageType{entity.OBS}, + Uncompressed: true, + }, + entity.ContainerDataset: { + ContainerPath: "/dataset", + ReadOnly: true, + Uncompressed: true, + AcceptStorageType: []entity.StorageType{entity.OBS}, + }, + entity.ContainerPreTrainModel: { + ContainerPath: "/pretrainmodel", + ReadOnly: true, + AcceptStorageType: []entity.StorageType{entity.OBS}, + }, + entity.ContainerOutPutPath: { + ContainerPath: "/output", + StorageRelativePath: "/output" + models.CloudbrainTwoDefaultVersion, + ReadOnly: false, + AcceptStorageType: []entity.StorageType{entity.OBS}, + MKDIR: true, + }, + entity.ContainerLogPath: { + ContainerPath: "/log", + StorageRelativePath: "/log" + models.CloudbrainTwoDefaultVersion, + ReadOnly: false, + AcceptStorageType: []entity.StorageType{entity.OBS}, + MKDIR: true, + }, + }, + } + return config +} + +func (t CloudbrainTwoInferenceTaskTemplate) Create(ctx *context.CreationContext) (*entity.CreateTaskRes, *response.BizError) { + c := &CreateOperator{} + err := c.Next(t.CheckParamFormat). + Next(t.HandleReqParameters). + Next(t.CheckPrivilege4Continue). + Next(t.CheckSourceTaskIsCleared). + Next(t.CheckWorkerNum). + Next(t.CheckMultiRequest). + Next(t.CheckBranchExists). + Next(t.CheckBootFile). + Next(t.CheckDisplayJobName). + Next(t.LoadSpec). + Next(t.CheckPointBalance). + Next(t.CheckDatasets). + Next(t.CheckModel). + Next(t.InsertCloudbrainRecord4Async). + AsyncNextWithErrFun(t.BuildContainerData, t.GetAvailableQueues, t.CallCreationAPI, t.AfterCallCreationAPI4Async, t.NotifyCreation, t.HandleErr4Async). + Operate(ctx) + if err != nil { + log.Error("create GrampusInferenceTask err.%v", err) + return nil, err + } + return &entity.CreateTaskRes{ID: ctx.NewCloudbrain.ID}, nil +} + +func (g CloudbrainTwoInferenceTaskTemplate) CallCreationAPI(ctx *context.CreationContext) *response.BizError { + c := g.GetMyCluster() + if c == nil { + return response.SYSTEM_ERROR + } + form := ctx.Request + req := entity.CreateTrainTaskRequest{ + Name: form.JobName, + DisplayJobName: form.DisplayJobName, + Description: form.Description, + Tasks: []entity.TrainTask{ + { + Name: form.JobName, + ResourceSpecId: ctx.Spec.SourceSpecId, + ImageId: form.ImageID, + ImageUrl: strings.TrimSpace(form.ImageUrl), + Datasets: ctx.GetContainerDataArray(entity.ContainerDataset), + Code: ctx.GetContainerDataArray(entity.ContainerCode), + LogPath: ctx.GetContainerDataArray(entity.ContainerLogPath), + Queues: ctx.Queues, + PreTrainModel: ctx.GetContainerDataArray(entity.ContainerPreTrainModel), + BootFile: form.BootFile, + OutPut: ctx.GetContainerDataArray(entity.ContainerOutPutPath), + Params: form.ParamArray, + Spec: ctx.Spec, + PoolId: ctx.Spec.QueueCode, + WorkServerNumber: form.WorkServerNumber, + }, + }, + } + createTime := timeutil.TimeStampNow() + res, err := c.CreateTrainJob(req) + if err != nil { + log.Error("CloudbrainTwo InfereceTask Create err.req=%+v err=%v", req, err) + return response.NewBizError(err) + } + ctx.Response = &entity.CreationResponse{ + JobID: res.JobID, + Status: res.Status, + CreateTime: createTime, + VersionID: res.VersionID, + VersionName: res.VersionName, + } + return nil +} diff --git a/services/ai_task_service/task/grampus_inference_task.go b/services/ai_task_service/task/grampus_inference_task.go new file mode 100644 index 0000000000..74399fa367 --- /dev/null +++ b/services/ai_task_service/task/grampus_inference_task.go @@ -0,0 +1,144 @@ +package task + +import ( + "strings" + + "code.gitea.io/gitea/entity" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/cloudbrain" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/timeutil" + "code.gitea.io/gitea/routers/response" + "code.gitea.io/gitea/services/ai_task_service/context" +) + +type GrampusInferenceTaskTemplate struct { + DefaultAITaskTemplate +} + +func init() { + t := &GrampusInferenceTaskTemplate{ + DefaultAITaskTemplate: DefaultAITaskTemplate{ + ClusterType: entity.C2Net, + JobType: models.JobTypeInference, + Config: GetGrampusInferenceTaskConfig, + }, + } + RegisterTask(models.JobTypeInference, entity.C2Net, t) +} + +func GetGrampusInferenceTaskConfig(opts entity.AITaskConfigKey) *entity.AITaskBaseConfig { + codePath := "/code" + datasetPath := "/dataset" + pretrainModelPath := "/pretrainmodel" + outputPath := "/output" + var config = &entity.AITaskBaseConfig{ + ContainerSteps: map[entity.ContainerDataType]*entity.ContainerBuildOpts{ + entity.ContainerCode: { + ContainerPath: "/tmp" + codePath, + StorageRelativePath: codePath, + ReadOnly: false, + AcceptStorageType: []entity.StorageType{entity.MINIO, entity.OBS}, + }, + entity.ContainerDataset: { + ContainerPath: "/tmp" + datasetPath, + ReadOnly: true, + AcceptStorageType: []entity.StorageType{entity.MINIO, entity.OBS}, + }, + entity.ContainerPreTrainModel: { + ContainerPath: "/tmp" + pretrainModelPath, + ReadOnly: true, + AcceptStorageType: []entity.StorageType{entity.MINIO, entity.OBS}, + }, + entity.ContainerOutPutPath: { + ContainerPath: "/tmp" + outputPath, + StorageRelativePath: cloudbrain.ModelMountPath, + ReadOnly: false, + AcceptStorageType: []entity.StorageType{entity.MINIO}, + MKDIR: false, + }, + }, + } + + switch opts.ComputeSource { + case models.GPU: + config.ActionType = models.ActionCreateGrampusGPUInferenceTask + case models.ILUVATAR: + config.ActionType = models.ActionCreateGrampusILUVATARInferenceTask + } + + config.IsActionUseJobId = true + return config +} + +func (t GrampusInferenceTaskTemplate) Create(ctx *context.CreationContext) (*entity.CreateTaskRes, *response.BizError) { + c := &CreateOperator{} + err := c.Next(t.CheckParamFormat). + Next(t.HandleReqParameters). + Next(t.CheckPrivilege4Continue). + Next(t.CheckSourceTaskIsCleared). + Next(t.CheckBranchExists). + Next(t.CheckBootFile). + Next(t.CheckWorkerNum). + Next(t.CheckMultiRequest). + Next(t.CheckDisplayJobName). + Next(t.LoadSpec). + Next(t.CheckPointBalance). + Next(t.CheckDatasets). + Next(t.CheckModel). + Next(t.InsertCloudbrainRecord4Async). + AsyncNextWithErrFun(t.BuildContainerData, t.GetAvailableQueues, t.CallCreationAPI, t.AfterCallCreationAPI4Async, t.NotifyCreation, t.HandleErr4Async). + Operate(ctx) + if err != nil { + log.Error("create GrampusTrainTaskTemplate err.%v", err) + return nil, err + } + return &entity.CreateTaskRes{ID: ctx.NewCloudbrain.ID}, nil +} + +func (g GrampusInferenceTaskTemplate) CallCreationAPI(ctx *context.CreationContext) *response.BizError { + c := g.GetMyCluster() + if c == nil { + return response.SYSTEM_ERROR + } + form := ctx.Request + imageUrl := strings.TrimSpace(form.ImageUrl) + if form.ImageID != "" { + imageUrl = "" + } + req := entity.CreateTrainTaskRequest{ + Name: form.JobName, + DisplayJobName: form.DisplayJobName, + Tasks: []entity.TrainTask{ + { + Name: form.JobName, + ResourceSpecId: ctx.Spec.SourceSpecId, + ImageId: form.ImageID, + ImageUrl: imageUrl, + Datasets: ctx.GetContainerDataArray(entity.ContainerDataset), + Code: ctx.GetContainerDataArray(entity.ContainerCode), + Queues: ctx.Queues, + PreTrainModel: ctx.GetContainerDataArray(entity.ContainerPreTrainModel), + BootFile: form.BootFile, + OutPut: ctx.GetContainerDataArray(entity.ContainerOutPutPath), + Params: form.ParamArray, + Spec: ctx.Spec, + RepoName: ctx.Repository.Name, + WorkServerNumber: ctx.Request.WorkServerNumber, + }, + }, + TaskConfig: ctx.Config, + } + createTime := timeutil.TimeStampNow() + res, err := c.CreateTrainJob(req) + if err != nil { + log.Error("GrampusTrainTaskTemplate CreateTrainJob err.req=%+v err=%v", req, err) + return response.NewBizError(err) + } + ctx.Response = &entity.CreationResponse{ + JobID: res.JobID, + Status: res.Status, + CreateTime: createTime, + } + return nil +} diff --git a/services/ai_task_service/task/opt_handler.go b/services/ai_task_service/task/opt_handler.go index e92320bdeb..af94df8f88 100644 --- a/services/ai_task_service/task/opt_handler.go +++ b/services/ai_task_service/task/opt_handler.go @@ -144,7 +144,7 @@ func (g DefaultCreationHandler) CheckDatasets(ctx *context.CreationContext) *res attachSize += infos.Size } limitSizeGB := ctx.Config.DatasetsLimitSizeGB - if limitSizeGB > 0 && attachSize > int64(limitSizeGB*1000*1000*1000) { + if limitSizeGB > 0 && attachSize > int64(limitSizeGB*1024*1024*1024) { log.Error("The DatasetSize exceeds the limit (%dGB)", limitSizeGB) // GB return response.DATASET_SIZE_OVER_LIMIT.WithParams(limitSizeGB) } diff --git a/services/ai_task_service/task/task_creation_info.go b/services/ai_task_service/task/task_creation_info.go index 82d67bf244..406e0e4d32 100644 --- a/services/ai_task_service/task/task_creation_info.go +++ b/services/ai_task_service/task/task_creation_info.go @@ -87,7 +87,7 @@ func GetAITaskCreationInfo(req entity.GetAITaskCreationInfoReq) (*entity.Creatio } result.Config = entity.AITaskCreationConfig{ - DatasetMaxSize: setting.DebugAttachSize * 1000 * 1000 * 1000, + DatasetMaxSize: setting.DebugAttachSize * 1024 * 1024 * 1024, } //查询可用节点数 if workerNums, err := t.GetAllowedWorkerNum(req.User.ID, req.ComputeSource); err == nil { diff --git a/services/cloudbrain/cloudbrainTask/notebook.go b/services/cloudbrain/cloudbrainTask/notebook.go index 1977e83155..44d2ff0dd0 100644 --- a/services/cloudbrain/cloudbrainTask/notebook.go +++ b/services/cloudbrain/cloudbrainTask/notebook.go @@ -170,7 +170,7 @@ func GrampusNotebookCreate(ctx *context.Context, option api.CreateNotebookOption for _, infos := range datasetInfos { attachSize += infos.Size } - if attachSize > int64(setting.DebugAttachSize*1000*1000*1000) { + if attachSize > int64(setting.DebugAttachSize*1024*1024*1024) { log.Error("The DatasetSize exceeds the limit (%dGB)", setting.DebugAttachSize) // GB ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("cloudbrain.error.debug_datasetsize", setting.DebugAttachSize))) return diff --git a/services/socketwrap/clientManager.go b/services/socketwrap/clientManager.go index f3a4532b42..05bdb9c2d2 100755 --- a/services/socketwrap/clientManager.go +++ b/services/socketwrap/clientManager.go @@ -10,7 +10,7 @@ import ( "github.com/elliotchance/orderedmap" ) -var opTypes = []int{1, 2, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 17, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 35, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49} +var opTypes = []int{1, 2, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 17, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 35, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51} type ClientsManager struct { Clients *orderedmap.OrderedMap diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index 4199b92fc2..7d54a9e0f5 100755 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -89,7 +89,7 @@
{{$JobID := '0'}} - {{if eq .JobType "DEBUG" "TRAIN" "HPC" "SNN4IMAGENET" "BRAINSCORE" "BENCHMARK" "MODELSAFETY" "SNN4ECOSET" "SIM2BRAIN_SNN" "ONLINEINFERENCE"}} + {{if eq .JobType "DEBUG" "TRAIN" "INFERENCE" "HPC" "SNN4IMAGENET" "BRAINSCORE" "BENCHMARK" "MODELSAFETY" "SNN4ECOSET" "SIM2BRAIN_SNN" "ONLINEINFERENCE"}} {{$JobID = .Cloudbrain.ID}} {{else}} {{$JobID = .JobID}} @@ -119,7 +119,7 @@ {{else if eq .JobType "INFERENCE"}} {{.DisplayJobName}} @@ -155,7 +155,7 @@
@@ -351,7 +351,7 @@ {{else}}
{{$.CsrfTokenHtml}} diff --git a/templates/repo/cloudbrain/inference/new.tmpl b/templates/repo/cloudbrain/inference/new.tmpl index 052ba8e614..e36addbb2e 100644 --- a/templates/repo/cloudbrain/inference/new.tmpl +++ b/templates/repo/cloudbrain/inference/new.tmpl @@ -1,553 +1 @@ -{{template "base/head" .}} - -{{template "custom/global_mask" .}} -
- {{template "repo/header" .}} -
- {{if eq .NotStopTaskCount 0}} - {{template "base/alert" .}} - {{end}} - {{template "custom/alert_cb" .}} - -

- {{.i18n.Tr "repo.modelarts.train_job.new_infer"}} -

-
- - - {{.CsrfTokenHtml}} - - - - - - - - - - -

{{.i18n.Tr "repo.modelarts.train_job.basic_info"}}:

-
- -
- - - - - - CPU/GPU - - - - - - - Ascend NPU -
-
-
- - {{template "custom/task_wait_count" .}} -
- - {{.i18n.Tr "cloudbrain.new_infer_gpu_tooltips" "/dataset" "/model" "/result" | Safe}} -
-
-
- - - {{.i18n.Tr "repo.cloudbrain_jobname_err"}} -
- -
- - {{if .description}} - - {{else}} - - {{end}} -
-
- - -

{{.i18n.Tr "repo.modelarts.train_job.parameter_setting"}}:

- - -
-
-
-
- -
- -
- - -
- - - -
- -
- -
- - {{if .boot_file}} - - {{else}} - - {{end}} - - - - {{.i18n.Tr "cloudbrain.view_sample"}} -
- - -
- - {{.i18n.Tr "repo.modelarts.train_job.add_run_parameter"}} - -
- -
-
- - - - -
- - - - {{.i18n.Tr "custom.resource_description"}} - {{if .CloudBrainPaySwitch}} -
- {{$.i18n.Tr "points.balance_of_points"}}{{.PointAccount.Balance}}{{$.i18n.Tr "points.points"}}{{$.i18n.Tr "points.expected_time"}}{{$.i18n.Tr "points.hours"}} - - - {{$.i18n.Tr "points.points_acquisition_instructions"}} - -
- {{end}} -
- -
- - - {{.i18n.Tr "repo.cloudbrain.cancel"}} -
- - -
-
-
-{{template "base/footer" .}} - - +{{ template "repo/cloudbrain/cloudbraincreate" .}} diff --git a/templates/repo/cloudbrain/inference/show.tmpl b/templates/repo/cloudbrain/inference/show.tmpl index 4d46aa35ed..73ba5b964e 100644 --- a/templates/repo/cloudbrain/inference/show.tmpl +++ b/templates/repo/cloudbrain/inference/show.tmpl @@ -1,446 +1 @@ -{{template "base/head" .}} - -
-
-
-
-
-
-
-
-
-
- {{template "repo/header" .}} -
-

-
- - {{.i18n.Tr "repo.cloudbrain"}} - -
/
- - {{$.i18n.Tr "repo.modelarts.infer_job"}} - -
/
-
{{.displayJobName}}
-
-

- {{with .task}} -
- -
-
-
- - - -
- {{TimeSinceUnix1 .CreatedUnix}} - - {{$.i18n.Tr "repo.modelarts.status"}}： - {{.Status}} - - {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}： - {{$.duration}} - - -
- - -
-
-
-
-
-
- {{$.i18n.Tr "repo.modelarts.train_job.config"}} - {{$.i18n.Tr "repo.modelarts.log"}} - {{$.i18n.Tr "repo.model_download"}} -
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {{$.i18n.Tr "repo.cloudbrain_task"}} - -
- {{.DisplayJobName}} -
-
- {{$.i18n.Tr "repo.modelarts.status"}} - -
- {{.Status}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.start_time"}} - -
- - {{if not (eq .StartTime 0)}} - {{TimeSinceUnix1 .StartTime}} - {{else}} - -- - {{end}} - -
-
- {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}} - -
- {{.TrainJobDuration}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.resource_type"}} - -
-
- {{$.i18n.Tr "repo.model.manage.description"}} - -
- {{if .Description}} - {{.Description}} - {{else}} - -- - {{end}} -
-
- {{$.i18n.Tr "repo.cloudbrain_creator"}} - -
- {{.User.Name}} -
-
- {{$.i18n.Tr "cloudbrain.mirror"}} - -
- - {{.Image}} - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {{$.i18n.Tr "repo.modelarts.infer_job_model"}} - -
- {{.ModelName}}   - {{$.i18n.Tr "repo.modelarts.version"}}：{{.ModelVersion}}   - -
-
- {{$.i18n.Tr "repo.modelarts.infer_job_model_file"}} - -
- {{.CkptName}} -
-
- {{$.i18n.Tr "repo.modelarts.model_label"}} - -
- {{if .LabelName}} - {{range $.LabelName}} - {{.}} - {{end}} - {{else}} - -- - {{end}} -
-
- {{$.i18n.Tr "repo.modelarts.code_version"}} - -
- {{.BranchName}} - {{SubStr .CommitID 0 10}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.start_file"}} - -
- {{.BootFile}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}} - -
- {{if .Parameters}} - {{.Parameters}} - {{else}} - -- - {{end}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.standard"}} - -
-
-
-
-
- - - - - - {{range $m ,$n := $.datasetDownload}} - - - - - {{end}} - - -
{{$.i18n.Tr "dataset.file"}}
- {{if eq .IsDelete true}} - {{.DatasetName}}({{$.i18n.Tr "dataset.file_deleted"}}) - {{else}} - {{.DatasetName}} - {{end}} -
-
-
- -
-
-
- -
- {{template "custom/task_log" Dict "$" $ "i18n" $.i18n }} -
-
-
{{$.i18n.Tr "repo.modelarts.log_file"}}
-
-
- {{template "custom/task_log" Dict "$" $ "i18n" $.i18n "Full" true }} -
-
-
-
- -
- - -
- - -
-
- -
-
- -
-
-
- - {{end}} -
- -
-{{template "base/footer" .}} - - - \ No newline at end of file +{{ template "repo/cloudbrain/cloudbraindetail" .}} diff --git a/templates/repo/grampus/inference/new.tmpl b/templates/repo/grampus/inference/new.tmpl new file mode 100644 index 0000000000..e36addbb2e --- /dev/null +++ b/templates/repo/grampus/inference/new.tmpl @@ -0,0 +1 @@ +{{ template "repo/cloudbrain/cloudbraincreate" .}} diff --git a/templates/repo/grampus/inference/show.tmpl b/templates/repo/grampus/inference/show.tmpl new file mode 100644 index 0000000000..73ba5b964e --- /dev/null +++ b/templates/repo/grampus/inference/show.tmpl @@ -0,0 +1 @@ +{{ template "repo/cloudbrain/cloudbraindetail" .}} diff --git a/templates/repo/modelarts/inferencejob/index.tmpl b/templates/repo/modelarts/inferencejob/index.tmpl index 2e82e6b799..e6d044d8f4 100644 --- a/templates/repo/modelarts/inferencejob/index.tmpl +++ b/templates/repo/modelarts/inferencejob/index.tmpl @@ -1,311 +1,9 @@ - {{template "base/head" .}} - - - - - -
- + +
{{template "repo/header" .}} - -
- {{template "base/alert" .}} -
-
-
- {{$.i18n.Tr "repo.modelarts.notebook"}} - {{$.i18n.Tr "repo.modelarts.train_job"}} - {{$.i18n.Tr "repo.modelarts.infer_job"}} - {{$.i18n.Tr "repo.modelarts.evaluate_job"}} - {{$.i18n.Tr "repo.modelarts.online_infer"}} - {{if MLOPS}} - - 在线推理1 - - - 流水线 - - {{end}} -
-
-
-
- {{svg "octicon-server" 16}} -
- -
-
{{$.i18n.Tr "repo.gpu_type_all"}}
-
CPU/GPU
-
NPU
-
-
- {{if .Permission.CanWrite $.UnitTypeCloudBrain}} - {{$.i18n.Tr "repo.modelarts.train_job.new_infer"}} - {{else}} - {{$.i18n.Tr "repo.modelarts.train_job.new_infer"}} - {{end}} -
-
- {{if eq 0 (len .Tasks)}} -
-
-
{{$.i18n.Tr "repo.inference_job_not_created"}}
-
- {{if $.RepoIsEmpty}} -
{{$.i18n.Tr "repo.repo_not_initialized" .RepoLink | Safe}}
- {{end}} - {{if eq 0 $.MODEL_COUNT}} -
{{$.i18n.Tr "repo.model_not_exist" .RepoLink .RepoLink | Safe}}
- {{end}} -
{{$.i18n.Tr "repo.dataset_desc"}}
-
{{$.i18n.Tr "repo.platform_instructions" "https://openi.pcl.ac.cn/docs/index.html#/cloudbrain/infer/inference-job" | Safe}}
-
-
- {{else}} - -
-
-
- -
- - -
-
-
- {{$.i18n.Tr "repo.cloudbrain_task"}} -
-
- {{$.i18n.Tr "repo.modelarts.infer_job.model_version"}} -
-
- {{$.i18n.Tr "repo.modelarts.status"}} -
-
- {{$.i18n.Tr "repo.modelarts.createtime"}} -
-
- {{$.i18n.Tr "repo.cloudbrain_status_runtime"}} -
-
- {{$.i18n.Tr "repo.modelarts.computing_resources"}} -
-
- {{$.i18n.Tr "repo.cloudbrain_creator"}} -
-
- {{$.i18n.Tr "repo.cloudbrain_operate"}} -
-
-
- - {{range .Tasks}} -
-
- - -
- - - {{.DisplayJobName}} - -
- - -
- - {{.ModelName}}  {{.ModelVersion}} -
- -
- - {{.Status}} - -
- -
- {{TimeSinceUnix .Cloudbrain.CreatedUnix $.Lang}} -
- -
- {{.TrainJobDuration}} -
- -
- {{.ComputeResource}} -
- -
- {{if .User.Name}} - - {{else}} - - {{end}} -
- -
- - {{if eq .Cloudbrain.Type 0 }} -
-
- {{$.CsrfTokenHtml}} - {{if .CanDel}} - - {{$.i18n.Tr "repo.stop"}} - - {{else}} - - {{$.i18n.Tr "repo.stop"}} - - {{end}} -
-
- {{else}} -
- {{$.CsrfTokenHtml}} - {{if .CanDel}} - - {{$.i18n.Tr "repo.stop"}} - - {{else}} - - {{$.i18n.Tr "repo.stop"}} - - {{end}} - -
- {{end}} - -
- {{$.CsrfTokenHtml}} - {{if .CanModify}} - - {{$.i18n.Tr "repo.model_download"}} - - {{else}} - - {{$.i18n.Tr "repo.model_download"}} - - {{end}} -
- -
- {{$.CsrfTokenHtml}} - {{if .CanDel}} - {{if eq .Cloudbrain.Type 0 }} - - {{$.i18n.Tr "repo.delete"}} - - {{else}} - - {{$.i18n.Tr "repo.delete"}} - - {{end}} - - {{else}} - - {{$.i18n.Tr "repo.delete"}} - - {{end}} -
-
-
-
- {{end}} -
-
- - -
-
-
- {{template "custom/save_most_time" .}} -
-
-
- {{end}} - -
- -
-
- -
- - -
-
-
- {{.i18n.Tr "cloudbrain.delete_task"}} -
- -
-

{{.i18n.Tr "cloudbrain.task_delete_confirm"}}

-
-
-
- {{.i18n.Tr "cloudbrain.operate_cancel"}} -
-
- {{.i18n.Tr "cloudbrain.operate_confirm"}} -
-
-
-
+
+ {{template "base/footer" .}} - - - diff --git a/templates/repo/modelarts/inferencejob/new.tmpl b/templates/repo/modelarts/inferencejob/new.tmpl index 0082c266c4..e36addbb2e 100644 --- a/templates/repo/modelarts/inferencejob/new.tmpl +++ b/templates/repo/modelarts/inferencejob/new.tmpl @@ -1,577 +1 @@ -{{template "base/head" .}} - -{{template "custom/global_mask" .}} -
- {{template "repo/header" .}} -
- {{if eq .NotStopTaskCount 0}} - {{template "base/alert" .}} - {{end}} - {{template "custom/alert_cb" .}} - -

- {{.i18n.Tr "repo.modelarts.train_job.new_infer"}} -

-
- -
- {{.CsrfTokenHtml}} - - - - - - - - - - - - -

{{.i18n.Tr "repo.modelarts.train_job.basic_info"}}:

-
- -
- - - - - - CPU/GPU - - - - - - - Ascend NPU -
-
-
- - {{template "custom/task_wait_count" .}} -
- - {{.i18n.Tr "cloudbrain.infer_dataset_path_rule" | Safe}} -
-
-
- - - {{.i18n.Tr "repo.cloudbrain_jobname_err"}} -
- -
- - {{if .description}} - - {{else}} - - {{end}} -
-
-

{{.i18n.Tr "repo.modelarts.train_job.parameter_setting"}}:

- - -
-
-
-
- -
- -
- -
- -
- - -
- -
- -
- - -
- - -
- -
- -
- - {{if .bootFile}} - - {{else}} - - {{end}} - - - - {{.i18n.Tr "cloudbrain.view_sample"}} -
- - -
- - {{.i18n.Tr "repo.modelarts.train_job.add_run_parameter"}} - -
- {{if ne 0 (len .params)}} - {{range $k ,$v := .params}} -
-
- -
-
- -
- - - - -
- {{end}} - {{end}} -
-
- - - - -
- - - - {{.i18n.Tr "custom.resource_description"}} - {{if .CloudBrainPaySwitch}} -
- {{$.i18n.Tr "points.balance_of_points"}}{{.PointAccount.Balance}}{{$.i18n.Tr "points.points"}}{{$.i18n.Tr "points.expected_time"}}{{$.i18n.Tr "points.hours"}} - - - {{$.i18n.Tr "points.points_acquisition_instructions"}} - -
- {{end}} -
- -
- - -
- -
-
- -
- - - {{.i18n.Tr "repo.cloudbrain.cancel"}} -
- -
-
-
-
-{{template "base/footer" .}} - - +{{ template "repo/cloudbrain/cloudbraincreate" .}} diff --git a/templates/repo/modelarts/inferencejob/show.tmpl b/templates/repo/modelarts/inferencejob/show.tmpl index 97aa682a4f..73ba5b964e 100644 --- a/templates/repo/modelarts/inferencejob/show.tmpl +++ b/templates/repo/modelarts/inferencejob/show.tmpl @@ -1,435 +1 @@ -{{template "base/head" .}} - -
-{{template "repo/header" .}} -
-

-
- - {{.i18n.Tr "repo.cloudbrain"}} - -
/
- - {{$.i18n.Tr "repo.modelarts.infer_job"}} - -
/
-
{{.displayJobName}}
-
-

- {{with .task}} -
- -
-
-
- - - -
- {{TimeSinceUnix1 .CreatedUnix}} - - {{$.i18n.Tr "repo.modelarts.status"}}： - {{.Status}} - - {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}： - {{.TrainJobDuration}} - - -
- - -
-
-
-
-
-
- - {{$.i18n.Tr "repo.modelarts.train_job.config"}} - {{$.i18n.Tr "repo.modelarts.log"}} - {{$.i18n.Tr "repo.model_download"}} -
- -
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {{$.i18n.Tr "repo.cloudbrain_task"}} - -
- {{.DisplayJobName}} -
-
- {{$.i18n.Tr "repo.modelarts.status"}} - -
- {{.Status}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.start_time"}} - -
- - {{if not (eq .StartTime 0)}} - {{TimeSinceUnix1 .StartTime}} - {{else}} - -- - {{end}} - -
-
- {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}} - -
- {{.TrainJobDuration}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.AI_driver"}} - -
- {{.EngineName}} -
-
- {{$.i18n.Tr "repo.model.manage.description"}} - -
- {{if .Description}} - {{.Description}} - {{else}} - -- - {{end}} -
-
- {{$.i18n.Tr "repo.cloudbrain_creator"}} - -
- {{$.userName}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.compute_node"}} - -
- {{.WorkServerNumber}} -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {{$.i18n.Tr "repo.modelarts.infer_job_model"}} - -
- {{.ModelName}}   - {{$.i18n.Tr "repo.modelarts.version"}}：{{.ModelVersion}}   - -
-
- {{$.i18n.Tr "repo.modelarts.infer_job_model_file"}} - -
- {{.CkptName}} -
-
- {{$.i18n.Tr "repo.modelarts.model_label"}} - -
- - {{if .LabelName}} - {{range $.labelName}} - {{.}} - {{end}} - {{else}} - -- - {{end}} -
-
- {{$.i18n.Tr "repo.modelarts.code_version"}} - -
- {{.BranchName}} - {{SubStr .CommitID 0 10}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.start_file"}} - -
- {{.BootFile}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}} - -
- {{if .Parameters}} - {{.Parameters}} - {{else}} - -- - {{end}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.standard"}} - -
-
-
-
-
- - - - - - {{range $m ,$n := $.datasetDownload}} - - - - - {{end}} - - -
{{$.i18n.Tr "dataset.file"}}
- {{if eq .IsDelete true}} - {{.DatasetName}}({{$.i18n.Tr "dataset.file_deleted"}}) - {{else}} - {{.DatasetName}} - {{end}} - -
-
-
- -
-
- -
- -
- {{template "custom/task_log" Dict "$" $ "i18n" $.i18n }} -
-
-
{{$.i18n.Tr "repo.modelarts.log_file"}}
-
-
- {{template "custom/task_log" Dict "$" $ "i18n" $.i18n "Full" true }} -
-
-
-
-
- - - -
- -
-
- -
-
-
- - {{end}} -
- -
-{{template "base/footer" .}} - - +{{ template "repo/cloudbrain/cloudbraindetail" .}} diff --git a/templates/user/auth/signin_navbar.tmpl b/templates/user/auth/signin_navbar.tmpl index b0d58ee702..e8d8485cb4 100755 --- a/templates/user/auth/signin_navbar.tmpl +++ b/templates/user/auth/signin_navbar.tmpl @@ -8,9 +8,9 @@ {{.i18n.Tr "phone.account_password_login"}} - + {{if .EnableOpenIDSignIn}} diff --git a/templates/user/dashboard/cloudbrains.tmpl b/templates/user/dashboard/cloudbrains.tmpl index fa245f1838..5d902a441e 100755 --- a/templates/user/dashboard/cloudbrains.tmpl +++ b/templates/user/dashboard/cloudbrains.tmpl @@ -72,7 +72,7 @@
{{$JobID := '0'}} - {{if eq .JobType "DEBUG" "TRAIN" "HPC" "SNN4IMAGENET" "BRAINSCORE" "BENCHMARK" "MODELSAFETY" "SNN4ECOSET" "SIM2BRAIN_SNN" "ONLINEINFERENCE"}} + {{if eq .JobType "DEBUG" "TRAIN" "INFERENCE" "HPC" "SNN4IMAGENET" "BRAINSCORE" "BENCHMARK" "MODELSAFETY" "SNN4ECOSET" "SIM2BRAIN_SNN" "ONLINEINFERENCE"}} {{$JobID = .Cloudbrain.ID}} {{else}} {{$JobID = .JobID}} @@ -102,7 +102,7 @@ {{else if eq .JobType "INFERENCE"}} {{.DisplayJobName}} @@ -321,7 +321,7 @@ {{else}}
{{$.CsrfTokenHtml}} @@ -380,7 +380,7 @@
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 017e6963a1..f7d35911ff 100755 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -91,7 +91,23 @@ {{$.i18n.Tr "action.task_nputrainjob" "" "" "" | Str2html}}{{.RefName}}{{$.i18n.Tr "repo.issues.deleted_milestone"}} {{end}} {{else if eq .GetOpType 28}} - {{$.i18n.Tr "action.task_inferencejob" .GetRepoLink .Content .RefName | Str2html}} + {{if .Cloudbrain}} + {{$.i18n.Tr "action.task_inferencejob" .GetRepoLink (Printf "%d" .Cloudbrain.ID) .RefName | Str2html}} + {{else}} + {{$.i18n.Tr "action.task_inferencejob" "" "" "" | Str2html}}{{.RefName}}{{$.i18n.Tr "repo.issues.deleted_milestone"}} + {{end}} + {{else if eq .GetOpType 50}} + {{if .Cloudbrain}} + {{$.i18n.Tr "action.task_c2net_gpu_inferencejob" .GetRepoLink (Printf "%d" .Cloudbrain.ID) .RefName | Str2html}} + {{else}} + {{$.i18n.Tr "action.task_c2net_gpu_inferencejob" "" "" "" | Str2html}}{{.RefName}}{{$.i18n.Tr "repo.issues.deleted_milestone"}} + {{end}} + {{else if eq .GetOpType 51}} + {{if .Cloudbrain}} + {{$.i18n.Tr "action.task_c2net_gpgpu_iluvatar_inferencejob" .GetRepoLink (Printf "%d" .Cloudbrain.ID) .RefName | Str2html}} + {{else}} + {{$.i18n.Tr "action.task_c2net_gpgpu_iluvatar_inferencejob" "" "" "" | Str2html}}{{.RefName}}{{$.i18n.Tr "repo.issues.deleted_milestone"}} + {{end}} {{else if eq .GetOpType 29}} {{$.i18n.Tr "action.task_benchmark" .GetRepoLink .Content .RefName | Str2html}} {{else if eq .GetOpType 30}} @@ -241,6 +257,10 @@ {{else if eq .GetOpType 28}} + {{else if eq .GetOpType 50}} + + {{else if eq .GetOpType 51}} + {{else if eq .GetOpType 29}} {{else if eq .GetOpType 30}} diff --git a/web_src/js/components/dataset/selectDataset.vue b/web_src/js/components/dataset/selectDataset.vue index a13634c40d..34e302d0b5 100755 --- a/web_src/js/components/dataset/selectDataset.vue +++ b/web_src/js/components/dataset/selectDataset.vue @@ -180,7 +180,7 @@ class="unzip-failed" v-if="data.Size > exceedSize" > - {{ i18n.dataset_exceeds_failed }}{{exceedSize/(1000*1000*1000)}}G + {{ i18n.dataset_exceeds_failed }}{{exceedSize/(1024*1024*1024)}}G @@ -292,7 +292,7 @@ class="unzip-failed" v-if="data.Size > exceedSize" > - {{ i18n.dataset_exceeds_failed }}{{exceedSize/(1000*1000*1000)}}G + {{ i18n.dataset_exceeds_failed }}{{exceedSize/(1024*1024*1024)}}G @@ -404,7 +404,7 @@ class="unzip-failed" v-if="data.Size > exceedSize" > - {{ i18n.dataset_exceeds_failed }}{{exceedSize/(1000*1000*1000)}}G + {{ i18n.dataset_exceeds_failed }}{{exceedSize/(1024*1024*1024)}}G @@ -516,7 +516,7 @@ class="unzip-failed" v-if="data.Size > exceedSize" > - {{ i18n.dataset_exceeds_failed }}{{exceedSize/(1000*1000*1000)}}G + {{ i18n.dataset_exceeds_failed }}{{exceedSize/(1024*1024*1024)}}G diff --git a/web_src/js/index.js b/web_src/js/index.js index 1ff7b808ca..661a98cfae 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -1179,6 +1179,7 @@ async function initRepository() { headers: { "X-Csrf-Token": csrf }, maxFiles: $dropzone.data("max-file"), maxFilesize: $dropzone.data("max-size"), + filesizeBase: 1024, acceptedFiles: $dropzone.data("accepts") === "*/*" ? null @@ -2828,6 +2829,7 @@ $(document).ready(async () => { headers: { "X-Csrf-Token": csrf }, maxFiles: $dropzone.data("max-file"), maxFilesize: $dropzone.data("max-size"), + filesizeBase: 1024, acceptedFiles: $dropzone.data("accepts") === "*/*" ? null : $dropzone.data("accepts"), addRemoveLinks: true, diff --git a/web_src/vuepages/components/cloudbrain/DatasetSelect.vue b/web_src/vuepages/components/cloudbrain/DatasetSelect.vue index 9a7ce8750e..cc3224a5d1 100644 --- a/web_src/vuepages/components/cloudbrain/DatasetSelect.vue +++ b/web_src/vuepages/components/cloudbrain/DatasetSelect.vue @@ -78,7 +78,7 @@ {{ $t('datasetObj.dataset_unzip_failed') }} - {{ $t('datasetObj.dataset_exceeds_failed') }}{{ exceedSize / (1000 * 1000 * 1000) }}G + {{ $t('datasetObj.dataset_exceeds_failed') }}{{ exceedSize / (1024 * 1024 * 1024) }}G diff --git a/web_src/vuepages/const/index.js b/web_src/vuepages/const/index.js index 290e3bb44d..1c832260e0 100644 --- a/web_src/vuepages/const/index.js +++ b/web_src/vuepages/const/index.js @@ -12,7 +12,7 @@ export const JOB_TYPE = [{ k: 'DEBUG', v: i18n.t('debugTask') }, { k: 'TRAIN', v export const CLUSTERS = [{ k: 'OpenI', v: i18n.t('resourcesManagement.OpenI') }, { k: 'C2Net', v: i18n.t('resourcesManagement.C2Net') }]; export const AI_CENTER = [{ k: 'OpenIOne', v: i18n.t('resourcesManagement.OpenIOne') }, { k: 'OpenITwo', v: i18n.t('resourcesManagement.OpenITwo') }, { k: 'OpenIChengdu', v: i18n.t('resourcesManagement.OpenIChengdu') }, { k: 'pclcci', v: i18n.t('resourcesManagement.pclcci') }, { k: 'hefei', v: i18n.t('resourcesManagement.hefeiCenter') }, { k: 'xuchang', v: i18n.t('resourcesManagement.xuchangCenter') }]; export const COMPUTER_RESOURCES = [{ k: 'CPU', v: 'CPU' }, { k: 'GPU', v: 'GPU' }, { k: 'NPU', v: 'NPU' }, { k: 'GCU', v: 'GCU' }, { k: 'MLU', v: 'MLU' }, { k: 'DCU', v: 'DCU' }, { k: 'ILUVATAR-GPGPU', v: 'ILUVATAR-GPGPU' }, { k: 'METAX-GPGPU', v: 'METAX-GPGPU' }]; -export const ACC_CARD_TYPE = [{ k: 'T4', v: 'T4' }, { k: 'A100', v: 'A100' }, { k: 'V100', v: 'V100' }, { k: 'ASCEND910', v: 'Ascend 910' }, { k: 'MLU270', v: 'MLU270' }, { k: 'MLU290', v: 'MLU290' }, { k: 'RTX3080', v: 'RTX3080' }, { k: 'ENFLAME-T20', v: 'ENFLAME-T20' }, { k: 'DCU', v: 'DCU' }, { k: 'BI-V100', v: 'BI-V100' }, { k: 'MR-V100', v: 'MR-V100' }, { k: 'N100', v: 'N100' }]; +export const ACC_CARD_TYPE = [{ k: 'T4', v: 'T4' }, { k: 'A100', v: 'A100' }, { k: 'V100', v: 'V100' }, { k: 'ASCEND910', v: 'Ascend 910' }, { k: 'ASCEND-D910B', v: 'Ascend-D910B' }, { k: 'MLU270', v: 'MLU270' }, { k: 'MLU290', v: 'MLU290' }, { k: 'RTX3080', v: 'RTX3080' }, { k: 'ENFLAME-T20', v: 'ENFLAME-T20' }, { k: 'DCU', v: 'DCU' }, { k: 'BI-V100', v: 'BI-V100' }, { k: 'MR-V100', v: 'MR-V100' }, { k: 'N100', v: 'N100' }]; export const SPECIFICATION_STATUS = [{ k: '1', v: i18n.t('resourcesManagement.willOnShelf') }, { k: '2', v: i18n.t('resourcesManagement.onShelf') }, { k: '3', v: i18n.t('resourcesManagement.offShelf') }]; export const NETWORK_TYPE = [{ k: 1, v: `${i18n.t('cloudbrainObj.networkType')}(${i18n.t('cloudbrainObj.noInternet')})` }, { k: 2, v: `${i18n.t('cloudbrainObj.networkType')}(${i18n.t('cloudbrainObj.hasInternet')})` }]; export const NETWORK_TYPE_VALUE = [{ k: 1, v: i18n.t('cloudbrainObj.noInternet') }, { k: 2, v: i18n.t('cloudbrainObj.hasInternet') }]; diff --git a/web_src/vuepages/langs/config/en-US.js b/web_src/vuepages/langs/config/en-US.js index 08f4be853c..dc509b4873 100644 --- a/web_src/vuepages/langs/config/en-US.js +++ b/web_src/vuepages/langs/config/en-US.js @@ -538,14 +538,16 @@ const en = { computeResource: 'Computing resources', sameTaskTips1: 'You have created an equivalent task that is waiting or running, please wait for the task to finish before creating it.', sameTaskTips2: 'You can view all your Cloud Brain tasks in Home > Cloudbrain Task .', - pathTips1: 'The code is storaged in {code}, the dataset is storaged in {dataset}, the pre-trained model is storaged in the run parameter {model}, and please put your model into {output} then you can download it online', - pathTips11: 'The code is storaged in {code}, the dataset is storaged in {dataset}, the pre-trained model is storaged in the {model}, and please put your model into {output} then you can download it online', - pathTips2: 'The code is storaged in {code}, the dataset is storaged in {dataset}, the pre-trained model is storaged in the {model}, and please put your model into {output} then you can download it online', + pathTips1: 'The code is storaged in {code}, the dataset is storaged in {dataset}, the pre-trained model is storaged in the run parameter {model}, and please put your model into {output} then you can download it online.', + pathTips11: 'The code is storaged in {code}, the dataset is storaged in {dataset}, the pre-trained model is storaged in the {model}, and please put your model into {output} then you can download it online.', + pathTips2: 'The code is storaged in {code}, the dataset is storaged in {dataset}, the pre-trained model is storaged in the {model}, and please put your model into {output} then you can download it online.', pathTips3: 'The code is storaged in {code}, the dataset is storaged in {dataset}, the pre-trained model is storaged in the {model}.', - pathTips4: 'The code is storaged in {code}, the pre-trained model is storaged in the run parameter {model}, and please put your model into {output} then you can download it online', + pathTips4: 'The code is storaged in {code}, the pre-trained model is storaged in the run parameter {model}, and please put your model into {output} then you can download it online.', pathTips5: 'The dataset is stored in {dataset}, the model file is stored in {model}, please store the inference output in {output} for subsequent downloads.', pathTips6: 'The dataset location is stored in the run parameter {dataset}, the pre-trained model is storaged in the run parameter {model}, and the output path is stored in the run parameter {output}.', pathTips66: 'The dataset location is stored in the run parameter {dataset}, the pre-trained model is storaged in the run parameter {model}, and please put your model into {output} then you can download it online.', + pathTips7: 'The dataset location is stored in the run parameter {dataset}, the model file is stored in the run parameter {model}, and the inference output path is stored in the run parameter {output}.', + pathTips71: 'The code is storaged in {code}, the dataset is storaged in {dataset}, the model file is storaged in the {model}, and please put your inference output into {output} then you can download it online.', basicInfo: 'Basic Info', paramsSetting: 'Parameter setting', taskPrepareTips: 'The task is currently being prepared. Drink a glass of water and come back to take a look~', @@ -631,18 +633,21 @@ const en = { debugTaskEmptyTitle: 'Debug task has not been created', debugTaskEmptyTip0: 'Code version: You have not initialized the code repository, please initialized first;', debugTaskEmptyTip1: 'Running time: no more than 4 hours, it will automatically stop if it exceeds 4 hours;', - debugTaskEmptyTip2: 'Dataset: Cloud Brain 1 provides CPU/GPU,Cloud Brain 2 provides Ascend NPU.And dataset also needs to be uploaded to the corresponding environment;', + debugTaskEmptyTip2: 'Dataset: Cloud Brain 1 provides CPU/GPU,Cloud Brain 2 provides Ascend NPU. And dataset also needs to be uploaded to the corresponding environment;', debugTaskEmptyTip3: 'Instructions for use: You can refer to the OpenI AI collaboration platform Help Center .', onlineInferTaskEmptyTitle: 'Online Inference task has not been created', - onlineInferEmptyTip2: 'Dataset: Cloud Brain 1 provides CPU/GPU,Cloud Brain 2 provides Ascend NPU.And dataset also needs to be uploaded to the corresponding environment;', + onlineInferEmptyTip2: 'Dataset: Cloud Brain 1 provides CPU/GPU,Cloud Brain 2 provides Ascend NPU. And dataset also needs to be uploaded to the corresponding environment;', superTaskEmptyTitle: 'HPC task has not been created', deleteConfirmTips: 'Are you sure you want to delete this task? Once this task is deleted, it cannot be recovered.', deletingTips: 'Task deletion in progress, please wait', tabTitDebug: 'Debug Task', tabTitTrain: 'Train Task', - tabTitInference: 'Inference Job', + tabTitInference: 'Inference Task', tabTitBenchmark: 'Model Evaluation', trainTaskEmptyTitle: 'Train task has not been created', + trainTaskEmptyTip2: 'Dataset: Cloud Brain 1 provides CPU/GPU,Cloud Brain 2 provides Ascend NPU. And dataset also needs to be uploaded to the corresponding environment;', + inferenceTaskEmptyTitle: 'Inference task has not been created', + inferenceTaskEmptyTip2: 'Dataset: Cloud Brain 1 provides CPU/GPU,Cloud Brain 2 provides Ascend NPU. And dataset also needs to be uploaded to the corresponding environment;', bootFileTips: 'The startup file is the entry file that your program executes, and it must be a file ending in .py', viewSample: 'View sample', tabTitOnlineInference: 'Online Inference', diff --git a/web_src/vuepages/langs/config/zh-CN.js b/web_src/vuepages/langs/config/zh-CN.js index 34c2422b23..33e5156084 100644 --- a/web_src/vuepages/langs/config/zh-CN.js +++ b/web_src/vuepages/langs/config/zh-CN.js @@ -562,6 +562,8 @@ const zh = { pathTips5: '数据集存储在 {dataset} 中，模型文件存储在 {model} 中，推理输出请存储在 {output} 中以供后续下载。', pathTips6: '数据集位置存储在运行参数 {dataset} 中，预训练模型存放在运行参数 {model} 中，训练输出路径存储在运行参数 {output} 中。', pathTips66: '数据集位置存储在运行参数 {dataset} 中，预训练模型存放在运行参数 {model} 中，训练输出请存储在 {output} 中以供后续下载。', + pathTips7: '数据集位置存储在运行参数 {dataset} 中，模型存放在运行参数 {model} 中，推理输出路径存储在运行参数 {output} 中。', + pathTips71: '推理脚本存储在 {code} 中，数据集存储在 {dataset} 中，模型存储在 {model} 中，推理输出请存储在 {output} 中以供后续下载。', basicInfo: '基本信息', paramsSetting: '参数设置', taskPrepareTips: '任务正在准备中，喝杯水回来再看看~', @@ -659,6 +661,9 @@ const zh = { tabTitInference: '推理任务', tabTitBenchmark: '评测任务', trainTaskEmptyTitle: '未创建过训练任务', + trainTaskEmptyTip2: '数据集：云脑1提供 CPU / GPU 资源，云脑2提供 Ascend NPU 资源，训练使用的数据集也需要上传到对应的环境；', + inferenceTaskEmptyTitle: '未创建过推理任务', + inferenceTaskEmptyTip2: '数据集：云脑1提供 CPU / GPU 资源，云脑2提供 Ascend NPU 资源，推理使用的数据集也需要上传到对应的环境；', bootFileTips: '启动文件是您程序执行的入口文件，必须是以.py结尾的文件。比如train.py、main.py、example/train.py、case/main.py。', viewSample: '查看样例', tabTitOnlineInference: '在线推理', diff --git a/web_src/vuepages/pages/cloudbrain/configs.js b/web_src/vuepages/pages/cloudbrain/configs.js index 5666c6bec6..065d36028b 100644 --- a/web_src/vuepages/pages/cloudbrain/configs.js +++ b/web_src/vuepages/pages/cloudbrain/configs.js @@ -34,8 +34,8 @@ export const CreatePageConfigs = { url: 'debugjob?debugListType=all', clusters: ['OpenI', 'C2Net'], 'OpenI': [{ - url: 'cloudbrain/create', - computerResouces: ['GPU', 'NPU'], + url: 'modelarts/notebook/create', + computerResouces: ['NPU'], 'GPU': [{ url: 'cloudbrain/create', clusterType: 'OpenICloudbrainOne', @@ -93,8 +93,8 @@ export const CreatePageConfigs = { model: '/pretrainmodel', }), form: { - taskName: { reuqired: true, }, - taskDescr: { reuqired: false, }, + taskName: { required: true, }, + taskDescr: { required: false, }, taskType: {}, branchName: {}, model: { required: false, multiple: true }, @@ -132,7 +132,7 @@ export const CreatePageConfigs = { taskDescr: { required: false, }, branchName: { required: true, }, model: { required: false, multiple: true }, - imagev2: { required: true }, + imagev2: { required: true, relatedSpec: true }, dataset: { required: false, useExceedSize: true }, networkType: { required: true }, spec: { required: true }, @@ -151,7 +151,7 @@ export const CreatePageConfigs = { taskDescr: { required: false, }, branchName: { required: true, }, model: { required: false, multiple: true }, - imagev2: { required: true }, + imagev2: { required: true, relatedSpec: true }, dataset: { required: false, useExceedSize: true }, networkType: { required: true }, spec: { required: true }, @@ -170,7 +170,7 @@ export const CreatePageConfigs = { taskDescr: { required: false, }, branchName: { required: true, }, model: { required: false, multiple: true }, - imagev2: { required: true }, + imagev2: { required: true, relatedSpec: true }, dataset: { required: false, useExceedSize: true }, networkType: { required: true }, spec: { required: true }, @@ -189,7 +189,7 @@ export const CreatePageConfigs = { taskDescr: { required: false, }, branchName: { required: true, }, model: { required: false, multiple: true }, - imagev2: { required: true }, + imagev2: { required: true, relatedSpec: true }, dataset: { required: false, useExceedSize: true }, networkType: { required: true }, spec: { required: true }, @@ -208,7 +208,7 @@ export const CreatePageConfigs = { taskDescr: { required: false, }, branchName: { required: true, }, model: { required: false, multiple: true }, - imagev2: { required: true }, + imagev2: { required: true, relatedSpec: true }, dataset: { required: false, useExceedSize: true }, networkType: { required: true }, spec: { required: true }, @@ -221,8 +221,8 @@ export const CreatePageConfigs = { url: 'modelarts/train-job?listType=all', clusters: ['OpenI', 'C2Net'], 'OpenI': [{ - url: 'cloudbrain/train-job/create', - computerResouces: ['GPU', 'NPU'], + url: 'modelarts/train-job/create', + computerResouces: ['NPU'], 'GPU': [{ url: 'cloudbrain/train-job/create', clusterType: 'OpenICloudbrainOne', @@ -271,7 +271,7 @@ export const CreatePageConfigs = { branchName: { required: true, }, model: { required: false, multiple: false }, imagev2: { required: true }, - bootFile: { required: true, sampleUrl: 'https://openi.pcl.ac.cn/OpenIOSSG/MINIST_Example' }, + bootFile: { required: true, sampleUrl: 'https://openi.pcl.ac.cn/OpenIOSSG/MNIST_Example' }, dataset: { required: true, type: 1 }, runParameters: { required: false }, networkType: { required: true }, @@ -297,8 +297,8 @@ export const CreatePageConfigs = { output: '/tmp/output', }), form: { - taskName: { reuqired: true, }, - taskDescr: { reuqired: false, }, + taskName: { required: true, }, + taskDescr: { required: false, }, taskType: {}, branchName: {}, model: { multiple: false }, @@ -348,7 +348,7 @@ export const CreatePageConfigs = { taskDescr: { required: false, }, branchName: { required: true, }, model: { required: false, multiple: false }, - imagev2: { required: true }, + imagev2: { required: true, relatedSpec: true }, bootFile: { required: true, sampleUrl: 'https://openi.pcl.ac.cn/OpenIOSSG/MNIST_PytorchExample_GCU/src/branch/master/train_for_c2net.py' }, dataset: { required: true }, runParameters: { required: false }, @@ -371,7 +371,7 @@ export const CreatePageConfigs = { taskDescr: { required: false, }, branchName: { required: true, }, model: { required: false, multiple: false }, - imagev2: { required: true }, + imagev2: { required: true, relatedSpec: true }, bootFile: { required: true, sampleUrl: '' }, dataset: { required: true }, runParameters: { required: false }, @@ -385,23 +385,80 @@ export const CreatePageConfigs = { // 推理任务 'INFERENCE': [{ url: 'modelarts/inference-job', - clusters: ['OpenI'], + clusters: ['OpenI', 'C2Net'], 'OpenI': [{ - url: 'cloudbrain/inference-job/create', - computerResouces: ['GPU', 'NPU'], - 'GPU': [{ - url: 'cloudbrain/inference-job/create', - tips2: '', - // hideTips2: true, - hideCluster: true, - form: {}, - }], + url: 'modelarts/inference-job/create', + computerResouces: ['NPU'], 'NPU': [{ url: 'modelarts/inference-job/create', - tips2: '', - // hideTips2: true, - hideCluster: true, - form: {}, + clusterType: 'OpenICloudbrainTwo', + tips2: i18n.t('cloudbrainObj.pathTips7', { + dataset: 'multi_data_url', + model: 'pretrain_url', + output: 'result_url', + }), + form: { + taskName: { required: true, }, + taskDescr: { required: false, }, + branchName: { required: true, }, + model: { required: true, multiple: false }, + imagev2: { required: true }, + bootFile: { required: true, sampleUrl: 'https://openi.pcl.ac.cn/OpenIOSSG/MNIST_Example/src/branch/master/inference.py' }, + dataset: { required: true, type: 1 }, + runParameters: { required: false }, + networkType: { required: true }, + spec: { required: true }, + workServerNum: { required: true }, + }, + }], + }], + 'C2Net': [{ + url: 'grampus/inference-job/create', + computerResouces: ['GPU', 'ILUVATAR-GPGPU'], + 'GPU': [{ + url: 'grampus/inference-job/create', + clusterType: 'C2Net', + tips2: i18n.t('cloudbrainObj.pathTips71', { + code: '/tmp/code', + dataset: '/tmp/dataset', + model: '/tmp/pretrainmodel', + output: '/tmp/output', + }), + form: { + taskName: { required: true, }, + taskDescr: { required: false, }, + taskType: {}, + branchName: {}, + model: { required: true, multiple: false }, + imagev1: { required: true, type: 2 }, + bootFile: { required: true, sampleUrl: 'https://openi.pcl.ac.cn/OpenIOSSG/MNIST_PytorchExample_GPU/src/branch/master/inference_for_c2net.py' }, + dataset: { required: true, type: 0 }, + runParameters: { required: false }, + networkType: { required: true }, + spec: {}, + }, + }], + 'ILUVATAR-GPGPU': [{ + url: 'modelarts/inference-job/create?type=1', + clusterType: 'C2Net', + tips2: i18n.t('cloudbrainObj.pathTips71', { + code: '/tmp/code', + dataset: '/tmp/dataset', + model: '/tmp/pretrainmodel', + output: '/tmp/output', + }), + form: { + taskName: { required: true, }, + taskDescr: { required: false, }, + branchName: { required: true, }, + model: { required: true, multiple: false }, + imagev2: { required: true, relatedSpec: true }, + bootFile: { required: true, sampleUrl: 'https://openi.pcl.ac.cn/OpenIOSSG/MNIST_PytorchExample_GPU/src/branch/master/inference_for_c2net.py' }, + dataset: { required: true, type: 0 }, + runParameters: { required: false }, + networkType: { required: true }, + spec: { required: true }, + } }], }], }], @@ -488,8 +545,8 @@ export const CreatePageConfigs = { model: '/pretrainmodel', }), form: { - taskName: { reuqired: true, }, - taskDescr: { reuqired: false, }, + taskName: { required: true, }, + taskDescr: { required: false, }, taskType: {}, branchName: {}, bootFile: { required: true, sampleUrl: 'https://openi.pcl.ac.cn/OpenIOSSG/Online-Inference_Example' }, @@ -535,14 +592,20 @@ export const ListPageConfigs = { operations: ['stop', 'modify', 'delete'], emptyTitle: i18n.t('cloudbrainObj.trainTaskEmptyTitle'), emptyTip0: true, - emptyTip1: i18n.t('cloudbrainObj.debugTaskEmptyTip2'), + emptyTip1: i18n.t('cloudbrainObj.trainTaskEmptyTip2'), emptyTip2: i18n.t('cloudbrainObj.debugTaskEmptyTip3'), }, { jobType: 'INFERENCE', + sortList: getSortList(['', 'GPU', 'NPU', 'ILUVATAR-GPGPU']), jobTypeName: getListValueWithKey(JOB_TYPE, 'INFERENCE'), url: 'modelarts/inference-job', - createUrl: 'cloudbrain/inference-job/create', - + createUrl: 'modelarts/inference-job/create', + columns: ['taskName', 'status', 'createTime', 'runDuration', 'clusterAndComputeResource', 'creator'], + operations: ['stop', 'delete'], + emptyTitle: i18n.t('cloudbrainObj.inferenceTaskEmptyTitle'), + emptyTip0: true, + emptyTip1: i18n.t('cloudbrainObj.inferenceTaskEmptyTip2'), + emptyTip2: i18n.t('cloudbrainObj.debugTaskEmptyTip3'), }, { jobType: 'BENCHMARK', jobTypeName: getListValueWithKey(JOB_TYPE, 'BENCHMARK'), @@ -1010,30 +1073,116 @@ export const DetailPageConfigs = { }], }] }], - /* // 推理任务 'INFERENCE': [{ listUrl: 'modelarts/inference-job', - clusters: ['OpenI'], + clusters: ['OpenI', 'C2Net'], 'OpenI': [{ - url: 'cloudbrain/inference-job/create', - computerResouces: ['GPU', 'NPU'], - 'GPU': [{ - url: 'cloudbrain/inference-job/create', - tips2: '', - // hideTips2: true, - hideCluster: true, - form: {}, - }], 'NPU': [{ - url: 'modelarts/inference-job/create', - tips2: '', - // hideTips2: true, - hideCluster: true, - form: {}, + detailUrl: 'modelarts/inference-job/', + summary: [], + operations: [], + tabs: [{ + name: 'configInfo', + fields: [ + 'taskName', 'imagev2', + 'status', 'spec', + 'creator', 'hasInternet', + 'branch', 'modelName', + 'computerRes', 'modelVersion', + 'runVersion', 'modelFiles', + 'createTime', 'bootFile', + 'startTime', 'runParameters', + 'endTime', 'workServerNum', + 'duration', '', + 'descr', '', + 'failedReason', + 'dataset', + 'modelList', + ] + }, { + name: 'logs', + multiNodes: true, + }, { + name: 'resourceUseage', + multiNodes: true, + }, { + name: 'resultDownload' + }], }], }], + 'C2Net': [{ + 'GPU': [{ + detailUrl: 'grampus/inference-job/', + summary: [], + operations: [], + tabs: [{ + name: 'configInfo', + fields: [ + 'taskName', 'imagev1', + 'status', 'spec', + 'creator', 'aiCenter', + 'branch', 'hasInternet', + 'computerRes', 'modelName', + 'createTime', 'modelVersion', + 'startTime', 'modelFiles', + 'endTime', 'bootFile', + 'duration', 'runParameters', + 'descr', 'workServerNum', + 'failedReason', '', + 'dataset', + 'modelList', + ] + }, { + name: 'operationProfile' + }, { + name: 'logs', + noScroll: true, + multiNodes: true, + }, { + name: 'resourceUseage', + multiNodes: true, + }, { + name: 'resultDownload' + }], + }], + 'ILUVATAR-GPGPU': [{ + detailUrl: 'grampus/inference-job/', + summary: [], + operations: [], + tabs: [{ + name: 'configInfo', + fields: [ + 'taskName', 'imagev2', + 'status', 'spec', + 'creator', 'aiCenter', + 'branch', 'hasInternet', + 'computerRes', 'modelName', + 'createTime', 'modelVersion', + 'startTime', 'modelFiles', + 'endTime', 'bootFile', + 'duration', 'runParameters', + 'descr', '', + 'failedReason', + 'dataset', + 'modelList', + ] + }, { + name: 'operationProfile' + }, { + name: 'logs', + noScroll: true, + multiNodes: true, + }, { + name: 'resourceUseage', + multiNodes: true, + }, { + name: 'resultDownload' + }], + }], + }] }], + /* // 评测任务 'BENCHMARK': [{ // 评测任务-算法 listUrl: 'cloudbrain/benchmark', @@ -1127,7 +1276,7 @@ export const DetailPageConfigs = { }, { name: 'logs', noScroll: true, - },{ + }, { name: 'resultDownload' }], }], diff --git a/web_src/vuepages/pages/cloudbrain/list/index.vue b/web_src/vuepages/pages/cloudbrain/list/index.vue index 3554505161..e2da971587 100644 --- a/web_src/vuepages/pages/cloudbrain/list/index.vue +++ b/web_src/vuepages/pages/cloudbrain/list/index.vue @@ -37,14 +37,22 @@ {{ scope.row.task.versionCount }} + + + @@ -105,6 +113,11 @@ :class="scope.row.can_modify && scope.row.task.canModify ? '' : 'disabled'">{{ $t('cloudbrainObj.modify') }} + {{ + $t('cloudbrainObj.modelDownload') + }} {{ @@ -387,6 +400,7 @@ export default { }); }); }, + opDownload(row) { }, }, beforeMount() { const urlParams = getUrlSearchParams(); diff --git a/web_src/vuepages/pages/cloudbrain/tools.js b/web_src/vuepages/pages/cloudbrain/tools.js index 90538ee8ac..9d79a49685 100644 --- a/web_src/vuepages/pages/cloudbrain/tools.js +++ b/web_src/vuepages/pages/cloudbrain/tools.js @@ -162,6 +162,15 @@ export class CloudBrainTools { } break; case 'INFERENCE': + if (taskInfo.cluster == 'OpenI') { + if (taskInfo.compute_source == 'GPU') { + link += `cloudbrain/inference-job/${taskInfo.id}`; + } else if (taskInfo.compute_source == 'NPU') { + link += `modelarts/inference-job/${taskInfo.id}`; + } + } else if (taskInfo.cluster == 'C2Net') { + link += `grampus/inference-job/${taskInfo.id}`; + } break; case 'BENCHMARK': break; diff --git a/web_src/vuepages/pages/computingpower/components/DemandForm.vue b/web_src/vuepages/pages/computingpower/components/DemandForm.vue index e984528b33..5239e18fcc 100644 --- a/web_src/vuepages/pages/computingpower/components/DemandForm.vue +++ b/web_src/vuepages/pages/computingpower/components/DemandForm.vue @@ -1,6 +1,6 @@