From 2829433b8563cbd2229fbd0fc1f1ea7b9a18247d Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Tue, 30 Mar 2021 11:04:55 +0800 Subject: [PATCH] create trainjob html --- modules/auth/modelarts.go | 1 + modules/modelarts/modelarts.go | 27 ++++++++++++----- routers/repo/modelarts.go | 22 ++++++++++---- templates/repo/modelarts/trainjob/new.tmpl | 34 +++++++++++----------- 4 files changed, 54 insertions(+), 30 deletions(-) diff --git a/modules/auth/modelarts.go b/modules/auth/modelarts.go index 7f14e0a9e..ef0041e8a 100755 --- a/modules/auth/modelarts.go +++ b/modules/auth/modelarts.go @@ -21,6 +21,7 @@ type CreateModelArtsTrainJobForm struct { BootFile string `form:"boot_file" binding:"Required"` WorkServerNumber int `form:"work_server_number" binding:"Required"` EngineID int `form:"engine_id" binding:"Required"` + Flavor string `form:"flavor" binding:"Required"` Description string `form:"description"` } diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 3508f1765..053502353 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -23,17 +23,16 @@ const ( FlavorInfo = "Ascend: 1*Ascend 910 CPU: 24 核 96GiB （modelarts.kat1.xlarge）" //train-job - engineID = 118 - - Engine = "Ascend-Powered-Engine" + ResourcePools = "{\"resource_pool\":[{\"id\":1, \"value\":\"专属资源池\"}]}" + Engines = "{\"engine\":[{\"id\":1, \"value\":\"Ascend-Powered-Engine\"}]}" EngineVersions = "{\"version\":[{\"id\":118,\"value\":\"MindSpore-1.0.0-c75-python3.7-euleros2.8-aarch64\"}," + - "{\"id\":119,\"value\":\"MindSpore-1.1.1-c76-python3.7-euleros2.8-aarch64\"}" + - "{\"id\":120,\"value\":\"MindSpore-1.1.1-c76-tr5-python3.7-euleros2.8-aarch64\"}" + + "{\"id\":119,\"value\":\"MindSpore-1.1.1-c76-python3.7-euleros2.8-aarch64\"}," + + "{\"id\":120,\"value\":\"MindSpore-1.1.1-c76-tr5-python3.7-euleros2.8-aarch64\"}," + "{\"id\":117,\"value\":\"TF-1.15-c75-python3.7-euleros2.8-aarch64\"}" + "]}" FlavorInfos = "{\"flavor\":[{\"id\":1,\"value\":\"Ascend : 2 * Ascend 910 CPU：48 核 512GiB\"}," + - "{\"id\":2,\"value\":\"Ascend : 8 * Ascend 910 CPU：192 核 2048GiB\"}" + - "{\"id\":3,\"value\":\"Ascend : 4 * Ascend 910 CPU：96 核 1024GiB\"}" + + "{\"id\":2,\"value\":\"Ascend : 8 * Ascend 910 CPU：192 核 2048GiB\"}," + + "{\"id\":3,\"value\":\"Ascend : 4 * Ascend 910 CPU：96 核 1024GiB\"}," + "{\"id\":4,\"value\":\"Ascend : 1 * Ascend 910 CPU：24 核 256GiB\"}" + "]}" CodePath = "/code/" @@ -67,6 +66,20 @@ type Flavor struct { } `json:"flavor"` } +type Engine struct { + Info []struct { + ID int `json:"id"` + Value string `json:"value"` + } `json:"engine"` +} + +type ResourcePool struct { + Info []struct { + ID int `json:"id"` + Value string `json:"value"` + } `json:"resource_pool"` +} + func GenerateTask(ctx *context.Context, jobName, uuid, description string) error { dataActualPath := setting.Bucket + "/" + setting.BasePath + path.Join(uuid[0:1], uuid[1:2]) + "/" + uuid + "/" jobResult, err := createNotebook(models.CreateNotebookParams{ diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 7d83113a0..abf684d43 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -296,25 +296,35 @@ func TrainJobNew(ctx *context.Context) { ctx.ServerError("GetAllUserAttachments failed:", err) return } - ctx.Data["attachments"] = attachs - ctx.Data["engine"] = modelarts.Engine + + var resourcePools modelarts.ResourcePool + if err = json.Unmarshal([]byte(modelarts.ResourcePools), &resourcePools); err != nil { + ctx.ServerError("json.Unmarshal failed:", err) + return + } + ctx.Data["resource_pools"] = resourcePools.Info + + var engines modelarts.Engine + if err = json.Unmarshal([]byte(modelarts.Engines), &engines); err != nil { + ctx.ServerError("json.Unmarshal failed:", err) + return + } + ctx.Data["engines"] = engines.Info var versionInfos modelarts.VersionInfo if err = json.Unmarshal([]byte(modelarts.EngineVersions), &versionInfos); err != nil { ctx.ServerError("json.Unmarshal failed:", err) return } - - ctx.Data["engine_versions"] = versionInfos + ctx.Data["engine_versions"] = versionInfos.Version var flavorInfos modelarts.Flavor if err = json.Unmarshal([]byte(modelarts.FlavorInfos), &flavorInfos); err != nil { ctx.ServerError("json.Unmarshal failed:", err) return } - - ctx.Data["flavor_infos"] = flavorInfos + ctx.Data["flavor_infos"] = flavorInfos.Info ctx.HTML(200, tplModelArtsTrainJobNew) } diff --git a/templates/repo/modelarts/trainjob/new.tmpl b/templates/repo/modelarts/trainjob/new.tmpl index 98a8bf1c9..741a81c38 100755 --- a/templates/repo/modelarts/trainjob/new.tmpl +++ b/templates/repo/modelarts/trainjob/new.tmpl @@ -108,7 +108,7 @@

基本信息

- +
@@ -129,16 +129,16 @@
- + {{range .engines}} {{end}}
- + {{range .engine_versions}} + {{end}}
@@ -146,20 +146,20 @@
- +
- + {{range .attachments}} + {{end}}
-
+
增加运行参数
@@ -170,8 +170,8 @@

资源设置

- + {{range .resource_pools}} {{end}} @@ -197,15 +197,15 @@
- + {{range .flavor_infos}} + {{end}}
- +