Merge branch 'master' of https://dev.lstznkj.com/DevLibs/MultiVisionModels

models/line_detect/predict.py

@@ -330,7 +330,7 @@ class Predict:
         im = img_tensor.permute(1, 2, 0)  # [H, W, 3]
         # im_resized = skimage.transform.resize(im.cpu().numpy().astype(np.float32), (512, 512))  # (512, 512, 3)
         if im.shape != (512, 512, 3):
-            im_resized = cv2.resize(im.cpu().numpy().astype(np.float32), (512, 512), interpolation=cv2.INTER_LINEAR)
+            im = cv2.resize(im.cpu().numpy().astype(np.float32), (512, 512), interpolation=cv2.INTER_LINEAR)
         img_ = torch.tensor(im).permute(2, 0, 1)  # [3, 512, 512]
         t_end = time.time()
         print(f"Image preprocessing used: {t_end - t_start:.4f} seconds")
@@ -424,7 +424,7 @@ class Predict1:
         im = img_tensor.permute(1, 2, 0)  # [H, W, 3]
         # im_resized = skimage.transform.resize(im.cpu().numpy().astype(np.float32), (512, 512))  # (512, 512, 3)
         if im.shape != (512, 512, 3):
-            im_resized = cv2.resize(im.cpu().numpy().astype(np.float32), (512, 512), interpolation=cv2.INTER_LINEAR)
+            im = cv2.resize(im.cpu().numpy().astype(np.float32), (512, 512), interpolation=cv2.INTER_LINEAR)
         img_ = torch.tensor(im).permute(2, 0, 1)  # [3, 512, 512]
         t_end = time.time()
         print(f"Image preprocessing used: {t_end - t_start:.4f} seconds")

models/line_detect/predict_demo.py

@@ -1,9 +1,10 @@
-from models.line_detect.line_net import linenet_resnet18_fpn
+from models.line_detect.line_net import linenet_resnet18_fpn, linenet_resnet50_fpn
 
 if __name__ == '__main__':
-    model=linenet_resnet18_fpn()
-    model.load_best_model(r'E:\projects\tmp\MultiVisionModels\models\line_detect\train_results\20250515_173829\weights\best_val.pth')
+    # model=linenet_resnet18_fpn()
+    model = linenet_resnet50_fpn()
+    model.load_best_model(r"\\192.168.50.222\share\zyh\best_val.pth")
 
-    img_path=r"\\192.168.50.222\share\rlq\datasets\修订513pcd转换彩图标注后汇总\2025-05-13-08-37-48_LaserData_ID019504_color.jpg"
+    img_path=r"\\192.168.50.222\share\zyh\5月彩色钢板数据汇总\total_325\2025-05-13-08-38-03_LaserData_ID019504_color.jpg"
 
     model.predict(img_path)