Browse Source

update pdpet

will-jl944 4 years ago
parent
commit
63adc173f5
3 changed files with 2 additions and 11 deletions
  1. 0 9
      paddlex/ppdet/__init__.py
  2. 1 1
      paddlex/ppdet/engine/tracker.py
  3. 1 1
      paddlex/ppdet/engine/trainer.py

+ 0 - 9
paddlex/ppdet/__init__.py

@@ -14,12 +14,3 @@
 
 
 from . import (core, data, engine, modeling, model_zoo, optimizer, metrics,
 from . import (core, data, engine, modeling, model_zoo, optimizer, metrics,
                utils, slim)
                utils, slim)
-
-try:
-    from .version import full_version as __version__
-    from .version import commit as __git_commit__
-except ImportError:
-    import sys
-    sys.stderr.write("Warning: import ppdet from source directory " \
-            "without installing, run 'python setup.py install' to " \
-            "install ppdet firstly\n")

+ 1 - 1
paddlex/ppdet/engine/tracker.py

@@ -29,7 +29,7 @@ from paddlex.ppdet.modeling.mot.utils import Timer, load_det_results
 from paddlex.ppdet.modeling.mot import visualization as mot_vis
 from paddlex.ppdet.modeling.mot import visualization as mot_vis
 
 
 from paddlex.ppdet.metrics import Metric, MOTMetric, KITTIMOTMetric
 from paddlex.ppdet.metrics import Metric, MOTMetric, KITTIMOTMetric
-import paddlex.ppdet.utils.stats as stats
+from paddlex.ppdet.utils import stats
 
 
 from .callbacks import Callback, ComposeCallback
 from .callbacks import Callback, ComposeCallback
 
 

+ 1 - 1
paddlex/ppdet/engine/trainer.py

@@ -37,7 +37,7 @@ from paddlex.ppdet.utils.visualizer import visualize_results, save_result
 from paddlex.ppdet.metrics import Metric, COCOMetric, VOCMetric, WiderFaceMetric, get_infer_results, KeyPointTopDownCOCOEval, KeyPointTopDownMPIIEval
 from paddlex.ppdet.metrics import Metric, COCOMetric, VOCMetric, WiderFaceMetric, get_infer_results, KeyPointTopDownCOCOEval, KeyPointTopDownMPIIEval
 from paddlex.ppdet.metrics import RBoxMetric, JDEDetMetric
 from paddlex.ppdet.metrics import RBoxMetric, JDEDetMetric
 from paddlex.ppdet.data.source.category import get_categories
 from paddlex.ppdet.data.source.category import get_categories
-import paddlex.ppdet.utils.stats as stats
+from paddlex.ppdet.utils import stats
 
 
 from .callbacks import Callback, ComposeCallback, LogPrinter, Checkpointer, WiferFaceEval, VisualDLWriter
 from .callbacks import Callback, ComposeCallback, LogPrinter, Checkpointer, WiferFaceEval, VisualDLWriter
 from .export_utils import _dump_infer_config
 from .export_utils import _dump_infer_config