From 7316cc6548f5743d3d5ee1f284e2bcdaee353d84 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 5 Jul 2022 11:37:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- modules/modelarts/modelarts.go | 2 +- routers/repo/modelarts.go | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 3c61ae5d7..ae0ce75e6 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -138,6 +138,7 @@ type VersionInfo struct { Version []struct { ID int `json:"id"` Value string `json:"value"` + Url string `json:"url"` } `json:"version"` } @@ -152,7 +153,6 @@ type Engine struct { Info []struct { ID int `json:"id"` Value string `json:"value"` - Url string `json:"url"` } `json:"engine"` } diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 60122092e..ecc94a92e 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -1216,14 +1216,15 @@ func getUserCommand(engineId int, req *modelarts.GenerateTrainJobReq) (string, s userCommand := "" if engineId < 0 { userCommand = "/bin/bash /home/work/run_train.sh 's3://" + req.CodeObsPath + "' 'code/" + req.BootFile + "' '/tmp/log/train.log' --'data_url'='s3://" + req.DataUrl + "' --'train_url'='s3://" + req.TrainUrl + "'" - var engines modelarts.Engine - if err := json.Unmarshal([]byte(setting.Engines), &engines); err != nil { - log.Info("json.Unmarshal failed:", err) - } - for _, engine := range engines.Info { - if engine.ID == engineId { - userImageUrl = engine.Url - break + var versionInfos modelarts.VersionInfo + if err := json.Unmarshal([]byte(setting.EngineVersions), &versionInfos); err != nil { + log.Info("json parse err." + err.Error()) + } else { + for _, engine := range versionInfos.Version { + if engine.ID == engineId { + userImageUrl = engine.Url + break + } } } for _, param := range req.Parameters {