Merge branch 'gpu-inference' of git.openi.org.cn:OpenI/aiforge into gpu-inference

routers/api/v1/api.go

@@ -925,7 +925,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Group("/inference-job", func() {
 						m.Group("/:jobid", func() {
 							m.Get("", repo.GetCloudBrainInferenceJob)
-							m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.DelCloudBrainJob)
+							m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRightForTrain, repo.DelCloudBrainJob)
 							m.Get("/result_list", repo.InferencJobResultList)
 						})
 					})

routers/repo/cloudbrain.go

@@ -131,10 +131,12 @@ func cloudBrainNewDataPrepare(ctx *context.Context) error {
 	}
 	ctx.Data["train_gpu_types"] = trainGpuInfos.GpuInfo
 
-	if inferenceGpuInfos == nil {
+	if inferenceGpuInfos == nil && setting.InferenceGpuTypes != "" {
 		json.Unmarshal([]byte(setting.InferenceGpuTypes), &inferenceGpuInfos)
 	}
-	ctx.Data["inference_gpu_types"] = inferenceGpuInfos.GpuInfo
+	if inferenceGpuInfos != nil {
+		ctx.Data["inference_gpu_types"] = inferenceGpuInfos.GpuInfo
+	}
 
 	if benchmarkGpuInfos == nil {
 		json.Unmarshal([]byte(setting.BenchmarkGpuTypes), &benchmarkGpuInfos)
@@ -156,10 +158,12 @@ func cloudBrainNewDataPrepare(ctx *context.Context) error {
 	}
 	ctx.Data["train_resource_specs"] = cloudbrain.TrainResourceSpecs.ResourceSpec
 
-	if cloudbrain.InferenceResourceSpecs == nil {
+	if cloudbrain.InferenceResourceSpecs == nil && setting.InferenceResourceSpecs != "" {
 		json.Unmarshal([]byte(setting.InferenceResourceSpecs), &cloudbrain.InferenceResourceSpecs)
 	}
-	ctx.Data["inference_resource_specs"] = cloudbrain.InferenceResourceSpecs.ResourceSpec
+	if cloudbrain.InferenceResourceSpecs != nil {
+		ctx.Data["inference_resource_specs"] = cloudbrain.InferenceResourceSpecs.ResourceSpec
+	}
 
 	if cloudbrain.SpecialPools != nil {
 		var debugGpuTypes []*models.GpuInfo