From c736f45f812b56be51258bfaba211b9866f3183b Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Sat, 28 Oct 2017 18:28:25 +0200
Subject: [PATCH] Placate new flake8
---
pyopencl/__init__.py | 4 +--
pyopencl/algorithm.py | 4 +--
pyopencl/array.py | 2 +-
pyopencl/cache.py | 4 +--
pyopencl/capture_call.py | 2 +-
pyopencl/cffi_cl.py | 28 ++++++++++-----------
pyopencl/characterize/__init__.py | 6 ++---
pyopencl/mempool.py | 10 ++++----
test/test_algorithm.py | 6 ++---
test/test_array.py | 42 ++++++++++++++++---------------
test/test_wrapper.py | 4 +--
11 files changed, 57 insertions(+), 55 deletions(-)
diff --git a/pyopencl/__init__.py b/pyopencl/__init__.py
index 218efe6c..53934975 100644
--- a/pyopencl/__init__.py
+++ b/pyopencl/__init__.py
@@ -569,7 +569,7 @@ def create_some_context(interactive=None, answers=None, cache_dir=None):
import sys
if not sys.stdin.isatty():
interactive = False
- except:
+ except Exception:
interactive = False
def cc_print(s):
@@ -944,7 +944,7 @@ DTYPE_TO_CHANNEL_TYPE = {
}
try:
np.float16
-except:
+except Exception:
pass
else:
DTYPE_TO_CHANNEL_TYPE[np.dtype(np.float16)] = channel_type.HALF_FLOAT
diff --git a/pyopencl/algorithm.py b/pyopencl/algorithm.py
index e256b578..5083b095 100644
--- a/pyopencl/algorithm.py
+++ b/pyopencl/algorithm.py
@@ -1001,8 +1001,8 @@ class ListOfListsBuilder:
if kwargs:
raise TypeError("invalid keyword arguments: '%s'" % ", ".join(kwargs))
- for l in omit_lists:
- if not any(l == name for name, _ in self.list_names_and_dtypes):
+ for oml in omit_lists:
+ if not any(oml == name for name, _ in self.list_names_and_dtypes):
raise ValueError("invalid list name '%s' in omit_lists")
result = {}
diff --git a/pyopencl/array.py b/pyopencl/array.py
index 744dca10..001c63bd 100644
--- a/pyopencl/array.py
+++ b/pyopencl/array.py
@@ -58,7 +58,7 @@ try:
def _dtype_is_object(t):
return t == object
-except:
+except Exception:
def _dtype_is_object(t):
return False
diff --git a/pyopencl/cache.py b/pyopencl/cache.py
index a5af74ca..22e55c40 100644
--- a/pyopencl/cache.py
+++ b/pyopencl/cache.py
@@ -310,7 +310,7 @@ def retrieve_from_cache(cache_dir, cache_key):
else:
mod_cache_dir_m.reset()
- except:
+ except Exception:
cleanup_m.error_clean_up()
raise
finally:
@@ -455,7 +455,7 @@ def _create_built_program_from_source_cached(ctx, src, options_bytes,
log=logs[i]), info_file)
info_file.close()
- except:
+ except Exception:
cleanup_m.error_clean_up()
raise
finally:
diff --git a/pyopencl/capture_call.py b/pyopencl/capture_call.py
index c1950ecd..09d483a5 100644
--- a/pyopencl/capture_call.py
+++ b/pyopencl/capture_call.py
@@ -94,7 +94,7 @@ def capture_kernel_call(kernel, filename, queue, g_size, l_size, *args, **kwargs
else:
try:
arg_buf = memoryview(arg)
- except:
+ except Exception:
raise RuntimeError("cannot capture: "
"unsupported arg nr %d (0-based)" % i)
diff --git a/pyopencl/cffi_cl.py b/pyopencl/cffi_cl.py
index d98f169d..4a837c0e 100644
--- a/pyopencl/cffi_cl.py
+++ b/pyopencl/cffi_cl.py
@@ -62,7 +62,7 @@ _pyrefs = {}
def _py_deref(handle):
try:
del _pyrefs[handle]
- except:
+ except Exception:
pass
@@ -96,7 +96,7 @@ _CPY2 = not _PYPY and sys.version_info < (3,)
try:
_unicode = eval('unicode')
_ffi_pystr = _ffi.string
-except:
+except Exception:
_unicode = str
_bytes = bytes
@@ -105,7 +105,7 @@ except:
else:
try:
_bytes = bytes
- except:
+ except Exception:
_bytes = str
@@ -859,7 +859,7 @@ def _norm_shape_dtype(shape, dtype, order="C", strides=None, name=""):
if not isinstance(shape, tuple):
try:
shape = tuple(shape)
- except:
+ except Exception:
shape = (shape,)
if strides is None:
if order in "cC":
@@ -1611,7 +1611,7 @@ class _Program(_Common):
for dev in self.get_info(program_info.DEVICES):
try:
log = self.get_build_info(dev, program_build_info.LOG)
- except:
+ except Exception:
log = "<error retrieving log>"
build_logs.append((dev, log))
@@ -2545,25 +2545,25 @@ class ImageDescriptor(object):
@_write_only_property
def shape(self, shape):
- l = len(shape)
- if l > 3:
+ sdims = len(shape)
+ if sdims > 3:
raise LogicError("shape has too many components",
status_code.INVALID_VALUE, "transfer")
desc = self.ptr
- desc.image_width = shape[0] if l > 0 else 1
- desc.image_height = shape[1] if l > 1 else 1
- desc.image_depth = shape[2] if l > 2 else 1
+ desc.image_width = shape[0] if sdims > 0 else 1
+ desc.image_height = shape[1] if sdims > 1 else 1
+ desc.image_depth = shape[2] if sdims > 2 else 1
desc.image_array_size = desc.image_depth
@_write_only_property
def pitches(self, pitches):
- l = len(pitches)
- if l > 2:
+ pdims = len(pitches)
+ if pdims > 2:
raise LogicError("pitches has too many components",
status_code.INVALID_VALUE, "transfer")
desc = self.ptr
- desc.image_row_pitch = pitches[0] if l > 0 else 1
- desc.image_slice_pitch = pitches[1] if l > 1 else 1
+ desc.image_row_pitch = pitches[0] if pdims > 0 else 1
+ desc.image_slice_pitch = pitches[1] if pdims > 1 else 1
@_write_only_property
def buffer(self, buff):
diff --git a/pyopencl/characterize/__init__.py b/pyopencl/characterize/__init__.py
index d0305189..26a4a688 100644
--- a/pyopencl/characterize/__init__.py
+++ b/pyopencl/characterize/__init__.py
@@ -52,7 +52,7 @@ def has_amd_double_support(dev):
def reasonable_work_group_size_multiple(dev, ctx=None):
try:
return dev.warp_size_nv
- except:
+ except Exception:
pass
if ctx is None:
@@ -77,7 +77,7 @@ def nv_compute_capability(dev):
try:
return (dev.compute_capability_major_nv,
dev.compute_capability_minor_nv)
- except:
+ except Exception:
return None
@@ -281,7 +281,7 @@ def get_simd_group_size(dev, type_size):
"""
try:
return dev.warp_size_nv
- except:
+ except Exception:
pass
lc_vendor = dev.platform.vendor.lower()
diff --git a/pyopencl/mempool.py b/pyopencl/mempool.py
index 071bdb98..6b1740ec 100644
--- a/pyopencl/mempool.py
+++ b/pyopencl/mempool.py
@@ -128,19 +128,19 @@ class MemoryPool(object):
@classmethod
def bin_number(cls, size):
- l = bitlog2(size)
+ bl2 = bitlog2(size)
mantissa_bits = cls.mantissa_bits
- if l >= mantissa_bits:
- shifted = size >> (l - mantissa_bits)
+ if bl2 >= mantissa_bits:
+ shifted = size >> (bl2 - mantissa_bits)
else:
- shifted = size << (mantissa_bits - l)
+ shifted = size << (mantissa_bits - bl2)
assert not (size and (shifted & (1 << mantissa_bits)) == 0)
chopped = shifted & cls.mantissa_mask
- return l << mantissa_bits | chopped
+ return bl2 << mantissa_bits | chopped
@classmethod
def alloc_size(cls, bin_nr):
diff --git a/test/test_algorithm.py b/test/test_algorithm.py
index 5076e2b1..2e1537df 100644
--- a/test/test_algorithm.py
+++ b/test/test_algorithm.py
@@ -158,9 +158,9 @@ def test_if_positive(ctx_factory):
from pyopencl.clrandom import rand as clrand
- l = 20000
- a_gpu = clrand(queue, (l,), np.float32)
- b_gpu = clrand(queue, (l,), np.float32)
+ ary_len = 20000
+ a_gpu = clrand(queue, (ary_len,), np.float32)
+ b_gpu = clrand(queue, (ary_len,), np.float32)
a = a_gpu.get()
b = b_gpu.get()
diff --git a/test/test_array.py b/test/test_array.py
index 78a69961..d5710085 100644
--- a/test/test_array.py
+++ b/test/test_array.py
@@ -513,7 +513,7 @@ def test_bitwise(ctx_factory):
from pyopencl.clrandom import rand as clrand
for a_dtype, b_dtype in product(dtypes, dtypes):
- l = 16
+ ary_len = 16
np.random.seed(10)
@@ -521,9 +521,11 @@ def test_bitwise(ctx_factory):
int32_max = np.iinfo(np.int32).max
a_dev = clrand(
- queue, (l,), a=int32_min, b=1+int32_max, dtype=np.int64).astype(a_dtype)
+ queue, (ary_len,), a=int32_min, b=1+int32_max, dtype=np.int64
+ ).astype(a_dtype)
b_dev = clrand(
- queue, (l,), a=int32_min, b=1+int32_max, dtype=np.int64).astype(b_dtype)
+ queue, (ary_len,), a=int32_min, b=1+int32_max, dtype=np.int64
+ ).astype(b_dtype)
a = a_dev.get()
b = b_dev.get()
@@ -655,7 +657,7 @@ def test_random_int_in_range(ctx_factory, rng_class, dtype, plot_hist=False):
def test_numpy_integer_shape(ctx_factory):
try:
list(np.int32(17))
- except:
+ except Exception:
pass
else:
from pytest import skip
@@ -754,8 +756,8 @@ def test_diff(ctx_factory):
from pyopencl.clrandom import rand as clrand
- l = 20000
- a_dev = clrand(queue, (l,), dtype=np.float32)
+ ary_len = 20000
+ a_dev = clrand(queue, (ary_len,), dtype=np.float32)
a = a_dev.get()
err = la.norm(
@@ -804,16 +806,16 @@ def test_slice(ctx_factory):
tp = np.float32
- l = 20000
- a_gpu = clrand(queue, (l,), dtype=tp)
- b_gpu = clrand(queue, (l,), dtype=tp)
+ ary_len = 20000
+ a_gpu = clrand(queue, (ary_len,), dtype=tp)
+ b_gpu = clrand(queue, (ary_len,), dtype=tp)
a = a_gpu.get()
b = b_gpu.get()
from random import randrange
for i in range(20):
- start = randrange(l)
- end = randrange(start, l)
+ start = randrange(ary_len)
+ end = randrange(start, ary_len)
a_gpu_slice = tp(2)*a_gpu[start:end]
a_slice = tp(2)*a[start:end]
@@ -821,8 +823,8 @@ def test_slice(ctx_factory):
assert la.norm(a_gpu_slice.get() - a_slice) == 0
for i in range(20):
- start = randrange(l)
- end = randrange(start, l)
+ start = randrange(ary_len)
+ end = randrange(start, ary_len)
a_gpu[start:end] = tp(2)*b[start:end]
a[start:end] = tp(2)*b[start:end]
@@ -830,8 +832,8 @@ def test_slice(ctx_factory):
assert la.norm(a_gpu.get() - a) == 0
for i in range(20):
- start = randrange(l)
- end = randrange(start, l)
+ start = randrange(ary_len)
+ end = randrange(start, ary_len)
a_gpu[start:end] = tp(2)*b_gpu[start:end]
a[start:end] = tp(2)*b[start:end]
@@ -868,9 +870,9 @@ def test_comparisons(ctx_factory):
from pyopencl.clrandom import rand as clrand
- l = 20000
- a_dev = clrand(queue, (l,), dtype=np.float32)
- b_dev = clrand(queue, (l,), dtype=np.float32)
+ ary_len = 20000
+ a_dev = clrand(queue, (ary_len,), dtype=np.float32)
+ b_dev = clrand(queue, (ary_len,), dtype=np.float32)
a = a_dev.get()
b = b_dev.get()
@@ -897,8 +899,8 @@ def test_any_all(ctx_factory):
context = ctx_factory()
queue = cl.CommandQueue(context)
- l = 20000
- a_dev = cl_array.zeros(queue, (l,), dtype=np.int8)
+ ary_len = 20000
+ a_dev = cl_array.zeros(queue, (ary_len,), dtype=np.int8)
assert not a_dev.all().get()
assert not a_dev.any().get()
diff --git a/test/test_wrapper.py b/test/test_wrapper.py
index e7d8c3d9..444b8a93 100644
--- a/test/test_wrapper.py
+++ b/test/test_wrapper.py
@@ -136,7 +136,7 @@ def test_get_info(ctx_factory):
try:
func(info)
- except:
+ except Exception:
msg = "failed get_info", type(cl_obj), info_name
if find_quirk(QUIRKS, cl_obj, info):
@@ -147,7 +147,7 @@ def test_get_info(ctx_factory):
if try_attr_form:
try:
getattr(cl_obj, info_name.lower())
- except:
+ except Exception:
print("failed attr-based get_info", type(cl_obj), info_name)
if find_quirk(QUIRKS, cl_obj, info):
--
GitLab