Merge branch 'master' of https://gitea.star-rising.cn/xkrs_manan/RODY

app/controller/AlgorithmController.py

@@ -21,7 +21,7 @@ from app.utils.websocket_tool import manager
 import sys
 from pathlib import Path
 
-# from pynvml import *
+from pynvml import *
 # FILE = Path(__file__).resolve()
 # ROOT = FILE.parents[0]  # YOLOv5 root directory
 # if str(ROOT) not in sys.path:
@@ -386,7 +386,7 @@ def returnTrainParams():
         {"index": 4, "name": "saveModDir", "value": "E:/alg_demo-master/alg_demo/app/yolov5/best.pt",
          "description": '保存模型路径',
          "default": "./app/maskrcnn/saved_model/test.pt", "type": "S", 'show': False},
-        {"index": 5, "name": "resumeModPath", "value": 'E:/alg_demo-master/alg_demo/app/yolov5/yolov5s.pt',
+        {"index": 5, "name": "resumeModPath", "value": '/yolov5s.pt',
          "description": '继续训练路径', "default": '', "type": "S",
          'show': False},
         {"index": 6, "name": "resumeMod", "value": '', "description": '继续训练模型', "default": '', "type": "E", "items": '',