Merge pull request #237 from MissPenguin/develop

replace python lanms with c++ version, fix infer_det bug, fix test_im…

Merge pull request #237 from MissPenguin/develop
replace python lanms with c++ version, fix infer_det bug, fix test_im…
db0aa24b · MissPenguin · GitHub · 514fd0d1 · a2a08583 · db0aa24b
Unverified Commit db0aa24b authored Jun 23, 2020 by MissPenguin Committed by GitHub Jun 23, 2020
15 changed files
--- a/ppocr/postprocess/lanms/include/pybind11/descr.h
+++ b/ppocr/postprocess/lanms/include/pybind11/descr.h
--- a/ppocr/postprocess/lanms/include/pybind11/eigen.h
+++ b/ppocr/postprocess/lanms/include/pybind11/eigen.h
--- a/ppocr/postprocess/lanms/include/pybind11/embed.h
+++ b/ppocr/postprocess/lanms/include/pybind11/embed.h
--- a/ppocr/postprocess/lanms/include/pybind11/eval.h
+++ b/ppocr/postprocess/lanms/include/pybind11/eval.h
--- a/ppocr/postprocess/lanms/include/pybind11/functional.h
+++ b/ppocr/postprocess/lanms/include/pybind11/functional.h
--- a/ppocr/postprocess/lanms/include/pybind11/numpy.h
+++ b/ppocr/postprocess/lanms/include/pybind11/numpy.h
--- a/ppocr/postprocess/lanms/include/pybind11/operators.h
+++ b/ppocr/postprocess/lanms/include/pybind11/operators.h
--- a/ppocr/postprocess/lanms/include/pybind11/options.h
+++ b/ppocr/postprocess/lanms/include/pybind11/options.h
--- a/ppocr/postprocess/lanms/include/pybind11/pybind11.h
+++ b/ppocr/postprocess/lanms/include/pybind11/pybind11.h
--- a/ppocr/postprocess/lanms/include/pybind11/pytypes.h
+++ b/ppocr/postprocess/lanms/include/pybind11/pytypes.h
--- a/ppocr/postprocess/lanms/include/pybind11/stl.h
+++ b/ppocr/postprocess/lanms/include/pybind11/stl.h
--- a/ppocr/postprocess/lanms/include/pybind11/stl_bind.h
+++ b/ppocr/postprocess/lanms/include/pybind11/stl_bind.h
--- a/ppocr/postprocess/lanms/include/pybind11/typeid.h
+++ b/ppocr/postprocess/lanms/include/pybind11/typeid.h
--- a/ppocr/postprocess/lanms/lanms.h
+++ b/ppocr/postprocess/lanms/lanms.h
--- a/tools/infer/utility.py
+++ b/tools/infer/utility.py
@@ -88,10 +88,10 @@ def create_predictor(args, mode):

    if args.use_gpu:
        config.enable_use_gpu(args.gpu_mem, 0)
-        config.enable_memory_optim()
    else:
        config.disable_gpu()

+    config.enable_memory_optim()
    config.disable_glog_info()

    # use zero copy