| @@ -30,6 +30,7 @@ import ( | |||||
| "gitlink.org.cn/JointCloud/pcm-modelarts/client/modelartsservice" | "gitlink.org.cn/JointCloud/pcm-modelarts/client/modelartsservice" | ||||
| "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" | "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" | ||||
| modelartsclient "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" | modelartsclient "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" | ||||
| "k8s.io/apimachinery/pkg/util/json" | |||||
| "log" | "log" | ||||
| "mime/multipart" | "mime/multipart" | ||||
| "regexp" | "regexp" | ||||
| @@ -155,6 +156,8 @@ func (m *ModelArtsLink) SubmitTask(ctx context.Context, imageId string, cmd stri | |||||
| // modelArts提交任务 | // modelArts提交任务 | ||||
| environments := make(map[string]string) | environments := make(map[string]string) | ||||
| parameters := make([]*modelarts.ParametersTrainJob, 0) | parameters := make([]*modelarts.ParametersTrainJob, 0) | ||||
| /* inputs := make([]*modelarts.InputTraining, 0) | |||||
| outputs := make([]*modelarts.OutputTraining, 0)*/ | |||||
| for _, env := range envs { | for _, env := range envs { | ||||
| s := strings.Split(env, COMMA) | s := strings.Split(env, COMMA) | ||||
| environments[s[0]] = s[1] | environments[s[0]] = s[1] | ||||
| @@ -166,6 +169,22 @@ func (m *ModelArtsLink) SubmitTask(ctx context.Context, imageId string, cmd stri | |||||
| Value: s[1], | Value: s[1], | ||||
| }) | }) | ||||
| } | } | ||||
| /* inputs = append(inputs, &modelarts.InputTraining{ | |||||
| Name: "data_url", | |||||
| Remote: &modelarts.RemoteTra{ | |||||
| Obs: &modelarts.Obs1{ | |||||
| ObsUrl: "/test-wq/data/mnist.npz", | |||||
| }, | |||||
| }}) | |||||
| outputs = append(outputs, &modelarts.OutputTraining{ | |||||
| Name: "train_url", | |||||
| Remote: &modelarts.RemoteOut{ | |||||
| Obs: &modelarts.ObsTra{ | |||||
| ObsUrl: "/test-wq/model/", | |||||
| }, | |||||
| }, | |||||
| })*/ | |||||
| req := &modelarts.CreateTrainingJobReq{ | req := &modelarts.CreateTrainingJobReq{ | ||||
| Kind: "job", | Kind: "job", | ||||
| Metadata: &modelarts.MetadataS{ | Metadata: &modelarts.MetadataS{ | ||||
| @@ -180,15 +199,22 @@ func (m *ModelArtsLink) SubmitTask(ctx context.Context, imageId string, cmd stri | |||||
| Command: cmd, | Command: cmd, | ||||
| Environments: environments, | Environments: environments, | ||||
| Parameters: parameters, | Parameters: parameters, | ||||
| //Inputs: inputs, | |||||
| //Outputs: outputs, | |||||
| }, | }, | ||||
| Spec: &modelarts.SpecsC{ | Spec: &modelarts.SpecsC{ | ||||
| Resource: &modelarts.ResourceCreateTraining{ | Resource: &modelarts.ResourceCreateTraining{ | ||||
| FlavorId: resourceId, | |||||
| FlavorId: "modelarts.kat1.xlarge", | |||||
| NodeCount: 1, | NodeCount: 1, | ||||
| }, | }, | ||||
| }, | }, | ||||
| Platform: m.platform, | Platform: m.platform, | ||||
| } | } | ||||
| marshal, err2 := json.Marshal(req) | |||||
| if err2 != nil { | |||||
| } | |||||
| println(string(marshal)) | |||||
| resp, err := m.modelArtsRpc.CreateTrainingJob(ctx, req) | resp, err := m.modelArtsRpc.CreateTrainingJob(ctx, req) | ||||
| if err != nil { | if err != nil { | ||||
| return nil, err | return nil, err | ||||