Changeset abbd910

Timestamp:

Jul 11, 2012, 10:43:00 PM (12 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

312826c

Parents:

195b424

Message:

gen_pyobject.py: clean up, output a float instead of a vector with a single element

File:

• interfaces/python/gen_pyobject.py (modified) (13 diffs)

interfaces/python/gen_pyobject.py

@@ -35 +35 @@
         return ['foo*', 'name'] """
     l = arg.split()
+    type_arg = {'type': l[0], 'name': l[1]}
     # ['foo', '*name'] -> ['foo*', 'name']
     if l[-1].startswith('*'):
-        return [l[0]+'*', l[1][1:]]
+        #return [l[0]+'*', l[1][1:]]
+        type_arg['type'] = l[0] + '*'
+        type_arg['name'] = l[1][1:]
     # ['foo', '*', 'name'] -> ['foo*', 'name']
     if len(l) == 3:
-        return [l[0]+l[1], l[2]]
+        #return [l[0]+l[1], l[2]]
+        type_arg['type'] = l[0]+l[1]
+        type_arg['name'] = l[2]
     else:
-        return l
+        #return l
+        pass
+    return type_arg
 
 def get_params(proto):
@@ -145 +152 @@
     # self->param1, self->param2, self->param3
     if len(newparams):
-        selfparams = ', self->'+', self->'.join([p[1] for p in newparams])
+        selfparams = ', self->'+', self->'.join([p['name'] for p in newparams])
     else:
         selfparams = '' 
     # "param1", "param2", "param3"
-    paramnames = ", ".join(["\""+p[1]+"\"" for p in newparams])
-    pyparams = "".join(map(lambda p: aubio2pytypes[p[0]], newparams))
-    paramrefs = ", ".join(["&" + p[1] for p in newparams])
+    paramnames = ", ".join(["\""+p['name']+"\"" for p in newparams])
+    pyparams = "".join(map(lambda p: aubio2pytypes[p['type']], newparams))
+    paramrefs = ", ".join(["&" + p['name'] for p in newparams])
     s = """\
 // WARNING: this file is generated, DO NOT EDIT
@@ -163 +170 @@
   aubio_%(name)s_t * o;
 """ % locals()
-    for ptype, pname in newparams:
+    for p in newparams:
+        ptype = p['type']
+        pname = p['name']
         s += """\
   %(ptype)s %(pname)s;
@@ -177 +186 @@
   Py_%(name)s *self;
 """ % locals()
-    for ptype, pname in newparams:
+    for p in newparams:
+        ptype = p['type']
+        pname = p['name']
         initval = aubioinitvalue[ptype]
         s += """\
@@ -200 +211 @@
   }
 """ % locals()
-    for ptype, pname in newparams:
+    for p in newparams:
+        ptype = p['type']
+        pname = p['name']
         defval = aubiodefvalue[pname]
         if ptype == 'char_t*':
@@ -248 +261 @@
     doparams = get_params_types_names(dofunc) 
     # make sure the first parameter is the object
-    assert doparams[0][0] == "aubio_"+name+"_t*", \
+    assert doparams[0]['type'] == "aubio_"+name+"_t*", \
         "method is not in 'aubio_<name>_t"
     # and remove it
@@ -261 +274 @@
     inputparams = [doparams[0]]
     # build the parsing string for PyArg_ParseTuple
-    pytypes = "".join([aubio2pytypes[p[0]] for p in doparams[0:1]])
-    inputdefs = "\n  ".join(["PyObject * " + p[-1] + "_obj;" for p in inputparams])
-    inputvecs = "\n  ".join(map(lambda p: \
-                p[0] + p[-1] + ";", inputparams))
-    parseinput = ""
+    pytypes = "".join([aubio2pytypes[p['type']] for p in doparams[0:1]])
+
+    inputdefs = "/* input vectors python prototypes */\n  "
+    inputdefs += "\n  ".join(["PyObject * " + p['name'] + "_obj;" for p in inputparams])
+
+    inputvecs = "/* input vectors prototypes */\n  "
+    inputvecs += "\n  ".join(map(lambda p: p['type'] + ' ' + p['name'] + ";", inputparams))
+
+    parseinput = "/* input vectors parsing */\n  "
     for p in inputparams:
-        inputvec = p[-1]
-        inputdef = p[-1] + "_obj"
-        converter = aubiovecfrompyobj[p[0]]
+        inputvec = p['name']
+        inputdef = p['name'] + "_obj"
+        converter = aubiovecfrompyobj[p['type']]
         parseinput += """%(inputvec)s = %(converter)s (%(inputdef)s);
 
