diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index a64c317a8..273d59012 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -48,8 +48,12 @@ const ( PerPage = 10 IsLatestVersion = "1" NotLatestVersion = "0" - ComputeResource = "NPU" - VersionCount = 1 + // ComputeResource = "NPU" + NPUResource = "NPU" + GPUResource = "CPU/GPU" + AllResource = "all" + DebugType = -1 + VersionCount = 1 SortByCreateTime = "create_time" ConfigTypeCustom = "custom" @@ -273,7 +277,7 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (err error DatasetName: attach.Name, CommitID: req.CommitID, IsLatestVersion: req.IsLatestVersion, - ComputeResource: ComputeResource, + ComputeResource: NPUResource, EngineID: req.EngineID, TrainUrl: req.TrainUrl, BranchName: req.BranchName, @@ -356,7 +360,7 @@ func GenerateTrainJobVersion(ctx *context.Context, req *GenerateTrainJobReq, job CommitID: req.CommitID, IsLatestVersion: req.IsLatestVersion, PreVersionName: req.PreVersionName, - ComputeResource: ComputeResource, + ComputeResource: NPUResource, EngineID: req.EngineID, TrainUrl: req.TrainUrl, BranchName: req.BranchName, diff --git a/routers/api/v1/repo/modelarts.go b/routers/api/v1/repo/modelarts.go index b4d5fc010..a18da3fe5 100755 --- a/routers/api/v1/repo/modelarts.go +++ b/routers/api/v1/repo/modelarts.go @@ -240,26 +240,28 @@ func DelTrainJobVersion(ctx *context.APIContext) { ctx.ServerError("get VersionListCount faild", err) return } - - // 判断当前删掉的任务是否是最新版本，若是，将排序后的TotalVersionCount置为删掉的最新版本的TotalVersionCount，若不是，按时间排序后的版本列表的第一个版本设置为最新版本，TotalVersionCount不变 - if task.IsLatestVersion == modelarts.IsLatestVersion { - err = models.SetVersionCountAndLatestVersion(jobID, VersionTaskList[0].Cloudbrain.VersionName, VersionListCount, modelarts.IsLatestVersion, task.TotalVersionCount) - if err != nil { - ctx.ServerError("UpdateJobVersionCount failed", err) - return - } - } else { - err = models.SetVersionCountAndLatestVersion(jobID, VersionTaskList[0].VersionName, VersionListCount, modelarts.IsLatestVersion, VersionTaskList[0].Cloudbrain.TotalVersionCount) - if err != nil { - ctx.ServerError("UpdateJobVersionCount failed", err) - return + if VersionListCount > 0 { + // 判断当前删掉的任务是否是最新版本，若是，将排序后的TotalVersionCount置为删掉的最新版本的TotalVersionCount，若不是，按时间排序后的版本列表的第一个版本设置为最新版本，TotalVersionCount不变 + if task.IsLatestVersion == modelarts.IsLatestVersion { + err = models.SetVersionCountAndLatestVersion(jobID, VersionTaskList[0].Cloudbrain.VersionName, VersionListCount, modelarts.IsLatestVersion, task.TotalVersionCount) + if err != nil { + ctx.ServerError("UpdateJobVersionCount failed", err) + return + } + } else { + err = models.SetVersionCountAndLatestVersion(jobID, VersionTaskList[0].VersionName, VersionListCount, modelarts.IsLatestVersion, VersionTaskList[0].Cloudbrain.TotalVersionCount) + if err != nil { + ctx.ServerError("UpdateJobVersionCount failed", err) + return + } } } ctx.JSON(http.StatusOK, map[string]interface{}{ - "JobID": jobID, - "VersionName": versionName, - "StatusOK": 0, + "JobID": jobID, + "VersionName": versionName, + "StatusOK": 0, + "VersionListCount": VersionListCount, }) } diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 256bc9e6d..3f5fce013 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -49,42 +49,6 @@ func MustEnableCloudbrain(ctx *context.Context) { return } } -func CloudBrainIndex(ctx *context.Context) { - MustEnableCloudbrain(ctx) - repo := ctx.Repo.Repository - page := ctx.QueryInt("page") - if page <= 0 { - page = 1 - } - - ciTasks, count, err := models.Cloudbrains(&models.CloudbrainsOptions{ - ListOptions: models.ListOptions{ - Page: page, - PageSize: setting.UI.IssuePagingNum, - }, - RepoID: repo.ID, - Type: models.TypeCloudBrainOne, - }) - if err != nil { - ctx.ServerError("Cloudbrain", err) - return - } - - for i, task := range ciTasks { - ciTasks[i].CanDebug = cloudbrain.CanCreateOrDebugJob(ctx) - ciTasks[i].CanDel = cloudbrain.CanDeleteJob(ctx, &task.Cloudbrain) - - } - - pager := context.NewPagination(int(count), setting.UI.IssuePagingNum, page, 5) - pager.SetDefaultParams(ctx) - ctx.Data["Page"] = pager - - ctx.Data["PageIsCloudBrain"] = true - ctx.Data["Tasks"] = ciTasks - ctx.Data["CanCreate"] = cloudbrain.CanCreateOrDebugJob(ctx) - ctx.HTML(200, tplCloudBrainIndex) -} func cutString(str string, lens int) string { if len(str) < lens { @@ -242,11 +206,11 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { } repo := ctx.Repo.Repository downloadCode(repo, codePath) - uploadCodeToMinio(codePath + "/", jobName, "/code/") + uploadCodeToMinio(codePath+"/", jobName, "/code/") modelPath := setting.JobPath + jobName + cloudbrain.ModelMountPath + "/" mkModelPath(modelPath) - uploadCodeToMinio(modelPath, jobName, cloudbrain.ModelMountPath + "/") + uploadCodeToMinio(modelPath, jobName, cloudbrain.ModelMountPath+"/") benchmarkPath := setting.JobPath + jobName + cloudbrain.BenchMarkMountPath if setting.IsBenchmarkEnabled && jobType == string(models.JobTypeBenchmark) { @@ -257,30 +221,30 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { } } downloadRateCode(repo, jobName, setting.BenchmarkOwner, setting.BrainScoreName, benchmarkPath, form.BenchmarkCategory, gpuType) - uploadCodeToMinio(benchmarkPath + "/", jobName, cloudbrain.BenchMarkMountPath + "/") + uploadCodeToMinio(benchmarkPath+"/", jobName, cloudbrain.BenchMarkMountPath+"/") } snn4imagenetPath := setting.JobPath + jobName + cloudbrain.Snn4imagenetMountPath if setting.IsSnn4imagenetEnabled && jobType == string(models.JobTypeSnn4imagenet) { downloadRateCode(repo, jobName, setting.Snn4imagenetOwner, setting.Snn4imagenetName, snn4imagenetPath, "", "") - uploadCodeToMinio(snn4imagenetPath + "/", jobName, cloudbrain.Snn4imagenetMountPath + "/") + uploadCodeToMinio(snn4imagenetPath+"/", jobName, cloudbrain.Snn4imagenetMountPath+"/") } brainScorePath := setting.JobPath + jobName + cloudbrain.BrainScoreMountPath if setting.IsBrainScoreEnabled && jobType == string(models.JobTypeBrainScore) { downloadRateCode(repo, jobName, setting.BrainScoreOwner, setting.BrainScoreName, brainScorePath, "", "") - uploadCodeToMinio(brainScorePath + "/", jobName, cloudbrain.BrainScoreMountPath + "/") + uploadCodeToMinio(brainScorePath+"/", jobName, cloudbrain.BrainScoreMountPath+"/") } - err = cloudbrain.GenerateTask(ctx, jobName, image, command, uuid, codePath, getMinioPath(jobName, cloudbrain.ModelMountPath + "/"), - getMinioPath(jobName, cloudbrain.BenchMarkMountPath + "/"), getMinioPath(jobName, cloudbrain.Snn4imagenetMountPath + "/"), - getMinioPath(jobName, cloudbrain.BrainScoreMountPath + "/"), jobType, gpuQueue, resourceSpecId) + err = cloudbrain.GenerateTask(ctx, jobName, image, command, uuid, codePath, getMinioPath(jobName, cloudbrain.ModelMountPath+"/"), + getMinioPath(jobName, cloudbrain.BenchMarkMountPath+"/"), getMinioPath(jobName, cloudbrain.Snn4imagenetMountPath+"/"), + getMinioPath(jobName, cloudbrain.BrainScoreMountPath+"/"), jobType, gpuQueue, resourceSpecId) if err != nil { cloudBrainNewDataPrepare(ctx) ctx.RenderWithErr(err.Error(), tplCloudBrainNew, &form) return } - ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain") + ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob") } func CloudBrainShow(ctx *context.Context) { @@ -412,8 +376,7 @@ func CloudBrainStop(ctx *context.Context) { ctx.ServerError("UpdateJob failed", err) return } - - ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain") + ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob") } func StopJobsByUserID(userID int64) { @@ -515,8 +478,7 @@ func CloudBrainDel(ctx *context.Context) { ctx.ServerError("DeleteJob failed", err) return } - - ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain") + ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob") } func CloudBrainShowModels(ctx *context.Context) { @@ -598,7 +560,7 @@ func getImages(ctx *context.Context, imageType string) { func GetModelDirs(jobName string, parentDir string) (string, error) { var req string - modelActualPath := getMinioPath(jobName, cloudbrain.ModelMountPath + "/") + modelActualPath := getMinioPath(jobName, cloudbrain.ModelMountPath+"/") if parentDir == "" { req = "baseDir=" + modelActualPath } else { @@ -794,7 +756,6 @@ func mkModelPath(modelPath string) error { return nil } - func SyncCloudbrainStatus() { cloudBrains, err := models.GetCloudBrainUnStoppedJob() if err != nil { diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 3994ba542..1d8323000 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -28,6 +28,8 @@ import ( ) const ( + tplDebugJobIndex base.TplName = "repo/debugjob/index" + tplModelArtsNotebookIndex base.TplName = "repo/modelarts/notebook/index" tplModelArtsNotebookNew base.TplName = "repo/modelarts/notebook/new" tplModelArtsNotebookShow base.TplName = "repo/modelarts/notebook/show" @@ -38,21 +40,23 @@ const ( tplModelArtsTrainJobVersionNew base.TplName = "repo/modelarts/trainjob/version_new" ) -// MustEnableDataset check if repository enable internal cb -func MustEnableModelArts(ctx *context.Context) { - if !ctx.Repo.CanRead(models.UnitTypeCloudBrain) { - ctx.NotFound("MustEnableCloudbrain", nil) - return - } -} - -func NotebookIndex(ctx *context.Context) { - MustEnableModelArts(ctx) +func DebugJobIndex(ctx *context.Context) { + debugListType := ctx.Query("debugListType") + MustEnableCloudbrain(ctx) repo := ctx.Repo.Repository page := ctx.QueryInt("page") if page <= 0 { page = 1 } + debugType := modelarts.DebugType + jobType := string(models.JobTypeDebug) + if debugListType == modelarts.GPUResource { + debugType = models.TypeCloudBrainOne + jobType = "" + } + if debugListType == modelarts.NPUResource { + debugType = models.TypeCloudBrainTwo + } ciTasks, count, err := models.Cloudbrains(&models.CloudbrainsOptions{ ListOptions: models.ListOptions{ @@ -60,28 +64,43 @@ func NotebookIndex(ctx *context.Context) { PageSize: setting.UI.IssuePagingNum, }, RepoID: repo.ID, - Type: models.TypeCloudBrainTwo, - JobType: string(models.JobTypeDebug), + Type: debugType, + JobType: jobType, }) if err != nil { - ctx.ServerError("Cloudbrain", err) + ctx.ServerError("Get debugjob faild:", err) return } for i, task := range ciTasks { + if task.Cloudbrain.Type == models.TypeCloudBrainOne { + ciTasks[i].CanDebug = cloudbrain.CanCreateOrDebugJob(ctx) + ciTasks[i].CanDel = cloudbrain.CanDeleteJob(ctx, &task.Cloudbrain) + ciTasks[i].Cloudbrain.ComputeResource = modelarts.GPUResource + } + if task.Cloudbrain.Type == models.TypeCloudBrainTwo { + ciTasks[i].CanDebug = cloudbrain.CanCreateOrDebugJob(ctx) + ciTasks[i].CanDel = cloudbrain.CanDeleteJob(ctx, &task.Cloudbrain) + ciTasks[i].Cloudbrain.ComputeResource = modelarts.NPUResource + } - ciTasks[i].CanDebug = cloudbrain.CanCreateOrDebugJob(ctx) - ciTasks[i].CanDel = cloudbrain.CanDeleteJob(ctx, &task.Cloudbrain) } pager := context.NewPagination(int(count), setting.UI.IssuePagingNum, page, 5) pager.SetDefaultParams(ctx) ctx.Data["Page"] = pager - ctx.Data["PageIsCloudBrain"] = true ctx.Data["Tasks"] = ciTasks ctx.Data["CanCreate"] = cloudbrain.CanCreateOrDebugJob(ctx) - ctx.HTML(200, tplModelArtsNotebookIndex) + ctx.HTML(200, tplDebugJobIndex) +} + +// MustEnableDataset check if repository enable internal cb +func MustEnableModelArts(ctx *context.Context) { + if !ctx.Repo.CanRead(models.UnitTypeCloudBrain) { + ctx.NotFound("MustEnableCloudbrain", nil) + return + } } func NotebookNew(ctx *context.Context) { @@ -136,8 +155,7 @@ func NotebookCreate(ctx *context.Context, form auth.CreateModelArtsNotebookForm) ctx.RenderWithErr(err.Error(), tplModelArtsNotebookNew, &form) return } - - ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/modelarts/notebook") + ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob") } func NotebookShow(ctx *context.Context) { @@ -244,8 +262,7 @@ func NotebookStop(ctx *context.Context) { ctx.ServerError("UpdateJob failed", err) return } - - ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/modelarts/notebook") + ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob") } func NotebookDel(ctx *context.Context) { @@ -275,7 +292,7 @@ func NotebookDel(ctx *context.Context) { return } - ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/modelarts/notebook") + ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob") } func TrainJobIndex(ctx *context.Context) { diff --git a/routers/routes/routes.go b/routers/routes/routes.go index a18fe422c..30e486b98 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -960,7 +960,6 @@ func RegisterRoutes(m *macaron.Macaron) { }, context.RepoRef()) m.Group("/cloudbrain", func() { - m.Get("", reqRepoCloudBrainReader, repo.CloudBrainIndex) m.Group("/:jobid", func() { m.Get("", reqRepoCloudBrainReader, repo.CloudBrainShow) m.Get("/debug", reqRepoCloudBrainWriter, repo.CloudBrainDebug) @@ -992,9 +991,12 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/downloadall", repo.DownloadMultiModelFile) }, context.RepoRef()) + m.Group("/debugjob", func() { + m.Get("", reqRepoCloudBrainReader, repo.DebugJobIndex) + }, context.RepoRef()) + m.Group("/modelarts", func() { m.Group("/notebook", func() { - m.Get("", reqRepoCloudBrainReader, repo.NotebookIndex) m.Group("/:jobid", func() { m.Get("", reqRepoCloudBrainReader, repo.NotebookShow) m.Get("/debug", reqRepoCloudBrainWriter, repo.NotebookDebug) diff --git a/templates/repo/cloudbrain/index.tmpl b/templates/repo/cloudbrain/index.tmpl deleted file mode 100755 index b23021c55..000000000 --- a/templates/repo/cloudbrain/index.tmpl +++ /dev/null @@ -1,641 +0,0 @@ - -{{template "base/head" .}} - - - - -
-
-
-
-
-
-
-
-
- - -
- -
- {{template "repo/header" .}} - -
- - - - -
- -
-
- {{$.i18n.Tr "repo.modelarts.notebook"}} - {{$.i18n.Tr "repo.modelarts.train_job"}} -
-
-
- -
- {{svg "octicon-server" 16}} -
CPU / GPU
- -
- CPU / GPU - Ascend NPU -
-
- {{if .Permission.CanWrite $.UnitTypeCloudBrain}} - {{$.i18n.Tr "repo.modelarts.train_job.new_debug"}}{{end}} -
-
- - -
-
-
- - - - - - - -
-
-
-
- {{$.i18n.Tr "repo.cloudbrain_task"}} -
-
- {{$.i18n.Tr "repo.cloudbrain_status_createtime"}} -
-
- {{$.i18n.Tr "repo.cloudbrain_creator"}} -
-
- {{$.i18n.Tr "repo.cloudbrain_operate"}} -
- -
- -
- {{range .Tasks}} -
-
- - -
- - - {{.JobName}} - -
- -
- - - - - {{.Status}} - - - - - {{TimeSinceUnix .Cloudbrain.CreatedUnix $.Lang}} -
- -
- {{if .User.Name}} - - {{else}} - - {{end}} -
-
-
- {{if and (ne .Status "WAITING") (ne .JobType "DEBUG")}} - - 评分 - - {{end}} - - - {{if $.Permission.CanWrite $.UnitTypeCloudBrain}} - - {{$.i18n.Tr "repo.debug"}} - - {{else}} - - {{$.i18n.Tr "repo.debug"}} - - {{end}} - -
- {{$.CsrfTokenHtml}} - {{if $.Permission.CanWrite $.UnitTypeCloudBrain}} - - {{$.i18n.Tr "repo.stop"}} - - {{else}} - - {{$.i18n.Tr "repo.stop"}} - - {{end}} -
-
-
- - - {{$.i18n.Tr "repo.download"}} - - - - - {{if $.Permission.CanWrite $.UnitTypeCloudBrain}} - {{$.i18n.Tr "repo.submit_image"}} - {{else}} - {{$.i18n.Tr "repo.submit_image"}} - {{end}} -
- - -
- {{$.CsrfTokenHtml}} - {{if $.Permission.CanWrite $.UnitTypeCloudBrain}} - - {{$.i18n.Tr "repo.delete"}} - - {{else}} - - {{$.i18n.Tr "repo.delete"}} - - {{end}} -
- -
- - - - - - -
-
- {{end}} {{template "base/paginate" .}} -
- -
-
-
- -
- -
- - - - - -
-
-
- 删除任务 -
- -
-

你确认删除该任务么？此任务一旦删除不可恢复。

-
-
-
- 取消操作 -
-
- 确定操作 -
-
-
-
- - -{{template "base/footer" .}} - - \ No newline at end of file diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl index fc0a8915b..d85b51bea 100755 --- a/templates/repo/cloudbrain/new.tmpl +++ b/templates/repo/cloudbrain/new.tmpl @@ -129,6 +129,24 @@ {{.i18n.Tr "repo.cloudbrain.new"}}
+
+ +
+ + + + + + CPU/GPU + + + + + + + Ascend NPU +
+
diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index d7b30cb72..58f368c8e 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -7,11 +7,11 @@

- + {{.i18n.Tr "repo.cloudbrain"}}
/
- + {{$.i18n.Tr "repo.modelarts.notebook"}}
/
diff --git a/templates/repo/debugjob/index.tmpl b/templates/repo/debugjob/index.tmpl index 83a12751d..673725d96 100644 --- a/templates/repo/debugjob/index.tmpl +++ b/templates/repo/debugjob/index.tmpl @@ -212,25 +212,40 @@
- {{$.i18n.Tr "repo.modelarts.notebook"}} + {{$.i18n.Tr "repo.modelarts.notebook"}} {{$.i18n.Tr "repo.modelarts.train_job"}}
{{svg "octicon-server" 16}} -
全部
+
- 全部 - CPU / GPU - Ascend NPU +
全部
+
CPU/GPU
+
NPU
{{if .Permission.CanWrite $.UnitTypeCloudBrain}} - {{$.i18n.Tr "repo.modelarts.train_job.new_debug"}}{{end}} + {{$.i18n.Tr "repo.modelarts.train_job.new_debug"}} + {{else}} + {{$.i18n.Tr "repo.modelarts.train_job.new_debug"}} + {{end}}
+ {{if eq 0 (len .Tasks)}} +
+
+
未创建过调试任务
+
+
代码版本：您还没有初始化代码仓库，请先创建代码版本；
+
运行时长：最长不超过4个小时，超过4个小时将自动停止；
+
数据集：云脑1提供 CPU / GPU 资源，云脑2提供 Ascend NPU 资源，调试使用的数据集也需要上传到对应的环境。
+
使用说明：可以参考启智AI协作平台小白训练营课程
+
+
+ {{else}}
@@ -265,7 +280,7 @@
- + {{.JobName}}
@@ -292,32 +307,32 @@
- {{if and (ne .Status "WAITING") (ne .JobType "DEBUG")}} + - {{if $.Permission.CanWrite $.UnitTypeCloudBrain}} + {{if .CanDebug}} {{if eq .ComputeResource "CPU/GPU"}} - + {{$.i18n.Tr "repo.debug"}} {{else}} - + {{$.i18n.Tr "repo.debug"}} {{end}} {{else}} - + {{$.i18n.Tr "repo.debug"}} {{end}}
{{$.CsrfTokenHtml}} - {{if $.Permission.CanWrite $.UnitTypeCloudBrain}} - + {{if .CanDel}} + {{$.i18n.Tr "repo.stop"}} {{else}} @@ -326,39 +341,51 @@ {{end}} +
+ +
+ + {{$.CsrfTokenHtml}} + {{if .CanDel}} + + {{$.i18n.Tr "repo.delete"}} + + {{else}} + + {{$.i18n.Tr "repo.delete"}} + + + {{end}}
-
- - - - - - {{if $.Permission.CanWrite $.UnitTypeCloudBrain}} - {{$.i18n.Tr "repo.submit_image"}} - {{else}} - {{$.i18n.Tr "repo.submit_image"}} - {{end}} -
- {{.CanDel}} -
- - {{$.CsrfTokenHtml}} - {{if .CanDel}} - - - {{$.i18n.Tr "repo.delete"}} - - {{else}} - - {{$.i18n.Tr "repo.delete"}} - - {{end}} -
+
+ +
+ {{end}}

@@ -433,7 +461,9 @@ \ No newline at end of file diff --git a/templates/repo/modelarts/notebook/new.tmpl b/templates/repo/modelarts/notebook/new.tmpl index 3fbef1a2e..9e28649b3 100755 --- a/templates/repo/modelarts/notebook/new.tmpl +++ b/templates/repo/modelarts/notebook/new.tmpl @@ -29,6 +29,23 @@
+
+ +
+ + + + + + CPU/GPU + + + + + + Ascend NPU +
+
diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 4850d9b22..8613c483f 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -7,11 +7,11 @@

- + {{.i18n.Tr "repo.cloudbrain"}}
/
- + {{$.i18n.Tr "repo.modelarts.notebook"}}
/
diff --git a/templates/repo/modelarts/trainjob/index.tmpl b/templates/repo/modelarts/trainjob/index.tmpl index f523d96a9..6ad3cbba9 100755 --- a/templates/repo/modelarts/trainjob/index.tmpl +++ b/templates/repo/modelarts/trainjob/index.tmpl @@ -29,77 +29,36 @@
{{template "base/alert" .}} - - - -
-
- {{$.i18n.Tr "repo.modelarts.notebook"}} + {{$.i18n.Tr "repo.modelarts.notebook"}} {{$.i18n.Tr "repo.modelarts.train_job"}}
- - {{if .Permission.CanWrite $.UnitTypeCloudBrain}} - {{$.i18n.Tr "repo.modelarts.train_job.new_train"}}{{end}} + {{$.i18n.Tr "repo.modelarts.train_job.new_train"}} + {{else}} + {{$.i18n.Tr "repo.modelarts.train_job.new_train"}} + {{end}}
- + {{if eq 0 (len .Tasks)}} +
+
+
未创建过训练任务
+
+
代码版本：您还没有初始化代码仓库，请先创建代码版本；
+
数据集：云脑1提供 CPU / GPU 资源，云脑2提供 Ascend NPU 资源，调试使用的数据集也需要上传到对应的环境。
+
使用说明：可以参考启智AI协作平台小白训练营课程
+
+
+ {{else}}
- - - -
@@ -130,13 +89,9 @@
{{$.i18n.Tr "repo.cloudbrain_operate"}}
- -
- +
- - {{range .Tasks}}
@@ -162,14 +117,6 @@
{{TimeSinceUnix .Cloudbrain.CreatedUnix $.Lang}}
-
@@ -188,27 +135,6 @@
- - -
{{$.CsrfTokenHtml}} @@ -244,6 +170,7 @@
+ {{end}}
diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index cd85057de..3f52e12c4 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -574,7 +574,12 @@ td, th { }, onApprove: function() { $.post(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/del_version`,{version_name:version_name},(data)=>{ - $('#accordion'+version_name).remove() + if(data.VersionListCount===0){ + location.href=`/${userName}/${repoPath}/modelarts/train-job` + }else{ + $('#accordion'+version_name).remove() + } + }).fail(function(err) { console.log(err); }); @@ -658,12 +663,6 @@ td, th { } } - function downloadModelFile(version_name,filename){ - $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/model_download?version_name=${version_name}&file_name=${filename}`, (data) => { - console.log(data) - - }) - } function renderDir(data,version_name){ let html="" html += "
" diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl index e7180081e..dd2fe58ae 100644 --- a/templates/repo/modelmanage/index.tmpl +++ b/templates/repo/modelmanage/index.tmpl @@ -52,11 +52,11 @@
- 删除任务 + 删除模型
-

你确认删除该任务么？此任务一旦删除不可恢复。

+

你确认删除该模型么？此模型一旦删除不可恢复。

diff --git a/web_src/less/_svg.less b/web_src/less/_svg.less index b17b9a8b3..643418c70 100644 --- a/web_src/less/_svg.less +++ b/web_src/less/_svg.less @@ -2,6 +2,7 @@ display: inline-block; vertical-align: text-top; fill: currentColor; + margin-right: 5px; .middle & { vertical-align: middle; diff --git a/web_src/less/openi.less b/web_src/less/openi.less index 8718d4cdc..a04510211 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -292,7 +292,8 @@ footer .column{margin-bottom:0!important; padding-bottom:0!important;} } .hover_active{ - + height: 100% !important; + margin-top: 1px !important; } .dropdown-menu:hover .dropdown-content { display: block; @@ -336,7 +337,39 @@ display: block; color: #3291F8; } +//缺省页 +.bgtask-none{ + background: #fff !important; + border: 0 !important; + box-shadow: none !important; + padding-bottom: 0 !important; + padding-top: 2em !important; + +} +.bgtask-header-pic { + height: 80px; + text-align: center; + background: url(//ai-studio-static-online.cdn.bcebos.com/aistudio/dist/1638363279337/images/search_empty.png) top no-repeat; + background-size: 80px 80px; +} +.bgtask-content{ + margin: 2rem auto 0; + /* width: 500px; */ + text-align: left; +} +.bgtask-content-txt { + font-size: 14px; + color: #a6a6a6; + line-height: 22px; + margin-bottom: 4px; +} +.bgtask-content-header { + text-align: center; + color: #3F3F40; + font-size: 18px; + margin-bottom: 1rem; +} .selectcloudbrain .active.item{ color: #0087f5 !important;