Merge remote-tracking branch 'origin/V20220601' into V20220519_patch

models/dataset.go

@@ -1,10 +1,12 @@
 package models
 
 import (
-	"code.gitea.io/gitea/modules/log"
 	"errors"
 	"fmt"
 	"sort"
+	"strings"
+
+	"code.gitea.io/gitea/modules/log"
 
 	"code.gitea.io/gitea/modules/timeutil"
 	"xorm.io/builder"
@@ -179,7 +181,7 @@ func SearchDatasetCondition(opts *SearchDatasetOptions) builder.Cond {
 
 func generateFilterCond(opts *SearchDatasetOptions, cond builder.Cond) builder.Cond {
 	if len(opts.Keyword) > 0 {
-		cond = cond.And(builder.Or(builder.Like{"dataset.title", opts.Keyword}, builder.Like{"dataset.description", opts.Keyword}))
+		cond = cond.And(builder.Or(builder.Like{"LOWER(dataset.title)", strings.ToLower(opts.Keyword)}, builder.Like{"LOWER(dataset.description)", strings.ToLower(opts.Keyword)}))
 	}
 
 	if len(opts.Category) > 0 {

models/org.go

@@ -160,7 +160,11 @@ func UpdateOrgStatistics() {
 			has, _ := x.Get(orgStat)
 
 			orgStat.NumScore = numScore
-			if has {
+
+			count, err := GetPublicRepositoryCount(&org)
+			if err != nil || count == 0 {
+				x.ID(orgStat.ID).Delete(new(OrgStatistic))
+			} else if has {
 				x.ID(orgStat.ID).Cols("num_score").Update(&orgStat)
 			} else {
 				x.Insert(orgStat)

routers/repo/cloudbrain.go

@@ -206,7 +206,7 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
 	ctx.Data["PageIsCloudBrain"] = true
 	displayJobName := form.DisplayJobName
 	jobName := util.ConvertDisplayJobNameToJobName(displayJobName)
-	image := form.Image
+	image := strings.TrimSpace(form.Image)
 	uuid := form.Attachment
 	jobType := form.JobType
 	gpuQueue := form.GpuType
@@ -283,30 +283,6 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
 	mkModelPath(modelPath)
 	uploadCodeToMinio(modelPath, jobName, cloudbrain.ModelMountPath+"/")
 
-	benchmarkPath := setting.JobPath + jobName + cloudbrain.BenchMarkMountPath
-	if setting.IsBenchmarkEnabled && jobType == string(models.JobTypeBenchmark) {
-		var gpuType string
-		for _, gpuInfo := range gpuInfos.GpuInfo {
-			if gpuInfo.Queue == gpuQueue {
-				gpuType = gpuInfo.Value
-			}
-		}
-		downloadRateCode(repo, jobName, setting.BenchmarkOwner, setting.BenchmarkName, benchmarkPath, form.BenchmarkCategory, gpuType)
-		uploadCodeToMinio(benchmarkPath+"/", jobName, cloudbrain.BenchMarkMountPath+"/")
-	}
-
-	snn4imagenetPath := setting.JobPath + jobName + cloudbrain.Snn4imagenetMountPath
-	if setting.IsSnn4imagenetEnabled && jobType == string(models.JobTypeSnn4imagenet) {
-		downloadRateCode(repo, jobName, setting.Snn4imagenetOwner, setting.Snn4imagenetName, snn4imagenetPath, "", "")
-		uploadCodeToMinio(snn4imagenetPath+"/", jobName, cloudbrain.Snn4imagenetMountPath+"/")
-	}
-
-	brainScorePath := setting.JobPath + jobName + cloudbrain.BrainScoreMountPath
-	if setting.IsBrainScoreEnabled && jobType == string(models.JobTypeBrainScore) {
-		downloadRateCode(repo, jobName, setting.BrainScoreOwner, setting.BrainScoreName, brainScorePath, "", "")
-		uploadCodeToMinio(brainScorePath+"/", jobName, cloudbrain.BrainScoreMountPath+"/")
-	}
-
 	err = cloudbrain.GenerateTask(ctx, displayJobName, jobName, image, command, uuid, storage.GetMinioPath(jobName, cloudbrain.CodeMountPath+"/"),
 		storage.GetMinioPath(jobName, cloudbrain.ModelMountPath+"/"),
 		storage.GetMinioPath(jobName, cloudbrain.BenchMarkMountPath+"/"), storage.GetMinioPath(jobName, cloudbrain.Snn4imagenetMountPath+"/"),
@@ -482,6 +458,17 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo
 					ctx.Data["resource_type"] = resourceType.Value
 				}
 			}
+		} else if cloudbrain.IsBenchmarkJob(task.JobType) {
+			if benchmarkGpuInfos == nil {
+				json.Unmarshal([]byte(setting.BenchmarkGpuTypes), &benchmarkGpuInfos)
+			}
+
+			for _, resourceType := range benchmarkGpuInfos.GpuInfo {
+				if resourceType.Queue == jobRes.Config.GpuType {
+					ctx.Data["resource_type"] = resourceType.Value
+				}
+			}
+
 		} else {
 			if gpuInfos == nil {
 				json.Unmarshal([]byte(setting.GpuTypes), &gpuInfos)
@@ -1241,7 +1228,7 @@ func downloadCode(repo *models.Repository, codePath, branchName string) error {
 	return nil
 }
 
-func downloadRateCode(repo *models.Repository, taskName, rateOwnerName, rateRepoName, codePath, benchmarkCategory, gpuType string) error {
+func downloadRateCode(repo *models.Repository, taskName, rateOwnerName, rateRepoName, codePath, benchmarkCategory, gpuType, userName string) error {
 	err := os.MkdirAll(codePath, os.ModePerm)
 	if err != nil {
 		log.Error("mkdir codePath failed", err.Error())
@@ -1269,7 +1256,7 @@ func downloadRateCode(repo *models.Repository, taskName, rateOwnerName, rateRepo
 	defer f.Close()
 
 	data, err := json.Marshal(models.TaskInfo{
-		Username:          repo.Owner.Name,
+		Username:          userName,
 		TaskName:          taskName,
 		CodeName:          repo.Name,
 		BenchmarkCategory: strings.Split(benchmarkCategory, ","),
@@ -1845,7 +1832,7 @@ func BenchMarkAlgorithmCreate(ctx *context.Context, form auth.CreateCloudBrainFo
 	ctx.Data["PageIsCloudBrain"] = true
 	displayJobName := form.DisplayJobName
 	jobName := util.ConvertDisplayJobNameToJobName(displayJobName)
-	image := form.Image
+	image := strings.TrimSpace(form.Image)
 	gpuQueue := form.GpuType
 	command := cloudbrain.CommandBenchmark
 	codePath := setting.JobPath + jobName + cloudbrain.CodeMountPath
@@ -1970,7 +1957,7 @@ func BenchMarkAlgorithmCreate(ctx *context.Context, form auth.CreateCloudBrainFo
 		}
 	}
 
-	if err := downloadRateCode(repo, jobName, childInfo.Owner, childInfo.RepoName, benchmarkPath, form.BenchmarkCategory, gpuType); err != nil {
+	if err := downloadRateCode(repo, jobName, childInfo.Owner, childInfo.RepoName, benchmarkPath, form.BenchmarkCategory, gpuType, ctx.User.Name); err != nil {
 		log.Error("downloadRateCode failed, %v", err, ctx.Data["MsgID"])
 		//cloudBrainNewDataPrepare(ctx)
 		//ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, &form)
@@ -2068,7 +2055,7 @@ func ModelBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainForm)
 
 	snn4imagenetPath := setting.JobPath + jobName + cloudbrain.Snn4imagenetMountPath
 	if setting.IsSnn4imagenetEnabled && jobType == string(models.JobTypeSnn4imagenet) {
-		downloadRateCode(repo, jobName, setting.Snn4imagenetOwner, setting.Snn4imagenetName, snn4imagenetPath, "", "")
+		downloadRateCode(repo, jobName, setting.Snn4imagenetOwner, setting.Snn4imagenetName, snn4imagenetPath, "", "", ctx.User.Name)
 		uploadCodeToMinio(snn4imagenetPath+"/", jobName, cloudbrain.Snn4imagenetMountPath+"/")
 		command = fmt.Sprintf(cloudbrain.Snn4imagenetCommand, displayJobName, trimSpaceNewlineInString(form.Description))
 
@@ -2076,7 +2063,7 @@ func ModelBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainForm)
 	benchmarkChildTypeID := 0
 	brainScorePath := setting.JobPath + jobName + cloudbrain.BrainScoreMountPath
 	if setting.IsBrainScoreEnabled && jobType == string(models.JobTypeBrainScore) {
-		downloadRateCode(repo, jobName, setting.BrainScoreOwner, setting.BrainScoreName, brainScorePath, "", "")
+		downloadRateCode(repo, jobName, setting.BrainScoreOwner, setting.BrainScoreName, brainScorePath, "", "", ctx.User.Name)
 		uploadCodeToMinio(brainScorePath+"/", jobName, cloudbrain.BrainScoreMountPath+"/")
 		benchmarkChildTypeID = form.BenchmarkChildTypeID
 		command = fmt.Sprintf(cloudbrain.BrainScoreCommand, getBrainRegion(benchmarkChildTypeID), displayJobName, trimSpaceNewlineInString(form.Description))
@@ -2136,7 +2123,7 @@ func CloudBrainTrainJobNew(ctx *context.Context) {
 
 func getTrainJobCommand(form auth.CreateCloudBrainForm) (string, error) {
 	var command string
-	bootFile := form.BootFile
+	bootFile := strings.TrimSpace(form.BootFile)
 	params := form.Params
 
 	if !strings.HasSuffix(bootFile, ".py") {

routers/repo/modelarts.go

@@ -967,7 +967,7 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
 	description := form.Description
 	workServerNumber := form.WorkServerNumber
 	engineID := form.EngineID
-	bootFile := form.BootFile
+	bootFile := strings.TrimSpace(form.BootFile)
 	flavorCode := form.Flavor
 	params := form.Params
 	poolID := form.PoolID
@@ -1210,7 +1210,7 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ
 	description := form.Description
 	workServerNumber := form.WorkServerNumber
 	engineID := form.EngineID
-	bootFile := form.BootFile
+	bootFile := strings.TrimSpace(form.BootFile)
 	flavorCode := form.Flavor
 	params := form.Params
 	poolID := form.PoolID
@@ -1284,7 +1284,7 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ
 
 	var parameters models.Parameters
 	param := make([]models.Parameter, 0)
-	existDeviceTarget := true
+	existDeviceTarget := false
 	if len(params) != 0 {
 		err := json.Unmarshal([]byte(params), &parameters)
 		if err != nil {
@@ -1803,7 +1803,7 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference
 	description := form.Description
 	workServerNumber := form.WorkServerNumber
 	engineID := form.EngineID
-	bootFile := form.BootFile
+	bootFile := strings.TrimSpace(form.BootFile)
 	flavorCode := form.Flavor
 	params := form.Params
 	poolID := form.PoolID