From 7bc0cac3451d754a116796412ada228c775320a6 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 1 Nov 2018 17:02:46 -0500
Subject: [PATCH] Placate flake8
---
pyopencl/_buffers.py | 2 +-
pyopencl/characterize/__init__.py | 16 ++++++++--------
test/test_clmath.py | 3 +--
test/test_wrapper.py | 24 ++++++++++++------------
4 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/pyopencl/_buffers.py b/pyopencl/_buffers.py
index 27cf4f4c..bbf81a2f 100644
--- a/pyopencl/_buffers.py
+++ b/pyopencl/_buffers.py
@@ -106,7 +106,7 @@ try:
CheckBuffer = ctypes.pythonapi.PyObject_CheckBuffer
CheckBuffer.argtypes = [ctypes.py_object]
CheckBuffer.restype = ctypes.c_int
-except AttributeError as err:
+except AttributeError:
# Python 2.6 doesn't appear to have CheckBuffer support...
def CheckBuffer(x): # noqa
return True
diff --git a/pyopencl/characterize/__init__.py b/pyopencl/characterize/__init__.py
index 873e1c11..eae523be 100644
--- a/pyopencl/characterize/__init__.py
+++ b/pyopencl/characterize/__init__.py
@@ -390,8 +390,8 @@ def has_struct_arg_count_bug(dev, ctx=None):
def _may_have_svm(dev):
- has_svm = (dev.platform._get_cl_version() >= (2, 0) and
- cl.get_cl_header_version() >= (2, 0))
+ has_svm = (dev.platform._get_cl_version() >= (2, 0)
+ and cl.get_cl_header_version() >= (2, 0))
if dev.platform.name == "Portable Computing Language":
has_svm = (
@@ -402,18 +402,18 @@ def _may_have_svm(dev):
def has_coarse_grain_buffer_svm(dev):
- return (_may_have_svm(dev) and
- bool(dev.svm_capabilities
+ return (_may_have_svm(dev)
+ and bool(dev.svm_capabilities
& cl.device_svm_capabilities.COARSE_GRAIN_BUFFER))
def has_fine_grain_buffer_svm(dev):
- return (_may_have_svm(dev) and
- bool(dev.svm_capabilities
+ return (_may_have_svm(dev)
+ and bool(dev.svm_capabilities
& cl.device_svm_capabilities.FINE_GRAIN_BUFFER))
def has_fine_grain_system_svm(dev):
- return (_may_have_svm(dev) and
- bool(dev.svm_capabilities
+ return (_may_have_svm(dev)
+ and bool(dev.svm_capabilities
& cl.device_svm_capabilities.FINE_GRAIN_SYSTEM))
diff --git a/test/test_clmath.py b/test/test_clmath.py
index beebc2a8..20f467ae 100644
--- a/test/test_clmath.py
+++ b/test/test_clmath.py
@@ -298,8 +298,7 @@ def test_bessel(ctx_factory):
if use_pyfmmlib and (
which_func == "j"
- or
- (which_func == "y" and n in [0, 1])):
+ or (which_func == "y" and n in [0, 1])):
pyfmm_bessel = pfymm_result[:, n]
error_pyfmm = get_err(cl_bessel, pyfmm_bessel)
assert error_pyfmm < 1e-10, error_pyfmm
diff --git a/test/test_wrapper.py b/test/test_wrapper.py
index fff07e0d..fba8ceb9 100644
--- a/test/test_wrapper.py
+++ b/test/test_wrapper.py
@@ -667,8 +667,8 @@ def test_wait_for_events(ctx_factory):
def test_unload_compiler(platform):
- if (platform._get_cl_version() < (1, 2) or
- cl.get_cl_header_version() < (1, 2)):
+ if (platform._get_cl_version() < (1, 2)
+ or cl.get_cl_header_version() < (1, 2)):
from pytest import skip
skip("clUnloadPlatformCompiler is only available in OpenCL 1.2")
_skip_if_pocl(platform, (0, 13), 'pocl does not support unloading compiler')
@@ -688,8 +688,8 @@ def test_platform_get_devices(ctx_factory):
dev_types = [cl.device_type.ACCELERATOR, cl.device_type.ALL,
cl.device_type.CPU, cl.device_type.DEFAULT, cl.device_type.GPU]
- if (platform._get_cl_version() >= (1, 2) and
- cl.get_cl_header_version() >= (1, 2)
+ if (platform._get_cl_version() >= (1, 2)
+ and cl.get_cl_header_version() >= (1, 2)
and not platform.name.lower().startswith("nvidia")):
dev_types.append(cl.device_type.CUSTOM)
@@ -706,8 +706,8 @@ def test_platform_get_devices(ctx_factory):
def test_user_event(ctx_factory):
ctx = ctx_factory()
- if (ctx._get_cl_version() < (1, 1) and
- cl.get_cl_header_version() < (1, 1)):
+ if (ctx._get_cl_version() < (1, 1)
+ and cl.get_cl_header_version() < (1, 1)):
from pytest import skip
skip("UserEvent is only available in OpenCL 1.1")
@@ -762,8 +762,8 @@ def test_buffer_get_host_array(ctx_factory):
buf = cl.Buffer(ctx, mf.READ_WRITE | mf.USE_HOST_PTR, hostbuf=host_buf)
host_buf2 = buf.get_host_array(25, np.float32)
assert (host_buf == host_buf2).all()
- assert (host_buf.__array_interface__['data'][0] ==
- host_buf.__array_interface__['data'][0])
+ assert (host_buf.__array_interface__['data'][0]
+ == host_buf.__array_interface__['data'][0])
assert host_buf2.base is buf
buf = cl.Buffer(ctx, mf.READ_WRITE | mf.ALLOC_HOST_PTR, size=100)
@@ -887,8 +887,8 @@ def test_global_offset(ctx_factory):
def test_sub_buffers(ctx_factory):
ctx = ctx_factory()
- if (ctx._get_cl_version() < (1, 1) or
- cl.get_cl_header_version() < (1, 1)):
+ if (ctx._get_cl_version() < (1, 1)
+ or cl.get_cl_header_version() < (1, 1)):
from pytest import skip
skip("sub-buffers are only available in OpenCL 1.1")
@@ -917,8 +917,8 @@ def test_spirv(ctx_factory):
ctx = ctx_factory()
queue = cl.CommandQueue(ctx)
- if (ctx._get_cl_version() < (2, 1) or
- cl.get_cl_header_version() < (2, 1)):
+ if (ctx._get_cl_version() < (2, 1)
+ or cl.get_cl_header_version() < (2, 1)):
from pytest import skip
skip("SPIR-V program creation only available in OpenCL 2.1 and higher")
--
GitLab