Flake8 for gof/cutils.py

theano/gof/cutils.py

@@ -14,18 +14,21 @@ if os.path.exists(os.path.join(config.compiledir, 'cutils_ext.so')):
 
 
 def compile_cutils_code():
-
     types = ['npy_' + t for t in ['int8', 'int16', 'int32', 'int64', 'int128',
-        'int256', 'uint8', 'uint16', 'uint32', 'uint64', 'uint128', 'uint256',
-        'float16', 'float32', 'float64', 'float80', 'float96', 'float128',
-        'float256']]
+                                  'int256', 'uint8', 'uint16', 'uint32',
+                                  'uint64', 'uint128', 'uint256',
+                                  'float16', 'float32', 'float64',
+                                  'float80', 'float96', 'float128',
+                                  'float256']]
 
     complex_types = ['npy_' + t for t in ['complex32', 'complex64',
-        'complex128', 'complex160', 'complex192', 'complex512']]
+                                          'complex128', 'complex160',
+                                          'complex192', 'complex512']]
 
     inplace_map_template = """
     #if defined(%(typen)s)
-    static void %(type)s_inplace_add(PyArrayMapIterObject *mit, PyArrayIterObject *it, int inc_or_set)
+    static void %(type)s_inplace_add(PyArrayMapIterObject *mit,
+                                     PyArrayIterObject *it, int inc_or_set)
     {
         int index = mit->size;
         while (index--) {
@@ -38,46 +41,52 @@ def compile_cutils_code():
     #endif
     """
 
-    floatadd = "((%(type)s*)mit->dataptr)[0] = inc_or_set * ((%(type)s*)mit->dataptr)[0] + ((%(type)s*)it->dataptr)[0];"
+    floatadd = ("((%(type)s*)mit->dataptr)[0] = inc_or_set * "
+                "((%(type)s*)mit->dataptr)[0] + ((%(type)s*)it->dataptr)[0];")
     complexadd = """
-    ((%(type)s*)mit->dataptr)[0].real = inc_or_set * ((%(type)s*)mit->dataptr)[0].real + ((%(type)s*)it->dataptr)[0].real;
-    ((%(type)s*)mit->dataptr)[0].imag = inc_or_set * ((%(type)s*)mit->dataptr)[0].imag + ((%(type)s*)it->dataptr)[0].imag;
+    ((%(type)s*)mit->dataptr)[0].real = inc_or_set *
+       ((%(type)s*)mit->dataptr)[0].real + ((%(type)s*)it->dataptr)[0].real;
+    ((%(type)s*)mit->dataptr)[0].imag = inc_or_set *
+       ((%(type)s*)mit->dataptr)[0].imag + ((%(type)s*)it->dataptr)[0].imag;
     """
 
     fns = ''.join([inplace_map_template % {'type': t, 'typen': t.upper(),
                                            'op': floatadd % {'type': t}}
-                        for t in types] +
+                   for t in types] +
                   [inplace_map_template % {'type': t, 'typen': t.upper(),
                                            'op': complexadd % {'type': t}}
-                        for t in complex_types])
+                   for t in complex_types])
+
+    def gen_binop(type, typen):
+        return """
+#if defined(%(typen)s)
+%(type)s_inplace_add,
+#endif
+""" % dict(type=type, typen=typen)
 
     fn_array = ("static inplace_map_binop addition_funcs[] = {" +
-            ''.join(["""
-            #if defined(%(typen)s)
-            %(type)s_inplace_add,
-            #endif
-            """ % {'type': t, 'typen': t.upper()}
-                for t in types + complex_types]) +
-            """NULL};
-            """)
+                ''.join([gen_binop(type=t, typen=t.upper())
+                         for t in types + complex_types]) + "NULL};\n")
+
+    def gen_num(typen):
+        return """
+#if defined(%(typen)s)
+%(typen)s,
+#endif
+""" % dict(type=type, typen=typen)
 
     type_number_array = ("static int type_numbers[] = {" +
-            ''.join(["""
-            #if defined(%(typen)s)
-            %(typen)s,
-            #endif
-            """ % {'type': t, 'typen': t.upper()}
-                for t in types + complex_types]) +
-            "-1000};")
+                         ''.join([gen_num(typen=t.upper())
+                                  for t in types + complex_types]) + "-1000};")
 
     code = ("""
         #if NPY_API_VERSION >= 0x00000008
-        typedef void (*inplace_map_binop)(PyArrayMapIterObject *, PyArrayIterObject *, int inc_or_set);
-        """ + fns + fn_array + type_number_array +
-
-"""
+        typedef void (*inplace_map_binop)(PyArrayMapIterObject *,
+                                          PyArrayIterObject *, int inc_or_set);
+        """ + fns + fn_array + type_number_array + """
 static int
-map_increment(PyArrayMapIterObject *mit, PyObject *op, inplace_map_binop add_inplace, int inc_or_set)
+map_increment(PyArrayMapIterObject *mit, PyObject *op,
+              inplace_map_binop add_inplace, int inc_or_set)
 {
     PyArrayObject *arr = NULL;
     PyArrayIterObject *it;
@@ -129,7 +138,8 @@ inplace_increment(PyObject *dummy, PyObject *args)
         return NULL;
     }
     if (!PyArray_Check(arg_a)) {
-        PyErr_SetString(PyExc_ValueError, "needs an ndarray as first argument");
+        PyErr_SetString(PyExc_ValueError,
+                        "needs an ndarray as first argument");
         return NULL;
     }
 
@@ -285,7 +295,7 @@ try:
         open(os.path.join(location, '__init__.py'), 'w').close()
 
     try:
-        from cutils_ext.cutils_ext import *
+        from cutils_ext.cutils_ext import *  # noqa
     except ImportError:
         get_lock()
     # Ensure no-one else is currently modifying the content of the compilation
@@ -296,11 +306,11 @@ try:
                 # We must retry to import it as some other process could
                 # have been compiling it between the first failed import
                 # and when we receive the lock
-                from cutils_ext.cutils_ext import *
+                from cutils_ext.cutils_ext import *  # noqa
             except ImportError:
 
                 compile_cutils()
-                from cutils_ext.cutils_ext import *
+                from cutils_ext.cutils_ext import *  # noqa
 
         finally:
             # Release lock on compilation directory.

theano/tests/test_flake8.py

@@ -268,7 +268,6 @@ whitelist_flake8 = [
     "sparse/sandbox/truedot.py",
     "sparse/sandbox/sp.py",
     "gof/destroyhandler.py",
-    "gof/cutils.py",
     "gof/compiledir.py",
     "gof/unify.py",
     "gof/lazylinker_c.py",