Merge branch 'rodrigob-master'

.gitignore

+
+build
+*.so
+*.egg-info
+
+pydensecrf/eigen.cpp
+pydensecrf/densecrf.cpp

util_inference_example.py → inference_example.py

@@ -8,11 +8,11 @@ functions.
 import sys
 import numpy as np
 import cv2
-import densecrf as dcrf
+import pydensecrf.densecrf as dcrf
 import matplotlib.pylab as plt
 from skimage.segmentation import relabel_sequential
 
-from utils import compute_unary, create_pairwise_bilateral, \
+from pydensecrf.utils import compute_unary, create_pairwise_bilateral, \
     create_pairwise_gaussian
 
 fn_im = sys.argv[1]

densecrf.pyx → pydensecrf/densecrf.pyx

 # distutils: language = c++
-# distutils: sources = densecrf/src/densecrf.cpp densecrf/src/unary.cpp densecrf/src/pairwise.cpp densecrf/src/permutohedral.cpp densecrf/src/optimization.cpp densecrf/src/objective.cpp densecrf/src/labelcompatibility.cpp densecrf/src/util.cpp densecrf/external/liblbfgs/lib/lbfgs.c
-# distutils: include_dirs = densecrf/include densecrf/external/liblbfgs/include
+# distutils: sources = pydensecrf/densecrf/src/densecrf.cpp pydensecrf/densecrf/src/unary.cpp pydensecrf/densecrf/src/pairwise.cpp pydensecrf/densecrf/src/permutohedral.cpp pydensecrf/densecrf/src/optimization.cpp pydensecrf/densecrf/src/objective.cpp pydensecrf/densecrf/src/labelcompatibility.cpp pydensecrf/densecrf/src/util.cpp pydensecrf/densecrf/external/liblbfgs/lib/lbfgs.c
+# distutils: include_dirs = pydensecrf/densecrf/include pydensecrf/densecrf/external/liblbfgs/include
 
 from numbers import Number