Commit 2dcd5ac9 authored by Tiago de Freitas Pereira's avatar Tiago de Freitas Pereira
Browse files

Merge pull request #2 from tiagofrepereira2012/master

Removed the imports with from .[module] import name
parents 03f09636 040d70b8
......@@ -15,12 +15,12 @@ matrix:
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 texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
- pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel sphinx nose numpy scipy matplotlib coverage cpp-coveralls
- sudo apt-get install -qq --force-yes libboost-all-dev libblitz1-dev libatlas-dev libatlas-base-dev liblapack-dev libhdf5-serial-dev texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended gfortran
- pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel sphinx nose numpy scipy==0.15.1 matplotlib coverage cpp-coveralls
- pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel --pre -r requirements.txt coveralls
install:
- python bootstrap-buildout.py
- CPPFLAGS=--coverage LDFLAGS=--coverage ./bin/buildout buildout:debug=false buildout:develop=. buildout:extensions=bob.buildout buildout:auto-checkout=
- CPPFLAGS=--coverage LDFLAGS=--coverage ./bin/buildout buildout:debug=false buildout:develop=. buildout:extensions=bob.buildout buildout:auto-checkout= buildout:newest=false
script:
- ./bin/python -c 'import pkg_resources; from bob.learn.boosting import get_config; print(get_config())'
- ./bin/coverage run --source=bob.learn.boosting ./bin/nosetests -sv
......
......@@ -6,27 +6,27 @@ import bob.extension
bob.extension.load_bob_library('bob.learn.boosting', __file__)
# versioning
from . import version
from .version import module as __version__
from .version import api as __api_version__
from bob.learn.boosting import version
from bob.learn.boosting.version import module as __version__
from bob.learn.boosting.version import api as __api_version__
# include loss functions
from . import LossFunction # Just to get the documentation for it
from .ExponentialLoss import ExponentialLoss
from .LogitLoss import LogitLoss
from .TangentialLoss import TangentialLoss
from ._library import JesorskyLoss
from bob.learn.boosting import LossFunction # Just to get the documentation for it
from bob.learn.boosting.ExponentialLoss import ExponentialLoss
from bob.learn.boosting.LogitLoss import LogitLoss
from bob.learn.boosting.TangentialLoss import TangentialLoss
from bob.learn.boosting._library import JesorskyLoss
# include trainers
from .StumpTrainer import StumpTrainer
from .Boosting import Boosting
from ._library import LUTTrainer
from bob.learn.boosting.StumpTrainer import StumpTrainer
from bob.learn.boosting.Boosting import Boosting
from bob.learn.boosting._library import LUTTrainer
# include machines
from ._library import WeakMachine, StumpMachine, LUTMachine, BoostedMachine
from bob.learn.boosting._library import WeakMachine, StumpMachine, LUTMachine, BoostedMachine
# include auxiliary functions
from ._library import weighted_histogram
from bob.learn.boosting._library import weighted_histogram
def get_config():
"""Returns a string containing the configuration information.
......
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