Skip to content

Commit 727ed35

Browse files
committed
misc: Address some comments
1 parent 6b66ea8 commit 727ed35

5 files changed

Lines changed: 10 additions & 8 deletions

File tree

devito/petsc/iet/passes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from devito.types import Symbol, Scalar
1111
from devito.types.basic import DataSymbol
1212
from devito.tools import frozendict
13-
import devito.logger as dl
13+
import devito.logger
1414

1515
from devito.petsc.types import (PetscMPIInt, PetscErrorCode, MultipleFieldData,
1616
PointerIS, Mat, CallbackVec, Vec, CallbackMat, SNES,
@@ -201,7 +201,7 @@ def solve(self):
201201

202202
@cached_property
203203
def logger(self):
204-
log_level = dl.logger.level
204+
log_level = devito.logger.logger.level
205205
return PetscLogger(
206206
log_level, self.get_info, **self.common_kwargs
207207
)

devito/petsc/logging.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,11 @@ def get_val(val):
192192
# - If the function returns multiple values (e.g., KSPGetTolerances),
193193
# return a dictionary mapping each output name to its value,
194194
# e.g., {'rtol': val0, 'atol': val1, ...}.
195-
if len(obj_mapper) > 1:
196-
return {k: get_val(v) for k, v in obj_mapper.items()}
197-
return get_val(next(iter(obj_mapper.values())))
195+
info = {k: get_val(v) for k, v in obj_mapper.items()}
196+
if len(info) == 1:
197+
return info.popitem()[1]
198+
else:
199+
return info
198200

199201

200202
@dataclass

devito/petsc/solver_parameters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ def format_options_prefix(options_prefix):
3838

3939
if options_prefix.endswith("_"):
4040
return options_prefix
41-
return options_prefix + "_"
41+
return f"{options_prefix}_"

requirements-optional.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ pillow>11,<11.3.1
33
pyrevolve==2.2.6
44
scipy<1.15.4
55
distributed<2025.7.1
6-
click<9.0
6+
click<9.0

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ multidict<6.3
99
anytree>=2.4.3,<=2.13.0
1010
cloudpickle<3.1.2
1111
packaging<25.1
12-
petsctools==2025.1
12+
petsctools<=2025.1

0 commit comments

Comments
 (0)