Commit 99c97585 authored by André Anjos's avatar André Anjos 💬

xbob -> bob

parent d0549f7e
......@@ -25,8 +25,8 @@ install:
- "python bootstrap.py"
- "CFLAGS=-coverage ./bin/buildout"
script:
- "./bin/python -c 'from xbob.math import get_config; print(get_config())'"
- "./bin/coverage run --source=xbob.math ./bin/nosetests -sv"
- "./bin/python -c 'from bob.math import get_config; print(get_config())'"
- "./bin/coverage run --source=bob.math ./bin/nosetests -sv"
- "./bin/sphinx-build -b doctest doc sphinx"
- "./bin/sphinx-build -b html doc sphinx"
after_success:
......
include LICENSE README.rst bootstrap.py buildout.cfg
recursive-include doc conf.py *.rst
recursive-include xbob *.cpp *.h
recursive-include bob *.cpp *.h
......@@ -2,16 +2,16 @@
.. Andre Anjos <andre.anjos@idiap.ch>
.. Thu 29 Aug 2013 16:07:57 CEST
.. image:: https://travis-ci.org/bioidiap/xbob.math.svg?branch=master
:target: https://travis-ci.org/bioidiap/xbob.math
.. image:: https://coveralls.io/repos/bioidiap/xbob.math/badge.png
:target: https://coveralls.io/r/bioidiap/xbob.math
.. image:: http://img.shields.io/github/tag/bioidiap/xbob.math.png
:target: https://github.com/bioidiap/xbob.math
.. image:: http://img.shields.io/pypi/v/xbob.math.png
:target: https://pypi.python.org/pypi/xbob.math
.. image:: http://img.shields.io/pypi/dm/xbob.math.png
:target: https://pypi.python.org/pypi/xbob.math
.. image:: https://travis-ci.org/bioidiap/bob.math.svg?branch=master
:target: https://travis-ci.org/bioidiap/bob.math
.. image:: https://coveralls.io/repos/bioidiap/bob.math/badge.png
:target: https://coveralls.io/r/bioidiap/bob.math
.. image:: http://img.shields.io/github/tag/bioidiap/bob.math.png
:target: https://github.com/bioidiap/bob.math
.. image:: http://img.shields.io/pypi/v/bob.math.png
:target: https://pypi.python.org/pypi/bob.math
.. image:: http://img.shields.io/pypi/dm/bob.math.png
:target: https://pypi.python.org/pypi/bob.math
=================================
Python bindings for bob.math
......@@ -42,7 +42,7 @@ Testing
You can run a set of tests using the nose test runner::
$ nosetests -sv xbob.math
$ nosetests -sv bob.math
.. warning::
......@@ -59,7 +59,7 @@ You can run our documentation tests using sphinx itself::
You can test overall test coverage with::
$ nosetests --with-coverage --cover-package=xbob.math
$ nosetests --with-coverage --cover-package=bob.math
The ``coverage`` egg must be installed for this to work properly.
......
......@@ -9,8 +9,8 @@
*/
#include "histogram.h"
#include <xbob.blitz/cppapi.h>
#include <xbob.blitz/cleanup.h>
#include <bob.blitz/cppapi.h>
#include <bob.blitz/cleanup.h>
#include "bob/math/histogram.h"
static PyObject* py_histogram_intersection_1
......
......@@ -9,8 +9,8 @@
*/
#include "histogram.h"
#include <xbob.blitz/cppapi.h>
#include <xbob.blitz/cleanup.h>
#include <bob.blitz/cppapi.h>
#include <bob.blitz/cleanup.h>
#include "bob/math/linsolve.h"
static PyObject* py_linsolve_1(PyObject*, PyObject* args, PyObject* kwds) {
......
......@@ -10,19 +10,19 @@
*/
#include "lp_interior_point.h"
#include <xbob.blitz/cppapi.h>
#include <xbob.blitz/cleanup.h>
#include <bob.blitz/cppapi.h>
#include <bob.blitz/cleanup.h>
#include <bob/math/LPInteriorPoint.h>
#include <structmember.h>
#include <xbob.extension/documentation.h>
#include <bob.extension/documentation.h>
/************************************************
* Implementation of LPInteriorPoint base class *
************************************************/
static auto s_lpinteriorpoint = xbob::extension::ClassDoc(
XBOB_EXT_MODULE_PREFIX ".LPInteriorPoint",
static auto s_lpinteriorpoint = bob::extension::ClassDoc(
BOB_EXT_MODULE_PREFIX ".LPInteriorPoint",
"Base class to solve a linear program using interior point methods.",
"For more details about the algorithms,please refer to the following book: *'Primal-Dual Interior-Point Methods', Stephen J. Wright, ISBN: 978-0898713824, Chapter 5, 'Path-Following Algorithms'*.\n\n"
".. warning:: You cannot instantiate an object of this type directly, you must use it through one of the inherited types.\n\n"
......@@ -49,7 +49,7 @@ static int PyBobMathLpInteriorPoint_init(PyBobMathLpInteriorPointObject* self, P
}
static auto s_M = xbob::extension::VariableDoc(
static auto s_M = bob::extension::VariableDoc(
"m",
"int",
"The first dimension of the problem/A matrix"
......@@ -83,7 +83,7 @@ static int PyBobMathLpInteriorPoint_setM (PyBobMathLpInteriorPointObject* self,
}
static auto s_N = xbob::extension::VariableDoc(
static auto s_N = bob::extension::VariableDoc(
"n",
"int",
"The second dimension of the problem/A matrix"
......@@ -116,7 +116,7 @@ static int PyBobMathLpInteriorPoint_setN (PyBobMathLpInteriorPointObject* self,
}
static auto s_epsilon = xbob::extension::VariableDoc(
static auto s_epsilon = bob::extension::VariableDoc(
"epsilon",
"float",
"The precision to determine whether an equality constraint is fulfilled or not"
......@@ -148,7 +148,7 @@ static int PyBobMathLpInteriorPoint_setEpsilon (PyBobMathLpInteriorPointObject*
}
static auto s_lambda = xbob::extension::VariableDoc(
static auto s_lambda = bob::extension::VariableDoc(
"lambda_",
"float",
"The value of the :math:`\\lambda` dual variable (read-only)"
......@@ -166,7 +166,7 @@ static PyObject* PyBobMathLpInteriorPoint_lambda (PyBobMathLpInteriorPointObject
return PyBlitzArray_NUMPY_WRAP(retval);
}
static auto s_mu = xbob::extension::VariableDoc(
static auto s_mu = bob::extension::VariableDoc(
"mu",
"float",
"The value of the :math:`\\mu` dual variable (read-only)"
......@@ -223,7 +223,7 @@ static PyGetSetDef PyBobMathLpInteriorPoint_getseters[] = {
{0} /* Sentinel */
};
static auto s_reset = xbob::extension::FunctionDoc(
static auto s_reset = bob::extension::FunctionDoc(
"reset",
"Resets the size of the problem (M and N correspond to the dimensions of the A matrix)"
)
......@@ -260,7 +260,7 @@ static PyObject* PyBobMathLpInteriorPoint_reset
}
static auto s_solve = xbob::extension::FunctionDoc(
static auto s_solve = bob::extension::FunctionDoc(
"solve",
"Solves an LP problem"
)
......@@ -381,7 +381,7 @@ static PyObject* PyBobMathLpInteriorPoint_solve
}
static auto s_is_feasible = xbob::extension::FunctionDoc(
static auto s_is_feasible = bob::extension::FunctionDoc(
"is_feasible",
"Checks if a primal-dual point (x, lambda, mu) belongs to the set of feasible points (i.e. fulfills the constraints)."
)
......@@ -476,7 +476,7 @@ static PyObject* PyBobMathLpInteriorPoint_is_feasible
}
static auto s_is_in_v = xbob::extension::FunctionDoc(
static auto s_is_in_v = bob::extension::FunctionDoc(
"is_in_v",
"Checks if a primal-dual point (x, lambda, mu) belongs to the V2 neighborhood of the central path.",
".. todo:: This documentation seems wrong since lambda is not in the list of parameters."
......@@ -540,7 +540,7 @@ static PyObject* PyBobMathLpInteriorPoint_is_in_v
}
static auto s_is_in_v_s = xbob::extension::FunctionDoc(
static auto s_is_in_v_s = bob::extension::FunctionDoc(
"is_in_v_s",
"Checks if a primal-dual point (x,lambda,mu) belongs to the V neighborhood of the central path and the set of feasible points."
)
......@@ -638,7 +638,7 @@ static PyObject* PyBobMathLpInteriorPoint_is_in_v_s
}
static auto s_initialize_dual_lambda_mu = xbob::extension::FunctionDoc(
static auto s_initialize_dual_lambda_mu = bob::extension::FunctionDoc(
"initialize_dual_lambda_mu",
"Initializes the dual variables ``lambda`` and ``mu`` by minimizing the logarithmic barrier function."
)
......@@ -808,12 +808,12 @@ PyTypeObject PyBobMathLpInteriorPoint_Type = {
* Implementation of LPInteriorPointShortstep class *
****************************************************/
const auto s_lpinteriorpointshortstep = xbob::extension::ClassDoc(
XBOB_EXT_MODULE_PREFIX ".LPInteriorPointShortstep",
const auto s_lpinteriorpointshortstep = bob::extension::ClassDoc(
BOB_EXT_MODULE_PREFIX ".LPInteriorPointShortstep",
"A Linear Program solver based on a short step interior point method.\n"
"See :py:class:`LPInteriorPoint` for more details on the base class."
)
.add_constructor(xbob::extension::FunctionDoc(
.add_constructor(bob::extension::FunctionDoc(
"LPInteriorPointShortstep",
"Objects of this class can be initialized in two different ways: "
"a detailed constructor with the parameters described below or "
......@@ -945,7 +945,7 @@ static void PyBobMathLpInteriorPointShortstep_delete (PyBobMathLpInteriorPointSh
}
static auto s_theta = xbob::extension::VariableDoc(
static auto s_theta = bob::extension::VariableDoc(
"theta",
"float",
"The value theta used to define a V2 neighborhood"
......@@ -1061,12 +1061,12 @@ PyTypeObject PyBobMathLpInteriorPointShortstep_Type = {
* Implementation of LPInteriorPointPredictorCorrector class *
*************************************************************/
static auto s_lpinteriorpointpredictorcorrector = xbob::extension::ClassDoc(
XBOB_EXT_MODULE_PREFIX ".LPInteriorPointPredictorCorrector",
static auto s_lpinteriorpointpredictorcorrector = bob::extension::ClassDoc(
BOB_EXT_MODULE_PREFIX ".LPInteriorPointPredictorCorrector",
"A Linear Program solver based on a predictor-corrector interior point method.",
"See :py:class:`LPInteriorPoint` for more details on the base class."
)
.add_constructor(xbob::extension::FunctionDoc(
.add_constructor(bob::extension::FunctionDoc(
"LPInteriorPointPredictorCorrector",
"Objects of this class can be initialized in two different ways: "
"a detailed constructor with the parameters described below or "
......@@ -1197,7 +1197,7 @@ static void PyBobMathLpInteriorPointPredictorCorrector_delete (PyBobMathLpInteri
}
static auto s_theta_pred = xbob::extension::VariableDoc(
static auto s_theta_pred = bob::extension::VariableDoc(
"theta_pred",
"float",
"The value theta_pred used to define a V2 neighborhood"
......@@ -1228,7 +1228,7 @@ static int PyBobMathLpInteriorPointPredictorCorrector_setThetaPred (PyBobMathLpI
}
static auto s_theta_corr = xbob::extension::VariableDoc(
static auto s_theta_corr = bob::extension::VariableDoc(
"theta_corr",
"float",
"The value theta_corr used to define a V2 neighborhood"
......@@ -1349,12 +1349,12 @@ PyTypeObject PyBobMathLpInteriorPointPredictorCorrector_Type = {
* Implementation of LPInteriorPointLongstep class *
****************************************************/
static auto s_lpinteriorpointlongstep = xbob::extension::ClassDoc(
XBOB_EXT_MODULE_PREFIX ".LPInteriorPointLongstep",
static auto s_lpinteriorpointlongstep = bob::extension::ClassDoc(
BOB_EXT_MODULE_PREFIX ".LPInteriorPointLongstep",
"A Linear Program solver based on a long step interior point method.",
"See :py:class:`LPInteriorPoint` for more details on the base class."
)
.add_constructor(xbob::extension::FunctionDoc(
.add_constructor(bob::extension::FunctionDoc(
"LPInteriorPointLongstep",
"Objects of this class can be initialized in two different ways: "
"a detailed constructor with the parameters described below or "
......@@ -1483,7 +1483,7 @@ static void PyBobMathLpInteriorPointLongstep_delete (PyBobMathLpInteriorPointLon
}
static auto s_gamma = xbob::extension::VariableDoc(
static auto s_gamma = bob::extension::VariableDoc(
"gamma",
"float",
"The value gamma used to define a V-Inf neighborhood"
......@@ -1515,7 +1515,7 @@ static int PyBobMathLpInteriorPointLongstep_setGamma (PyBobMathLpInteriorPointLo
}
static auto s_sigma = xbob::extension::VariableDoc(
static auto s_sigma = bob::extension::VariableDoc(
"sigma",
"float",
"The value sigma used to define a V-Inf neighborhood"
......@@ -1592,7 +1592,7 @@ static PyObject* PyBobMathLpInteriorPointLongstep_RichCompare
}
static auto s_is_in_vinf = xbob::extension::FunctionDoc(
static auto s_is_in_vinf = bob::extension::FunctionDoc(
"is_in_v",
"Checks if a primal-dual point (x, lambda, mu) belongs to the V-Inf neighborhood of the central path.",
".. todo:: This documentation looks wrong since lambda is not part of the parameters"
......
This diff is collapsed.
......@@ -7,7 +7,7 @@
*/
#include "pavx.h"
#include <xbob.blitz/cppapi.h>
#include <bob.blitz/cppapi.h>
#include <bob/math/norminv.h>
PyObject* py_norminv (PyObject*, PyObject* args, PyObject* kwds) {
......
......@@ -7,8 +7,8 @@
*/
#include "pavx.h"
#include <xbob.blitz/cppapi.h>
#include <xbob.blitz/cleanup.h>
#include <bob.blitz/cppapi.h>
#include <bob.blitz/cleanup.h>
#include "bob/math/pavx.h"
#include "bob/core/cast.h"
......
......@@ -8,8 +8,8 @@
*/
#include "scatter.h"
#include <xbob.blitz/cppapi.h>
#include <xbob.blitz/cleanup.h>
#include <bob.blitz/cppapi.h>
#include <bob.blitz/cleanup.h>
#include <bob/math/stats.h>
PyObject* py_scatter (PyObject*, PyObject* args, PyObject* kwds) {
......
......@@ -5,11 +5,11 @@
#
# Copyright (C) 2011-2013 Idiap Research Institute, Martigny, Switzerland
"""Tests xbob interior point Linear Programming solvers
"""Tests bob interior point Linear Programming solvers
"""
import os, sys
from xbob.math import histogram_intersection, kullback_leibler, chi_square
from bob.math import histogram_intersection, kullback_leibler, chi_square
import numpy
import nose.tools
......@@ -48,7 +48,7 @@ values = numpy.array([1,1,1,1,1], dtype = numpy.float64)
def test_histogram_intersection():
# compare our implementation with xbob.math
# compare our implementation with bob.math
nose.tools.eq_(histogram_intersection(m_h1, m_h2), py_histogram_intersection(m_h1, m_h2))
nose.tools.eq_(histogram_intersection(m_h3, m_h4), py_histogram_intersection(m_h3, m_h4))
......@@ -61,7 +61,7 @@ def test_histogram_intersection():
def test_chi_square():
# compare our implementation with xbob.math
# compare our implementation with bob.math
nose.tools.eq_(chi_square(m_h1, m_h2), py_chi_square(m_h1, m_h2))
nose.tools.eq_(chi_square(m_h3, m_h4), py_chi_square(m_h3, m_h4))
......@@ -74,7 +74,7 @@ def test_chi_square():
def test_kullback_leibler():
# compare our implementation with xbob.math
# compare our implementation with bob.math
nose.tools.eq_(chi_square(m_h1, m_h2), py_chi_square(m_h1, m_h2))
nose.tools.eq_(chi_square(m_h3, m_h4), py_chi_square(m_h3, m_h4))
......
......@@ -9,7 +9,7 @@
"""
import os, sys
from xbob.math import linsolve, linsolve_sympos, linsolve_cg_sympos
from bob.math import linsolve, linsolve_sympos, linsolve_cg_sympos
import numpy
import nose.tools
......
......@@ -9,7 +9,7 @@
"""
import os, sys
from xbob.math import LPInteriorPointShortstep, LPInteriorPointPredictorCorrector, LPInteriorPointLongstep
from bob.math import LPInteriorPointShortstep, LPInteriorPointPredictorCorrector, LPInteriorPointLongstep
import numpy
import nose.tools
......
......@@ -9,7 +9,7 @@
"""
import os, sys
from xbob.math import norminv, normsinv
from bob.math import norminv, normsinv
import numpy
def test_norminv():
......
......@@ -9,7 +9,7 @@
"""
import os, sys
from xbob.math import pavx, pavx_, pavxWidth, pavxWidthHeight
from bob.math import pavx, pavx_, pavxWidth, pavxWidthHeight
import numpy
def pavx_check(y, ghat_ref, w_ref, h_ref):
......
......@@ -9,7 +9,7 @@
"""
import os, sys
from xbob.math import scatter, scatter_, scatters, scatters_
from bob.math import scatter, scatter_, scatters, scatters_
import numpy
import nose.tools
......
......@@ -19,8 +19,8 @@
#ifdef NO_IMPORT_ARRAY
#undef NO_IMPORT_ARRAY
#endif
#include <xbob.blitz/capi.h>
#include <xbob.blitz/cleanup.h>
#include <bob.blitz/capi.h>
#include <bob.blitz/cleanup.h>
static int dict_set(PyObject* d, const char* key, const char* value) {
PyObject* v = Py_BuildValue("s", value);
......@@ -96,10 +96,10 @@ static PyObject* numpy_version() {
}
/**
* xbob.blitz c/c++ api version
* bob.blitz c/c++ api version
*/
static PyObject* xbob_blitz_version() {
return Py_BuildValue("{ss}", "api", BOOST_PP_STRINGIZE(XBOB_BLITZ_API_VERSION));
static PyObject* bob_blitz_version() {
return Py_BuildValue("{ss}", "api", BOOST_PP_STRINGIZE(BOB_BLITZ_API_VERSION));
}
static PyObject* build_version_dictionary() {
......@@ -113,7 +113,7 @@ static PyObject* build_version_dictionary() {
if (!dict_steal(retval, "Compiler", compiler_version())) return 0;
if (!dict_steal(retval, "Python", python_version())) return 0;
if (!dict_steal(retval, "NumPy", numpy_version())) return 0;
if (!dict_steal(retval, "xbob.blitz", xbob_blitz_version())) return 0;
if (!dict_steal(retval, "bob.blitz", bob_blitz_version())) return 0;
if (!dict_steal(retval, "Bob", bob_version())) return 0;
Py_INCREF(retval);
......@@ -131,7 +131,7 @@ PyDoc_STRVAR(module_docstr,
#if PY_VERSION_HEX >= 0x03000000
static PyModuleDef module_definition = {
PyModuleDef_HEAD_INIT,
XBOB_EXT_MODULE_NAME,
BOB_EXT_MODULE_NAME,
module_docstr,
-1,
module_methods,
......@@ -144,27 +144,27 @@ static PyObject* create_module (void) {
# if PY_VERSION_HEX >= 0x03000000
PyObject* m = PyModule_Create(&module_definition);
# else
PyObject* m = Py_InitModule3(XBOB_EXT_MODULE_NAME, module_methods, module_docstr);
PyObject* m = Py_InitModule3(BOB_EXT_MODULE_NAME, module_methods, module_docstr);
# endif
if (!m) return 0;
auto m_ = make_safe(m); ///< protects against early returns
/* register version numbers and constants */
if (PyModule_AddStringConstant(m, "module", XBOB_EXT_MODULE_VERSION) < 0)
if (PyModule_AddStringConstant(m, "module", BOB_EXT_MODULE_VERSION) < 0)
return 0;
PyObject* externals = build_version_dictionary();
if (!externals) return 0;
if (PyModule_AddObject(m, "externals", externals) < 0) return 0;
if (import_xbob_blitz() < 0) return 0;
if (import_bob_blitz() < 0) return 0;
Py_INCREF(m);
return m;
}
PyMODINIT_FUNC XBOB_EXT_ENTRY_NAME (void) {
PyMODINIT_FUNC BOB_EXT_ENTRY_NAME (void) {
# if PY_VERSION_HEX >= 0x03000000
return
# endif
......
......@@ -4,23 +4,23 @@
[buildout]
parts = scripts
eggs = xbob.math
extensions = xbob.buildout
eggs = bob.math
extensions = bob.buildout
mr.developer
auto-checkout = *
develop = src/xbob.extension
src/xbob.blitz
develop = src/bob.extension
src/bob.blitz
.
; options for xbob.buildout extension
; options for bob.buildout extension
debug = true
verbose = true
prefixes = /idiap/group/torch5spro/nightlies/last/bob/linux-x86_64-release
prefixes = /idiap/group/torch5spro/releases/preview/install/linux-x86_64-release
/Users/andre/work/bob/b/dbg/
[sources]
xbob.extension = git https://github.com/bioidiap/xbob.extension branch=prototype
xbob.blitz = git https://github.com/bioidiap/xbob.blitz
bob.extension = git https://github.com/bioidiap/bob.extension
bob.blitz = git https://github.com/bioidiap/bob.blitz
[scripts]
recipe = xbob.buildout:scripts
recipe = bob.buildout:scripts
......@@ -58,12 +58,12 @@ source_suffix = '.rst'
master_doc = 'index'
# General information about the project.
project = u'xbob.math'
project = u'bob.math'
import time
copyright = u'%s, Idiap Research Institute' % time.strftime('%Y')
# Grab the setup entry
distribution = pkg_resources.require('xbob.math')[0]
distribution = pkg_resources.require('bob.math')[0]
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
......@@ -129,7 +129,7 @@ if sphinx.__version__ >= "1.0":
#html_title = None
# A shorter title for the navigation bar. Default is the same as html_title.
#html_short_title = 'xbob_math'
#html_short_title = 'bob_math'
# The name of an image file (relative to this directory) to place at the top
# of the sidebar.
......@@ -187,7 +187,7 @@ html_favicon = 'img/favicon.ico'
#html_file_suffix = None
# Output file base name for HTML help builder.
htmlhelp_basename = 'xbob_math_doc'
htmlhelp_basename = 'bob_math_doc'
# -- Options for LaTeX output --------------------------------------------------
......@@ -201,7 +201,7 @@ latex_font_size = '10pt'
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [
('index', 'xbob_math.tex', u'Bob Mathematical Routines',
('index', 'bob_math.tex', u'Bob Mathematical Routines',
u'Biometrics Group, Idiap Research Institute', 'manual'),
]
......@@ -241,7 +241,7 @@ rst_epilog = """
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
('index', 'xbob_math', u'Bob Mathematical Routines Documentation', [u'Idiap Research Institute'], 1)
('index', 'bob_math', u'Bob Mathematical Routines Documentation', [u'Idiap Research Institute'], 1)
]
# Default processing flags for sphinx
......
......@@ -5,7 +5,7 @@
.. testsetup:: mathtest
import numpy
import xbob.math
import bob.math
============
User Guide
......
......@@ -6,19 +6,19 @@
Python API
============
This section includes information for using the pure Python API of ``xbob.math``.
This section includes information for using the pure Python API of ``bob.math``.
Summary
.......
.. autosummary::
xbob.math.LPInteriorPoint
xbob.math.LPInteriorPointShortstep
xbob.math.LPInteriorPointLongstep
bob.math.LPInteriorPoint
bob.math.LPInteriorPointShortstep
bob.math.LPInteriorPointLongstep
Details
.......
.. automodule:: xbob.math
.. automodule:: bob.math
:members:
......@@ -4,13 +4,13 @@
# Mon 16 Apr 08:18:08 2012 CEST
from setuptools import setup, find_packages, dist
dist.Distribution(dict(setup_requires=['xbob.blitz','xbob.extension']))
from xbob.blitz.extension import Extension
import xbob.extension
dist.Distribution(dict(setup_requires=['bob.blitz','bob.extension']))
from bob.blitz.extension import Extension
import bob.extension
import os
package_dir = os.path.dirname(os.path.realpath(__file__))
package_dir = os.path.join(package_dir, 'xbob', 'math', 'include')
package_dir = os.path.join(package_dir, 'bob', 'math', 'include')
include_dirs = [package_dir]
packages = ['bob-math >= 1.2.2']
......@@ -18,10 +18,10 @@ version = '2.0.0a0'
setup(
name='xbob.math',
name='bob.math',
version=version,
description='Bindings for bob.math',
url='http://github.com/bioidiap/xbob.math',
url='http://github.com/bioidiap/bob.math',
license='BSD',
author='Andre Anjos',
author_email='andre.anjos@idiap.ch',
......@@ -33,37 +33,37 @@ setup(
install_requires=[
'setuptools',
'xbob.blitz',
'xbob.extension',
'bob.blitz',
'bob.extension',
],
namespace_packages=[
"xbob",
"bob",
],
ext_modules = [
Extension("xbob.math.version",
Extension("bob.math.version",
[
"xbob/math/version.cpp",
"bob/math/version.cpp",
],
packages = packages,
version = version,
include_dirs = include_dirs,
),
Extension("xbob.math._library",
Extension("bob.math._library",
[
"xbob/math/histogram.cpp",
"xbob/math/linsolve.cpp",
"xbob/math/pavx.cpp",
"xbob/math/norminv.cpp",
"xbob/math/scatter.cpp",
"xbob/math/lp_interior_point.cpp",
"xbob/math/main.cpp",
"bob/math/histogram.cpp",
"bob/math/linsolve.cpp",
"bob/math/pavx.cpp",
"bob/math/norminv.cpp",
"bob/math/scatter.cpp",
"bob/math/lp_interior_point.cpp",
"bob/math/main.cpp",
],
packages = packages,
version = version,
include_dirs = include_dirs,
# define_macros = [('XBOB_SHORT_DOCSTRINGS',1)],
# define_macros = [('BOB_SHORT_DOCSTRINGS',1)],
),
],
......
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