del: 删除多余文件

pdfdet/models/Paddle/configs/picodet/legacy_model/application/layout_analysis/picodet_lcnet_x1_0_layout.yml

@@ -17,7 +17,7 @@ PicoDet:
   backbone: LCNet
   neck: CSPPAN
   head: PicoHead
-  nms_cpu: True
+  #nms_cpu: True
 
 LCNet:
   scale: 1.0

pdfdet/models/Paddle/configs/picodet/legacy_model/application/layout_analysis/picodet_lcnet_x1_0_layout1.yml

@@ -17,7 +17,7 @@ PicoDet:
   backbone: LCNet
   neck: CSPPAN
   head: PicoHead
-  nms_cpu: True
+  #nms_cpu: True
 
 LCNet:
   scale: 1.0

pdfdet/models/Paddle/paddle_cdla.py

@@ -13,8 +13,32 @@
 
 from pdfdet.models.baseModel import base_module
 from ppdet.core.workspace import load_config
-from ppdet.engine import Trainer
+from ppdet.engine import Trainer as Trainer1
+from ppdet.core.workspace import create
 
+class Trainer(Trainer1):
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+
+    def predict(self,
+                images):
+
+        self.dataset.set_images(images)
+        loader = create('TestReader')(self.dataset, 0)
+
+        # Run Infer 
+        self.model.eval()
+        results = []
+        for step_id, data in enumerate(loader):
+            # forward
+            outs = self.model(data)
+
+            for key, value in outs.items():
+                if hasattr(value, 'numpy'):
+                    outs[key] = value.numpy()
+            results.append(outs)
+
+        return results
 
 class paddle_cdla_model(base_module):
     def __init__(self, *args, **kwargs) -> None:

pdfdet/models/Paddle/paddle_pub.py

@@ -7,9 +7,9 @@
 parent_path = os.path.abspath(os.path.join(__file__, *([".."] * 1)))
 sys.path.insert(0, parent_path)
 
-from .paddle_cdla import paddle_cdla_model
+from .paddle_cdla import paddle_cdla_model,Trainer
 from ppdet.core.workspace import load_config
-from ppdet.engine import Trainer
+
 
 
 class paddle_pub_model(paddle_cdla_model):