move benchonset to aubio.bench

move benchonset to aubio.bench

diff --git a/python/aubio/bench/node.py b/python/aubio/bench/node.py
index 3ec442ba165f4b1238f8c456eab8829c7fd2651a..15969d39a258da45cdedd4424ff351a89340d24c 100644 (file)
--- a/python/aubio/bench/node.py
+++ b/python/aubio/bench/node.py
@@ -89,7 +89,7 @@ def act_on_files (action,listfiles,listres=None,suffix='.txt',filter='f',sub='\.
 class bench:
        """ class to run benchmarks on directories """
        def __init__(self,datadir,resdir=None,checkres=False,checkanno=False,params=[]):
-               from aubio.tasks import taskparams
+               from aubio.task.params import taskparams
                self.datadir = datadir
                # path to write results path to
                self.resdir = resdir

diff --git a/python/test/bench/onset/benchonset.py b/python/aubio/bench/onset.py
similarity index 100%
rename from python/test/bench/onset/benchonset.py
rename to python/aubio/bench/onset.py

diff --git a/python/aubio/task/onset.py b/python/aubio/task/onset.py
index 0f58ff4ea786ad98f11476cb51382b5d8c1cd76a..59ae47afc50f1ae8719515fee5eede6d63105cf0 100644 (file)
--- a/python/aubio/task/onset.py
+++ b/python/aubio/task/onset.py
@@ -60,8 +60,8 @@ class taskonset(task):
                print self.params.step*foo[0]
 
        def eval(self,inputdata,ftru,mode='roc',vmode=''):
-               from txtfile import read_datafile 
-               from onsetcompare import onset_roc, onset_diffs, onset_rocloc
+               from aubio.txtfile import read_datafile 
+               from aubio.onsetcompare import onset_roc, onset_diffs, onset_rocloc
                ltru = read_datafile(ftru,depth=0)
                lres = []
                for i in range(len(inputdata)): lres.append(inputdata[i][0]*self.params.step)

diff --git a/python/test/bench/onset/bench-onset b/python/test/bench/onset/bench-onset
index 9edc8665c84c8deb2ac69e5a3b0f6ffd273729ca..a56e4d47b9ecf9831b3b5d457a3e3eed2949e8a0 100755 (executable)
--- a/python/test/bench/onset/bench-onset
+++ b/python/test/bench/onset/bench-onset
@@ -1,8 +1,8 @@
 #! /usr/bin/python
 
-from aubio.tasks import *
+from aubio.task import *
 
-from benchonset import mmean, stdev, benchonset
+from aubio.bench.onset import mmean, stdev, benchonset
 
 class mybenchonset(benchonset):
 

diff --git a/python/test/bench/pitch/bench-pitch b/python/test/bench/pitch/bench-pitch
index a0a31a08630f7f584073ec88c4258582fbb2889f..7ad73517481aa03b4845ecafac62c242be3a829e 100755 (executable)
--- a/python/test/bench/pitch/bench-pitch
+++ b/python/test/bench/pitch/bench-pitch
@@ -1,7 +1,7 @@
 #! /usr/bin/python
 
 from aubio.bench.node import *
-from aubio.tasks import *
+from aubio.task import *
 
 class benchpitch(bench):