Skip to content

Commit 0c23026

Browse files
committed
data: define convert_*_event at module level
Summary: Per suggestion of @nfelt in post-review comment on #2980. This way, the functions are only defined once. Test Plan: Unit tests pass. wchargin-branch: mux-toplevel-read-helpers
1 parent fd4183f commit 0c23026

File tree

1 file changed

+20
-18
lines changed

1 file changed

+20
-18
lines changed

tensorboard/backend/event_processing/data_provider.py

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,7 @@ def read_scalars(
8787
index = self.list_scalars(
8888
experiment_id, plugin_name, run_tag_filter=run_tag_filter
8989
)
90-
91-
def convert_scalar_event(event):
92-
return provider.ScalarDatum(
93-
step=event.step,
94-
wall_time=event.wall_time,
95-
value=tensor_util.make_ndarray(event.tensor_proto).item(),
96-
)
97-
98-
return self._read(convert_scalar_event, index)
90+
return self._read(_convert_scalar_event, index)
9991

10092
def list_tensors(self, experiment_id, plugin_name, run_tag_filter=None):
10193
run_tag_content = self._multiplexer.PluginRunToTagToContent(plugin_name)
@@ -113,15 +105,7 @@ def read_tensors(
113105
index = self.list_tensors(
114106
experiment_id, plugin_name, run_tag_filter=run_tag_filter
115107
)
116-
117-
def convert_tensor_event(event):
118-
return provider.TensorDatum(
119-
step=event.step,
120-
wall_time=event.wall_time,
121-
numpy=tensor_util.make_ndarray(event.tensor_proto),
122-
)
123-
124-
return self._read(convert_tensor_event, index)
108+
return self._read(_convert_tensor_event, index)
125109

126110
def _list(self, construct_time_series, run_tag_content, run_tag_filter):
127111
"""Helper to list scalar or tensor time series.
@@ -181,3 +165,21 @@ def _read(self, convert_event, index):
181165
events = self._multiplexer.Tensors(run, tag)
182166
result_for_run[tag] = [convert_event(e) for e in events]
183167
return result
168+
169+
170+
def _convert_scalar_event(event):
171+
"""Helper for `read_scalars`."""
172+
return provider.ScalarDatum(
173+
step=event.step,
174+
wall_time=event.wall_time,
175+
value=tensor_util.make_ndarray(event.tensor_proto).item(),
176+
)
177+
178+
179+
def _convert_tensor_event(event):
180+
"""Helper for `read_tensors`."""
181+
return provider.TensorDatum(
182+
step=event.step,
183+
wall_time=event.wall_time,
184+
numpy=tensor_util.make_ndarray(event.tensor_proto),
185+
)

0 commit comments

Comments
 (0)