模型评测任务在个人中心及首页推送显示问题。

Signed-off-by: zouap <zouap@pcl.ac.cn>

models/action.go

@@ -65,7 +65,6 @@ const (
 	ActionCreateImage               //36
 	ActionImageRecommend            //37
 	ActionChangeUserAvatar          //38
-
 )
 
 // Action represents user operation type and other information to

modules/cloudbrain/cloudbrain.go

@@ -20,19 +20,19 @@ import (
 const (
 	//Command = `pip3 install jupyterlab==2.2.5 -i https://pypi.tuna.tsinghua.edu.cn/simple;service ssh stop;jupyter lab --no-browser --ip=0.0.0.0 --allow-root --notebook-dir="/code" --port=80 --LabApp.token="" --LabApp.allow_origin="self https://cloudbrain.pcl.ac.cn"`
 	//CommandBenchmark      = `echo "start benchmark";python /code/test.py;echo "end benchmark"`
-	CommandBenchmark      = `cd /benchmark && bash run_bk.sh >/model/benchmark-log.txt`
-	CodeMountPath         = "/code"
-	DataSetMountPath      = "/dataset"
-	ModelMountPath        = "/model"
+	CommandBenchmark       = `cd /benchmark && bash run_bk.sh >/model/benchmark-log.txt`
+	CodeMountPath          = "/code"
+	DataSetMountPath       = "/dataset"
+	ModelMountPath         = "/model"
 	PretrainModelMountPath = "/pretrainmodel"
-	LogFile               = "log.txt"
-	BenchMarkMountPath    = "/benchmark"
-	BenchMarkResourceID   = 1
-	Snn4imagenetMountPath = "/snn4imagenet"
-	BrainScoreMountPath   = "/brainscore"
-	TaskInfoName          = "/taskInfo"
-	Snn4imagenetCommand   = `/opt/conda/bin/python /snn4imagenet/testSNN_script.py --modelname '%s' --modelpath '/dataset' --modeldescription '%s' >/model/benchmark-log.txt`
-	BrainScoreCommand     = `bash /brainscore/brainscore_test_par4shSrcipt.sh -b '%s' -n '%s' -p '/dataset' -d '%s' >/model/benchmark-log.txt`
+	LogFile                = "log.txt"
+	BenchMarkMountPath     = "/benchmark"
+	BenchMarkResourceID    = 1
+	Snn4imagenetMountPath  = "/snn4imagenet"
+	BrainScoreMountPath    = "/brainscore"
+	TaskInfoName           = "/taskInfo"
+	Snn4imagenetCommand    = `/opt/conda/bin/python /snn4imagenet/testSNN_script.py --modelname '%s' --modelpath '/dataset' --modeldescription '%s' >/model/benchmark-log.txt`
+	BrainScoreCommand      = `bash /brainscore/brainscore_test_par4shSrcipt.sh -b '%s' -n '%s' -p '/dataset' -d '%s' >/model/benchmark-log.txt`
 
 	SubTaskName = "task1"
 
@@ -405,7 +405,7 @@ func GenerateTask(req GenerateCloudBrainTaskReq) error {
 }
 
 func IsBenchmarkJob(jobType string) bool {
-	return string(models.JobTypeBenchmark) == jobType || string(models.JobTypeBrainScore) == jobType || string(models.JobTypeSnn4imagenet) == jobType
+	return string(models.JobTypeModelSafety) == jobType || string(models.JobTypeBenchmark) == jobType || string(models.JobTypeBrainScore) == jobType || string(models.JobTypeSnn4imagenet) == jobType
 }
 
 func GetWaitingCloudbrainCount(cloudbrainType int, computeResource string, jobTypes ...models.JobType) int64 {

modules/modelarts/modelarts.go

@@ -771,7 +771,12 @@ func GenerateInferenceJob(ctx *context.Context, req *GenerateInferenceJobReq) (e
 		log.Error("CreateCloudbrain(%s) failed:%v", req.JobName, err.Error())
 		return err
 	}
-	notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, jobID, req.DisplayJobName, models.ActionCreateInferenceTask)
+	if req.JobType == string(models.JobTypeModelSafety) {
+		notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, jobID, req.DisplayJobName, models.ActionCreateBenchMarkTask)
+	} else {
+		notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, jobID, req.DisplayJobName, models.ActionCreateInferenceTask)
+	}
+
 	return nil
 }