Skip to content

Commit

Permalink
Merge pull request #323 from stefan-balke/feature-dtw
Browse files Browse the repository at this point in the history
[CR] DTW
  • Loading branch information
bmcfee committed Jul 26, 2016
2 parents ffdcdbd + 73dd8ab commit c053d9e
Show file tree
Hide file tree
Showing 8 changed files with 474 additions and 16 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ python:
- "3.4"
- "3.5"

env:
- ENABLE_NUMBA=false
- ENABLE_NUMBA=true

before_install:
- bash .travis_dependencies.sh
- export PATH="$HOME/env/miniconda$TRAVIS_PYTHON_VERSION/bin:$PATH";
Expand Down
8 changes: 6 additions & 2 deletions .travis_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ src="$HOME/env/miniconda$TRAVIS_PYTHON_VERSION"
if [ ! -d "$src" ]; then
mkdir -p $HOME/env
pushd $HOME/env

# Download miniconda packages
wget http://repo.continuum.io/miniconda/Miniconda-3.16.0-Linux-x86_64.sh -O miniconda.sh;

Expand All @@ -34,7 +34,11 @@ if [ ! -d "$src" ]; then
source activate $ENV_NAME

pip install python-coveralls


if [ "$ENABLE_NUMBA" = true ]; then
conda install numba
fi

source deactivate
popd
else
Expand Down
14 changes: 12 additions & 2 deletions librosa/core/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
"""
Core IO and DSP
Core IO and DSP
===============
Audio processing
Expand Down Expand Up @@ -76,13 +76,23 @@
pitch_tuning
piptrack
Dynamic Time Warping
--------------------
.. autosummary::
:toctree: generated/
dtw
calc_accu_cost
backtracking
band_mask
"""

from .time_frequency import * # pylint: disable=wildcard-import
from .audio import * # pylint: disable=wildcard-import
from .spectrum import * # pylint: disable=wildcard-import
from .pitch import * # pylint: disable=wildcard-import
from .constantq import * # pylint: disable=wildcard-import
from .dtw import * # pylint: disable=wildcard-import

__all__ = [_ for _ in dir() if not _.startswith('_')]

Loading

0 comments on commit c053d9e

Please sign in to comment.