Merge branch 'main' into cupyactx

Author: matthiasdiener

.basedpyright/baseline.json

@@ -31,37 +31,42 @@ jobs:
                 pip install ruff
                 ruff check
 
-    pylint:
-        name: Pylint
+    mypy:
+        name: Mypy
         runs-on: ubuntu-latest
         steps:
         -   uses: actions/checkout@v4
         -   name: "Main Script"
             run: |
+                set -x
                 USE_CONDA_BUILD=1
-                curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-pylint.sh
-
                 CONDA_ENVIRONMENT=.test-conda-env-py3.yml
                 echo "- cupy" >> "$CONDA_ENVIRONMENT"
 
-                . ./prepare-and-run-pylint.sh "$(basename $GITHUB_REPOSITORY)" examples/*.py test/test_*.py
+                curl -L -O https://tiker.net/ci-support-v0
+                . ./ci-support-v0
 
-    mypy:
-        name: Mypy
+                build_py_project_in_conda_env
+                python -m pip install mypy pytest
+                ./run-mypy.sh
+
+    basedpyright:
         runs-on: ubuntu-latest
         steps:
         -   uses: actions/checkout@v4
         -   name: "Main Script"
             run: |
+                EXTRA_INSTALL="pytest types-colorama types-Pygments"
                 curl -L -O https://tiker.net/ci-support-v0
                 . ./ci-support-v0
 
                 CONDA_ENVIRONMENT=.test-conda-env-py3.yml
                 echo "- cupy" >> "$CONDA_ENVIRONMENT"
 
                 build_py_project_in_conda_env
-                python -m pip install mypy pytest
-                ./run-mypy.sh
+                cipip install basedpyright
+
+                basedpyright "$(get_proj_name)" test
 
     pytest3_pocl:
         name: Pytest Conda Py3 POCL

.github/workflows/ci.yml

@@ -115,16 +115,6 @@ Ruff:
   except:
   - tags
 
-Pylint:
-  script: |
-    EXTRA_INSTALL="jax[cpu]"
-    curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-pylint.sh
-    . ./prepare-and-run-pylint.sh "$CI_PROJECT_NAME" examples/*.py test/test_*.py
-  tags:
-  - python3
-  except:
-  - tags
-
 Mypy:
   script: |
     EXTRA_INSTALL="mypy pytest"

.gitlab-ci.yml

@@ -234,22 +234,6 @@ def norm(self, ary, ord=None):
 
         actx = self._array_context
 
-        try:
-            from meshmode.dof_array import DOFArray, flat_norm
-        except ImportError:
-            pass
-        else:
-            if isinstance(ary, DOFArray):
-                from warnings import warn
-                warn("Taking an actx.np.linalg.norm of a DOFArray is deprecated. "
-                        "(DOFArrays use 2D arrays internally, and "
-                        "actx.np.linalg.norm should compute matrix norms of those.) "
-                        "This will stop working in 2022. "
-                        "Use meshmode.dof_array.flat_norm instead.",
-                        DeprecationWarning, stacklevel=2)
-
-                return flat_norm(ary, ord=ord)
-
         try:
             iterable = serialize_container(ary)
         except NotAnArrayContainerError:

arraycontext/fake_numpy.py

@@ -132,11 +132,6 @@ def call_loopy(self, t_unit, **kwargs):
 
     def einsum(self, spec, *args, arg_names=None, tagged=()):
         import jax.numpy as jnp
-        if arg_names is not None:
-            from warnings import warn
-            warn("'arg_names' don't bear any significance in "
-                 f"{type(self).__name__}.", stacklevel=2)
-
         return jnp.einsum(spec, *args)
 
     def clone(self):

arraycontext/impl/jax/__init__.py

@@ -47,13 +47,6 @@
 from arraycontext.loopy import LoopyBasedFakeNumpyNamespace
 
 
-try:
-    import pyopencl as cl  # noqa: F401
-    import pyopencl.array as cl_array
-except ImportError:
-    pass
-
-
 # {{{ fake numpy
 
 class PyOpenCLFakeNumpyNamespace(LoopyBasedFakeNumpyNamespace):
@@ -121,6 +114,7 @@ def _copy(subary):
         return self._array_context._rec_map_container(_copy, ary)
 
     def arange(self, *args, **kwargs):
+        import pyopencl.array as cl_array
         return cl_array.arange(self._array_context.queue, *args, **kwargs)
 
     # }}}
@@ -155,13 +149,15 @@ def _rec_ravel(a):
         return rec_map_array_container(_rec_ravel, a)
 
     def concatenate(self, arrays, axis=0):
+        import pyopencl.array as cl_array
         return cl_array.concatenate(
             arrays, axis,
             self._array_context.queue,
             self._array_context.allocator
         )
 
     def stack(self, arrays, axis=0):
+        import pyopencl.array as cl_array
         return rec_multimap_array_container(
                 lambda *args: cl_array.stack(arrays=args, axis=axis,
                     queue=self._array_context.queue),
@@ -172,6 +168,7 @@ def stack(self, arrays, axis=0):
     # {{{ linear algebra
 
     def vdot(self, x, y, dtype=None):
+        import pyopencl.array as cl_array
         return rec_multimap_reduce_array_container(
                 sum,
                 partial(cl_array.vdot, dtype=dtype, queue=self._array_context.queue),
@@ -189,6 +186,7 @@ def _all(ary):
                 return np.int8(all([ary]))
             return ary.all(queue=queue)
 
+        import pyopencl.array as cl_array
         return rec_map_reduce_array_container(
                 partial(reduce, partial(cl_array.minimum, queue=queue)),
                 _all,
@@ -202,6 +200,7 @@ def _any(ary):
                 return np.int8(any([ary]))
             return ary.any(queue=queue)
 
+        import pyopencl.array as cl_array
         return rec_map_reduce_array_container(
                 partial(reduce, partial(cl_array.maximum, queue=queue)),
                 _any,
@@ -215,6 +214,8 @@ def array_equal(self, a: ArrayOrContainer, b: ArrayOrContainer) -> Array:
         true_ary = actx.from_numpy(np.int8(True))
         false_ary = actx.from_numpy(np.int8(False))
 
+        import pyopencl.array as cl_array
+
         def rec_equal(x: ArrayOrContainer, y: ArrayOrContainer) -> cl_array.Array:
             if type(x) is not type(y):
                 return false_ary
@@ -270,12 +271,15 @@ def not_equal(self, x, y):
         return rec_multimap_array_container(operator.ne, x, y)
 
     def logical_or(self, x, y):
+        import pyopencl.array as cl_array
         return rec_multimap_array_container(cl_array.logical_or, x, y)
 
     def logical_and(self, x, y):
+        import pyopencl.array as cl_array
         return rec_multimap_array_container(cl_array.logical_and, x, y)
 
     def logical_not(self, x):
+        import pyopencl.array as cl_array
         return rec_map_array_container(cl_array.logical_not, x)
 
     # }}}
@@ -290,11 +294,13 @@ def _rec_sum(ary):
             if axis not in [None, tuple(range(ary.ndim))]:
                 raise NotImplementedError(f"Sum over '{axis}' axes not supported.")
 
+            import pyopencl.array as cl_array
             return cl_array.sum(ary, dtype=dtype, queue=self._array_context.queue)
 
         return rec_map_reduce_array_container(sum, _rec_sum, a)
 
     def maximum(self, x, y):
+        import pyopencl.array as cl_array
         return rec_multimap_array_container(
                 partial(cl_array.maximum, queue=self._array_context.queue),
                 x, y)
@@ -308,8 +314,10 @@ def amax(self, a, axis=None):
         def _rec_max(ary):
             if axis not in [None, tuple(range(ary.ndim))]:
                 raise NotImplementedError(f"Max. over '{axis}' axes not supported.")
+            import pyopencl.array as cl_array
             return cl_array.max(ary, queue=queue)
 
+        import pyopencl.array as cl_array
         return rec_map_reduce_array_container(
                 partial(reduce, partial(cl_array.maximum, queue=queue)),
                 _rec_max,
@@ -318,6 +326,7 @@ def _rec_max(ary):
     max = amax
 
     def minimum(self, x, y):
+        import pyopencl.array as cl_array
         return rec_multimap_array_container(
                 partial(cl_array.minimum, queue=self._array_context.queue),
                 x, y)
@@ -331,8 +340,10 @@ def amin(self, a, axis=None):
         def _rec_min(ary):
             if axis not in [None, tuple(range(ary.ndim))]:
                 raise NotImplementedError(f"Min. over '{axis}' axes not supported.")
+            import pyopencl.array as cl_array
             return cl_array.min(ary, queue=queue)
 
+        import pyopencl.array as cl_array
         return rec_map_reduce_array_container(
                 partial(reduce, partial(cl_array.minimum, queue=queue)),
                 _rec_min,
@@ -351,6 +362,7 @@ def where(self, criterion, then, else_):
         def where_inner(inner_crit, inner_then, inner_else):
             if isinstance(inner_crit, bool | np.bool_):
                 return inner_then if inner_crit else inner_else
+            import pyopencl.array as cl_array
             return cl_array.if_positive(inner_crit != 0, inner_then, inner_else,
                     queue=self._array_context.queue)
 

arraycontext/impl/pyopencl/fake_numpy.py

@@ -199,12 +199,7 @@ def map_data_wrapper(self, expr: DataWrapper) -> Array:
         np_data = self.actx.to_numpy(expr.data)
         assert isinstance(np_data, np.ndarray)
 
-        # https://github.com/pylint-dev/pylint/issues/3893
-        # pylint: disable=unexpected-keyword-arg
-        # type-ignore: discussed at
-        # https://github.com/inducer/arraycontext/pull/289#discussion_r1855523967
-        # possibly related: https://github.com/python/mypy/issues/17375
-        return DataWrapper(  # type: ignore[call-arg]
+        return DataWrapper(
             data=np_data,
             shape=expr.shape,
             axes=expr.axes,

arraycontext/impl/pytato/utils.py

@@ -7,7 +7,7 @@ name = "arraycontext"
 version = "2024.0"
 description = "Choose your favorite numpy-workalike"
 readme = "README.rst"
-license = { text = "MIT" }
+license = "MIT"
 authors = [
     { name = "Andreas Kloeckner", email = "inform@tiker.net" },
 ]
@@ -17,7 +17,6 @@ classifiers = [
     "Intended Audience :: Developers",
     "Intended Audience :: Other Audience",
     "Intended Audience :: Science/Research",
-    "License :: OSI Approved :: MIT License",
     "Natural Language :: English",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3 :: Only",
@@ -133,3 +132,28 @@ ignore_missing_imports = true
 extend-ignore-re = [
   "(?Rm)^.*(#|//)\\s*spellchecker:\\s*disable-line$"
 ]
+
+[tool.basedpyright]
+reportImplicitStringConcatenation = "none"
+reportUnnecessaryIsInstance = "none"
+reportUnusedCallResult = "none"
+reportExplicitAny = "none"
+
+# This reports even cycles that are qualified by 'if TYPE_CHECKING'. Not what
+# we care about at this moment.
+# https://github.com/microsoft/pyright/issues/746
+reportImportCycles = "none"
+pythonVersion = "3.10"
+pythonPlatform = "All"
+
+[[tool.basedpyright.executionEnvironments]]
+root = "test"
+reportUnknownArgumentType = "hint"
+reportUnknownMemberType = "hint"
+reportUnknownVariableType = "hint"
+reportUnknownParameterType = "hint"
+reportMissingTypeArgument = "hint"
+reportPrivateUsage = "none"
+reportMissingTypeStubs = "hint"
+reportAny = "hint"
+