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
40 changes: 20 additions & 20 deletions .basedpyright/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -12538,7 +12538,7 @@
}
},
{
"code": "reportUnknownVariableType",
"code": "reportAny",
"range": {
"startColumn": 12,
"endColumn": 35,
Expand Down Expand Up @@ -12602,7 +12602,7 @@
}
},
{
"code": "reportUnknownArgumentType",
"code": "reportAny",
"range": {
"startColumn": 34,
"endColumn": 57,
Expand Down Expand Up @@ -12706,7 +12706,7 @@
}
},
{
"code": "reportUnknownVariableType",
"code": "reportAny",
"range": {
"startColumn": 12,
"endColumn": 35,
Expand Down Expand Up @@ -12754,7 +12754,7 @@
}
},
{
"code": "reportUnknownArgumentType",
"code": "reportAny",
"range": {
"startColumn": 37,
"endColumn": 60,
Expand Down Expand Up @@ -18943,14 +18943,6 @@
"lineCount": 1
}
},
{
"code": "reportIncompatibleMethodOverride",
"range": {
"startColumn": 8,
"endColumn": 18,
"lineCount": 1
}
},
{
"code": "reportImplicitOverride",
"range": {
Expand Down Expand Up @@ -19367,14 +19359,6 @@
"lineCount": 1
}
},
{
"code": "reportIncompatibleMethodOverride",
"range": {
"startColumn": 8,
"endColumn": 18,
"lineCount": 1
}
},
{
"code": "reportImplicitOverride",
"range": {
Expand Down Expand Up @@ -29601,6 +29585,14 @@
"lineCount": 1
}
},
{
"code": "reportAbstractUsage",
"range": {
"startColumn": 19,
"endColumn": 18,
"lineCount": 4
}
},
{
"code": "reportCallIssue",
"range": {
Expand Down Expand Up @@ -29729,6 +29721,14 @@
"lineCount": 1
}
},
{
"code": "reportAbstractUsage",
"range": {
"startColumn": 19,
"endColumn": 18,
"lineCount": 4
}
},
{
"code": "reportCallIssue",
"range": {
Expand Down
7 changes: 4 additions & 3 deletions pytential/linalg/direct_solver_symbolic.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

from typing import TYPE_CHECKING

from constantdict import constantdict
from typing_extensions import override

from pymbolic.geometric_algebra import componentwise
Expand Down Expand Up @@ -137,7 +138,7 @@ def map_int_g(self, expr: IntG) -> IntG:
target_kernel=target_kernel,
source_kernels=source_kernels,
densities=self.rec(expr.densities),
kernel_arguments=kernel_arguments)
kernel_arguments=constantdict(kernel_arguments))

# }}}

Expand Down Expand Up @@ -234,10 +235,10 @@ def map_int_g(self,
densities=tuple(self.rec_arith(d) for d in expr.densities),
qbx_forced_limit=expr.qbx_forced_limit,
source=self.default_source, target=self.default_target,
kernel_arguments={
kernel_arguments=constantdict({
name: componentwise(self.rec_arith, arg_expr)
for name, arg_expr in expr.kernel_arguments.items()
}
})
)


Expand Down
4 changes: 2 additions & 2 deletions pytential/symbolic/mappers.py
Original file line number Diff line number Diff line change
Expand Up @@ -729,10 +729,10 @@ def map_int_g(self, expr: pp.IntG):
expr,
qbx_forced_limit=None,
densities=self.rec(expr.densities),
kernel_arguments={
kernel_arguments=constantdict({
name: componentwise(self.rec_arith, arg_expr)
for name, arg_expr in expr.kernel_arguments.items()
}
})
)

# }}}
Expand Down
14 changes: 11 additions & 3 deletions pytential/symbolic/primitives.py
Original file line number Diff line number Diff line change
Expand Up @@ -1938,24 +1938,32 @@ def __init__(
**kwargs: Operand
) -> None:
if kernel_arguments is None:
kernel_arguments = {}
kernel_arguments = constantdict({})

if isinstance(kernel_arguments, tuple):
kernel_arguments = dict(kernel_arguments)
kernel_arguments = constantdict(kernel_arguments)

if source is None:
source = DEFAULT_DOFDESC

if target is None:
target = DEFAULT_DOFDESC

if kwargs:
warn(f"Passing named '**kwargs' to {type(self).__name__!r} is "
"deprecated and will result in an error in 2025. Use the "
"'kernel_arguments' argument instead.",
DeprecationWarning, stacklevel=2)

kernel_arguments = kernel_arguments.copy()
kernel_arguments = dict(kernel_arguments)
for name, value in kwargs.items():
if name in kernel_arguments:
raise ValueError(f"'{name}' already set in 'kernel_arguments'")

kernel_arguments[name] = value

kernel_arguments = constantdict(kernel_arguments)

object.__setattr__(self, "target_kernel", target_kernel)
object.__setattr__(self, "source_kernels", source_kernels)
object.__setattr__(self, "densities", densities)
Expand Down
Loading