Skip to content

Commit

Permalink
Enable mypy lintrunner, Part 4 (util/*) (#7496)
Browse files Browse the repository at this point in the history
  • Loading branch information
mergennachin authored Jan 6, 2025
1 parent 7a2dc47 commit 3fdff26
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .lintrunner.toml
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ include_patterns = [
'runtime/**/*.py',
'scripts/**/*.py',
# 'test/**/*.py',
# 'util/**/*.py',
'util/**/*.py',
'*.py',
]
exclude_patterns = [
Expand Down
2 changes: 1 addition & 1 deletion .mypy.ini
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ ignore_missing_imports = True
ignore_missing_imports = True

[mypy-zstd]
ignore_missing_imports = True
ignore_missing_imports = True
21 changes: 10 additions & 11 deletions util/activation_memory_profiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import json
import typing
from dataclasses import dataclass, field
from typing import List
from typing import Any, Dict, List, Optional

import executorch.exir.memory as memory
import torch
Expand Down Expand Up @@ -52,7 +52,7 @@ def create_tensor_allocation_info(graph: torch.fx.Graph) -> List[MemoryTimeline]
allocations at that timestep.
"""
nodes = graph.nodes
memory_timeline = [None] * len(nodes)
memory_timeline: List[Optional[MemoryTimeline]] = [None for _ in range(len(nodes))]
for _, node in enumerate(nodes):
if node.op == "output":
continue
Expand All @@ -72,11 +72,11 @@ def create_tensor_allocation_info(graph: torch.fx.Graph) -> List[MemoryTimeline]
stack_trace = node.meta.get("stack_trace")
fqn = _get_module_hierarchy(node)
for j in range(start, end + 1):
if memory_timeline[j] is None:
# pyre-ignore
memory_timeline[j] = MemoryTimeline()
# pyre-ignore
memory_timeline[j].allocations.append(
memory_timeline_j = memory_timeline[j]
if memory_timeline_j is None:
memory_timeline_j = MemoryTimeline()
assert memory_timeline_j
memory_timeline_j.allocations.append(
Allocation(
node.name,
node.target,
Expand All @@ -87,8 +87,7 @@ def create_tensor_allocation_info(graph: torch.fx.Graph) -> List[MemoryTimeline]
stack_trace,
)
)
# pyre-ignore
return memory_timeline
return memory_timeline # type: ignore[return-value]


def _validate_memory_planning_is_done(exported_program: ExportedProgram):
Expand Down Expand Up @@ -129,7 +128,7 @@ def generate_memory_trace(

memory_timeline = create_tensor_allocation_info(exported_program.graph)
root = {}
trace_events = []
trace_events: List[Dict[str, Any]] = []
root["traceEvents"] = trace_events

tid = 0
Expand All @@ -138,7 +137,7 @@ def generate_memory_trace(
if memory_timeline_event is None:
continue
for allocation in memory_timeline_event.allocations:
e = {}
e: Dict[str, Any] = {}
e["name"] = allocation.name
e["cat"] = "memory_allocation"
e["ph"] = "X"
Expand Down
14 changes: 8 additions & 6 deletions util/python_profiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,20 @@
import re
from pstats import Stats

from snakeviz.stats import json_stats, table_rows
from tornado import template
from snakeviz.stats import json_stats, table_rows # type: ignore[import-not-found]
from tornado import template # type: ignore[import-not-found]

module_found = True
snakeviz_templates_dir: str = ""

try:
import snakeviz
import snakeviz # type: ignore[import-not-found]

snakeviz_dir = os.path.dirname(os.path.abspath(snakeviz.__file__))
snakeviz_templates_dir = os.path.join(snakeviz_dir, "templates")
except ImportError:
module_found = False

snakeviz_dir = os.path.dirname(os.path.abspath(snakeviz.__file__))
snakeviz_templates_dir = os.path.join(snakeviz_dir, "templates")


def _from_pstat_to_static_html(stats: Stats, html_filename: str):
"""
Expand Down

0 comments on commit 3fdff26

Please sign in to comment.