From 877b918c26deddcc695a50f0b53fc97e149633f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Fri, 1 Feb 2019 04:22:54 +0100 Subject: [PATCH 1/2] Avoid using specific Py3 sub-versions for CI --- .gitlab-ci.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea69114d6..a09e5d830 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,16 +38,16 @@ Python 2.7 with legacy PyOpenCL: junit: test/pytest.xml -Python 3.6 POCL: +Python 3 POCL: script: - - export PY_EXE=python3.6 + - export PY_EXE=python3 - export PYOPENCL_TEST=portable - export EXTRA_INSTALL="pybind11 numpy mako" - export LOOPY_NO_CACHE=1 - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: - - python3.6 + - python3 - pocl except: - tags @@ -56,9 +56,9 @@ Python 3.6 POCL: junit: test/pytest.xml -Python 3.6 POCL Twice With Cache: +Python 3 POCL Twice With Cache: script: - - export PY_EXE=python3.6 + - export PY_EXE=python3 - export PYOPENCL_TEST=portable - export EXTRA_INSTALL="pybind11 numpy mako" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh @@ -67,7 +67,7 @@ Python 3.6 POCL Twice With Cache: - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: - - python3.6 + - python3 - pocl except: - tags @@ -89,14 +89,14 @@ Python 3.6 POCL Twice With Cache: # except: # - tags -Python 3.6 POCL Examples: +Python 3 POCL Examples: script: - - export PY_EXE=python3.6 + - export PY_EXE=python3 - export PYOPENCL_TEST=portable - export EXTRA_INSTALL="pybind11 numpy mako pyvisfile matplotlib ipykernel nbconvert" - ". ./build-py-project-and-run-examples.sh" tags: - - python3.6 + - python3 - pocl - large-node - ispc @@ -124,7 +124,7 @@ Documentation: - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-docs.sh - ". ./build-docs.sh" tags: - - python3.5 + - python3 only: - master @@ -133,6 +133,6 @@ Flake8: - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh - ". ./prepare-and-run-flake8.sh loopy test" tags: - - python3.5 + - python3 except: - tags -- GitLab From 6cf776b9b0f548491a67226acd8c71ca97b32a17 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Thu, 31 Jan 2019 21:36:23 -0600 Subject: [PATCH 2/2] Fix flake8 overindentation errors --- loopy/schedule/__init__.py | 2 +- loopy/symbolic.py | 6 +++--- loopy/target/c/codegen/expression.py | 4 ++-- loopy/target/ispc.py | 18 +++++++++--------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/loopy/schedule/__init__.py b/loopy/schedule/__init__.py index 58b68486b..378a1c0bf 100644 --- a/loopy/schedule/__init__.py +++ b/loopy/schedule/__init__.py @@ -754,7 +754,7 @@ def generate_loop_schedules_internal( preschedule=sched_state.preschedule[1:]), allow_boost=rec_allow_boost, debug=debug): - yield result + yield result # }}} diff --git a/loopy/symbolic.py b/loopy/symbolic.py index ae0c8999e..60473ada5 100644 --- a/loopy/symbolic.py +++ b/loopy/symbolic.py @@ -1431,9 +1431,9 @@ def constraint_to_cond_expr(cns): # Looks like this is ok after all--get_aff() performs some magic. # Not entirely sure though... FIXME # - #ls = cns.get_local_space() - #if ls.dim(dim_type.div): - #raise RuntimeError("constraint has an existentially quantified variable") + # ls = cns.get_local_space() + # if ls.dim(dim_type.div): + # raise RuntimeError("constraint has an existentially quantified variable") expr = aff_to_expr(cns.get_aff()) diff --git a/loopy/target/c/codegen/expression.py b/loopy/target/c/codegen/expression.py index f377ed1de..8ef921e44 100644 --- a/loopy/target/c/codegen/expression.py +++ b/loopy/target/c/codegen/expression.py @@ -263,8 +263,8 @@ class ExpressionToCExpressionMapper(IdentityMapper): def map_linear_subscript(self, expr, type_context): from pymbolic.primitives import Variable if not isinstance(expr.aggregate, Variable): - raise RuntimeError("linear indexing on non-variable: %s" - % expr) + raise RuntimeError("linear indexing on non-variable: %s" + % expr) if expr.aggregate.name in self.kernel.arg_dict: arg = self.kernel.arg_dict[expr.aggregate.name] diff --git a/loopy/target/ispc.py b/loopy/target/ispc.py index 771f2cdf6..5e59dff48 100644 --- a/loopy/target/ispc.py +++ b/loopy/target/ispc.py @@ -432,15 +432,15 @@ class ISPCASTBuilder(CASTBuilder): for term in terms: if (isinstance(term, Variable) and kernel.iname_tags_of_type(term.name, LocalIndexTag)): - tag, = kernel.iname_tags_of_type( - term.name, LocalIndexTag, min_num=1, max_num=1) - if tag.axis == 0: - if saw_l0: - raise LoopyError( - "streaming store must have stride 1 in " - "local index, got: %s" % subscript) - saw_l0 = True - continue + tag, = kernel.iname_tags_of_type( + term.name, LocalIndexTag, min_num=1, max_num=1) + if tag.axis == 0: + if saw_l0: + raise LoopyError( + "streaming store must have stride 1 in " + "local index, got: %s" % subscript) + saw_l0 = True + continue else: for dep in get_dependencies(term): if filter_iname_tags_by_type( -- GitLab