Merge branch 'feature/dct_multiopt'

Paul Brossier committed 8 years ago

Commit ad3770f2 parents 87e181d 3cb2a5213 files · +969 −5Browse files

Showing the changes to python (3 of 13 files). Show all

Unified · Split

3 files

python/lib/gen_code.py +21 −4
python/lib/gen_external.py +3 −1
python/tests/test_dct.py +68 −0

     # we have some clean up to do
     'buf_size': 'Py_default_vector_length',
     'win_s': 'Py_default_vector_length',
+    'size': 'Py_default_vector_length',
     # and here too
     'hop_size': 'Py_default_vector_length / 2',
     'hop_s': 'Py_default_vector_length / 2',
         'tempo': '1',
         'filterbank': 'self->n_filters',
         'tss': 'self->buf_size',
+        'dct': 'self->size',
         }
 objinputsize = {
         self.do_inputs = [get_params_types_names(self.do_proto)[1]]
         self.do_outputs = get_params_types_names(self.do_proto)[2:]
         struct_output_str = ["PyObject *{0[name]}; {1} c_{0[name]}".format(i, i['type'][:-1]) for i in self.do_outputs]
+        if len(self.prototypes['rdo']):
+            rdo_outputs = get_params_types_names(prototypes['rdo'][0])[2:]
+            struct_output_str += ["PyObject *{0[name]}; {1} c_{0[name]}".format(i, i['type'][:-1]) for i in rdo_outputs]
+            self.outputs += rdo_outputs
         self.struct_outputs = ";\n    ".join(struct_output_str)
         #print ("input_params: ", map(split_type, get_input_params(self.do_proto)))
             out += self.gen_init()
             out += self.gen_del()
             out += self.gen_do()
+            if len(self.prototypes['rdo']):
+                self.do_proto = self.prototypes['rdo'][0]
+                self.do_inputs = [get_params_types_names(self.do_proto)[1]]
+                self.do_outputs = get_params_types_names(self.do_proto)[2:]
+                out += self.gen_do(method='rdo')
             out += self.gen_memberdef()
             out += self.gen_set()
             out += self.gen_get()
 """.format(del_fn = del_fn)
         return out
-    def gen_do(self):
+    def gen_do(self, method = 'do'):
         out = """
 // do {shortname}
 static PyObject*
-Py_{shortname}_do  (Py_{shortname} * self, PyObject * args)
+Pyaubio_{shortname}_{method}  (Py_{shortname} * self, PyObject * args)
-{{""".format(**self.__dict__)
+{{""".format(method = method, **self.__dict__)
         input_params = self.do_inputs
         output_params = self.do_outputs
         #print input_params
             out += """
   {{"{shortname}", (PyCFunction) Py{name},
     METH_NOARGS, ""}},""".format(name = name, shortname = shortname)
+        for m in self.prototypes['rdo']:
+            name = get_name(m)
+            shortname = name.replace('aubio_%s_' % self.shortname, '')
+            out += """
+  {{"{shortname}", (PyCFunction) Py{name},
+    METH_VARARGS, ""}},""".format(name = name, shortname = shortname)
         out += """
   {NULL} /* sentinel */
 };
   0,
   0,
   0,
-  (ternaryfunc)Py_{shortname}_do,
+  (ternaryfunc)Pyaubio_{shortname}_do,
   0,
   0,
   0,

python/lib/gen_external.py+3−1

         if o[:6] == 'aubio_':
             shortname = o[6:-2]  # without aubio_ prefix and _t suffix
-        lib[shortname] = {'struct': [], 'new': [], 'del': [], 'do': [], 'get': [], 'set': [], 'other': []}
+        lib[shortname] = {'struct': [], 'new': [], 'del': [], 'do': [], 'rdo': [], 'get': [], 'set': [], 'other': []}
         lib[shortname]['longname'] = o
         lib[shortname]['shortname'] = shortname
                     lib[shortname]['struct'].append(fn)
                 elif '_do' in fn:
                     lib[shortname]['do'].append(fn)
+                elif '_rdo' in fn:
+                    lib[shortname]['rdo'].append(fn)
                 elif 'new_' in fn:
                     lib[shortname]['new'].append(fn)
                 elif 'del_' in fn:

python/tests/test_dct.py+68−0

@@ -0,0 +1,68 @@
	1	#! /usr/bin/env python
	2
	3
	4	import numpy as np
	5	from numpy.testing import TestCase, assert_almost_equal
	6	import aubio
	7
	8	precomputed_arange = [ 9.89949512, -6.44232273, 0., -0.67345482, 0.,
	9	-0.20090288, 0., -0.05070186]
	10
	11	precomputed_some_ones = [ 4.28539848, 0.2469689, -0.14625292, -0.58121818,
	12	-0.83483052, -0.75921834, -0.35168475, 0.24087936,
	13	0.78539824, 1.06532764, 0.97632152, 0.57164496, 0.03688532,
	14	-0.39446154, -0.54619485, -0.37771079]
	15
	16	class aubio_dct(TestCase):
	17
	18	def test_init(self):
	19	""" test that aubio.dct() is created with expected size """
	20	a_dct = aubio.dct()
	21	self.assertEqual(a_dct.size, 1024)
	22
	23	def test_arange(self):
	24	""" test that dct(arange(8)) is computed correctly
	25
	26	>>> from scipy.fftpack import dct
	27	>>> a_in = np.arange(8).astype(aubio.float_type)
	28	>>> precomputed = dct(a_in, norm='ortho')
	29	"""
	30	N = len(precomputed_arange)
	31	a_dct = aubio.dct(8)
	32	a_in = np.arange(8).astype(aubio.float_type)
	33	a_expected = aubio.fvec(precomputed_arange)
	34	assert_almost_equal(a_dct(a_in), a_expected, decimal=5)
	35
	36	def test_some_ones(self):
	37	""" test that dct(somevector) is computed correctly """
	38	a_dct = aubio.dct(16)
	39	a_in = np.ones(16).astype(aubio.float_type)
	40	a_in[1] = 0
	41	a_in[3] = np.pi
	42	a_expected = aubio.fvec(precomputed_some_ones)
	43	assert_almost_equal(a_dct(a_in), a_expected, decimal=6)
	44
	45	def test_reconstruction(self):
	46	""" test that some_ones vector can be recontructed """
	47	a_dct = aubio.dct(16)
	48	a_in = np.ones(16).astype(aubio.float_type)
	49	a_in[1] = 0
	50	a_in[3] = np.pi
	51	a_dct_in = a_dct(a_in)
	52	a_dct_reconstructed = a_dct.rdo(a_dct_in)
	53	assert_almost_equal(a_dct_reconstructed, a_in, decimal=6)
	54
	55	def test_negative_size(self):
	56	""" test that creation fails with a negative size """
	57	with self.assertRaises(ValueError):
	58	aubio.dct(-1)
	59
	60	def test_wrong_size(self):
	61	""" test that creation fails with a non power-of-two size """
	62	# supports for non 2** fft sizes only when compiled with fftw3
	63	size = 13
	64	try:
	65	with self.assertRaises(RuntimeError):
	66	aubio.dct(size)
	67	except AssertionError:
	68	self.skipTest('creating aubio.dct with size %d did not fail' % size)

Merge branch 'feature/dct_multiopt'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code