@@ -275 +292 @@
     return NULL;
   }""" % locals()
+
     # build the string for the input objects references
-    inputrefs = ", ".join(["&" + p[-1] + "_obj" for p in inputparams])
+    inputrefs = ", ".join(["&" + p['name'] + "_obj" for p in inputparams])
     # end of inputs strings
 
@@ -284 +302 @@
         #assert len(outputparams) == 1, \
         #    "too many output parameters"
-        outputvecs = "\n  ".join([p[0] + p[-1] + ";" for p in outputparams])
-        outputcreate = "\n  ".join(["""\
-  %(name)s = new_%(autype)s (%(length)s);""" % \
-    {'name': p[-1], 'pytype': p[0], 'autype': p[0][:-3],
-        'length': defaultsizes[name]} \
-        for p in outputparams]) 
+        outputvecs = "\n  /* output vectors prototypes */\n  "
+        outputvecs += "\n  ".join([p['type'] + ' ' + p['name'] + ";" for p in outputparams])
+        params = {
+          'name': p['name'], 'pytype': p['type'], 'autype': p['type'][:-3],
+          'length': defaultsizes[name]}
+        outputcreate = "\n  ".join(["""/* creating output %(name)s as a new_%(autype)s of length %(length)s */""" % \
+            params for p in outputparams]) 
+        outputcreate += "\n"
+        outputcreate += "\n  ".join(["""  %(name)s = new_%(autype)s (%(length)s);""" % \
+            params for p in outputparams]) 
+        returnval = ""
         if len(outputparams) > 1:
-            returnval = "PyObject *outputs = PyList_New(0);\n"
+            returnval += "PyObject *outputs = PyList_New(0);\n"
             for p in outputparams:
-                returnval += "  PyList_Append( outputs, (PyObject *)" + aubiovectopyobj[p[0]] + " (" + p[-1] + ")" +");\n"
+                returnval += "  PyList_Append( outputs, (PyObject *)" + aubiovectopyobj[p['type']] + " (" + p['name'] + ")" +");\n"
             returnval += "  return outputs;"
         else:
-            returnval = "return (PyObject *)" + aubiovectopyobj[p[0]] + " (" + p[-1] + ")"
+            if defaultsizes[name] == '1':
+                returnval += "return (PyObject *)PyFloat_FromDouble(" + p['name'] + "->data[0])"
+            else:
+                returnval += "return (PyObject *)" + aubiovectopyobj[p['type']] + " (" + p['name'] + ")"
     else:
         # no output
@@ -302 +328 @@
         outputcreate = ""
         #returnval = "Py_None";
-        returnval = "return (PyObject *)" + aubiovectopyobj[p[0]] + " (" + p[-1] + ")"
+        returnval = "return (PyObject *)" + aubiovectopyobj[p['type']] + " (" + p['name'] + ")"
     # end of output strings
 
     # build the parameters for the  _do() call
-    doparams_string = "self->o, " + ", ".join([p[-1] for p in doparams])
+    doparams_string = "self->o, " + ", ".join([p['name'] for p in doparams])
 
     # put it all together
     s = """\
+/* function Py_%(name)s_do */
 static PyObject * 
 Py_%(name)s_do(Py_%(name)s * self, PyObject * args)
@@ -338 +365 @@
 AUBIO_MEMBERS_START(%(name)s)""" % locals()
     for param in newparams:
-        if param[0] == 'char_t*':
+        if param['type'] == 'char_t*':
             s += """
   {"%(pname)s", T_STRING, offsetof (Py_%(name)s, %(pname)s), READONLY, ""},""" \
-        % { 'pname': param[1], 'ptype': param[0], 'name': name}
-        elif param[0] == 'uint_t':
+        % { 'pname': param['name'], 'ptype': param['type'], 'name': name}
+        elif param['type'] == 'uint_t':
             s += """
   {"%(pname)s", T_INT, offsetof (Py_%(name)s, %(pname)s), READONLY, ""},""" \
-        % { 'pname': param[1], 'ptype': param[0], 'name': name}
-        elif param[0] == 'smpl_t':
+        % { 'pname': param['name'], 'ptype': param['type'], 'name': name}
+        elif param['type'] == 'smpl_t':
             s += """
   {"%(pname)s", T_FLOAT, offsetof (Py_%(name)s, %(pname)s), READONLY, ""},""" \
-        % { 'pname': param[1], 'ptype': param[0], 'name': name}
+        % { 'pname': param['name'], 'ptype': param['type'], 'name': name}
         else:
             write_msg ("-- ERROR, unknown member type ", param )
@@ -366 +393 @@
         params = get_params_types_names(method)
         out_type = get_return_type(method)
-        assert params[0][0] == "aubio_"+name+"_t*", \
+        assert params[0]['type'] == "aubio_"+name+"_t*", \
             "get method is not in 'aubio_<name>_t"
         write_msg (method )
         write_msg (params[1:])
-        setter_args = "self->o, " +",".join([p[1] for p in params[1:]])
+        setter_args = "self->o, " +",".join([p['name'] for p in params[1:]])
         parse_args = ""
         for p in params[1:]:
-            parse_args += p[0] + " " + p[1] + ";\n"
-        argmap = "".join([aubio2pytypes[p[0]] for p in params[1:]])
-        arglist = ", ".join(["&"+p[1] for p in params[1:]])
+            parse_args += p['type'] + " " + p['name'] + ";\n"
+        argmap = "".join([aubio2pytypes[p['type']] for p in params[1:]])
+        arglist = ", ".join(["&"+p['name'] for p in params[1:]])
         parse_args += """
   if (!PyArg_ParseTuple (args, "%(argmap)s", %(arglist)s)) {
@@ -409 +436 @@
         params = get_params_types_names(method)
         out_type = get_return_type(method)
-        assert params[0][0] == "aubio_"+name+"_t*", \
-            "get method is not in 'aubio_<name>_t %s" % params[0][0]
+        assert params[0]['type'] == "aubio_"+name+"_t*", \
+            "get method is not in 'aubio_<name>_t %s" % params[0]['type']
         assert len(params) == 1, \
             "get method has more than one parameter %s" % params