#4023 GPU再次调试,如果模型不存在,则直接报错。

Merged
ychao_1983 merged 5 commits from zouap into V20230410 1 year ago
  1. +0
    -6
      models/cloudbrain.go
  2. +8
    -7
      routers/repo/cloudbrain.go
  3. +1
    -1
      services/cloudbrain/modelmanage/model_manage.go

+ 0
- 6
models/cloudbrain.go View File

@@ -2090,12 +2090,6 @@ func increaseModelReference(session *xorm.Session, modelId string) {
}
}

// func IncreaseModelRefernceCount(cloudbrain *Cloudbrain) {
// if cloudbrain.ModelId != "" {
// AddModelInferenceCount(cloudbrain.ModelId)
// }
// }

func getRepoCloudBrain(cb *Cloudbrain) (*Cloudbrain, error) {
has, err := x.Get(cb)
if err != nil {


+ 8
- 7
routers/repo/cloudbrain.go View File

@@ -22,6 +22,7 @@ import (
"code.gitea.io/gitea/modules/dataset"

"code.gitea.io/gitea/services/cloudbrain/cloudbrainTask"
"code.gitea.io/gitea/services/cloudbrain/modelmanage"
"code.gitea.io/gitea/services/cloudbrain/resource"
"code.gitea.io/gitea/services/reward/point/account"

@@ -433,9 +434,9 @@ func cloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {

func dealModelInfo(modelId string, jobName string, ckptName string) (string, error) {
preModel, err := models.QueryModelById(modelId)
if err != nil {
if err != nil || preModel == nil {
log.Error("Can not find model", err)
return "", err
return "", fmt.Errorf("Can not find model: %v", ckptName)
}
minioPreModelURL, err := downloadModelFromObs(preModel, jobName, cloudbrain.PretrainModelMountPath, ckptName)
if err != nil {
@@ -787,11 +788,11 @@ func CloudBrainRestart(ctx *context.Context) {
break
}
}
// if !modelmanage.HasModelFile(task) {
// resultCode = "-1"
// errorMsg = ctx.Tr("repo.debug.manage.model_not_exist")
// break
// }
if !modelmanage.HasModelFile(task) {
resultCode = "-1"
errorMsg = ctx.Tr("repo.debug.manage.model_not_exist")
break
}

if hasDatasetDeleted(task) {
resultCode = "-1"


+ 1
- 1
services/cloudbrain/modelmanage/model_manage.go View File

@@ -28,7 +28,7 @@ func HasModelFile(task *models.Cloudbrain) bool {
}

model, err := models.QueryModelById(task.ModelId)
if err != nil {
if err != nil || model == nil {
log.Error("Can not find model", err)
return false
}


Loading…
Cancel
Save