merge develop

PaddlePaddle · Jan 28, 2023 · 0e16f7f · 0e16f7f
2 parents fc63886 + b7a6bb6
commit 0e16f7f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/deploy/pptracking/python/det_infer.py b/deploy/pptracking/python/det_infer.py
@@ -39,6 +39,7 @@
 # Global dictionary
 SUPPORT_MODELS = {
     'YOLO',
+    'PPYOLOE',
     'PicoDet',
     'JDE',
     'FairMOT',

diff --git a/ppdet/engine/trainer.py b/ppdet/engine/trainer.py
@@ -399,7 +399,8 @@ def load_weights(self, weights):
     def load_weights_sde(self, det_weights, reid_weights):
         if self.model.detector:
             load_weight(self.model.detector, det_weights)
-            load_weight(self.model.reid, reid_weights)
+            if self.model.reid:
+                load_weight(self.model.reid, reid_weights)
         else:
             load_weight(self.model.reid, reid_weights)
 

diff --git a/ppdet/modeling/architectures/ppyoloe.py b/ppdet/modeling/architectures/ppyoloe.py
@@ -20,6 +20,8 @@
 from .meta_arch import BaseArch
 
 __all__ = ['PPYOLOE']
+# PP-YOLOE and PP-YOLOE+ are recommended to use this architecture
+# PP-YOLOE and PP-YOLOE+ can also use the same architecture of YOLOv3 in yolo.py
 
 
 @register

diff --git a/ppdet/modeling/architectures/yolo.py b/ppdet/modeling/architectures/yolo.py
@@ -22,6 +22,7 @@
 
 __all__ = ['YOLOv3']
 # YOLOv3,PP-YOLO,PP-YOLOv2,PP-YOLOE,PP-YOLOE+ use the same architecture as YOLOv3
+# PP-YOLOE and PP-YOLOE+ are recommended to use PPYOLOE architecture in ppyoloe.py
 
 
 @register