Merge branch 'main' into c_vecextensions_target

Author: kaushikcfd

build-py-project-and-run-examples.sh renamed to .ci/examples-funcs.sh

@@ -95,16 +95,18 @@ jobs:
         -   uses: actions/checkout@v2
         -   name: "Main Script"
             run: |
-                EXTRA_INSTALL="matplotlib ipykernel nbconvert"
                 curl -L -O https://tiker.net/ci-support-v0
                 . ./ci-support-v0
                 build_py_project_in_conda_env
 
+                # ipython_genutils for https://github.com/jupyter/nbconvert/issues/1725
+                with_echo pip install matplotlib ipykernel nbconvert ipython_genutils
+
                 install_ispc
 
                 export PYOPENCL_TEST=portable:pthread
 
-                . ./build-py-project-and-run-examples.sh
+                . ./.ci/examples-funcs.sh
                 run_py_examples
                 run_ipynb_examples
                 run_floopy_examples

.github/workflows/ci.yml

@@ -112,16 +112,19 @@ Pytest POCL Examples:
   stage: test
   script: |
     export PYOPENCL_TEST=portable:pthread
-    export EXTRA_INSTALL="pybind11 numpy mako pyvisfile matplotlib ipykernel nbconvert"
+    export EXTRA_INSTALL="pybind11 numpy mako"
 
     curl -L -O https://tiker.net/ci-support-v0
     . ./ci-support-v0
 
     build_py_project_in_venv
 
+    # ipython_genutils for https://github.com/jupyter/nbconvert/issues/1725
+    pip install matplotlib ipykernel nbconvert ipython_genutils
+
     install_ispc
 
-    . ./build-py-project-and-run-examples.sh
+    . ./.ci/examples-funcs.sh
     run_py_examples
     run_ipynb_examples
     run_floopy_examples

.gitlab-ci.yml

@@ -1,6 +1,16 @@
 - arg: extension-pkg-whitelist
   val: islpy
+
 - arg: ignore
-  val: compyte
+  val:
+  - compyte
+
+- arg: ignored-modules
+  val:
+  - IPython
+  - pycuda
+  - maptlotlib
+  - maptlotlib.pyplot
+
 - arg: init-hook
   val: sys.setrecursionlimit(5000)

.pylintrc-local.yml

@@ -11,8 +11,3 @@ dependencies:
 - mako
 - pyopencl
 - islpy
-
-# Only needed to make pylint succeed
-- matplotlib-base
-- ipykernel
-- ply

.test-conda-env-py3.yml

@@ -560,7 +560,7 @@ Consider this example:
     #define lid(N) ((int) get_local_id(N))
     ...
       for (int i_outer = 0; i_outer <= -1 + (15 + n) / 16; ++i_outer)
-        for (int i_inner = 0; i_inner <= (-16 + n + -16 * i_outer >= 0 ? 15 : -1 + n + -16 * i_outer); ++i_inner)
+        for (int i_inner = 0; i_inner <= (-17 + n + -16 * i_outer >= 0 ? 15 : -1 + n + -16 * i_outer); ++i_inner)
           a[16 * i_outer + i_inner] = 0.0f;
     ...
 

doc/tutorial.rst

@@ -1453,7 +1453,7 @@ def _are_sub_array_refs_equivalent(sar1, sar2, caller):
 
     from loopy.symbolic import SubstitutionMapper
     from pymbolic.mapper.substitutor import make_subst_func
-    from loopy.isl_helpers import simplify_via_aff
+    from loopy.symbolic import simplify_via_aff
     subst_func = make_subst_func({iname1.name:  iname2
                                   for iname1, iname2 in zip(sar1.swept_inames,
                                                             sar2.swept_inames)

loopy/check.py

@@ -1,6 +1,5 @@
 """isl helpers"""
 
-
 __copyright__ = "Copyright (C) 2012 Andreas Kloeckner"
 
 __license__ = """
@@ -28,6 +27,7 @@
 
 import islpy as isl
 from islpy import dim_type
+from warnings import warn
 
 
 def pw_aff_to_aff(pw_aff):
@@ -448,19 +448,6 @@ def add_in_dims(aff):
 # }}}
 
 
-def simplify_via_aff(expr):
-    from loopy.symbolic import aff_to_expr, guarded_aff_from_expr, get_dependencies
-    from loopy.diagnostic import ExpressionToAffineConversionError
-
-    deps = sorted(get_dependencies(expr))
-    try:
-        return aff_to_expr(guarded_aff_from_expr(
-            isl.Space.create_from_names(isl.DEFAULT_CONTEXT, list(deps)),
-            expr))
-    except ExpressionToAffineConversionError:
-        return expr
-
-
 def project_out(set, inames):
     for iname in inames:
         var_dict = set.get_var_dict()
@@ -849,4 +836,11 @@ def find_and_rename_dim(isl_obj, dt, old_name, new_name):
 # }}}
 
 
+def simplify_via_aff(expr):
+    warn("simplify_via_aff has moved to loopy.symbolic. "
+            "Importing it from loopy.isl_helpers will stop working in July 2022.",
+            DeprecationWarning, stacklevel=2)
+    from loopy.symbolic import simplify_via_aff
+    return simplify_via_aff(expr)
+
 # vim: foldmethod=marker

loopy/isl_helpers.py

@@ -188,8 +188,15 @@ def get_le_neutral(dtype):
         elif dtype.numpy_dtype.itemsize == 8:
             # 64 bit integer
             return var("LONG_MAX")
-    else:
-        raise NotImplementedError("less")
+    elif dtype.numpy_dtype.kind == "u":
+        if dtype.numpy_dtype.itemsize == 4:
+            # 32 bit integer
+            return var("UINT_MAX")
+        elif dtype.numpy_dtype.itemsize == 8:
+            # 64 bit integer
+            return var("ULONG_MAX")
+
+    raise NotImplementedError(f"neutral element for <= and {dtype}")
 
 
 def get_ge_neutral(dtype):
@@ -211,8 +218,10 @@ def get_ge_neutral(dtype):
         elif dtype.numpy_dtype.itemsize == 8:
             # 64 bit integer
             return var("LONG_MIN")
-    else:
-        raise NotImplementedError("less")
+    elif dtype.numpy_dtype.kind == "u":
+        return 0
+
+    raise NotImplementedError(f"neutral element for >= and {dtype}")
 
 
 class MaxReductionOperation(ScalarReductionOperation):

loopy/library/reduction.py

@@ -228,6 +228,10 @@ def __init__(self, tag: pytools.tag.Tag):
     def __call__(self, kernel, matchable):
         return self.tag in matchable.tags
 
+    def update_persistent_hash(self, key_hash, key_builder):
+        key_builder.rec(key_hash, type(self).__name__)
+        key_builder.rec(key_hash, self.tag)
+
 
 class GlobMatchExpressionBase(MatchExpressionBase):
     def __init__(self, glob):