From e5ca8846c51e612f1640ddd869f9a7399ece789e Mon Sep 17 00:00:00 2001
From: Kai Chen <chenkaidev@gmail.com>
Date: Sun, 7 Jul 2019 21:41:31 +0800
Subject: [PATCH] Fix the compiling bug when using `pip install mmcv` (#88)

* rename flowWarp to FlowWarp

* fix the compiling bug when using pip install

* update version to v0.2.10
---
 MANIFEST.in                                  | 1 +
 mmcv/version.py                              | 2 +-
 mmcv/video/optflow_warp/flow_warp.cpp        | 4 ++--
 mmcv/video/optflow_warp/flow_warp.hpp        | 2 +-
 mmcv/video/optflow_warp/flow_warp_module.pyx | 4 ++--
 setup.py                                     | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 MANIFEST.in

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 000000000..e844cc6f4
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1 @@
+include mmcv/video/optflow_warp/*.hpp
\ No newline at end of file
diff --git a/mmcv/version.py b/mmcv/version.py
index cd9b13754..e913eb46f 100644
--- a/mmcv/version.py
+++ b/mmcv/version.py
@@ -1 +1 @@
-__version__ = '0.2.9'
+__version__ = '0.2.10'
diff --git a/mmcv/video/optflow_warp/flow_warp.cpp b/mmcv/video/optflow_warp/flow_warp.cpp
index 68d25ca8f..ad16fc066 100644
--- a/mmcv/video/optflow_warp/flow_warp.cpp
+++ b/mmcv/video/optflow_warp/flow_warp.cpp
@@ -1,6 +1,6 @@
-#include <flow_warp.hpp>
+#include "flow_warp.hpp"
 
-void flowWarp(double* img, double* flow, double* out, const int height,
+void FlowWarp(double* img, double* flow, double* out, const int height,
               const int width, const int channels, const int filling_value = 0,
               const int interpolateMode = 0) {
   for (int h = 0; h < height; h++) {
diff --git a/mmcv/video/optflow_warp/flow_warp.hpp b/mmcv/video/optflow_warp/flow_warp.hpp
index fdca9da27..79e32ebf7 100644
--- a/mmcv/video/optflow_warp/flow_warp.hpp
+++ b/mmcv/video/optflow_warp/flow_warp.hpp
@@ -4,7 +4,7 @@
 
 using namespace std;
 
-void flowWarp(double* img, double* flow1, double* out, const int height,
+void FlowWarp(double* img, double* flow1, double* out, const int height,
               const int width, const int channels, const int filling_value,
               const int interpolateMode);
 
diff --git a/mmcv/video/optflow_warp/flow_warp_module.pyx b/mmcv/video/optflow_warp/flow_warp_module.pyx
index cb5e7d914..0aca1b6cb 100644
--- a/mmcv/video/optflow_warp/flow_warp_module.pyx
+++ b/mmcv/video/optflow_warp/flow_warp_module.pyx
@@ -6,7 +6,7 @@ cimport numpy as np
 np.import_array()
 
 cdef extern from "flow_warp.hpp":
-    void flowWarp(double* img, double* flow1, double* out, const int height, const int width, const int channels, const int filling_value, const int interpolateMode)
+    void FlowWarp(double* img, double* flow1, double* out, const int height, const int width, const int channels, const int filling_value, const int interpolateMode)
 
 def flow_warp_c(np.ndarray[double, ndim=3, mode="c"] img_array not None,
                 np.ndarray[double, ndim=3, mode="c"] flow_array not None,
@@ -15,7 +15,7 @@ def flow_warp_c(np.ndarray[double, ndim=3, mode="c"] img_array not None,
 
     out_array = np.zeros_like(img_array)
 
-    flowWarp(<double*> np.PyArray_DATA(img_array),
+    FlowWarp(<double*> np.PyArray_DATA(img_array),
              <double*> np.PyArray_DATA(flow_array),
              <double*> np.PyArray_DATA(out_array),
              out_array.shape[0],
diff --git a/setup.py b/setup.py
index f929b00ab..5cb0d2f93 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@ EXT_MODULES = [
             './mmcv/video/optflow_warp/flow_warp.cpp',
             './mmcv/video/optflow_warp/flow_warp_module.pyx'
         ],
-        include_dirs=[numpy.get_include(), './mmcv/video/optflow_warp/'],
+        include_dirs=[numpy.get_include()],
         language="c++",
     ),
 ]