Skip to content

metrics: fix wall time rendering #4552

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

Merged
wchargin merged 1 commit into from
Jan 14, 2021
Merged

metrics: fix wall time rendering #4552

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
2 changes: 1 addition & 1 deletion tensorboard/webapp/widgets/line_chart/line_chart_component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ export class LineChartComponent<
private formatByXAxisType(seriesData: Point<ExtraPointData>[]) {
return seriesData.map((datum) => {
if (this.isWallTimeBased(this.xAxisType)) {
return {...datum, wall_time: new Date(datum.x)};
return {...datum, wall_time: new Date(datum.x * 1000)};
}
return {...datum, step: datum.x};
});
Expand Down
28 changes: 20 additions & 8 deletions tensorboard/webapp/widgets/line_chart/line_chart_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ describe('LineChart', () => {
{
seriesId: 'series1',
metadata: {},
points: [{x: 10, y: 20, flavor: 'spicy'}],
points: [{x: 1610612159, y: 20, flavor: 'spicy'}],
visible: true,
},
];
Expand Down Expand Up @@ -174,8 +174,10 @@ describe('LineChart', () => {
'series1',
[
{
...fakeSeriesDataList[0].points[0],
wall_time: new Date(fakeSeriesDataList[0].points[0].x),
x: 1610612159,
wall_time: new Date(1610612159 * 1000),
y: 20,
flavor: 'spicy',
},
],
],
Expand Down Expand Up @@ -207,8 +209,8 @@ describe('LineChart', () => {
setSeriesDataCallArgs.push(args);
});

const fakePoints1 = [{x: 10, y: 20, flavor: 'spicy'}];
const fakePoints2 = [{x: 30, y: 40, flavor: 'bitter'}];
const fakePoints1 = [{x: 1610613017, y: 20, flavor: 'spicy'}];
const fakePoints2 = [{x: 1610613025, y: 40, flavor: 'bitter'}];
const fakeSeriesDataList1 = [
{
seriesId: 'series1',
Expand All @@ -235,15 +237,25 @@ describe('LineChart', () => {
fixture.detectChanges();

expect(setSeriesDataCallArgs).toEqual([
['series1', [{...fakePoints1[0], wall_time: new Date(fakePoints1[0].x)}]],
[
'series1',
[
{
x: 1610613017,
wall_time: new Date(1610613017 * 1000),
y: 20,
flavor: 'spicy',
},
],
],
]);

fixture.componentInstance.xAxisType = XAxisType.STEP;
fixture.detectChanges();

expect(setSeriesDataCallArgs).toEqual([
setSeriesDataCallArgs[0],
['series1', [{...fakePoints1[0], step: fakePoints1[0].x}]],
['series1', [{x: 1610613017, step: 1610613017, y: 20, flavor: 'spicy'}]],
]);

fixture.componentInstance.seriesDataList = fakeSeriesDataList2;
Expand All @@ -252,7 +264,7 @@ describe('LineChart', () => {
expect(setSeriesDataCallArgs).toEqual([
setSeriesDataCallArgs[0],
setSeriesDataCallArgs[1],
['series2', [{...fakePoints2[0], step: fakePoints2[0].x}]],
['series2', [{x: 1610613025, step: 1610613025, y: 40, flavor: 'bitter'}]],
]);
});

Expand Down