Skip to content

Improve validate() performance for large arrays of structures #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maarten-ic wants to merge 1 commit into
base: develop
Choose a base branch
from
+11 −10
Open

Improve validate() performance for large arrays of structures #139

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 11 additions & 10 deletions imas/ids_coordinates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def __init__(self, coordinate_spec: str) -> None:
logger.debug(
f"Ignoring invalid coordinate specifier {spec}", exc_info=True
)
self.references: "tuple[IDSPath]" = tuple(refs)
self.references: "tuple[IDSPath, ...]" = tuple(refs)
"""A tuple paths that this coordinate refers to.
"""

Expand Down Expand Up @@ -357,28 +357,29 @@ def _capture_goto_errors(self, dim, coordinate):
IDSPath.goto().
"""
did_capture = []
path = self._node._path
try:
yield did_capture
except CoordinateLookupError as exc:
raise ValidationError(exc.args[0])
except IndexError as exc:
# Can happen in IDSPath.goto when an invalid index is encountered.
coordinate_refs = coordinate.format_refs(self._node)
path = self._node._path
raise ValidationError(
f"Error while validating element `{path}`: dimension {dim + 1} has an "
f"invalid index for coordinate(s) {coordinate_refs}."
) from exc
except Exception as exc:
# Ignore all other exceptions and log them
if "Unexpected index" in str(exc):
logger.debug(
"Ignored AoS coordinate outside our tree (see IMAS-4675) of "
"element `%s`, dimension %s, coordinate `%s`",
path,
dim,
coordinate.references,
)
if logger.isEnabledFor(logging.DEBUG):
logger.debug(
"Ignored AoS coordinate outside our tree (see IMAS-4675) "
"of element `%s`, dimension %s, coordinate `%s`",
self._node._path,
dim,
coordinate.references,
)
else:
if self._node._version <= "3.38.1":
version_error = (
Expand All @@ -395,7 +396,7 @@ def _capture_goto_errors(self, dim, coordinate):
coordinate.references,
dim,
version_error,
exc_info=1,
exc_info=True,
)
# Flag to the caller that an error was suppressed
did_capture.append(1)