提交代码

models/cloudbrain.go

@@ -336,7 +336,7 @@ func IsModelArtsDebugJobTerminal(status string) bool {
 func IsCloudBrainOneDebugJobTerminal(status string) bool {
 	return status == string(JobStopped) || status == string(JobFailed) || status == string(JobSucceeded)
 }
-func IsBenchMarkJobType(jobType string) bool {
+func IsModelBenchMarkJobType(jobType string) bool {
 	return jobType == string(JobTypeSnn4imagenet) || jobType == string(JobTypeBrainScore) || jobType == string(JobTypeSnn4Ecoset)
 }
 

modules/cloudbrain/cloudbrain.go

@@ -32,9 +32,9 @@ const (
 	Snn4imagenetMountPath  = "/snn4imagenet"
 	BrainScoreMountPath    = "/brainscore"
 	TaskInfoName           = "/taskInfo"
-	Snn4imagenetCommand    = `/opt/conda/bin/python /code/testSNN_script.py --modelname '%s' --modelpath '/pretrainmodel/%s' --modeldescription '%s' >/model/benchmark-log.txt`
-	BrainScoreCommand      = `bash /code/brainscore_test_par4shSrcipt.sh -b '%s' -n '%s' -p '/pretrainmodel/%s' -d '%s' >/model/benchmark-log.txt`
-	Snn4EcosetCommand      = `/opt/conda/bin/python /code/testSNN_script_user.py --datapath '/dataset' --modelname '%s' --modelpath '/pretrainmodel/%s'  --modeldescription '%s' >/model/benchmark-log.txt`
+	Snn4imagenetCommand    = `/opt/conda/bin/python /benchmark/testSNN_script.py --modelname '%s' --modelpath '/pretrainmodel/%s' --modeldescription '%s' >/model/benchmark-log.txt`
+	BrainScoreCommand      = `bash /benchmark/brainscore_test_par4shSrcipt.sh -b '%s' -n '%s' -p '/pretrainmodel/%s' -d '%s' >/model/benchmark-log.txt`
+	Snn4EcosetCommand      = `/opt/conda/bin/python /benchmark/testSNN_script.py --datapath '/dataset' --modelname '%s' --modelpath '/pretrainmodel/%s'  --modeldescription '%s' >/model/benchmark-log.txt`
 	SubTaskName            = "task1"
 
 	Success = "S000"

routers/repo/cloudbrain.go

@@ -843,7 +843,7 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo
 
 	if task.JobType == string(models.JobTypeBenchmark) {
 		task.BenchmarkType = ctx.Tr("repo.cloudbrain.benchmark.algorithm")
-	} else if models.IsBenchMarkJobType(task.JobType) {
+	} else if models.IsModelBenchMarkJobType(task.JobType) {
 		task.BenchmarkType = ctx.Tr("repo.cloudbrain.benchmark.model")
 		task.BenchmarkTypeName = task.JobType
 		ctx.Data["BenchmarkTypeName"] = task.JobType
@@ -2181,7 +2181,7 @@ func CloudBrainBenchmarkIndex(ctx *context.Context) {
 		ciTasks[i].BenchmarkTypeName = ""
 		if ciTasks[i].JobType == string(models.JobTypeBenchmark) {
 			ciTasks[i].BenchmarkType = ctx.Tr("repo.cloudbrain.benchmark.algorithm")
-		} else if models.IsBenchMarkJobType(ciTasks[i].JobType) {
+		} else if models.IsModelBenchMarkJobType(ciTasks[i].JobType) {
 			ciTasks[i].BenchmarkType = ctx.Tr("repo.cloudbrain.benchmark.model")
 			ciTasks[i].BenchmarkTypeName = ciTasks[i].JobType
 
@@ -2541,7 +2541,8 @@ func ModelBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainForm)
 	jobName := util.ConvertDisplayJobNameToJobName(displayJobName)
 	image := form.Image
 	jobType := form.JobType
-
+	codePath := setting.JobPath + jobName + cloudbrain.CodeMountPath
+	branchName := cloudbrain.DefaultBranchName
 	repo := ctx.Repo.Repository
 
 	tpl := tplCloudBrainBenchmarkNew
@@ -2580,7 +2581,7 @@ func ModelBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainForm)
 		return
 	}
 
-	if !models.IsBenchMarkJobType(jobType) {
+	if !models.IsModelBenchMarkJobType(jobType) {
 		log.Error("jobtype error:", jobType, ctx.Data["MsgID"])
 		cloudBrainNewDataPrepare(ctx, jobType)
 		ctx.RenderWithErr("jobtype error", tpl, &form)
@@ -2602,21 +2603,25 @@ func ModelBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainForm)
 		}
 	}
 
+	downloadCode(repo, codePath, branchName)
+	uploadCodeToMinio(codePath+"/", jobName, cloudbrain.CodeMountPath+"/")
+
 	modelPath := setting.JobPath + jobName + cloudbrain.ModelMountPath + "/"
 	mkModelPath(modelPath)
 	uploadCodeToMinio(modelPath, jobName, cloudbrain.ModelMountPath+"/")
 
-	codePath := setting.JobPath + jobName + cloudbrain.CodeMountPath
+	benchmarkPath := setting.JobPath + jobName + cloudbrain.BenchMarkMountPath
 	if setting.IsSnn4imagenetEnabled && jobType == string(models.JobTypeSnn4imagenet) {
-		downloadRateCode(repo, jobName, setting.Snn4imagenetOwner, setting.Snn4imagenetName, codePath, "", "", ctx.User.Name)
-		uploadCodeToMinio(codePath+"/", jobName, cloudbrain.CodeMountPath+"/")
+		downloadRateCode(repo, jobName, setting.Snn4imagenetOwner, setting.Snn4imagenetName, benchmarkPath, "", "", ctx.User.Name)
+		uploadCodeToMinio(benchmarkPath+"/", jobName, cloudbrain.BenchMarkMountPath+"/")
 		command = fmt.Sprintf(cloudbrain.Snn4imagenetCommand, displayJobName, form.CkptName, trimSpaceNewlineInString(form.Description))
 
 	}
 	benchmarkChildTypeID := 0
+
 	if setting.IsBrainScoreEnabled && jobType == string(models.JobTypeBrainScore) {
-		downloadRateCode(repo, jobName, setting.BrainScoreOwner, setting.BrainScoreName, codePath, "", "", ctx.User.Name)
-		uploadCodeToMinio(codePath+"/", jobName, cloudbrain.CodeMountPath+"/")
+		downloadRateCode(repo, jobName, setting.BrainScoreOwner, setting.BrainScoreName, benchmarkPath, "", "", ctx.User.Name)
+		uploadCodeToMinio(benchmarkPath+"/", jobName, cloudbrain.BenchMarkMountPath+"/")
 		benchmarkChildTypeID = form.BenchmarkChildTypeID
 		command = fmt.Sprintf(cloudbrain.BrainScoreCommand, getBrainRegion(benchmarkChildTypeID), displayJobName, form.CkptName, trimSpaceNewlineInString(form.Description))
 	}
@@ -2624,8 +2629,8 @@ func ModelBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainForm)
 	var datasetInfos map[string]models.DatasetInfo
 	var datasetNames string
 	if setting.IsSnn4EcosetEnabled && jobType == string(models.JobTypeSnn4Ecoset) {
-		downloadRateCode(repo, jobName, setting.Snn4EcosetOwner, setting.Snn4EcosetName, codePath, "", "", ctx.User.Name)
-		uploadCodeToMinio(codePath+"/", jobName, cloudbrain.CodeMountPath+"/")
+		downloadRateCode(repo, jobName, setting.Snn4EcosetOwner, setting.Snn4EcosetName, benchmarkPath, "", "", ctx.User.Name)
+		uploadCodeToMinio(benchmarkPath+"/", jobName, cloudbrain.BenchMarkMountPath+"/")
 		command = fmt.Sprintf(cloudbrain.Snn4EcosetCommand, displayJobName, form.CkptName, trimSpaceNewlineInString(form.Description))
 
 		attachment, err := getEcosetAttachment()
@@ -2673,7 +2678,7 @@ func ModelBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainForm)
 		BenchmarkPath:        storage.GetMinioPath(jobName, cloudbrain.BenchMarkMountPath+"/"),
 		JobType:              jobType,
 		Description:          form.Description,
-		BranchName:           cloudbrain.DefaultBranchName,
+		BranchName:           branchName,
 		BootFile:             form.BootFile,
 		Params:               form.Params,
 		CommitID:             "",

services/cloudbrain/cloudbrainTask/count.go

@@ -76,7 +76,7 @@ var StatusInfoDict = map[string]StatusInfo{string(models.JobTypeDebug) + "-" + s
 
 func GetNotFinalStatusTaskCount(uid int64, cloudbrainType int, jobType string, computeResource ...string) (int, error) {
 	jobNewType := jobType
-	if models.IsBenchMarkJobType(jobType) {
+	if models.IsModelBenchMarkJobType(jobType) {
 		jobNewType = string(models.JobTypeBenchmark)
 	}