From 5c587cdea6b547fc646962f068805479b8b981c6 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Tue, 9 Aug 2016 15:50:11 -0500 Subject: [PATCH 1/3] Ignore pytest's cache directory --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5114558..b47ef08 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ distribute*tar.gz a.out doc/_build +.cache -- GitLab From ae7cdb3865faa7d0ef2a1d00250e95190a9874c6 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Tue, 9 Aug 2016 15:50:13 -0500 Subject: [PATCH 2/3] Ack funding --- doc/misc.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/doc/misc.rst b/doc/misc.rst index 2250db3..2e2e8df 100644 --- a/doc/misc.rst +++ b/doc/misc.rst @@ -69,3 +69,15 @@ Frequently Asked Questions The FAQ is maintained collaboratively on the `Wiki FAQ page `_. + +Acknowledgments +=============== + +Andreas Klöckner's work on :mod:`dagrt` was supported in part by + +* the Department of Energy, National Nuclear Security Administration, under Award Number DE-NA0002374, +* the US National Science Foundation under grant number CCF-1524433. + +AK also gratefully acknowledges a hardware gift from Nvidia Corporation. The +views and opinions expressed herein do not necessarily reflect those of the +funding agencies. -- GitLab From cc193ce8feec0b8dd72a0b8bb2ea92187007683d Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Mon, 5 Dec 2016 20:18:29 -0600 Subject: [PATCH 3/3] Run flake8 during CI --- .gitlab-ci.yml | 12 ++++++++++++ dagrt/codegen/expressions.py | 1 - dagrt/codegen/fortran.py | 1 + dagrt/codegen/python.py | 1 + dagrt/function_registry.py | 1 + test/test_codegen_python.py | 1 + 6 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3be8173..9aba11c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ Python 2.7: - python2.7 except: - tags + Python 3.5: script: - py_version=3.5 @@ -18,6 +19,7 @@ Python 3.5: - python3.5 except: - tags + Python 2.6: script: - py_version=2.6 @@ -28,6 +30,7 @@ Python 2.6: - python2.6 except: - tags + Documentation: script: - EXTRA_INSTALL="numpy" @@ -37,3 +40,12 @@ Documentation: - python3.5 only: - master + +Flake8: + script: + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh + - ". ./prepare-and-run-flake8.sh dagrt test" + tags: + - python3.5 + except: + - tags diff --git a/dagrt/codegen/expressions.py b/dagrt/codegen/expressions.py index 456633e..e20d440 100644 --- a/dagrt/codegen/expressions.py +++ b/dagrt/codegen/expressions.py @@ -27,7 +27,6 @@ THE SOFTWARE. """ - # {{{ fortran class FortranExpressionMapper(StringifyMapper): diff --git a/dagrt/codegen/fortran.py b/dagrt/codegen/fortran.py index e8f6e85..7a7875a 100644 --- a/dagrt/codegen/fortran.py +++ b/dagrt/codegen/fortran.py @@ -47,6 +47,7 @@ def pad_fortran(line, width): line += '&' return line + wrap_line = partial(wrap_line_base, pad_func=pad_fortran) diff --git a/dagrt/codegen/python.py b/dagrt/codegen/python.py index c876387..903b22b 100644 --- a/dagrt/codegen/python.py +++ b/dagrt/codegen/python.py @@ -42,6 +42,7 @@ def pad_python(line, width): line += '\\' return line + wrap_line = partial(wrap_line_base, pad_func=pad_python) _inner_class_code = '''from collections import namedtuple diff --git a/dagrt/function_registry.py b/dagrt/function_registry.py index 7026b2d..1581a07 100644 --- a/dagrt/function_registry.py +++ b/dagrt/function_registry.py @@ -455,6 +455,7 @@ def _make_bfr(): return bfr + base_function_registry = _make_bfr() # }}} diff --git a/test/test_codegen_python.py b/test/test_codegen_python.py index 0d47816..e119ea3 100755 --- a/test/test_codegen_python.py +++ b/test/test_codegen_python.py @@ -423,6 +423,7 @@ def test_svd(python_method_impl): assert la.norm(result) < 1e-10 + if __name__ == "__main__": if len(sys.argv) > 1: exec(sys.argv[1]) -- GitLab