From 495b8986288b7650bcd78e2c98e067832d57995d Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Wed, 30 Nov 2016 16:13:55 -0600
Subject: [PATCH] Flake8 fixes
---
loopy/__init__.py | 2 +-
loopy/kernel/creation.py | 3 ++-
loopy/target/python.py | 2 +-
loopy/transform/data.py | 1 +
loopy/transform/padding.py | 1 +
setup.cfg | 4 ++--
test/gnuma_loopy_transforms.py | 4 ++--
test/library_for_test.py | 1 +
test/test_domain.py | 7 +++----
test/test_from_loopy_import_star.py | 2 +-
10 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/loopy/__init__.py b/loopy/__init__.py
index 6bd764f8d..6cbb3362e 100644
--- a/loopy/__init__.py
+++ b/loopy/__init__.py
@@ -457,8 +457,8 @@ def _set_up_default_target():
set_default_target(target)
-_set_up_default_target()
+_set_up_default_target()
# }}}
diff --git a/loopy/kernel/creation.py b/loopy/kernel/creation.py
index 6c5491384..9962195e3 100644
--- a/loopy/kernel/creation.py
+++ b/loopy/kernel/creation.py
@@ -583,7 +583,8 @@ def parse_instructions(instructions, defines):
new_instructions.append(
insn.copy(
id=intern(insn.id) if isinstance(insn.id, str) else insn.id,
- depends_on=frozenset(intern_if_str(dep) for dep in insn.depends_on),
+ depends_on=frozenset(
+ intern_if_str(dep) for dep in insn.depends_on),
groups=frozenset(intern(grp) for grp in insn.groups),
conflicts_with_groups=frozenset(
intern(grp) for grp in insn.conflicts_with_groups),
diff --git a/loopy/target/python.py b/loopy/target/python.py
index 09a86665b..99ec42f44 100644
--- a/loopy/target/python.py
+++ b/loopy/target/python.py
@@ -134,7 +134,7 @@ class ExpressionToPythonMapper(StringifyMapper):
# Synthesize PREC_IFTHENELSE, make sure it is in the right place in the
# operator precedence hierarchy (right above "or").
from pymbolic.mapper.stringifier import PREC_LOGICAL_OR, PREC_NONE
- PREC_IFTHENELSE = PREC_LOGICAL_OR - 1
+ PREC_IFTHENELSE = PREC_LOGICAL_OR - 1 # noqa
return self.parenthesize_if_needed(
"{then} if {cond} else {else_}".format(
diff --git a/loopy/transform/data.py b/loopy/transform/data.py
index 5797b01c3..6871cdbf4 100644
--- a/loopy/transform/data.py
+++ b/loopy/transform/data.py
@@ -431,6 +431,7 @@ def set_array_axis_names(kernel, ary_names, dim_names):
return kernel
+
set_array_dim_names = MovedFunctionDeprecationWrapper(set_array_axis_names)
# }}}
diff --git a/loopy/transform/padding.py b/loopy/transform/padding.py
index 915742fc1..d695e3595 100644
--- a/loopy/transform/padding.py
+++ b/loopy/transform/padding.py
@@ -245,6 +245,7 @@ def split_array_dim(kernel, arrays_and_axes, count, auto_split_inames=True,
return kernel
+
split_arg_axis = MovedFunctionDeprecationWrapper(split_array_dim)
# }}}
diff --git a/setup.cfg b/setup.cfg
index 2a5739293..f940d2653 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,4 +1,4 @@
[flake8]
-ignore = E126,E127,E128,E123,E226,E241,E242,E265,N802,W503,E402
+ignore = E126,E127,E128,E123,E226,E241,E242,E265,N802,W503,E402,N814
max-line-length=85
-exclude=loopy/target/c/compyte/ndarray
+exclude=loopy/target/c/compyte/ndarray,loopy/target/c/compyte/array.py
diff --git a/test/gnuma_loopy_transforms.py b/test/gnuma_loopy_transforms.py
index 5a55f4a3d..bb521bd2c 100644
--- a/test/gnuma_loopy_transforms.py
+++ b/test/gnuma_loopy_transforms.py
@@ -14,7 +14,7 @@ def pick_apart_float_cast(value):
return float(fval_match.group(2))
-def fix_euler_parameters(kernel, p_p0, p_Gamma, p_R):
+def fix_euler_parameters(kernel, p_p0, p_Gamma, p_R): # noqa
return lp.fix_parameters(
kernel,
p_p0=pick_apart_float_cast(p_p0),
@@ -36,7 +36,7 @@ def set_D_storage_format(kernel):
return lp.tag_array_axes(kernel, "D", "f,f")
-def set_up_volume_loop(kernel, Nq):
+def set_up_volume_loop(kernel, Nq): # noqa
kernel = lp.fix_parameters(kernel, Nq=Nq)
kernel = lp.prioritize_loops(kernel, "e,k,j,i")
kernel = lp.tag_inames(kernel, dict(e="g.0", j="l.1", i="l.0"))
diff --git a/test/library_for_test.py b/test/library_for_test.py
index b2de0d402..2cb4067e0 100644
--- a/test/library_for_test.py
+++ b/test/library_for_test.py
@@ -1,5 +1,6 @@
# This exists because function handles can't be pickled.
+
def no_ret_f_mangler(kernel, name, arg_dtypes):
if not isinstance(name, str):
return None
diff --git a/test/test_domain.py b/test/test_domain.py
index 531e79270..e01c3a937 100644
--- a/test/test_domain.py
+++ b/test/test_domain.py
@@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
"""
-import six
-from six.moves import range
+import six # noqa
+from six.moves import range # noqa
import sys
import numpy as np
@@ -31,7 +31,7 @@ import loopy as lp
import pyopencl as cl
import pyopencl.clmath # noqa
import pyopencl.clrandom # noqa
-import pytest
+import pytest # noqa
import logging
logger = logging.getLogger(__name__)
@@ -225,7 +225,6 @@ def test_dependent_loop_bounds_3(ctx_factory):
knl = lp.preprocess_kernel(knl, ctx.devices[0])
- import pytest
with pytest.raises(RuntimeError):
list(lp.generate_loop_schedules(knl_bad))
diff --git a/test/test_from_loopy_import_star.py b/test/test_from_loopy_import_star.py
index 02ec16044..4f339ef96 100644
--- a/test/test_from_loopy_import_star.py
+++ b/test/test_from_loopy_import_star.py
@@ -1 +1 @@
-from loopy import *
+from loopy import * # noqa
--
GitLab