mod-cloudbrain-type
into V20211101
2 years ago
@@ -29,6 +29,7 @@ const ( | |||||
JobTypeBenchmark JobType = "BENCHMARK" | JobTypeBenchmark JobType = "BENCHMARK" | ||||
JobTypeSnn4imagenet JobType = "SNN4IMAGENET" | JobTypeSnn4imagenet JobType = "SNN4IMAGENET" | ||||
JobTypeBrainScore JobType = "BRAINSCORE" | JobTypeBrainScore JobType = "BRAINSCORE" | ||||
JobTypeTrain JobType = "TRAIN" | |||||
ModelArtsCreateQueue ModelArtsJobStatus = "CREATE_QUEUING" //免费资源创建排队中 | ModelArtsCreateQueue ModelArtsJobStatus = "CREATE_QUEUING" //免费资源创建排队中 | ||||
ModelArtsCreating ModelArtsJobStatus = "CREATING" //创建中 | ModelArtsCreating ModelArtsJobStatus = "CREATING" //创建中 | ||||
@@ -153,7 +154,8 @@ type CloudbrainsOptions struct { | |||||
SortType string | SortType string | ||||
CloudbrainIDs []int64 | CloudbrainIDs []int64 | ||||
// JobStatus CloudbrainStatus | // JobStatus CloudbrainStatus | ||||
Type int | |||||
Type int | |||||
JobType string | |||||
} | } | ||||
type TaskPod struct { | type TaskPod struct { | ||||
TaskRoleStatus struct { | TaskRoleStatus struct { | ||||
@@ -846,6 +848,12 @@ func Cloudbrains(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) { | |||||
) | ) | ||||
} | } | ||||
if (opts.JobType) != "" { | |||||
cond = cond.And( | |||||
builder.Eq{"cloudbrain.job_type": opts.JobType}, | |||||
) | |||||
} | |||||
// switch opts.JobStatus { | // switch opts.JobStatus { | ||||
// case JobWaiting: | // case JobWaiting: | ||||
// cond.And(builder.Eq{"cloudbrain.status": int(JobWaiting)}) | // cond.And(builder.Eq{"cloudbrain.status": int(JobWaiting)}) | ||||
@@ -14,11 +14,8 @@ const ( | |||||
) | ) | ||||
const ( | const ( | ||||
TypeCloudBrainOne = 0 | |||||
TypeCloudBrainNotebook = 1 | |||||
TypeCloudBrainTrainJob = 2 | |||||
TypeCloudBrainTwo = 1 | |||||
TypeCloudBrainOne int = iota | |||||
TypeCloudBrainTwo | |||||
) | ) | ||||
type FileChunk struct { | type FileChunk struct { | ||||
@@ -159,7 +159,7 @@ func GenerateTask(ctx *context.Context, jobName, uuid, description string) error | |||||
JobID: jobResult.ID, | JobID: jobResult.ID, | ||||
JobName: jobName, | JobName: jobName, | ||||
JobType: string(models.JobTypeDebug), | JobType: string(models.JobTypeDebug), | ||||
Type: models.TypeCloudBrainNotebook, | |||||
Type: models.TypeCloudBrainTwo, | |||||
Uuid: uuid, | Uuid: uuid, | ||||
}) | }) | ||||
@@ -207,8 +207,8 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) error { | |||||
RepoID: ctx.Repo.Repository.ID, | RepoID: ctx.Repo.Repository.ID, | ||||
JobID: strconv.FormatInt(jobResult.JobID, 10), | JobID: strconv.FormatInt(jobResult.JobID, 10), | ||||
JobName: req.JobName, | JobName: req.JobName, | ||||
JobType: string(models.JobTypeDebug), | |||||
Type: models.TypeCloudBrainTrainJob, | |||||
JobType: string(models.JobTypeTrain), | |||||
Type: models.TypeCloudBrainTwo, | |||||
VersionID: jobResult.VersionID, | VersionID: jobResult.VersionID, | ||||
VersionName: jobResult.VersionName, | VersionName: jobResult.VersionName, | ||||
Uuid: req.Uuid, | Uuid: req.Uuid, | ||||
@@ -1020,7 +1020,7 @@ func queryDatasets(ctx *context.Context, attachs []*models.AttachmentUsername) { | |||||
} | } | ||||
func checkTypeCloudBrain(typeCloudBrain int) error { | func checkTypeCloudBrain(typeCloudBrain int) error { | ||||
if typeCloudBrain != models.TypeCloudBrainOne && typeCloudBrain != models.TypeCloudBrainNotebook { | |||||
if typeCloudBrain != models.TypeCloudBrainOne && typeCloudBrain != models.TypeCloudBrainTwo { | |||||
log.Error("type error:", typeCloudBrain) | log.Error("type error:", typeCloudBrain) | ||||
return errors.New("type error") | return errors.New("type error") | ||||
} | } | ||||
@@ -287,7 +287,8 @@ func NotebookIndex(ctx *context.Context) { | |||||
PageSize: setting.UI.IssuePagingNum, | PageSize: setting.UI.IssuePagingNum, | ||||
}, | }, | ||||
RepoID: repo.ID, | RepoID: repo.ID, | ||||
Type: models.TypeCloudBrainNotebook, | |||||
Type: models.TypeCloudBrainTwo, | |||||
JobType: string(models.JobTypeDebug), | |||||
}) | }) | ||||
if err != nil { | if err != nil { | ||||
ctx.ServerError("Cloudbrain", err) | ctx.ServerError("Cloudbrain", err) | ||||
@@ -512,7 +513,8 @@ func TrainJobIndex(ctx *context.Context) { | |||||
PageSize: setting.UI.IssuePagingNum, | PageSize: setting.UI.IssuePagingNum, | ||||
}, | }, | ||||
RepoID: repo.ID, | RepoID: repo.ID, | ||||
Type: models.TypeCloudBrainTrainJob, | |||||
Type: models.TypeCloudBrainTwo, | |||||
JobType: string(models.JobTypeTrain), | |||||
}) | }) | ||||
if err != nil { | if err != nil { | ||||
ctx.ServerError("Cloudbrain", err) | ctx.ServerError("Cloudbrain", err) | ||||
Dear OpenI User
Thank you for your continuous support to the Openl Qizhi Community AI Collaboration Platform. In order to protect your usage rights and ensure network security, we updated the Openl Qizhi Community AI Collaboration Platform Usage Agreement in January 2024. The updated agreement specifies that users are prohibited from using intranet penetration tools. After you click "Agree and continue", you can continue to use our services. Thank you for your cooperation and understanding.
For more agreement content, please refer to the《Openl Qizhi Community AI Collaboration Platform Usage Agreement》