Skip to content
Snippets Groups Projects
Commit 9e0930f1 authored by Laurent EL SHAFEY's avatar Laurent EL SHAFEY
Browse files

Update bootstrap.py; Use numpy.linalg.norm instead of deprecated bob method

parent 8d7cd9bb
Branches
Tags
No related merge requests found
......@@ -18,7 +18,11 @@ The script accepts buildout command-line options, so you can
use the -c option to specify an alternate configuration file.
"""
import os, shutil, sys, tempfile
import os
import shutil
import sys
import tempfile
from optparse import OptionParser
tmpeggs = tempfile.mkdtemp()
......@@ -31,8 +35,8 @@ Bootstraps a buildout-based project.
Simply run this script in a directory containing a buildout.cfg, using the
Python that you want bin/buildout to use.
Note that by using --setup-source and --download-base to point to
local resources, you can keep this script from going over the network.
Note that by using --find-links to point to local resources, you can keep
this script from going over the network.
'''
parser = OptionParser(usage=usage)
......@@ -48,23 +52,21 @@ parser.add_option("-t", "--accept-buildout-test-releases",
"bootstrap and buildout will get the newest releases "
"even if they are alphas or betas."))
parser.add_option("-c", "--config-file",
help=("Specify the path to the buildout configuration "
"file to be used."))
help=("Specify the path to the buildout configuration "
"file to be used."))
parser.add_option("-f", "--find-links",
help=("Specify a URL to search for buildout releases"))
help=("Specify a URL to search for buildout releases"))
options, args = parser.parse_args()
######################################################################
# load/install distribute
# load/install setuptools
to_reload = False
try:
import pkg_resources, setuptools
if not hasattr(pkg_resources, '_distribute'):
to_reload = True
raise ImportError
import pkg_resources
import setuptools
except ImportError:
ez = {}
......@@ -73,8 +75,10 @@ except ImportError:
except ImportError:
from urllib2 import urlopen
exec(urlopen('http://python-distribute.org/distribute_setup.py').read(), ez)
setup_args = dict(to_dir=tmpeggs, download_delay=0, no_fake=True)
# XXX use a more permanent ez_setup.py URL when available.
exec(urlopen('https://bitbucket.org/pypa/setuptools/raw/0.7.2/ez_setup.py'
).read(), ez)
setup_args = dict(to_dir=tmpeggs, download_delay=0)
ez['use_setuptools'](**setup_args)
if to_reload:
......@@ -86,10 +90,23 @@ except ImportError:
if path not in pkg_resources.working_set.entries:
pkg_resources.working_set.add_entry(path)
######################################################################
# Try to best guess the version of buildout given setuptools
if options.version is None:
try:
from distutils.version import LooseVersion
package = pkg_resources.require('setuptools')[0]
v = LooseVersion(package.version)
if v < LooseVersion('0.7'):
options.version = '2.1.1'
except:
pass
######################################################################
# Install buildout
ws = pkg_resources.working_set
ws = pkg_resources.working_set
cmd = [sys.executable, '-c',
'from setuptools.command.easy_install import main; main()',
......@@ -104,8 +121,8 @@ find_links = os.environ.get(
if find_links:
cmd.extend(['-f', find_links])
distribute_path = ws.find(
pkg_resources.Requirement.parse('distribute')).location
setuptools_path = ws.find(
pkg_resources.Requirement.parse('setuptools')).location
requirement = 'zc.buildout'
version = options.version
......@@ -113,13 +130,14 @@ if version is None and not options.accept_buildout_test_releases:
# Figure out the most recent final version of zc.buildout.
import setuptools.package_index
_final_parts = '*final-', '*final'
def _final_version(parsed_version):
for part in parsed_version:
if (part[:1] == '*') and (part not in _final_parts):
return False
return True
index = setuptools.package_index.PackageIndex(
search_path=[distribute_path])
search_path=[setuptools_path])
if find_links:
index.add_find_links((find_links,))
req = pkg_resources.Requirement.parse(requirement)
......@@ -142,7 +160,7 @@ if version:
cmd.append(requirement)
import subprocess
if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=distribute_path)) != 0:
if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=setuptools_path)) != 0:
raise Exception(
"Failed to execute command:\n%s",
repr(cmd)[1:-1])
......
......@@ -21,7 +21,7 @@
import bob
import xbob.db.atnt
import os, sys
import numpy
import numpy, numpy.linalg
from matplotlib import pyplot
# This is the base directory where by default the AT&T images are found. You can
......@@ -130,7 +130,7 @@ def main():
negative_scores = []
print "Computing scores"
distance_function = bob.math.euclidean_distance
distance_function = (lambda x,y: numpy.linalg.norm(x - y))
# iterate through models and probes and compute scores
for model_key, model_feature in model_features.iteritems():
......
......@@ -25,7 +25,7 @@ import unittest
from nose.plugins.skip import SkipTest
import bob
import numpy
import numpy, numpy.linalg
import xbob.db.atnt
......@@ -92,7 +92,7 @@ class FaceVerifyExampleTest(unittest.TestCase):
self.assertTrue(numpy.allclose(probe_ref, probe))
# compute score
score = bob.math.euclidean_distance(model, probe)
score = numpy.linalg.norm(model - probe)
self.assertAlmostEqual(score, 3498.308154114)
......
......@@ -28,7 +28,7 @@ setup(
# This is the basic information about your project. Modify all this
# information before releasing code publicly.
name='bob.example.faceverify',
version='0.4.1',
version='0.4.2',
description='Example for using Bob to create face verification systems',
url='http://pypi.python.org/pypi/bob.example.faceverify',
license='GPLv3',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment