Skip to content

Read non-finite float values back from an ETDump #22785

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
Dev-next-gen wants to merge 1 commit into
base: main
Choose a base branch
from
+32 −1
Open

Read non-finite float values back from an ETDump #22785

Show file tree
Hide file tree
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
12 changes: 11 additions & 1 deletion devtools/etdump/serialize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import importlib.resources as _resources
import json
import os
import re
import tempfile

import executorch.devtools.etdump as etdump_package
Expand All @@ -21,6 +22,10 @@
ETDUMP_FLATCC_SCHEMA_NAME = "etdump_schema_flatcc"
SCALAR_TYPE_SCHEMA_NAME = "scalar_type"

# flatc writes non-finite floats as bare inf, -inf, nan and -nan, which
# json.loads rejects. String literals are matched first so they pass through.
_FLATC_NON_FINITE_RE = re.compile(rb'("(?:[^"\\]|\\.)*")|-?\bnan\b|\binf\b')


def _write_schema(d: str, schema_name: str) -> None:
schema_path = os.path.join(d, "{}.fbs".format(schema_name))
Expand All @@ -39,7 +44,12 @@ def _serialize_from_etdump_to_json(etdump: ETDumpFlatCC) -> str:

# from json to etdump
def _deserialize_from_json_to_etdump_flatcc(etdump_json: bytes) -> ETDumpFlatCC:
etdump_json = json.loads(etdump_json)
etdump_json = json.loads(
_FLATC_NON_FINITE_RE.sub(
lambda m: m.group(1) or (b"Infinity" if m.group(0) == b"inf" else b"NaN"),
etdump_json,
)
)
return _json_to_dataclass(etdump_json, ETDumpFlatCC)


Expand Down
21 changes: 21 additions & 0 deletions devtools/etdump/tests/serialize_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import difflib
import json
import math
import unittest
from pprint import pformat
from typing import List
Expand Down Expand Up @@ -140,3 +141,23 @@ def test_serialize(self) -> None:
)
),
)

def test_serialize_non_finite_floats(self) -> None:
program = get_sample_etdump_flatcc()
debug_entry = program.run_data[0].events[3].debug_event.debug_entry
debug_entry.float_value = flatcc.Float(float("inf"))
debug_entry.double_value = flatcc.Double(float("-inf"))

deserialized_obj = deserialize_from_etdump_flatcc(
serialize_to_etdump_flatcc(program), size_prefixed=False
)
self.assertEqual(program, deserialized_obj)

debug_entry.double_value = flatcc.Double(float("nan"))
deserialized_obj = deserialize_from_etdump_flatcc(
serialize_to_etdump_flatcc(program), size_prefixed=False
)
deserialized_entry = deserialized_obj.run_data[0].events[3].debug_event
self.assertTrue(
math.isnan(deserialized_entry.debug_entry.double_value.double_val)
)
Loading