Merge pull request '解决不配置推理影响调试训练任务问题，解决删除报500错误问题' (#2498) from gpu-inference into V20220718

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2498
Reviewed-by: zouap <zouap@pcl.ac.cn>

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

web_src/js/features/cloudrbanin.js

@@ -458,10 +458,15 @@ export default async function initCloudrain() {
   });
 
   function setWaitNums() {
-    console.log($(".cloudbrain-type"));
     if ($(".cloudbrain-type").length === 0 && $(".gpu-type").length === 0) {
       return;
     }
+    if (
+      $(".cloudbrain-type").length !== 0 &&
+      !$(".cloudbrain-type").data("queue")
+    ) {
+      return;
+    }
     let waitNums = $(".cloudbrain-type").data("queue").split("map")[1];
     let test = new Map();
     let waitNumsArray = waitNums.split(" ");