Changeset 569b363 for python/lib

Timestamp:

Apr 24, 2016, 6:23:14 PM (8 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:

51b9c83

Parents:

a35db12

Message:

python/ext: simplify memory allocations, removed unneeded malloc/free calls

File:

• python/lib/gen_code.py (modified) (4 diffs)

python/lib/gen_code.py

@@ -203 +203 @@
 }} Py_{shortname};
 """
-        return out.format(do_inputs_list = "; ".join(get_input_params(self.do_proto)), **self.__dict__)
+        # fmat_t* / fvec_t* / cvec_t* inputs -> full fvec_t /.. struct in Py_{shortname}
+        do_inputs_list = "; ".join(get_input_params(self.do_proto)).replace('fvec_t *','fvec_t').replace('fmat_t *', 'fmat_t').replace('cvec_t *', 'cvec_t')
+        return out.format(do_inputs_list = do_inputs_list, **self.__dict__)
 
     def gen_doc(self):
@@ -311 +313 @@
   // TODO get internal params after actual object creation?
 """
-        for input_param in self.do_inputs:
-            out += """
-  self->{0} = ({1})malloc(sizeof({2}));""".format(input_param['name'], input_param['type'], input_param['type'][:-1])
         out += """
   // create outputs{output_create}
@@ -343 +342 @@
 {{""".format(**self.__dict__)
         for input_param in self.do_inputs:
-            out += """
-    free(self->{0[name]});""".format(input_param)
+            if input_param['type'] == 'fmat_t *':
+                out += """
+    free(self->{0[name]}.data);""".format(input_param)
         for o in self.outputs:
             name = o['name']
@@ -380 +380 @@
         for p in input_params:
             out += """
-    if (!{pytoaubio}(py_{0[name]}, self->{0[name]})) {{
+    if (!{pytoaubio}(py_{0[name]}, &(self->{0[name]}))) {{
         return NULL;
     }}""".format(input_param, pytoaubio = pytoaubio_fn[input_param['type']])
         do_fn = get_name(self.do_proto)
-        inputs = ", ".join(['self->'+p['name'] for p in input_params])
+        inputs = ", ".join(['&(self->'+p['name']+')' for p in input_params])
         outputs = ", ".join(["self->%s" % p['name'] for p in self.do_outputs])
         out += """