Commit 51ade767 authored by Andre Anjos's avatar Andre Anjos

Loading correctly for the first time

parent 1c5d7223
......@@ -7,21 +7,15 @@ from setuptools import setup, find_packages, dist
dist.Distribution(dict(setup_requires=['xbob.blitz']))
from xbob.blitz.extension import Extension
import os
package_dir = os.path.dirname(os.path.realpath(__file__))
package_dir = os.path.join(package_dir, 'xbob', 'io', 'include')
include_dirs = [package_dir]
packages = ['bob-io >= 1.3']
packages = ['bob-measure >= 1.3']
version = '2.0.0a0'
define_macros = [("XBOB_IO_VERSION", '"%s"' % version)]
setup(
name='xbob.io',
name='xbob.measure',
version=version,
description='Bindings for bob.io',
url='http://github.com/anjos/xbob.io',
description='Bindings for bob.measure',
url='http://github.com/anjos/xbob.measure',
license='BSD',
author='Andre Anjos',
author_email='andre.anjos@idiap.ch',
......@@ -34,6 +28,7 @@ setup(
install_requires=[
'setuptools',
'xbob.blitz',
#'xbob.math',
],
namespace_packages=[
......@@ -41,32 +36,21 @@ setup(
],
ext_modules = [
Extension("xbob.io._externals",
[
"xbob/io/externals.cpp",
],
packages = packages,
define_macros = define_macros,
include_dirs = include_dirs,
),
Extension("xbob.io._library",
Extension("xbob.measure._library",
[
"xbob/io/bobskin.cpp",
"xbob/io/file.cpp",
"xbob/io/videoreader.cpp",
"xbob/io/videowriter.cpp",
"xbob/io/hdf5.cpp",
"xbob/io/main.cpp",
"xbob/measure/main.cpp",
],
packages = packages,
define_macros = define_macros,
include_dirs = include_dirs,
version = version,
),
],
entry_points={
'console_scripts': [
'xbob_video_test.py = xbob.io.script.video_test:main',
'xbob_compute_perf.py = xbob.measure.script.compute_perf:main',
'xbob_eval_threshold.py = xbob.measure.script.eval_threshold:main',
'xbob_apply_threshold.py = xbob.measure.script.apply_threshold:main',
'xbob_plot_cmc.py = xbob.measure.script.plot_cmc:main',
],
},
......
Subproject commit 0c025f75ef8fc80c34ef0460febae775568450a1
Subproject commit 6df5905976b1ea66ed2cc1550fd944a2dc939f19
from ._library import __version__, __api_version__
from ._library import __version__
from . import plot
from . import load
......
......@@ -21,7 +21,6 @@
import math
import numpy
from ..math import pavx
def cllr(negatives, positives):
"""Computes the 'cost of log likelihood ratio' measure as given in the bosaris toolkit"""
......@@ -35,6 +34,9 @@ def cllr(negatives, positives):
def min_cllr(negatives, positives):
"""Computes the 'minimum cost of log likelihood ratio' measure as given in the bosaris toolkit"""
from ..math import pavx
# first, sort both scores
neg = sorted(negatives)
pos = sorted(positives)
......@@ -71,8 +73,8 @@ def min_cllr(negatives, positives):
llrs = posterior_log_odds - log_prior_odds;
# some weired addition
# for i in range(I):
# llrs[i] += float(i)*1e-6/float(I)
# for i in range(I):
# llrs[i] += float(i)*1e-6/float(I)
# unmix positive and negative scores
new_neg = numpy.zeros(N)
......
This diff is collapsed.
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