diff --git a/.pylintrc-local.yml b/.pylintrc-local.yml index e9aeb6d44ed869ac7a5ee14a783bcd34c08d1044..9c64ee13e460d2168f26983399ca627c272ebdab 100644 --- a/.pylintrc-local.yml +++ b/.pylintrc-local.yml @@ -13,4 +13,8 @@ - maptlotlib.pyplot - arg: init-hook - val: sys.setrecursionlimit(5000) + val: import sys; sys.setrecursionlimit(5000) + +- arg: disable + val: + - E1102 diff --git a/loopy/auto_test.py b/loopy/auto_test.py index d89294a9c4519de1883e5e82be3415e03cec8cb1..8b89391e29b1d1f1d770aab24434a94ed4562a7b 100644 --- a/loopy/auto_test.py +++ b/loopy/auto_test.py @@ -307,6 +307,7 @@ def _default_check_result(result, ref_result): linf_err = ( np.max(np.abs(ref_result-result)) / np.max(np.abs(ref_result-result))) + # pylint: disable=bad-string-format-type return (False, "results do not match -- (rel) l_2 err: %g, l_inf err: %g" % (l2_err, linf_err)) diff --git a/loopy/kernel/tools.py b/loopy/kernel/tools.py index edf5f03334f3dbd5c699b3f3fffb2b4d09a37790..ba2fb22562036154981b98dbda9c063381890a62 100644 --- a/loopy/kernel/tools.py +++ b/loopy/kernel/tools.py @@ -763,13 +763,14 @@ def get_auto_axis_iname_ranking_by_stride(kernel, insn): continue coeffs = CoefficientCollector()(iexpr_i) for var, coeff in coeffs.items(): - if (isinstance(var, Variable) - and var.name in auto_axis_inames): - # excludes '1', i.e. the constant - new_stride = coeff*stride - old_stride = iname_to_stride_expr.get(var.name, None) - if old_stride is None or new_stride < old_stride: - iname_to_stride_expr[var.name] = new_stride + # This is a nested if instead of 'and' for pylint's benefit. + if isinstance(var, Variable): + if var.name in auto_axis_inames: + # excludes '1', i.e. the constant + new_stride = coeff*stride + old_stride = iname_to_stride_expr.get(var.name, None) + if old_stride is None or new_stride < old_stride: + iname_to_stride_expr[var.name] = new_stride # }}} @@ -1807,10 +1808,7 @@ def get_subkernel_to_insn_id_map(kernel): for insn_id in sched_item_to_insn_id(sched_item): result[subkernel].add(insn_id) - for subkernel in result: - result[subkernel] = frozenset(result[subkernel]) - - return result + return {name: frozenset(insn_ids) for name, insn_ids in result.items()} # }}}