From 1e89049f10ed14f20e07fe74a3fd0658f019bf07 Mon Sep 17 00:00:00 2001 From: devad Date: Thu, 2 Nov 2023 10:37:51 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20modelarts=20=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: devad Former-commit-id: bfa8281d3bceffb53a87900a276c7679f6c800cd --- api/internal/storeLink/modelarts.go | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/api/internal/storeLink/modelarts.go b/api/internal/storeLink/modelarts.go index 045aacad..d79dcb75 100644 --- a/api/internal/storeLink/modelarts.go +++ b/api/internal/storeLink/modelarts.go @@ -19,13 +19,6 @@ type ModelArtsLink struct { participant *models.StorelinkCenter } -//const ( -// IMG_NAME_PREFIX = "oct_" -// IMG_VERSION_PREFIX = "version_" -// TASK_NAME_PREFIX = "trainJob_" -// RESOURCE_POOL = "common-pool" -//) - func NewModelArtsLink(ctx context.Context, svcCtx *svc.ServiceContext, participant *models.StorelinkCenter) *ModelArtsLink { return &ModelArtsLink{ctx: ctx, svcCtx: svcCtx, participant: participant, platform: participant.Name, pageIndex: 1, pageSize: 100} } @@ -37,7 +30,6 @@ func (o *ModelArtsLink) UploadImage(path string) (interface{}, error) { func (o *ModelArtsLink) DeleteImage(imageId string) (interface{}, error) { // TODO modelArts删除镜像 - return nil, nil } @@ -65,12 +57,18 @@ func (o *ModelArtsLink) QueryImageList() (interface{}, error) { func (o *ModelArtsLink) SubmitTask(imageId string, cmd string, envs []string, params []string, resourceId string) (interface{}, error) { // modelArts提交任务 environments := make(map[string]string) - - for _, param := range params { - s := strings.Split(param, COMMA) + parameters := make([]*modelarts.ParametersTrainJob, 0) + for _, env := range envs { + s := strings.Split(env, COMMA) environments[s[0]] = s[1] } - + for _, param := range params { + s := strings.Split(param, COMMA) + parameters = append(parameters, &modelarts.ParametersTrainJob{ + Name: s[0], + Value: s[1], + }) + } req := &modelarts.CreateTrainingJobReq{ Kind: "job", Metadata: &modelarts.MetadataS{ @@ -83,6 +81,7 @@ func (o *ModelArtsLink) SubmitTask(imageId string, cmd string, envs []string, pa }, Command: cmd, Environments: environments, + Parameters: parameters, }, Spec: &modelarts.SpecsC{ Resource: &modelarts.ResourceCreateTraining{