Skip to content

Commit f0ad270

Browse files
inducerinducer
authored
Merge branch 'main' into gt
2 parents d6f8d5a + 0fd7598 commit f0ad270

6 files changed

Lines changed: 30 additions & 125 deletions

File tree

‎.basedpyright/baseline.json‎

Lines changed: 7 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -7135,14 +7135,6 @@
71357135
"lineCount": 1
71367136
}
71377137
},
7138-
{
7139-
"code": "reportUnknownMemberType",
7140-
"range": {
7141-
"startColumn": 14,
7142-
"endColumn": 35,
7143-
"lineCount": 1
7144-
}
7145-
},
71467138
{
71477139
"code": "reportUnknownMemberType",
71487140
"range": {
@@ -7335,14 +7327,6 @@
73357327
"lineCount": 1
73367328
}
73377329
},
7338-
{
7339-
"code": "reportUnknownMemberType",
7340-
"range": {
7341-
"startColumn": 14,
7342-
"endColumn": 35,
7343-
"lineCount": 1
7344-
}
7345-
},
73467330
{
73477331
"code": "reportUnknownMemberType",
73487332
"range": {
@@ -8115,14 +8099,6 @@
81158099
"lineCount": 1
81168100
}
81178101
},
8118-
{
8119-
"code": "reportUnknownMemberType",
8120-
"range": {
8121-
"startColumn": 14,
8122-
"endColumn": 35,
8123-
"lineCount": 1
8124-
}
8125-
},
81268102
{
81278103
"code": "reportUnknownMemberType",
81288104
"range": {
@@ -8688,82 +8664,26 @@
86888664
}
86898665
},
86908666
{
8691-
"code": "reportUnknownParameterType",
8692-
"range": {
8693-
"startColumn": 29,
8694-
"endColumn": 34,
8695-
"lineCount": 1
8696-
}
8697-
},
8698-
{
8699-
"code": "reportMissingParameterType",
8700-
"range": {
8701-
"startColumn": 29,
8702-
"endColumn": 34,
8703-
"lineCount": 1
8704-
}
8705-
},
8706-
{
8707-
"code": "reportUnknownParameterType",
8708-
"range": {
8709-
"startColumn": 36,
8710-
"endColumn": 41,
8711-
"lineCount": 1
8712-
}
8713-
},
8714-
{
8715-
"code": "reportMissingParameterType",
8716-
"range": {
8717-
"startColumn": 36,
8718-
"endColumn": 41,
8719-
"lineCount": 1
8720-
}
8721-
},
8722-
{
8723-
"code": "reportUnknownParameterType",
8667+
"code": "reportAny",
87248668
"range": {
8725-
"startColumn": 43,
8726-
"endColumn": 50,
8669+
"startColumn": 12,
8670+
"endColumn": 15,
87278671
"lineCount": 1
87288672
}
87298673
},
87308674
{
8731-
"code": "reportMissingParameterType",
8675+
"code": "reportAny",
87328676
"range": {
8733-
"startColumn": 43,
8734-
"endColumn": 50,
8677+
"startColumn": 19,
8678+
"endColumn": 86,
87358679
"lineCount": 1
87368680
}
87378681
},
87388682
{
87398683
"code": "reportAny",
87408684
"range": {
87418685
"startColumn": 15,
8742-
"endColumn": 82,
8743-
"lineCount": 1
8744-
}
8745-
},
8746-
{
8747-
"code": "reportUnknownArgumentType",
8748-
"range": {
8749-
"startColumn": 52,
8750-
"endColumn": 57,
8751-
"lineCount": 1
8752-
}
8753-
},
8754-
{
8755-
"code": "reportUnknownArgumentType",
8756-
"range": {
8757-
"startColumn": 59,
8758-
"endColumn": 64,
8759-
"lineCount": 1
8760-
}
8761-
},
8762-
{
8763-
"code": "reportUnknownArgumentType",
8764-
"range": {
8765-
"startColumn": 74,
8766-
"endColumn": 81,
8686+
"endColumn": 20,
87678687
"lineCount": 1
87688688
}
87698689
},
@@ -9967,14 +9887,6 @@
99679887
"lineCount": 1
99689888
}
99699889
},
9970-
{
9971-
"code": "reportUnknownMemberType",
9972-
"range": {
9973-
"startColumn": 14,
9974-
"endColumn": 44,
9975-
"lineCount": 1
9976-
}
9977-
},
99789890
{
99799891
"code": "reportUnknownMemberType",
99809892
"range": {
@@ -14621,14 +14533,6 @@
1462114533
"lineCount": 1
1462214534
}
1462314535
},
14624-
{
14625-
"code": "reportUnknownMemberType",
14626-
"range": {
14627-
"startColumn": 18,
14628-
"endColumn": 39,
14629-
"lineCount": 1
14630-
}
14631-
},
1463214536
{
1463314537
"code": "reportUnknownArgumentType",
1463414538
"range": {
@@ -14637,14 +14541,6 @@
1463714541
"lineCount": 1
1463814542
}
1463914543
},
14640-
{
14641-
"code": "reportUnknownMemberType",
14642-
"range": {
14643-
"startColumn": 18,
14644-
"endColumn": 39,
14645-
"lineCount": 1
14646-
}
14647-
},
1464814544
{
1464914545
"code": "reportUnknownArgumentType",
1465014546
"range": {

‎pyproject.toml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,16 @@ extend-select = [
9292
"Q", # flake8-quotes
9393
"RUF", # ruff
9494
"SIM", # flake8-simplify
95+
"TC", # flake8-type-checking
9596
"UP", # pyupgrade
9697
"W", # pycodestyle
97-
"TC",
9898
]
9999
extend-ignore = [
100-
"C90", # McCabe complexity
101-
"E221", # multiple spaces before operator
102-
"E226", # missing whitespace around arithmetic operator
103-
"E402", # module-level import not at top of file
100+
"C90", # McCabe complexity
101+
"E221", # multiple spaces before operator
102+
"E226", # missing whitespace around arithmetic operator
103+
"E402", # module-level import not at top of file
104+
"RUF067", # non-empty-init-module
104105
]
105106

106107
[tool.ruff.lint.flake8-quotes]

‎sumpy/codegen.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ def map_constant(self, expr: object, /) -> Expression:
600600

601601
complex_dtype = self.complex_dtype
602602
if complex_dtype is None:
603-
if complex(np.complex64(expr)) == expr:
603+
if complex(np.complex64(expr)) == expr: # noqa: RUF069
604604
return np.complex64(expr)
605605

606606
complex_dtype = np.complex128

‎sumpy/fmm.py‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
from boxtree.tree import Tree
4747

4848
import pytools.obj_array as obj_array
49-
from pytools import memoize_method
49+
from pytools import memoize_in, memoize_method
5050

5151
from sumpy import (
5252
E2EFromChildren,
@@ -240,9 +240,17 @@ def p2p(self):
240240
exclude_self=self.exclude_self,
241241
strength_usage=self.strength_usage, name="p2p")
242242

243-
@memoize_method
244-
def opencl_fft_app(self, shape, dtype, inverse):
245-
return get_opencl_fft_app(self._setup_actx, shape, dtype, inverse=inverse)
243+
def opencl_fft_app(self,
244+
shape: tuple[int, ...],
245+
dtype: np.dtype[Any],
246+
inverse: bool) -> Any:
247+
@memoize_in(self._setup_actx, (
248+
SumpyTreeIndependentDataForWrangler.opencl_fft_app,
249+
shape, dtype, inverse))
250+
def app() -> Any:
251+
return get_opencl_fft_app(self._setup_actx, shape, dtype, inverse=inverse)
252+
253+
return app()
246254

247255
# }}}
248256

‎sumpy/kernel.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ def __new__(cls,
773773
viscosity_mu: float | str | SpatialConstant = "mu",
774774
poisson_ratio: float | str | SpatialConstant = "nu",
775775
) -> ElasticityKernel:
776-
if poisson_ratio == 0.5:
776+
if poisson_ratio == 0.5: # noqa: RUF069
777777
return super().__new__(StokesletKernel)
778778
else:
779779
return super().__new__(cls)
@@ -899,7 +899,7 @@ def __init__(self,
899899
if poisson_ratio is None:
900900
poisson_ratio = 0.5
901901

902-
if poisson_ratio != 0.5:
902+
if poisson_ratio != 0.5: # noqa: RUF069
903903
raise ValueError(
904904
"'StokesletKernel' must have a Poisson ratio of 0.5: "
905905
f"got '{poisson_ratio}'")

‎sumpy/test/test_kernels.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -734,14 +734,14 @@ def test_m2m_and_l2l_exprs_simpler(base_knl, local_expn_class, mpole_expn_class,
734734
dvec, tgt_rscale, _fast_version=False)
735735

736736
for expr1, expr2 in zip(faster_m2m, slower_m2m, strict=True):
737-
assert float(sym.doit(expr1 - expr2).expand()) == 0.0
737+
assert float(sym.doit(expr1 - expr2).expand()) == 0.0 # noqa: RUF069
738738

739739
faster_l2l = local_expn.translate_from(local_expn, src_coeff_exprs, src_rscale,
740740
dvec, tgt_rscale)
741741
slower_l2l = local_expn.translate_from(local_expn, src_coeff_exprs, src_rscale,
742742
dvec, tgt_rscale, _fast_version=False)
743743
for expr1, expr2 in zip(faster_l2l, slower_l2l, strict=True):
744-
assert float(sym.doit(expr1 - expr2).expand()) == 0.0
744+
assert float(sym.doit(expr1 - expr2).expand()) == 0.0 # noqa: RUF069
745745

746746
# }}}
747747

0 commit comments

Comments
 (0)