Showing the changes to python (8 of 11 files). Show all
Unified · Split
| @@ -63,7 +63,7 @@ while True: · 62 unmodified lines | ||
| 63 | 63 | delta = frames2tick(total_frames) - last_time |
| 64 | 64 | if new_note[2] > 0: |
| 65 | 65 | track.append(Message('note_off', note=int(new_note[2]), |
| 66 | − velocity=127, time=0) | |
| 66 | + velocity=127, time=delta) | |
| 67 | 67 | ) |
| 68 | 68 | track.append(Message('note_on', |
| 69 | 69 | note=int(new_note[0]), |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | #define PYAUBIO_dct_doc \ |
| 2 | 2 | "dct(size=1024)\n"\ |
| 3 | 3 | "\n"\ |
| 4 | − "Compute Discrete Fourier Transorms of Type-II.\n"\ | |
| 4 | + "Compute Discrete Fourier Transforms of Type-II.\n"\ | |
| 5 | 5 | "\n"\ |
| 6 | 6 | "Parameters\n"\ |
| 7 | 7 | "----------\n"\ |
| @@ -3,7 +3,7 @@ · 2 unmodified lines | ||
| 3 | 3 | static char Py_fft_doc[] = "" |
| 4 | 4 | "fft(size=1024)\n" |
| 5 | 5 | "\n" |
| 6 | −"Compute Fast Fourier Transorms.\n" | |
| 6 | +"Compute Fast Fourier Transforms.\n" | |
| 7 | 7 | "\n" |
| 8 | 8 | "Parameters\n" |
| 9 | 9 | "----------\n" |
| @@ -81,7 +81,7 @@ static char Py_sink_close_doc[] = "" · 80 unmodified lines | ||
| 81 | 81 | "Close this sink now.\n" |
| 82 | 82 | "\n" |
| 83 | 83 | "By default, the sink will be closed before being deleted.\n" |
| 84 | −"Explicitely closing a sink can be useful to control the number\n" | |
| 84 | +"Explicitly closing a sink can be useful to control the number\n" | |
| 85 | 85 | "of files simultaneously opened.\n" |
| 86 | 86 | ""; |
| 87 | 87 | |
| @@ -120,23 +120,24 @@ def get_cpp_output(header=header, usedouble=False): · 119 unmodified lines | ||
| 120 | 120 | print("Running command: {:s}".format(" ".join(cpp_cmd))) |
| 121 | 121 | proc = subprocess.Popen(cpp_cmd, |
| 122 | 122 | stderr=subprocess.PIPE, |
| 123 | − stdout=subprocess.PIPE) | |
| 123 | + stdout=subprocess.PIPE, | |
| 124 | + universal_newlines=True) | |
| 124 | 125 | assert proc, 'Proc was none' |
| 125 | 126 | cpp_output = proc.stdout.read() |
| 126 | 127 | err_output = proc.stderr.read() |
| 127 | 128 | if err_output: |
| 128 | 129 | print("Warning: preprocessor produced errors or warnings:\n%s" \ |
| 129 | − % err_output.decode('utf8')) | |
| 130 | + % err_output) | |
| 130 | 131 | if not cpp_output: |
| 131 | 132 | raise_msg = "preprocessor output is empty! Running command " \ |
| 132 | 133 | + "\"%s\" failed" % " ".join(cpp_cmd) |
| 133 | 134 | if err_output: |
| 134 | − raise_msg += " with stderr: \"%s\"" % err_output.decode('utf8') | |
| 135 | + raise_msg += " with stderr: \"%s\"" % err_output | |
| 135 | 136 | else: |
| 136 | 137 | raise_msg += " with no stdout or stderr" |
| 137 | 138 | raise Exception(raise_msg) |
| 138 | 139 | if not isinstance(cpp_output, list): |
| 139 | − cpp_output = [l.strip() for l in cpp_output.decode('utf8').split('\n')] | |
| 140 | + cpp_output = [l.strip() for l in cpp_output.split('\n')] | |
| 140 | 141 | |
| 141 | 142 | return cpp_output |
| 142 | 143 | |
| @@ -4,23 +4,28 @@ from unittest import main · 3 unmodified lines | ||
| 4 | 4 | from numpy.testing import TestCase |
| 5 | 5 | from numpy.testing import assert_equal, assert_almost_equal |
| 6 | 6 | from _tools import assert_warns |
| 7 | +from utils import is32bit | |
| 7 | 8 | import numpy as np |
| 8 | 9 | import aubio |
| 9 | 10 | |
| 10 | 11 | from aubio import hztomel, meltohz |
| 11 | 12 | from aubio import hztomel_htk, meltohz_htk |
| 12 | 13 | |
| 13 | − | |
| 14 | 14 | class aubio_hztomel_test_case(TestCase): |
| 15 | 15 | |
| 16 | 16 | def test_hztomel(self): |
| 17 | 17 | assert_equal(hztomel(0.), 0.) |
| 18 | 18 | assert_almost_equal(hztomel(400. / 3.), 2., decimal=5) |
| 19 | 19 | assert_almost_equal(hztomel(1000. / 3), 5.) |
| 20 | − assert_equal(hztomel(200.), 3.) | |
| 20 | + # on 32bit, some of these tests fails unless compiling with -ffloat-store | |
| 21 | + try: | |
| 22 | + assert_equal(hztomel(200.), 3.) | |
| 23 | + except AssertionError: | |
| 24 | + if not is32bit(): raise | |
| 25 | + assert_almost_equal(hztomel(200.), 3., decimal=5) | |
| 21 | 26 | assert_almost_equal(hztomel(1000.), 15) |
| 22 | − assert_almost_equal(hztomel(6400), 42) | |
| 23 | − assert_almost_equal(hztomel(40960), 69) | |
| 27 | + assert_almost_equal(hztomel(6400), 42, decimal=5) | |
| 28 | + assert_almost_equal(hztomel(40960), 69, decimal=5) | |
| 24 | 29 | |
| 25 | 30 | for m in np.linspace(0, 1000, 100): |
| 26 | 31 | assert_almost_equal(hztomel(meltohz(m)) - m, 0, decimal=3) |
| @@ -28,7 +33,11 @@ class aubio_hztomel_test_case(TestCase): · 1 unmodified line | ||
| 28 | 33 | def test_meltohz(self): |
| 29 | 34 | assert_equal(meltohz(0.), 0.) |
| 30 | 35 | assert_almost_equal(meltohz(2), 400. / 3., decimal=4) |
| 31 | − assert_equal(meltohz(3.), 200.) | |
| 36 | + try: | |
| 37 | + assert_equal(meltohz(3.), 200.) | |
| 38 | + except AssertionError: | |
| 39 | + if not is32bit(): raise | |
| 40 | + assert_almost_equal(meltohz(3.), 200., decimal=5) | |
| 32 | 41 | assert_almost_equal(meltohz(5), 1000. / 3., decimal=4) |
| 33 | 42 | assert_almost_equal(meltohz(15), 1000., decimal=4) |
| 34 | 43 | assert_almost_equal(meltohz(42), 6400., decimal=2) |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | #! /usr/bin/env python |
| 2 | 2 | |
| 3 | 3 | from numpy.testing import TestCase, assert_equal, assert_array_less |
| 4 | −from _tools import parametrize | |
| 4 | +from _tools import parametrize, skipTest | |
| 5 | 5 | from aubio import fvec, cvec, pvoc, float_type |
| 6 | 6 | import numpy as np |
| 7 | 7 | |
| @@ -51,7 +51,7 @@ class Test_aubio_pvoc_test_case(object): · 43 unmodified lines | ||
| 51 | 51 | assert_equal (s.phas[s.phas > 0], +np.pi) |
| 52 | 52 | assert_equal (s.phas[s.phas < 0], -np.pi) |
| 53 | 53 | assert_equal (np.abs(s.phas[np.abs(s.phas) != np.pi]), 0) |
| 54 | − self.skipTest('pvoc(fvec(%d)).phas != +0, ' % win_s \ | |
| 54 | + skipTest('pvoc(fvec(%d)).phas != +0, ' % win_s \ | |
| 55 | 55 | + 'This is expected when using fftw3 on powerpc.') |
| 56 | 56 | assert_equal ( r, 0.) |
| 57 | 57 | |
| @@ -3,11 +3,15 @@ · 2 unmodified lines | ||
| 3 | 3 | import os |
| 4 | 4 | import re |
| 5 | 5 | import glob |
| 6 | +import struct | |
| 6 | 7 | import numpy as np |
| 7 | 8 | from tempfile import mkstemp |
| 8 | 9 | |
| 9 | 10 | DEFAULT_SOUND = '22050Hz_5s_brownnoise.wav' |
| 10 | 11 | |
| 12 | +def is32bit(): | |
| 13 | + return struct.calcsize("P") * 8 == 32 | |
| 14 | + | |
| 11 | 15 | def array_from_text_file(filename, dtype = 'float'): |
| 12 | 16 | realpathname = os.path.join(os.path.dirname(__file__), filename) |
| 13 | 17 | return np.loadtxt(realpathname, dtype = dtype) |