From 75b2dce5365d2ba54b920b99b41b210a18ff2a64 Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 13 Jul 2023 10:51:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?#4484=20npu=E6=8E=A8=E7=90=86=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/repo/modelarts.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index d2f1141809..c048d2dc65 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -2,7 +2,6 @@ package repo import ( "archive/zip" - ai_task "code.gitea.io/gitea/services/ai_task_service/task" "encoding/json" "errors" "fmt" @@ -16,6 +15,8 @@ import ( "time" "unicode/utf8" + ai_task "code.gitea.io/gitea/services/ai_task_service/task" + "code.gitea.io/gitea/services/cloudbrain/modelmanage" "code.gitea.io/gitea/services/lock" @@ -2224,6 +2225,7 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference ckptName := form.CkptName ckptUrl := "/" + form.PreTrainModelUrl + form.CkptName log.Info("ckpt url:" + ckptUrl) + log.Info("uuid:" + uuid) errStr := checkInferenceJobMultiNode(ctx.User.ID, form.WorkServerNumber) if errStr != "" { @@ -2359,7 +2361,7 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference param = addModelUrlParam(param, form.PreTrainModelUrl, form.CkptName) - datasUrlList, dataUrl, datasetNames, isMultiDataset, err := getDatasUrlListByUUIDS(uuid) + datasUrlList, dataUrl, datasetNames, _, err := getDatasUrlListByUUIDS(uuid) if err != nil { inferenceJobErrorNewDataPrepare(ctx, form) ctx.RenderWithErr(err.Error(), tplModelArtsInferenceJobNew, &form) @@ -2373,12 +2375,10 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference ctx.RenderWithErr("json error:"+err.Error(), tplModelArtsInferenceJobNew, &form) return } - if isMultiDataset { - param = append(param, models.Parameter{ - Label: modelarts.MultiDataUrl, - Value: string(jsondatas), - }) - } + param = append(param, models.Parameter{ + Label: modelarts.MultiDataUrl, + Value: string(jsondatas), + }) existDeviceTarget := false if len(params) != 0 { -- 2.34.1 From 7da0570c70680f0196b3d0f3f828b0e80eb3ff9f Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 13 Jul 2023 11:31:25 +0800 Subject: [PATCH 2/2] fix-4484 --- routers/repo/modelarts.go | 1 - 1 file changed, 1 deletion(-) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index c048d2dc65..29bab6454a 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -2225,7 +2225,6 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference ckptName := form.CkptName ckptUrl := "/" + form.PreTrainModelUrl + form.CkptName log.Info("ckpt url:" + ckptUrl) - log.Info("uuid:" + uuid) errStr := checkInferenceJobMultiNode(ctx.User.ID, form.WorkServerNumber) if errStr != "" { -- 2.34.1