Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions .basedpyright/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -1913,22 +1913,6 @@
"lineCount": 1
}
},
{
"code": "reportUnknownArgumentType",
"range": {
"startColumn": 42,
"endColumn": 46,
"lineCount": 1
}
},
{
"code": "reportUnknownArgumentType",
"range": {
"startColumn": 48,
"endColumn": 52,
"lineCount": 1
}
},
{
"code": "reportUnknownArgumentType",
"range": {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
downstream_tests:
strategy:
matrix:
downstream_project: [meshmode, grudge, mirgecom, mirgecom_examples]
downstream_project: [meshmode, grudge]
fail-fast: false

name: Tests for downstream project ${{ matrix.downstream_project }}
Expand Down
17 changes: 8 additions & 9 deletions arraycontext/loopy.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
from collections.abc import Mapping, Sequence
from types import EllipsisType

import islpy as isl
import namedisl as nisl

from loopy.kernel.data import (
ArrayArg,
Expand All @@ -95,7 +95,7 @@


def make_loopy_program(
domains: str | Sequence[str | isl.BasicSet],
domains: str | Sequence[str | nisl.Set],
statements: str | Sequence[InstructionBase | SubstitutionRule | str],
kernel_data: Sequence[
ValueArg | ArrayArg | TemporaryVariable | EllipsisType | str
Expand Down Expand Up @@ -142,14 +142,13 @@ def get(c_name: str, nargs: int, naxes: int) -> lp.TranslationUnit:
size_names = [f"n{i}" for i in range(naxes)]
subscript = tuple(Variable(vname) for vname in var_names)

from islpy import make_zero_and_vars
import namedisl as nisl

v = make_zero_and_vars(var_names, params=size_names)
domain = v[0].domain()
space = nisl.Space.from_names(out=var_names, param=size_names)
v = nisl.pw_affs_from_domain_space(space)
domain = v[0].aggregate_domain()
for vname, sname in zip(var_names, size_names, strict=True):
domain = domain & v[0].le_set(v[vname]) & v[vname].lt_set(v[sname])

domain_bset, = domain.get_basic_sets()
domain = domain & v[0].where("<=", v[vname]) & v[vname].where("<", v[sname])

import loopy as lp

Expand All @@ -159,7 +158,7 @@ def sub(name: str) -> Variable | Subscript:
return Subscript(Variable(name), subscript) if subscript else Variable(name)

return make_loopy_program(
[domain_bset], [
[domain], [
lp.Assignment(
sub("out"),
Variable(c_name)(*[sub(f"inp{i}") for i in range(nargs)]))
Expand Down
5 changes: 4 additions & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@
version = ".".join(release.split(".")[:2])

intersphinx_mapping = {
"jax": ("https://jax.readthedocs.io/en/latest/", None),
"jax": ("https://docs.jax.dev/en/latest/", None),
"loopy": ("https://documen.tician.de/loopy", None),
"meshmode": ("https://documen.tician.de/meshmode", None),
"numpy": ("https://numpy.org/doc/stable/", None),
"pymbolic": ("https://documen.tician.de/pymbolic", None),
"namedisl": ("https://documen.tician.de/namedisl", None),
"pyopencl": ("https://documen.tician.de/pyopencl", None),
"pytato": ("https://documen.tician.de/pytato", None),
"pytest": ("https://docs.pytest.org/en/latest/", None),
Expand Down Expand Up @@ -51,6 +52,8 @@
sphinxconfig_missing_reference_aliases = {
# pyopencl
"cl.Device": "obj:pyopencl.Device",
# namedisl
"nisl.Set": "obj:namedisl.Set",
}


Expand Down
Loading