clean up nms.

snxmv · Sep 16, 2017 · 85a4559 · 85a4559
1 parent 250100e
commit 85a4559
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 167 deletions.
diff --git a/lib/model/test.py b/lib/model/test.py
@@ -17,11 +17,11 @@
 import math
 
 from utils.timer import Timer
-from utils.cython_nms import nms
 from utils.blob import im_list_to_blob
 
 from model.config import cfg, get_output_dir
 from model.bbox_transform import clip_boxes, bbox_transform_inv
+from model.nms_wrapper import nms
 
 def _get_image_blob(im):
   """Converts an image into a network input.

diff --git a/lib/setup.py b/lib/setup.py
@@ -111,12 +111,6 @@ def build_extensions(self):
         extra_compile_args={'gcc': ["-Wno-cpp", "-Wno-unused-function"]},
         include_dirs = [numpy_include]
     ),
-    Extension(
-        "utils.cython_nms",
-        ["utils/nms.pyx"],
-        extra_compile_args={'gcc': ["-Wno-cpp", "-Wno-unused-function"]},
-        include_dirs = [numpy_include]
-    ),
     Extension(
         "nms.cpu_nms",
         ["nms/cpu_nms.pyx"],

diff --git a/lib/utils/nms.py b/lib/utils/nms.py
diff --git a/lib/utils/nms.pyx b/lib/utils/nms.pyx