From c94b63acc05d0fd52869c0978a117b580ae2b124 Mon Sep 17 00:00:00 2001 From: Lawrence Mitchell Date: Fri, 10 Nov 2017 10:46:51 +0000 Subject: [PATCH 1/2] Migrate citations import to firedrake_citations --- coffee/citations.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coffee/citations.py b/coffee/citations.py index c9fc861e..d6ba83b4 100644 --- a/coffee/citations.py +++ b/coffee/citations.py @@ -53,7 +53,7 @@ def update_citations(params): # Firedrake try: - from firedrake import Citations + from firedrake_citations import Citations rewrite = params.get('rewrite', 0) nozeros = params.get('dead_ops_elimination', False) align_pad = params.get('align_pad', False) From a182af3fb9a4afefcda316adc308ddb9f7509642 Mon Sep 17 00:00:00 2001 From: Lawrence Mitchell Date: Fri, 10 Nov 2017 10:52:46 +0000 Subject: [PATCH 2/2] Fix some flake8 errors --- coffee/scheduler.py | 2 +- coffee/vectorizer.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coffee/scheduler.py b/coffee/scheduler.py index ea3ead5e..3da18964 100644 --- a/coffee/scheduler.py +++ b/coffee/scheduler.py @@ -520,7 +520,7 @@ def _track_nz_expr(self, node, nz_syms, nest): try: # Am I tracking the loop with iteration variable == /r/ ? loop = [l for l, p in nest if l.dim == r][0] - except: + except IndexError: # No, so I just assume it covers the entire non zero-valued region itspace.append([(r, nz_b) for nz_b in nz_bs]) continue diff --git a/coffee/vectorizer.py b/coffee/vectorizer.py index d22e6444..73ac9031 100644 --- a/coffee/vectorizer.py +++ b/coffee/vectorizer.py @@ -491,7 +491,7 @@ def __init__(self, tensor_size): def get_reg(self): if len(self.var) == 0: - l = self.ntot * 2 + l = self.ntot * 2 # noqa: E741 self.var += [self.i["reg"](v) for v in range(self.ntot, l)] self.ntot = l return self.var.pop(0)