Skip to content

HParam UI: Change SelectedStepRunData to use name #6362

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
JamesHollyer merged 1 commit into from
May 10, 2023
Merged

HParam UI: Change SelectedStepRunData to use name #6362

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
3 changes: 2 additions & 1 deletion tensorboard/webapp/metrics/views/card_renderer/scalar_card_component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ export class ScalarCardComponent<Downloader> {
@ViewChild(LineChartComponent)
lineChart?: LineChartComponent;
sortingInfo: SortingInfo = {
header: ColumnHeaderType.RUN,
header: ColumnHeaderType.RUN, //This is no longer used but the type needs it or it will break sync. TODO(jameshollyer): remove this once internal code all uses name.
name: 'run',
order: SortingOrder.ASCENDING,
};

Expand Down
88 changes: 46 additions & 42 deletions tensorboard/webapp/metrics/views/card_renderer/scalar_card_data_table.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,60 +131,60 @@ export class ScalarCardDataTable {
}
const selectedStepData: SelectedStepRunData = {
id: datum.id,
color: metadata.color,
};
selectedStepData.COLOR = metadata.color;
for (const header of this.columnHeaders) {
switch (header.type) {
case ColumnHeaderType.RUN:
let alias = '';
if (metadata.alias) {
alias = `${metadata.alias.aliasNumber} ${metadata.alias.aliasText}/`;
}
selectedStepData.RUN = `${alias}${metadata.displayName}`;
selectedStepData[header.name] = `${alias}${metadata.displayName}`;
continue;
case ColumnHeaderType.STEP:
selectedStepData.STEP = closestStartPoint.step;
selectedStepData[header.name] = closestStartPoint.step;
continue;
case ColumnHeaderType.VALUE:
selectedStepData.VALUE = closestStartPoint.value;
selectedStepData[header.name] = closestStartPoint.value;
continue;
case ColumnHeaderType.RELATIVE_TIME:
selectedStepData.RELATIVE_TIME =
selectedStepData[header.name] =
closestStartPoint.relativeTimeInMs;
continue;
case ColumnHeaderType.SMOOTHED:
selectedStepData.SMOOTHED = closestStartPoint.y;
selectedStepData[header.name] = closestStartPoint.y;
continue;
case ColumnHeaderType.VALUE_CHANGE:
if (!closestEndPoint) {
continue;
}
selectedStepData.VALUE_CHANGE =
selectedStepData[header.name] =
closestEndPoint.y - closestStartPoint.y;
continue;
case ColumnHeaderType.START_STEP:
selectedStepData.START_STEP = closestStartPoint.step;
selectedStepData[header.name] = closestStartPoint.step;
continue;
case ColumnHeaderType.END_STEP:
if (!closestEndPoint) {
continue;
}
selectedStepData.END_STEP = closestEndPoint.step;
selectedStepData[header.name] = closestEndPoint.step;
continue;
case ColumnHeaderType.START_VALUE:
selectedStepData.START_VALUE = closestStartPoint.y;
selectedStepData[header.name] = closestStartPoint.y;
continue;
case ColumnHeaderType.END_VALUE:
if (!closestEndPoint) {
continue;
}
selectedStepData.END_VALUE = closestEndPoint.y;
selectedStepData[header.name] = closestEndPoint.y;
continue;
case ColumnHeaderType.MIN_VALUE:
if (!closestEndPointIndex) {
continue;
}
selectedStepData.MIN_VALUE = this.getMinPointInRange(
selectedStepData[header.name] = this.getMinPointInRange(
datum.points,
closestStartPointIndex,
closestEndPointIndex
Expand All @@ -194,7 +194,7 @@ export class ScalarCardDataTable {
if (!closestEndPointIndex) {
continue;
}
selectedStepData.MAX_VALUE = this.getMaxPointInRange(
selectedStepData[header.name] = this.getMaxPointInRange(
datum.points,
closestStartPointIndex,
closestEndPointIndex
Expand All @@ -204,14 +204,14 @@ export class ScalarCardDataTable {
if (!closestEndPoint) {
continue;
}
selectedStepData.PERCENTAGE_CHANGE =
selectedStepData[header.name] =
(closestEndPoint.y - closestStartPoint.y) / closestStartPoint.y;
continue;
case ColumnHeaderType.STEP_AT_MAX:
if (!closestEndPointIndex) {
continue;
}
selectedStepData.STEP_AT_MAX = this.getMaxPointInRange(
selectedStepData[header.name] = this.getMaxPointInRange(
datum.points,
closestStartPointIndex,
closestEndPointIndex
Expand All @@ -221,7 +221,7 @@ export class ScalarCardDataTable {
if (!closestEndPointIndex) {
continue;
}
selectedStepData.STEP_AT_MIN = this.getMinPointInRange(
selectedStepData[header.name] = this.getMinPointInRange(
datum.points,
closestStartPointIndex,
closestEndPointIndex
Expand All @@ -231,7 +231,7 @@ export class ScalarCardDataTable {
if (!closestEndPointIndex) {
continue;
}
selectedStepData.MEAN = this.getMean(
selectedStepData[header.name] = this.getMean(
datum.points,
closestStartPointIndex,
closestEndPointIndex
Expand All @@ -241,7 +241,7 @@ export class ScalarCardDataTable {
if (!closestEndPoint) {
continue;
}
selectedStepData.RAW_CHANGE =
selectedStepData[header.name] =
closestEndPoint.value - closestStartPoint.value;
continue;
default:
Expand All @@ -250,35 +250,39 @@ export class ScalarCardDataTable {
}
return selectedStepData;
});
dataTableData.sort(
(point1: SelectedStepRunData, point2: SelectedStepRunData) => {
const p1 = this.getSortableValue(point1, this.sortingInfo.header);
const p2 = this.getSortableValue(point2, this.sortingInfo.header);
if (p1 < p2) {
return this.sortingInfo.order === SortingOrder.ASCENDING ? -1 : 1;
}
if (p1 > p2) {
return this.sortingInfo.order === SortingOrder.ASCENDING ? 1 : -1;
}

return 0;
}
const sortingHeader = this.columnHeaders.find(
(header) => header.name === this.sortingInfo.name
);
if (sortingHeader !== undefined) {
dataTableData.sort(
(point1: SelectedStepRunData, point2: SelectedStepRunData) => {
if (!sortingHeader) {
return 0;
}
const p1 = this.getSortableValue(point1, sortingHeader);
const p2 = this.getSortableValue(point2, sortingHeader);
if (p1 < p2) {
return this.sortingInfo.order === SortingOrder.ASCENDING ? -1 : 1;
}
if (p1 > p2) {
return this.sortingInfo.order === SortingOrder.ASCENDING ? 1 : -1;
}

return 0;
}
);
}
return dataTableData;
}

private getSortableValue(
point: SelectedStepRunData,
header: ColumnHeaderType
) {
switch (header) {
// The value shown in the "RUN" column is a string concatenation of Alias Id + Alias + Run Name
// but we would actually prefer to sort by just the run name.
case ColumnHeaderType.RUN:
return makeValueSortable(this.chartMetadataMap[point.id].displayName);
default:
return makeValueSortable(point[header]);
private getSortableValue(point: SelectedStepRunData, header: ColumnHeader) {
// The value shown in the "RUN" column is a string concatenation of Alias Id + Alias + Run Name
// but we would actually prefer to sort by just the run name.
if (header.type === ColumnHeaderType.RUN) {
return makeValueSortable(this.chartMetadataMap[point.id].displayName);
}

return makeValueSortable(point[header.name]);
}

orderColumns(headers: ColumnHeader[]) {
Expand Down
Loading