Commit a1cfbf71 authored by Manuel Günther's avatar Manuel Günther

Removed VLFEAT from version.cpp if not HAVE_VLFEAT.

parent aa061ad7
......@@ -9,17 +9,18 @@ matrix:
- BOB_DOCUMENTATION_SERVER=https://www.idiap.ch/software/bob/docs/latest/bioidiap/%s/master
- python: 3.2
env:
- NUMPYSPEC===1.8.0
- PYVER=3
- python: 3.3
env:
- NUMPYSPEC===1.8.0
- PYVER=3
virtualenv:
system_site_packages: true
before_install:
- sudo add-apt-repository -y ppa:biometrics/bob
- sudo apt-get update -qq
- sudo apt-get install -qq --force-yes libboost-all-dev libblitz1-dev libatlas-dev libatlas-base-dev liblapack-dev libhdf5-serial-dev libvl-dev texlive-latex-base texlive-latex-extra texlive-math-extra texlive-latex-recommended texlive-fonts-recommended
- if [ -n "${NUMPYSPEC}" ]; then sudo apt-get install -qq gfortran; fi
- if [ -n "${NUMPYSPEC}" ]; then pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel numpy$NUMPYSPEC; fi
- pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel sphinx matplotlib==1.3.0 nose==1.3.0 jinja2==2.6 cpp-coveralls pygments==1.6
- sudo apt-get install -qq --force-yes libboost-all-dev libblitz1-dev libatlas-dev libatlas-base-dev liblapack-dev python$PYVER-numpy
- sudo apt-get install -qq --force-yes libhdf5-serial-dev libvl-dev texlive-latex-base texlive-latex-extra texlive-math-extra texlive-latex-recommended texlive-fonts-recommended
- pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel sphinx matplotlib nose==1.3.0 jinja2==2.6 cpp-coveralls pygments==1.6
install:
- python bootstrap-buildout.py
- CFLAGS=-coverage ./bin/buildout
......
......@@ -17,7 +17,7 @@
#include <bob.ip.base/GaussianScaleSpace.h>
#include <bob.ip.base/HOG.h>
#ifdef HAVE_VLFEAT
#if HAVE_VLFEAT
#include <vl/generic.h>
#include <vl/sift.h>
#include <vl/dsift.h>
......@@ -235,7 +235,7 @@ namespace bob { namespace ip { namespace base {
};
#ifdef HAVE_VLFEAT
#if HAVE_VLFEAT
class VLSIFT
{
......@@ -515,4 +515,3 @@ namespace bob { namespace ip { namespace base {
} } } // namespaces
#endif /* BOB_IP_BASE_SIFT_H */
......@@ -160,7 +160,7 @@ static PyObject* create_module (void) {
if (!init_BobIpBaseGLCM(module)) return 0;
if (!init_BobIpBaseWiener(module)) return 0;
#ifdef HAVE_VLFEAT
#if HAVE_VLFEAT
if (!init_BobIpBaseVLFEAT(module)) return 0;
#endif // HAVE_VLFEAT
......
......@@ -204,7 +204,7 @@ extern PyTypeObject PyBobIpBaseSIFT_Type;
bool init_BobIpBaseSIFT(PyObject* module);
int PyBobIpBaseSIFT_Check(PyObject* o);
#ifdef HAVE_VLFEAT
#if HAVE_VLFEAT
// .. VLSIFT
typedef struct {
PyObject_HEAD
......
......@@ -17,7 +17,9 @@
#include <boost/preprocessor/stringize.hpp>
#include <boost/version.hpp>
#include <boost/format.hpp>
#if HAVE_VLFEAT
#include <vl/generic.h>
#endif // HAVE_VLFEAT
#include <bob.core/config.h>
#include <bob.io.base/config.h>
......@@ -84,9 +86,11 @@ static PyObject* python_version() {
/**
* VLFeat version
*/
#if HAVE_VLFEAT
static PyObject* vlfeat_version() {
return Py_BuildValue("s", VL_VERSION_STRING);
}
#endif // HAVE_VLFEAT
/**
* Numpy version
......@@ -149,7 +153,9 @@ static PyObject* build_version_dictionary() {
if (!dict_steal(retval, "bob.io.base", bob_io_base_version())) return 0;
if (!dict_steal(retval, "bob.sp", bob_sp_version())) return 0;
if (!dict_steal(retval, "bob.math", bob_math_version())) return 0;
#if HAVE_VLFEAT
if (!dict_steal(retval, "VLFeat", vlfeat_version())) return 0;
#endif // HAVE_VLFEAT
Py_INCREF(retval);
return retval;
......
......@@ -9,7 +9,7 @@
#include "main.h"
#ifdef HAVE_VLFEAT
#if HAVE_VLFEAT
static auto VLSIFT_doc = bob::extension::ClassDoc(
BOB_EXT_MODULE_PREFIX ".VLSIFT",
......@@ -798,4 +798,3 @@ bool init_BobIpBaseVLFEAT(PyObject* module)
}
#endif // HAVE_VLFEAT
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment