From 9998aeb0f9607f8ff20e0f5e590d403bec34cc1b Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 09:26:45 +0800 Subject: [PATCH 01/23] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A3=81=E7=9B=98=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/cloudbrain.go | 10 ++++++---- modules/modelarts/modelarts.go | 17 +++++++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index cdd9698fe..cb2bd2837 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1045,6 +1045,7 @@ type CreateUserImageTrainJobParams struct { Description string `json:"job_desc"` Config UserImageConfig `json:"config"` WorkspaceID string `json:"workspace_id"` + Volume Volumes `json:"volumes"` } type UserImageConfig struct { @@ -1063,10 +1064,11 @@ type UserImageConfig struct { } type CreateTrainJobParams struct { - JobName string `json:"job_name"` - Description string `json:"job_desc"` - Config Config `json:"config"` - WorkspaceID string `json:"workspace_id"` + JobName string `json:"job_name"` + Description string `json:"job_desc"` + Config Config `json:"config"` + WorkspaceID string `json:"workspace_id"` + Volume Volumes `json:"volumes"` } type Config struct { diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index dd502dfd0..06d0836e2 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -66,6 +66,9 @@ const ( SortByCreateTime = "create_time" ConfigTypeCustom = "custom" TotalVersionCount = 1 + + VolumeSourcePath = "192.168.0.30:/" + VolumeDestPath = "/home/ma-user/sfs" ) var ( @@ -374,6 +377,13 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str UserImageUrl: req.UserImageUrl, UserCommand: req.UserCommand, }, + Volume: models.Volumes{ + Nfs: models.Nfs{ + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, + }, + }, }) } else { jobResult, createErr = createTrainJob(models.CreateTrainJobParams{ @@ -394,6 +404,13 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str }, Parameter: req.Parameters, }, + Volume: models.Volumes{ + Nfs: models.Nfs{ + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, + }, + }, }) } if createErr != nil { From 45c63b85d59b975819d385ea490f103abd60cb30 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 10:06:35 +0800 Subject: [PATCH 02/23] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A3=81=E7=9B=98=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/modelarts/modelarts.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 06d0836e2..57c92e990 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -68,7 +68,7 @@ const ( TotalVersionCount = 1 VolumeSourcePath = "192.168.0.30:/" - VolumeDestPath = "/home/ma-user/sfs" + VolumeDestPath = "/cache/sfs/" ) var ( From 46658293e5e673abb5e5a3ca16a679d4c0ddb7b8 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 10:12:46 +0800 Subject: [PATCH 03/23] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A3=81=E7=9B=98=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/modelarts/modelarts.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 57c92e990..cd2989e80 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -68,7 +68,7 @@ const ( TotalVersionCount = 1 VolumeSourcePath = "192.168.0.30:/" - VolumeDestPath = "/cache/sfs/" + VolumeDestPath = "/cache/" ) var ( From d4f4776ca333a70d3ad38e8323f0e823bdee596e Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 10:23:41 +0800 Subject: [PATCH 04/23] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A3=81=E7=9B=98=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/modelarts/modelarts.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index cd2989e80..41d9c57d2 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -68,7 +68,7 @@ const ( TotalVersionCount = 1 VolumeSourcePath = "192.168.0.30:/" - VolumeDestPath = "/cache/" + VolumeDestPath = "/cache/data/" ) var ( From dac33a75a81062b86a024502f624039954fa0a27 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 10:36:02 +0800 Subject: [PATCH 05/23] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A3=81=E7=9B=98=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/cloudbrain.go | 16 ++++++++-------- modules/modelarts/modelarts.go | 20 ++++++++------------ 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index cb2bd2837..a517a7edf 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1045,7 +1045,7 @@ type CreateUserImageTrainJobParams struct { Description string `json:"job_desc"` Config UserImageConfig `json:"config"` WorkspaceID string `json:"workspace_id"` - Volume Volumes `json:"volumes"` + DataMount Nfs `json:"volumes"` } type UserImageConfig struct { @@ -1064,11 +1064,11 @@ type UserImageConfig struct { } type CreateTrainJobParams struct { - JobName string `json:"job_name"` - Description string `json:"job_desc"` - Config Config `json:"config"` - WorkspaceID string `json:"workspace_id"` - Volume Volumes `json:"volumes"` + JobName string `json:"job_name"` + Description string `json:"job_desc"` + Config Config `json:"config"` + WorkspaceID string `json:"workspace_id"` + DataMount Nfs `json:"volumes"` } type Config struct { @@ -1215,8 +1215,8 @@ type Volumes struct { type Nfs struct { ID string `json:"id"` - SourcePath string `json:"src_path"` - DestPath string `json:"dest_path"` + SourcePath string `json:"nfs_server_path"` + DestPath string `json:"local_path"` ReadOnly bool `json:"read_only"` } diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 41d9c57d2..39fdb6afc 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -377,12 +377,10 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str UserImageUrl: req.UserImageUrl, UserCommand: req.UserCommand, }, - Volume: models.Volumes{ - Nfs: models.Nfs{ - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, - ReadOnly: false, - }, + DataMount: models.Nfs{ + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, }, }) } else { @@ -404,12 +402,10 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str }, Parameter: req.Parameters, }, - Volume: models.Volumes{ - Nfs: models.Nfs{ - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, - ReadOnly: false, - }, + DataMount: models.Nfs{ + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, }, }) } From 7af655bea15b0937c42fb1a18ab3322c70209f68 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 10:43:37 +0800 Subject: [PATCH 06/23] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A3=81=E7=9B=98=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/cloudbrain.go | 10 +++++----- modules/modelarts/modelarts.go | 24 ++++++++++++++---------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index a517a7edf..cdd04cc01 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1045,7 +1045,6 @@ type CreateUserImageTrainJobParams struct { Description string `json:"job_desc"` Config UserImageConfig `json:"config"` WorkspaceID string `json:"workspace_id"` - DataMount Nfs `json:"volumes"` } type UserImageConfig struct { @@ -1061,6 +1060,7 @@ type UserImageConfig struct { CreateVersion bool `json:"create_version"` Flavor Flavor `json:"flavor"` PoolID string `json:"pool_id"` + DataMount Volumes `json:"volumes"` } type CreateTrainJobParams struct { @@ -1068,7 +1068,6 @@ type CreateTrainJobParams struct { Description string `json:"job_desc"` Config Config `json:"config"` WorkspaceID string `json:"workspace_id"` - DataMount Nfs `json:"volumes"` } type Config struct { @@ -1082,9 +1081,10 @@ type Config struct { LogUrl string `json:"log_url"` //UserImageUrl string `json:"user_image_url"` //UserCommand string `json:"user_command"` - CreateVersion bool `json:"create_version"` - Flavor Flavor `json:"flavor"` - PoolID string `json:"pool_id"` + CreateVersion bool `json:"create_version"` + Flavor Flavor `json:"flavor"` + PoolID string `json:"pool_id"` + DataMount Volumes `json:"volumes"` } type CreateInferenceJobParams struct { JobName string `json:"job_name"` diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 39fdb6afc..a223f8708 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -376,11 +376,13 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Parameter: req.Parameters, UserImageUrl: req.UserImageUrl, UserCommand: req.UserCommand, - }, - DataMount: models.Nfs{ - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, - ReadOnly: false, + DataMount: models.Volumes{ + Nfs: models.Nfs{ + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, + }, + }, }, }) } else { @@ -401,11 +403,13 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Code: req.Spec.SourceSpecId, }, Parameter: req.Parameters, - }, - DataMount: models.Nfs{ - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, - ReadOnly: false, + DataMount: models.Volumes{ + Nfs: models.Nfs{ + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, + }, + }, }, }) } From 6d11f68505abc7e63b30db397c519a47d0de1191 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 14:12:11 +0800 Subject: [PATCH 07/23] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A3=81=E7=9B=98=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/cloudbrain.go | 12 +++++++----- modules/modelarts/modelarts.go | 26 +++++++++++++++----------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index cdd04cc01..b3bfa1843 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1060,7 +1060,7 @@ type UserImageConfig struct { CreateVersion bool `json:"create_version"` Flavor Flavor `json:"flavor"` PoolID string `json:"pool_id"` - DataMount Volumes `json:"volumes"` + Volumes Volumes `json:"volumes"` } type CreateTrainJobParams struct { @@ -1084,14 +1084,16 @@ type Config struct { CreateVersion bool `json:"create_version"` Flavor Flavor `json:"flavor"` PoolID string `json:"pool_id"` - DataMount Volumes `json:"volumes"` + Volumes Volumes `json:"volumes"` } + type CreateInferenceJobParams struct { JobName string `json:"job_name"` Description string `json:"job_desc"` InfConfig InfConfig `json:"config"` WorkspaceID string `json:"workspace_id"` } + type CreateInfUserImageParams struct { JobName string `json:"job_name"` Description string `json:"job_desc"` @@ -1209,14 +1211,14 @@ type DataSource struct { } type Volumes struct { - Nfs Nfs `json:"nfs"` + Nfs []Nfs `json:"nfs"` HostPath HostPath `json:"host_path"` } type Nfs struct { ID string `json:"id"` - SourcePath string `json:"nfs_server_path"` - DestPath string `json:"local_path"` + SourcePath string `json:"src_path"` + DestPath string `json:"dest_path"` ReadOnly bool `json:"read_only"` } diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index a223f8708..e2ad865bf 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -68,7 +68,7 @@ const ( TotalVersionCount = 1 VolumeSourcePath = "192.168.0.30:/" - VolumeDestPath = "/cache/data/" + VolumeDestPath = "/cache/sfs/" ) var ( @@ -376,11 +376,13 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Parameter: req.Parameters, UserImageUrl: req.UserImageUrl, UserCommand: req.UserCommand, - DataMount: models.Volumes{ - Nfs: models.Nfs{ - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, - ReadOnly: false, + Volumes: models.Volumes{ + Nfs: []models.Nfs{ + { + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, + }, }, }, }, @@ -403,11 +405,13 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Code: req.Spec.SourceSpecId, }, Parameter: req.Parameters, - DataMount: models.Volumes{ - Nfs: models.Nfs{ - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, - ReadOnly: false, + Volumes: models.Volumes{ + Nfs: []models.Nfs{ + { + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, + }, }, }, }, From e714383f13aa0e184a06da1f3c2fae663d5e2be3 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 14:19:37 +0800 Subject: [PATCH 08/23] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A3=81=E7=9B=98=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/cloudbrain.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index b3bfa1843..28cf3cf89 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1217,8 +1217,8 @@ type Volumes struct { type Nfs struct { ID string `json:"id"` - SourcePath string `json:"src_path"` - DestPath string `json:"dest_path"` + SourcePath string `json:"nfs_server_path"` + DestPath string `json:"local_path"` ReadOnly bool `json:"read_only"` } From 814e3c50594133c190e795e386f9d46c385b371e Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 14:39:55 +0800 Subject: [PATCH 09/23] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A3=81=E7=9B=98=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/cloudbrain.go | 6 +++--- modules/modelarts/modelarts.go | 20 ++++++++------------ 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 28cf3cf89..ee5ec6162 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1211,14 +1211,14 @@ type DataSource struct { } type Volumes struct { - Nfs []Nfs `json:"nfs"` + Nfs Nfs `json:"nfs"` HostPath HostPath `json:"host_path"` } type Nfs struct { ID string `json:"id"` - SourcePath string `json:"nfs_server_path"` - DestPath string `json:"local_path"` + SourcePath string `json:"src_path"` + DestPath string `json:"dest_path"` ReadOnly bool `json:"read_only"` } diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index e2ad865bf..dc5ba5b65 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -377,12 +377,10 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str UserImageUrl: req.UserImageUrl, UserCommand: req.UserCommand, Volumes: models.Volumes{ - Nfs: []models.Nfs{ - { - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, - ReadOnly: false, - }, + Nfs: models.Nfs{ + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, }, }, }, @@ -406,12 +404,10 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str }, Parameter: req.Parameters, Volumes: models.Volumes{ - Nfs: []models.Nfs{ - { - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, - ReadOnly: false, - }, + Nfs: models.Nfs{ + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, }, }, }, From a71ba7f2c9eac6a9ff8504e21e079aef7af5cd19 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 15:06:46 +0800 Subject: [PATCH 10/23] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A3=81=E7=9B=98=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/modelarts/resty.go | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index c38300606..ca7f40843 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -492,6 +492,7 @@ sendjob: SetResult(&result). Post(HOST + "/v1/" + setting.ProjectID + urlTrainJob) + log.Info("%s", createJobParams) if err != nil { return nil, fmt.Errorf("resty create train-job: %s", err) } From 0c54532060bfbbaab5264b1e5c2724f9a62a1c08 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 15:30:19 +0800 Subject: [PATCH 11/23] add --- modules/modelarts/resty.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index ca7f40843..7af6b42e8 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -492,7 +492,8 @@ sendjob: SetResult(&result). Post(HOST + "/v1/" + setting.ProjectID + urlTrainJob) - log.Info("%s", createJobParams) + log.Info("jochen10518", "%s", createJobParams) + if err != nil { return nil, fmt.Errorf("resty create train-job: %s", err) } From 4d76517dfaa0f986b1c905d1a2d3e1c5065dbc05 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 15:38:51 +0800 Subject: [PATCH 12/23] add --- modules/modelarts/resty.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index 7af6b42e8..a7d4910d8 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -492,8 +492,6 @@ sendjob: SetResult(&result). Post(HOST + "/v1/" + setting.ProjectID + urlTrainJob) - log.Info("jochen10518", "%s", createJobParams) - if err != nil { return nil, fmt.Errorf("resty create train-job: %s", err) } @@ -554,6 +552,7 @@ sendjob: SetResult(&result). Post(HOST + "/v1/" + setting.ProjectID + urlTrainJob) + log.Info("abcd", createJobParams) if err != nil { return nil, fmt.Errorf("resty create train-job: %s", err) } From fe24eafdcb82c2d8736ebdea8930ed926cc995fa Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 15:47:36 +0800 Subject: [PATCH 13/23] add --- modules/modelarts/resty.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index a7d4910d8..68a9c0797 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -483,7 +483,8 @@ func createTrainJobUserImage(createJobParams models.CreateUserImageTrainJobParam var result models.CreateTrainJobResult retry := 0 - + log.Info("abcd", createJobParams) + fmt.Print("abcd", createJobParams) sendjob: res, err := client.R(). SetHeader("Content-Type", "application/json"). @@ -544,6 +545,9 @@ func createTrainJob(createJobParams models.CreateTrainJobParams) (*models.Create retry := 0 + log.Info("abcd", createJobParams) + fmt.Print("abcd", createJobParams) + sendjob: res, err := client.R(). SetHeader("Content-Type", "application/json"). @@ -552,7 +556,6 @@ sendjob: SetResult(&result). Post(HOST + "/v1/" + setting.ProjectID + urlTrainJob) - log.Info("abcd", createJobParams) if err != nil { return nil, fmt.Errorf("resty create train-job: %s", err) } From b8281eb89be5328fc8cea7505acf7f14c268bb21 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 17:08:30 +0800 Subject: [PATCH 14/23] add --- models/cloudbrain.go | 1 + modules/modelarts/resty.go | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index ee5ec6162..2bae839cf 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1181,6 +1181,7 @@ type CreateConfigParams struct { LogUrl string `json:"log_url"` Flavor Flavor `json:"flavor"` PoolID string `json:"pool_id"` + Volumes Volumes `json:"volumes"` } type Parameter struct { diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index 68a9c0797..de9c0b2b6 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -483,8 +483,7 @@ func createTrainJobUserImage(createJobParams models.CreateUserImageTrainJobParam var result models.CreateTrainJobResult retry := 0 - log.Info("abcd", createJobParams) - fmt.Print("abcd", createJobParams) + sendjob: res, err := client.R(). SetHeader("Content-Type", "application/json"). @@ -499,6 +498,7 @@ sendjob: req, _ := json.Marshal(createJobParams) log.Info("%s", req) + log.Info("postapi detail: %s", string(req)) if res.StatusCode() == http.StatusUnauthorized && retry < 1 { retry++ @@ -544,9 +544,7 @@ func createTrainJob(createJobParams models.CreateTrainJobParams) (*models.Create var result models.CreateTrainJobResult retry := 0 - - log.Info("abcd", createJobParams) - fmt.Print("abcd", createJobParams) + log.Info("postapi detail: %s", createJobParams) sendjob: res, err := client.R(). @@ -759,6 +757,7 @@ func CreateTrainJobConfig(req models.CreateConfigParams) (*models.CreateTrainJob var result models.CreateTrainJobConfigResult retry := 0 + log.Info("postapi detail: %s", req) sendjob: res, err := client.R(). From 6762b26cae7f5178e5980218ed9e805e243f0b6e Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 17:21:31 +0800 Subject: [PATCH 15/23] add --- modules/modelarts/resty.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index de9c0b2b6..75f16155f 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -497,8 +497,9 @@ sendjob: } req, _ := json.Marshal(createJobParams) - log.Info("%s", req) - log.Info("postapi detail: %s", string(req)) + log.Info("postapi json: %s", string(req)) + log.Info("postapi detail: %s", createJobParams) + log.Info("postapi detail: %s", createJobParams.Config.Volumes) if res.StatusCode() == http.StatusUnauthorized && retry < 1 { retry++ @@ -545,6 +546,7 @@ func createTrainJob(createJobParams models.CreateTrainJobParams) (*models.Create retry := 0 log.Info("postapi detail: %s", createJobParams) + log.Info("postapi detail: %s", createJobParams.Config.Volumes) sendjob: res, err := client.R(). @@ -757,7 +759,9 @@ func CreateTrainJobConfig(req models.CreateConfigParams) (*models.CreateTrainJob var result models.CreateTrainJobConfigResult retry := 0 + log.Info("postapi detail: %s", req) + log.Info("postapi detail: %s", req.Volumes) sendjob: res, err := client.R(). From 7fe5748f5950049c34a06c80dbc669b10fa99a3a Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 17:48:07 +0800 Subject: [PATCH 16/23] add --- modules/modelarts/modelarts.go | 3 +++ modules/modelarts/resty.go | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index dc5ba5b65..5ccb08c92 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -67,6 +67,7 @@ const ( ConfigTypeCustom = "custom" TotalVersionCount = 1 + VolumeID = "c6a73891-6a19-4a6a-a2e8-0d6baa72a7c5" VolumeSourcePath = "192.168.0.30:/" VolumeDestPath = "/cache/sfs/" ) @@ -378,6 +379,7 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str UserCommand: req.UserCommand, Volumes: models.Volumes{ Nfs: models.Nfs{ + ID: VolumeID, SourcePath: VolumeSourcePath, DestPath: VolumeDestPath, ReadOnly: false, @@ -405,6 +407,7 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Parameter: req.Parameters, Volumes: models.Volumes{ Nfs: models.Nfs{ + ID: VolumeID, SourcePath: VolumeSourcePath, DestPath: VolumeDestPath, ReadOnly: false, diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index 75f16155f..27c37b1e8 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -498,8 +498,8 @@ sendjob: req, _ := json.Marshal(createJobParams) log.Info("postapi json: %s", string(req)) - log.Info("postapi detail: %s", createJobParams) - log.Info("postapi detail: %s", createJobParams.Config.Volumes) + log.Info("postapi detail all: %s", createJobParams) + log.Info("postapi detail Volume: %s", createJobParams.Config.Volumes) if res.StatusCode() == http.StatusUnauthorized && retry < 1 { retry++ @@ -545,8 +545,8 @@ func createTrainJob(createJobParams models.CreateTrainJobParams) (*models.Create var result models.CreateTrainJobResult retry := 0 - log.Info("postapi detail: %s", createJobParams) - log.Info("postapi detail: %s", createJobParams.Config.Volumes) + log.Info("postapi detail all: %s", createJobParams) + log.Info("postapi detail Volume: %s", createJobParams.Config.Volumes) sendjob: res, err := client.R(). @@ -760,8 +760,8 @@ func CreateTrainJobConfig(req models.CreateConfigParams) (*models.CreateTrainJob retry := 0 - log.Info("postapi detail: %s", req) - log.Info("postapi detail: %s", req.Volumes) + log.Info("postapi detail all: %s", req) + log.Info("postapi detail Volume: %s", req.Volumes) sendjob: res, err := client.R(). From 11f0bbd4e42720bd5ae5851d3afd7b06ded348e1 Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 29 Nov 2022 09:20:10 +0800 Subject: [PATCH 17/23] add --- models/cloudbrain.go | 12 ++++++------ modules/modelarts/modelarts.go | 30 +++++++++++++++++------------- modules/modelarts/resty.go | 5 ----- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 2bae839cf..aba31f53c 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1060,7 +1060,7 @@ type UserImageConfig struct { CreateVersion bool `json:"create_version"` Flavor Flavor `json:"flavor"` PoolID string `json:"pool_id"` - Volumes Volumes `json:"volumes"` + Volumes []Volumes `json:"volumes"` } type CreateTrainJobParams struct { @@ -1081,10 +1081,10 @@ type Config struct { LogUrl string `json:"log_url"` //UserImageUrl string `json:"user_image_url"` //UserCommand string `json:"user_command"` - CreateVersion bool `json:"create_version"` - Flavor Flavor `json:"flavor"` - PoolID string `json:"pool_id"` - Volumes Volumes `json:"volumes"` + CreateVersion bool `json:"create_version"` + Flavor Flavor `json:"flavor"` + PoolID string `json:"pool_id"` + Volumes []Volumes `json:"volumes"` } type CreateInferenceJobParams struct { @@ -1181,7 +1181,7 @@ type CreateConfigParams struct { LogUrl string `json:"log_url"` Flavor Flavor `json:"flavor"` PoolID string `json:"pool_id"` - Volumes Volumes `json:"volumes"` + Volumes []Volumes `json:"volumes"` } type Parameter struct { diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 5ccb08c92..03378159a 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -69,7 +69,7 @@ const ( VolumeID = "c6a73891-6a19-4a6a-a2e8-0d6baa72a7c5" VolumeSourcePath = "192.168.0.30:/" - VolumeDestPath = "/cache/sfs/" + VolumeDestPath = "/cache/sfs" ) var ( @@ -377,12 +377,14 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Parameter: req.Parameters, UserImageUrl: req.UserImageUrl, UserCommand: req.UserCommand, - Volumes: models.Volumes{ - Nfs: models.Nfs{ - ID: VolumeID, - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, - ReadOnly: false, + Volumes: []models.Volumes{ + { + Nfs: models.Nfs{ + ID: VolumeID, + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, + }, }, }, }, @@ -405,12 +407,14 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Code: req.Spec.SourceSpecId, }, Parameter: req.Parameters, - Volumes: models.Volumes{ - Nfs: models.Nfs{ - ID: VolumeID, - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, - ReadOnly: false, + Volumes: []models.Volumes{ + { + Nfs: models.Nfs{ + ID: VolumeID, + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, + }, }, }, }, diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index 27c37b1e8..058641ddd 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -545,8 +545,6 @@ func createTrainJob(createJobParams models.CreateTrainJobParams) (*models.Create var result models.CreateTrainJobResult retry := 0 - log.Info("postapi detail all: %s", createJobParams) - log.Info("postapi detail Volume: %s", createJobParams.Config.Volumes) sendjob: res, err := client.R(). @@ -760,9 +758,6 @@ func CreateTrainJobConfig(req models.CreateConfigParams) (*models.CreateTrainJob retry := 0 - log.Info("postapi detail all: %s", req) - log.Info("postapi detail Volume: %s", req.Volumes) - sendjob: res, err := client.R(). SetHeader("Content-Type", "application/json"). From 5055eb8e5fb0a8f9b4eaf13b91df207686e0a2bf Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 29 Nov 2022 11:01:08 +0800 Subject: [PATCH 18/23] add --- modules/modelarts/modelarts.go | 34 +++++++++++++++++++++++++--------- modules/modelarts/resty.go | 2 ++ 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 03378159a..db31d45ec 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -67,9 +67,11 @@ const ( ConfigTypeCustom = "custom" TotalVersionCount = 1 - VolumeID = "c6a73891-6a19-4a6a-a2e8-0d6baa72a7c5" - VolumeSourcePath = "192.168.0.30:/" - VolumeDestPath = "/cache/sfs" + NfsID = "c6a73891-6a19-4a6a-a2e8-0d6baa72a7c5" + NfsSourcePath = "192.168.0.30:/" + NfsDestPath = "/cache/sfs" + HostSourcePath = "/mnt/sfs_turbo/data" + HostDestPath = "/cache/host" ) var ( @@ -380,9 +382,16 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Volumes: []models.Volumes{ { Nfs: models.Nfs{ - ID: VolumeID, - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, + ID: NfsID, + SourcePath: NfsSourcePath, + DestPath: NfsDestPath, + ReadOnly: false, + }, + }, + { + HostPath: models.HostPath{ + SourcePath: HostSourcePath, + DestPath: HostDestPath, ReadOnly: false, }, }, @@ -410,9 +419,16 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Volumes: []models.Volumes{ { Nfs: models.Nfs{ - ID: VolumeID, - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, + ID: NfsID, + SourcePath: NfsSourcePath, + DestPath: NfsDestPath, + ReadOnly: false, + }, + }, + { + HostPath: models.HostPath{ + SourcePath: HostSourcePath, + DestPath: HostDestPath, ReadOnly: false, }, }, diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index 058641ddd..b05bb0f9b 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -546,6 +546,8 @@ func createTrainJob(createJobParams models.CreateTrainJobParams) (*models.Create retry := 0 + log.Info("postapi detail", createJobParams.Config.Volumes) + sendjob: res, err := client.R(). SetHeader("Content-Type", "application/json"). From 50f14ef3be16fb91d0bd7c6ef1127aeeb52e42bb Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 29 Nov 2022 11:09:37 +0800 Subject: [PATCH 19/23] add --- modules/modelarts/resty.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index b05bb0f9b..0dc7252e5 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -498,8 +498,6 @@ sendjob: req, _ := json.Marshal(createJobParams) log.Info("postapi json: %s", string(req)) - log.Info("postapi detail all: %s", createJobParams) - log.Info("postapi detail Volume: %s", createJobParams.Config.Volumes) if res.StatusCode() == http.StatusUnauthorized && retry < 1 { retry++ @@ -545,8 +543,7 @@ func createTrainJob(createJobParams models.CreateTrainJobParams) (*models.Create var result models.CreateTrainJobResult retry := 0 - - log.Info("postapi detail", createJobParams.Config.Volumes) + log.Info("postapi detail", createJobParams) sendjob: res, err := client.R(). From a32a705b0b713b642efb18b14bd6ce08e0b1620a Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 29 Nov 2022 11:25:50 +0800 Subject: [PATCH 20/23] add --- modules/modelarts/modelarts.go | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index db31d45ec..39ce8b826 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -67,11 +67,9 @@ const ( ConfigTypeCustom = "custom" TotalVersionCount = 1 - NfsID = "c6a73891-6a19-4a6a-a2e8-0d6baa72a7c5" - NfsSourcePath = "192.168.0.30:/" - NfsDestPath = "/cache/sfs" - HostSourcePath = "/mnt/sfs_turbo/data" - HostDestPath = "/cache/host" + NfsID = "c6a73891-6a19-4a6a-a2e8-0d6baa72a7c5" + NfsSourcePath = "192.168.0.30:/" + NfsDestPath = "/cache/sfs" ) var ( @@ -388,13 +386,6 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str ReadOnly: false, }, }, - { - HostPath: models.HostPath{ - SourcePath: HostSourcePath, - DestPath: HostDestPath, - ReadOnly: false, - }, - }, }, }, }) @@ -425,13 +416,6 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str ReadOnly: false, }, }, - { - HostPath: models.HostPath{ - SourcePath: HostSourcePath, - DestPath: HostDestPath, - ReadOnly: false, - }, - }, }, }, }) From 405cd970e689eebea9c9a1d20c43353914774cb5 Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 29 Nov 2022 11:56:37 +0800 Subject: [PATCH 21/23] add --- models/cloudbrain.go | 14 +++++++++----- modules/modelarts/modelarts.go | 32 +++++++++----------------------- modules/modelarts/resty.go | 5 +++-- 3 files changed, 21 insertions(+), 30 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index aba31f53c..bbc2298d3 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1060,7 +1060,9 @@ type UserImageConfig struct { CreateVersion bool `json:"create_version"` Flavor Flavor `json:"flavor"` PoolID string `json:"pool_id"` - Volumes []Volumes `json:"volumes"` + ShareAddr string `json:"nas_share_addr"` + MountPath string `json:"nas_mount_path"` + NasType string `json:"nas_type"` } type CreateTrainJobParams struct { @@ -1081,10 +1083,12 @@ type Config struct { LogUrl string `json:"log_url"` //UserImageUrl string `json:"user_image_url"` //UserCommand string `json:"user_command"` - CreateVersion bool `json:"create_version"` - Flavor Flavor `json:"flavor"` - PoolID string `json:"pool_id"` - Volumes []Volumes `json:"volumes"` + CreateVersion bool `json:"create_version"` + Flavor Flavor `json:"flavor"` + PoolID string `json:"pool_id"` + ShareAddr string `json:"nas_share_addr"` + MountPath string `json:"nas_mount_path"` + NasType string `json:"nas_type"` } type CreateInferenceJobParams struct { diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 39ce8b826..b97ef6249 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -67,9 +67,9 @@ const ( ConfigTypeCustom = "custom" TotalVersionCount = 1 - NfsID = "c6a73891-6a19-4a6a-a2e8-0d6baa72a7c5" - NfsSourcePath = "192.168.0.30:/" - NfsDestPath = "/cache/sfs" + ShareAddr = "192.168.0.30:/" + MountPath = "/cache/sfs" + NasType = "nfs" ) var ( @@ -377,16 +377,9 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Parameter: req.Parameters, UserImageUrl: req.UserImageUrl, UserCommand: req.UserCommand, - Volumes: []models.Volumes{ - { - Nfs: models.Nfs{ - ID: NfsID, - SourcePath: NfsSourcePath, - DestPath: NfsDestPath, - ReadOnly: false, - }, - }, - }, + ShareAddr: ShareAddr, + MountPath: MountPath, + NasType: NasType, }, }) } else { @@ -407,16 +400,9 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Code: req.Spec.SourceSpecId, }, Parameter: req.Parameters, - Volumes: []models.Volumes{ - { - Nfs: models.Nfs{ - ID: NfsID, - SourcePath: NfsSourcePath, - DestPath: NfsDestPath, - ReadOnly: false, - }, - }, - }, + ShareAddr: ShareAddr, + MountPath: MountPath, + NasType: NasType, }, }) } diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index 0dc7252e5..50f22b372 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -497,7 +497,7 @@ sendjob: } req, _ := json.Marshal(createJobParams) - log.Info("postapi json: %s", string(req)) + log.Info("postapi json: %s", req) if res.StatusCode() == http.StatusUnauthorized && retry < 1 { retry++ @@ -543,7 +543,8 @@ func createTrainJob(createJobParams models.CreateTrainJobParams) (*models.Create var result models.CreateTrainJobResult retry := 0 - log.Info("postapi detail", createJobParams) + req, _ := json.Marshal(createJobParams) + log.Info("postapi json: %s", req) sendjob: res, err := client.R(). From 8545f920d3267fa26e9a32418a75215c672314df Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 29 Nov 2022 14:28:29 +0800 Subject: [PATCH 22/23] add --- models/cloudbrain.go | 6 ++++++ modules/modelarts/modelarts.go | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index bbc2298d3..1790ef44b 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1155,6 +1155,9 @@ type TrainJobVersionConfig struct { Flavor Flavor `json:"flavor"` PoolID string `json:"pool_id"` PreVersionId int64 `json:"pre_version_id"` + ShareAddr string `json:"nas_share_addr"` + MountPath string `json:"nas_mount_path"` + NasType string `json:"nas_type"` } type TrainJobVersionUserImageConfig struct { @@ -1170,6 +1173,9 @@ type TrainJobVersionUserImageConfig struct { PreVersionId int64 `json:"pre_version_id"` UserImageUrl string `json:"user_image_url"` UserCommand string `json:"user_command"` + ShareAddr string `json:"nas_share_addr"` + MountPath string `json:"nas_mount_path"` + NasType string `json:"nas_type"` } type CreateConfigParams struct { diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index b97ef6249..67c0b76c3 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -521,6 +521,9 @@ func GenerateTrainJobVersion(ctx *context.Context, req *GenerateTrainJobReq, job PreVersionId: req.PreVersionId, UserImageUrl: req.UserImageUrl, UserCommand: req.UserCommand, + ShareAddr: ShareAddr, + MountPath: MountPath, + NasType: NasType, }, }, jobId) } else { @@ -540,6 +543,9 @@ func GenerateTrainJobVersion(ctx *context.Context, req *GenerateTrainJobReq, job }, Parameter: req.Parameters, PreVersionId: req.PreVersionId, + ShareAddr: ShareAddr, + MountPath: MountPath, + NasType: NasType, }, }, jobId) } From 924c0a93258f58d4834313e1a95f3f7e21ff450f Mon Sep 17 00:00:00 2001 From: Gitea Date: Thu, 15 Dec 2022 14:49:31 +0800 Subject: [PATCH 23/23] modified modelart api --- modules/modelarts/modelarts.go | 36 ++++++++++++++++-------------------- modules/setting/setting.go | 6 ++++++ 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 746aca32e..9cc9dc1ed 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -71,10 +71,6 @@ const ( SortByCreateTime = "create_time" ConfigTypeCustom = "custom" TotalVersionCount = 1 - - ShareAddr = "192.168.0.30:/" - MountPath = "/cache/sfs" - NasType = "nfs" ) var ( @@ -285,7 +281,7 @@ func GenerateTask(ctx *context.Context, jobName, uuid, description, flavor strin return nil } -func GenerateNotebook2(ctx *context.Context, displayJobName, jobName, uuid, description, imageId string, spec *models.Specification, bootFile string,autoStopDurationInMs int64) (string, error) { +func GenerateNotebook2(ctx *context.Context, displayJobName, jobName, uuid, description, imageId string, spec *models.Specification, bootFile string, autoStopDurationInMs int64) (string, error) { if poolInfos == nil { json.Unmarshal([]byte(setting.PoolInfos), &poolInfos) } @@ -383,9 +379,9 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Parameter: req.Parameters, UserImageUrl: req.UserImageUrl, UserCommand: req.UserCommand, - ShareAddr: ShareAddr, - MountPath: MountPath, - NasType: NasType, + ShareAddr: setting.ModelArtsShareAddr, + MountPath: setting.ModelArtsMountPath, + NasType: setting.ModelArtsNasType, }, }) } else { @@ -406,9 +402,9 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Code: req.Spec.SourceSpecId, }, Parameter: req.Parameters, - ShareAddr: ShareAddr, - MountPath: MountPath, - NasType: NasType, + ShareAddr: setting.ModelArtsShareAddr, + MountPath: setting.ModelArtsMountPath, + NasType: setting.ModelArtsNasType, }, }) } @@ -527,9 +523,9 @@ func GenerateTrainJobVersion(ctx *context.Context, req *GenerateTrainJobReq, job PreVersionId: req.PreVersionId, UserImageUrl: req.UserImageUrl, UserCommand: req.UserCommand, - ShareAddr: ShareAddr, - MountPath: MountPath, - NasType: NasType, + ShareAddr: setting.ModelArtsShareAddr, + MountPath: setting.ModelArtsMountPath, + NasType: setting.ModelArtsNasType, }, }, jobId) } else { @@ -549,9 +545,9 @@ func GenerateTrainJobVersion(ctx *context.Context, req *GenerateTrainJobReq, job }, Parameter: req.Parameters, PreVersionId: req.PreVersionId, - ShareAddr: ShareAddr, - MountPath: MountPath, - NasType: NasType, + ShareAddr: setting.ModelArtsShareAddr, + MountPath: setting.ModelArtsMountPath, + NasType: setting.ModelArtsNasType, }, }, jobId) } @@ -988,14 +984,14 @@ func getJupyterBaseUrl(url string) string { } func getCookiesAndCsrf(jupyterUrl string) ([]*http.Cookie, string) { - log.Info("jupyter url:"+jupyterUrl) + log.Info("jupyter url:" + jupyterUrl) var cookies []*http.Cookie const retryTimes = 10 for i := 0; i < retryTimes; i++ { res, err := http.Get(jupyterUrl) if err != nil { - log.Error("browser jupyterUrl failed.",err) - if i==retryTimes-1{ + log.Error("browser jupyterUrl failed.", err) + if i == retryTimes-1 { return cookies, "" } diff --git a/modules/setting/setting.go b/modules/setting/setting.go index a473dad6a..601a20309 100755 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -584,6 +584,9 @@ var ( TrainJobFLAVORINFOS string ModelArtsSpecialPools string ModelArtsMultiNode string + ModelArtsShareAddr string + ModelArtsMountPath string + ModelArtsNasType string //kanban IsCloudbrainTimingEnabled bool @@ -1542,6 +1545,9 @@ func NewContext() { TrainJobFLAVORINFOS = sec.Key("TrainJob_FLAVOR_INFOS").MustString("") ModelArtsSpecialPools = sec.Key("SPECIAL_POOL").MustString("") ModelArtsMultiNode = sec.Key("MULTI_NODE").MustString("") + ModelArtsShareAddr = sec.Key("ModelArts_Share_Addr").MustString("192.168.0.30:/") + ModelArtsMountPath = sec.Key("ModelArts_Mount_Path").MustString("/cache/sfs") + ModelArtsNasType = sec.Key("ModelArts_Nas_Type").MustString("nfs") sec = Cfg.Section("elk") ElkUrl = sec.Key("ELKURL").MustString("")