From e2ca3b5be4a32363925ba0adc76c1635153740a2 Mon Sep 17 00:00:00 2001 From: tzwang Date: Fri, 2 Feb 2024 11:28:19 +0800 Subject: [PATCH] modified shuguangAi implementations Former-commit-id: ec3fe090a5fc92df53e058aa6602923dca56e089 --- api/internal/scheduler/schedulers/option/aiOption.go | 4 +++- api/internal/scheduler/strategy/replication.go | 2 +- api/internal/storeLink/shuguangai.go | 7 ++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/api/internal/scheduler/schedulers/option/aiOption.go b/api/internal/scheduler/schedulers/option/aiOption.go index b1029d37..cd0d36fb 100644 --- a/api/internal/scheduler/schedulers/option/aiOption.go +++ b/api/internal/scheduler/schedulers/option/aiOption.go @@ -1,9 +1,11 @@ package option type AiOption struct { - AiType string // shuguangAi/octopus + //AiType string // shuguangAi/octopus ResourceType string // cpu/gpu/compute card TaskType string // pytorch/tensorflow + DatasetsType string + CodeType string ImageId string SpecId string diff --git a/api/internal/scheduler/strategy/replication.go b/api/internal/scheduler/strategy/replication.go index fad6fcde..f9b04b1f 100644 --- a/api/internal/scheduler/strategy/replication.go +++ b/api/internal/scheduler/strategy/replication.go @@ -1,7 +1,7 @@ package strategy import ( - "github.com/pkg/errors" + "errors" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/scheduler/entity" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/scheduler/strategy/param" ) diff --git a/api/internal/storeLink/shuguangai.go b/api/internal/storeLink/shuguangai.go index 57fecfc6..ad430d55 100644 --- a/api/internal/storeLink/shuguangai.go +++ b/api/internal/storeLink/shuguangai.go @@ -210,9 +210,14 @@ func (o *ShuguangAi) GetResourceSpecs() (*collector.ResourceSpecs, error) { } func (o *ShuguangAi) Execute(option *option.AiOption) (interface{}, error) { - task, err := o.SubmitTask(option.ImageId, option.Cmd, option.Envs, option.Params, option.ResourceId, option.AiType) + o.generateSubmitParams(option) + task, err := o.SubmitTask(option.ImageId, option.Cmd, option.Envs, option.Params, option.ResourceId, option.TaskType) if err != nil { return nil, err } return task, nil } + +func (o *ShuguangAi) generateSubmitParams(option *option.AiOption) { + +}