Skip to content
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

Jump to bottom

Displays hparams in scalar card tables #6737

Merged
merged 37 commits into from
Feb 6, 2024
Merged

Displays hparams in scalar card tables #6737

Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
89fc04a
Adds shared hparam related common selectors
hoonji Jan 24, 2024
bed9604
Fixes test description
hoonji Jan 24, 2024
9eef734
Fixes formatting
hoonji Jan 24, 2024
f72b2a2
Changes reorder column events to use source and destination
hoonji Jan 25, 2024
f3130d0
Fixes lint
hoonji Jan 25, 2024
a9c53c3
Runs buildifier
hoonji Jan 25, 2024
f17fe22
Turns groupColumns into a projector function helper
hoonji Jan 26, 2024
555a84e
Merge branch 'hparam_common_selectors' into hparam_update_reorder
hoonji Jan 26, 2024
6e45e6e
Makes runs table use hparam store for hparam columns
hoonji Jan 26, 2024
ec93a93
Changes ColumnGroup to enum
hoonji Jan 27, 2024
cff6ce3
Merge branch 'hparam_common_selectors' into hparam_update_reorder
hoonji Jan 27, 2024
c17894d
Applies comments
hoonji Jan 27, 2024
694251c
Merge branch 'hparam_update_reorder' into hparam_runs_hparams
hoonji Jan 27, 2024
ff8c096
Applies comments
hoonji Jan 27, 2024
999bffc
Adds hparams to scalar tables
hoonji Jan 28, 2024
d3f2cb9
Fixes card view stacking context
hoonji Jan 29, 2024
62f4099
Applies fixes
hoonji Jan 29, 2024
e96b32a
Fixes lint error
hoonji Jan 29, 2024
7f39b54
Fixes lint error
hoonji Jan 29, 2024
ef301e5
Merge branch 'hparam_update_reorder' into hparam_runs_hparams
hoonji Jan 29, 2024
06b550e
Merge branch 'hparam_runs_hparams' into hparam_scalar_table_hparams
hoonji Jan 29, 2024
dd390f0
Revert card view layout paint
hoonji Jan 29, 2024
8f95404
Move contain layout paint to original position
hoonji Jan 29, 2024
c58c14d
Applies fixes
hoonji Jan 30, 2024
90d7125
Applies fixes
hoonji Jan 30, 2024
3dcdefb
Remove unused dataTableColumnAdded action
hoonji Jan 30, 2024
4d7c07a
Adds remove column functionality to scalar tables
hoonji Jan 31, 2024
2a7bb5c
Merge branch 'master' into hparam_scalar_table_hparams
hoonji Feb 1, 2024
2e07ef8
Misc fixes
hoonji Feb 1, 2024
e29efc3
Removes hidable contxt menu option and combines it with removable
hoonji Feb 1, 2024
129b298
Merge branch 'hparam_remove_hidable' into hparam_scalar_table_hparams
hoonji Feb 1, 2024
0428494
Removes hide column functionality from data tables
hoonji Feb 1, 2024
1a1f08b
Adds enableScalarColumnContextMenus feature flag
hoonji Feb 1, 2024
85fa49a
Reverts merge error
hoonji Feb 1, 2024
3dfae7c
Merge branch 'hparam_add_feature_Flag' into hparam_scalar_table_hparams
hoonji Feb 1, 2024
a8a1b5a
Fixes lint
hoonji Feb 1, 2024
9585fb2
Merge branch 'master' into hparam_scalar_table_hparams
hoonji Feb 6, 2024
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
1 change: 0 additions & 1 deletion tensorboard/webapp/metrics/actions/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import {
HeaderEditInfo,
HeaderToggleInfo,
HistogramMode,
MinMaxStep,
PluginType,
TooltipSort,
XAxisType,
Expand Down
50 changes: 16 additions & 34 deletions tensorboard/webapp/metrics/store/metrics_reducers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,47 +275,42 @@ const {initialState, reducers: namespaceContextedReducer} =
removable: false,
sortable: true,
movable: false,
hidable: false,
},
{
type: ColumnHeaderType.SMOOTHED,
name: 'smoothed',
displayName: 'Smoothed',
enabled: true,
removable: false,
removable: true,
sortable: true,
movable: true,
hidable: true,
},
{
type: ColumnHeaderType.VALUE,
name: 'value',
displayName: 'Value',
enabled: true,
removable: false,
removable: true,
sortable: true,
movable: true,
hidable: true,
},
{
type: ColumnHeaderType.STEP,
name: 'step',
displayName: 'Step',
enabled: true,
removable: false,
removable: true,
sortable: true,
movable: true,
hidable: true,
},
{
type: ColumnHeaderType.RELATIVE_TIME,
name: 'relative',
displayName: 'Relative',
enabled: true,
removable: false,
removable: true,
sortable: true,
movable: true,
hidable: true,
},
],
rangeSelectionHeaders: [
Expand All @@ -327,127 +322,114 @@ const {initialState, reducers: namespaceContextedReducer} =
removable: false,
sortable: true,
movable: true,
hidable: true,
},
{
type: ColumnHeaderType.MIN_VALUE,
name: 'min',
displayName: 'Min',
enabled: true,
removable: false,
removable: true,
sortable: true,
movable: true,
hidable: true,
},
{
type: ColumnHeaderType.MAX_VALUE,
name: 'max',
displayName: 'Max',
enabled: true,
removable: false,
removable: true,
sortable: true,
movable: true,
hidable: true,
},
{
type: ColumnHeaderType.START_VALUE,
name: 'start',
displayName: 'Start Value',
enabled: true,
removable: false,
removable: true,
sortable: true,
movable: true,
hidable: true,
},
{
type: ColumnHeaderType.END_VALUE,
name: 'end',
displayName: 'End Value',
enabled: true,
removable: false,
removable: true,
sortable: true,
movable: true,
hidable: true,
},
{
type: ColumnHeaderType.VALUE_CHANGE,
name: 'valueChange',
displayName: 'Value',
enabled: true,
removable: false,
removable: true,
sortable: true,
movable: true,
hidable: true,
},
{
type: ColumnHeaderType.PERCENTAGE_CHANGE,
name: 'percentageChange',
displayName: '%',
enabled: true,
removable: false,
removable: true,
sortable: true,
movable: true,
hidable: true,
},
{
type: ColumnHeaderType.START_STEP,
name: 'startStep',
displayName: 'Start Step',
enabled: true,
removable: false,
removable: true,
sortable: true,
movable: true,
hidable: true,
},
{
type: ColumnHeaderType.END_STEP,
name: 'endStep',
displayName: 'End Step',
enabled: true,
removable: false,
removable: true,
sortable: true,
movable: true,
hidable: true,
},
{
type: ColumnHeaderType.STEP_AT_MAX,
name: 'stepAtMax',
displayName: 'Step At Max',
enabled: false,
removable: false,
removable: true,
sortable: true,
movable: true,
hidable: true,
},
{
type: ColumnHeaderType.STEP_AT_MIN,
name: 'stepAtMin',
displayName: 'Step At Min',
enabled: false,
removable: false,
removable: true,
sortable: true,
movable: true,
hidable: true,
},
{
type: ColumnHeaderType.MEAN,
name: 'mean',
displayName: 'Mean',
enabled: false,
removable: false,
removable: true,
sortable: true,
movable: true,
hidable: true,
},
{
type: ColumnHeaderType.RAW_CHANGE,
name: 'rawChange',
displayName: 'Raw',
enabled: false,
removable: false,
removable: true,
sortable: true,
movable: true,
hidable: true,
},
],
filteredPluginTypes: new Set(),
Expand Down
52 changes: 26 additions & 26 deletions tensorboard/webapp/metrics/store/metrics_selectors_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1819,7 +1819,7 @@ describe('metrics selectors', () => {
singleSelectionHeaders,
rangeSelectionHeaders,
cardStateMap: {
card1: {
'card1': {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suppresses 1p tslint

rangeSelectionOverride:
CardFeatureOverride.OVERRIDE_AS_DISABLED,
},
Expand All @@ -1830,30 +1830,30 @@ describe('metrics selectors', () => {
});

expect(selectors.getGroupedHeadersForCard('card1')(state)).toEqual([
{
jasmine.objectContaining({
type: ColumnHeaderType.RUN,
name: 'run',
displayName: 'My Run name',
enabled: false,
},
{
}),
jasmine.objectContaining({
type: ColumnHeaderType.HPARAM,
name: 'conv_layers',
displayName: 'Conv Layers',
enabled: true,
},
{
}),
jasmine.objectContaining({
type: ColumnHeaderType.HPARAM,
name: 'conv_kernel_size',
displayName: 'Conv Kernel Size',
enabled: true,
},
{
}),
jasmine.objectContaining({
type: ColumnHeaderType.COLOR,
name: 'color',
displayName: 'Color',
enabled: true,
},
}),
]);
});

Expand All @@ -1864,7 +1864,7 @@ describe('metrics selectors', () => {
singleSelectionHeaders,
rangeSelectionHeaders,
cardStateMap: {
card1: {
'card1': {
rangeSelectionOverride: CardFeatureOverride.OVERRIDE_AS_ENABLED,
},
},
Expand All @@ -1874,30 +1874,30 @@ describe('metrics selectors', () => {
});

expect(selectors.getGroupedHeadersForCard('card1')(state)).toEqual([
{
jasmine.objectContaining({
type: ColumnHeaderType.RUN,
name: 'run',
displayName: 'My Run name',
enabled: false,
},
{
}),
jasmine.objectContaining({
type: ColumnHeaderType.HPARAM,
name: 'conv_layers',
displayName: 'Conv Layers',
enabled: true,
},
{
}),
jasmine.objectContaining({
type: ColumnHeaderType.HPARAM,
name: 'conv_kernel_size',
displayName: 'Conv Kernel Size',
enabled: true,
},
{
}),
jasmine.objectContaining({
type: ColumnHeaderType.MEAN,
name: 'mean',
displayName: 'Mean',
enabled: true,
},
}),
]);
});

Expand All @@ -1914,30 +1914,30 @@ describe('metrics selectors', () => {
});

expect(selectors.getGroupedHeadersForCard('card1')(state)).toEqual([
{
jasmine.objectContaining({
type: ColumnHeaderType.RUN,
name: 'run',
displayName: 'My Run name',
enabled: false,
},
{
}),
jasmine.objectContaining({
type: ColumnHeaderType.HPARAM,
name: 'conv_layers',
displayName: 'Conv Layers',
enabled: true,
},
{
}),
jasmine.objectContaining({
type: ColumnHeaderType.HPARAM,
name: 'conv_kernel_size',
displayName: 'Conv Kernel Size',
enabled: true,
},
{
}),
jasmine.objectContaining({
type: ColumnHeaderType.MEAN,
name: 'mean',
displayName: 'Mean',
enabled: true,
},
}),
]);
});
});
Expand Down
6 changes: 6 additions & 0 deletions tensorboard/webapp/metrics/views/card_renderer/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,8 @@ tf_ng_module(
"//tensorboard/webapp/angular:expect_angular_material_progress_spinner",
"//tensorboard/webapp/experiments:types",
"//tensorboard/webapp/feature_flag/store",
"//tensorboard/webapp/hparams",
"//tensorboard/webapp/hparams:types",
"//tensorboard/webapp/metrics:types",
"//tensorboard/webapp/metrics/actions",
"//tensorboard/webapp/metrics/data_source",
Expand Down Expand Up @@ -461,13 +463,17 @@ tf_ts_library(
"//tensorboard/webapp/angular:expect_angular_platform_browser_animations",
"//tensorboard/webapp/angular:expect_ngrx_store_testing",
"//tensorboard/webapp/experiments:types",
"//tensorboard/webapp/hparams/_redux:hparams_actions",
"//tensorboard/webapp/hparams/_redux:hparams_selectors",
"//tensorboard/webapp/hparams/_redux:types",
"//tensorboard/webapp/metrics:test_lib",
"//tensorboard/webapp/metrics:types",
"//tensorboard/webapp/metrics/actions",
"//tensorboard/webapp/metrics/data_source",
"//tensorboard/webapp/metrics/store",
"//tensorboard/webapp/metrics/store:types",
"//tensorboard/webapp/metrics/views/main_view:common_selectors",
"//tensorboard/webapp/runs/store:selectors",
"//tensorboard/webapp/runs/store:testing",
"//tensorboard/webapp/runs/store:types",
"//tensorboard/webapp/testing:mat_icon",
Expand Down
7 changes: 7 additions & 0 deletions tensorboard/webapp/metrics/views/card_renderer/scalar_card_component.ng.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,15 @@
[columnCustomizationEnabled]="columnCustomizationEnabled"
[smoothingEnabled]="smoothingEnabled"
[hparamsEnabled]="hparamsEnabled"
[columnFilters]="columnFilters"
[runToHparamMap]="runToHparamMap"
[selectableColumns]="selectableColumns"
(sortDataBy)="sortDataBy($event)"
(editColumnHeaders)="editColumnHeaders.emit($event)"
(addColumn)="addColumn.emit($event)"
(removeColumn)="removeColumn.emit($event)"
(hideColumn)="hideColumn.emit($event)"
(addFilter)="addFilter.emit($event)"
>
</scalar-card-data-table>
</div>
Expand Down
Loading
Loading