mirror of https://github.com/open-mmlab/mmcv.git
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.10pull/89/head v0.2.10
parent
0ad15a508e
commit
e5ca8846c5
|
@ -0,0 +1 @@
|
|||
include mmcv/video/optflow_warp/*.hpp
|
|
@ -1 +1 @@
|
|||
__version__ = '0.2.9'
|
||||
__version__ = '0.2.10'
|
||||
|
|
|
@ -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++) {
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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],
|
||||
|
|
Loading…
Reference in New Issue