Skip to content

HParams: Add new hparams selector factories #6323

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
rileyajones merged 2 commits into from
Apr 19, 2023
Merged

HParams: Add new hparams selector factories #6323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56d6e75
add new hparams selector factories
rileyajones Apr 14, 2023
39b5e5b
remove typecast
rileyajones Apr 18, 2023
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: 1 addition & 0 deletions tensorboard/webapp/hparams/_redux/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ tf_ts_library(
":hparams_actions",
":types",
":utils",
"//tensorboard/webapp:app_state",
"//tensorboard/webapp/hparams:types",
"//tensorboard/webapp/runs/actions",
"@npm//@ngrx/store",
Expand Down
159 changes: 102 additions & 57 deletions tensorboard/webapp/hparams/_redux/hparams_selectors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,81 +25,126 @@ import {
const getHparamsState =
createFeatureSelector<HparamsState>(HPARAMS_FEATURE_KEY);

const getHparamsDefaultFiltersForExperiments = createSelector(
getHparamsState,
(
state: HparamsState,
experimentIds: string[]
): Map<string, DiscreteFilter | IntervalFilter> => {
const defaultFilterMaps: Array<
Map<string, DiscreteFilter | IntervalFilter>
> = [];

for (const experimentId of experimentIds) {
if (!state.specs[experimentId]) {
continue;
}

defaultFilterMaps.push(state.specs[experimentId].hparam.defaultFilters);
function getHparamsDefaultFiltersForExperimentsResultFunction(
state: HparamsState,
experimentIds: string[]
): Map<string, DiscreteFilter | IntervalFilter> {
const defaultFilterMaps: Array<Map<string, DiscreteFilter | IntervalFilter>> =
[];

for (const experimentId of experimentIds) {
if (!state.specs[experimentId]) {
continue;
}

return combineDefaultHparamFilters(defaultFilterMaps);
defaultFilterMaps.push(state.specs[experimentId].hparam.defaultFilters);
}
);

export const getHparamFilterMap = createSelector(
getHparamsDefaultFiltersForExperiments,
return combineDefaultHparamFilters(defaultFilterMaps);
}

const getHparamsDefaultFiltersForExperiments = createSelector(
Copy link
Contributor

@JamesHollyer JamesHollyer Apr 17, 2023

Choose a reason for hiding this comment

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

So this is basically a selector with a prop right? All current calls use this?

Copy link
Contributor Author

@rileyajones rileyajones Apr 18, 2023

Choose a reason for hiding this comment

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

Yeah, exactly. It is only used a dependency of other selectors though

getHparamsState,
(
combinedDefaultfilterMap,
hparamState,
experimentIds: string[]
): Map<string, IntervalFilter | DiscreteFilter> => {
const id = getIdFromExperimentIds(experimentIds);
const otherFilter = hparamState.filters[id];

return new Map([
...combinedDefaultfilterMap,
...(otherFilter?.hparams ?? []),
]);
}
getHparamsDefaultFiltersForExperimentsResultFunction
);

const getMetricsDefaultFiltersForExperiments = createSelector(
getHparamsState,
(
state: HparamsState,
experimentIds: string[]
): Map<string, IntervalFilter> => {
const defaultFilterMaps: Array<Map<string, IntervalFilter>> = [];
function getHparamsDefaultFiltersForExperimentsFromExperimentIds(
experimentIds: string[]
) {
return createSelector(getHparamsState, (state) =>
getHparamsDefaultFiltersForExperimentsResultFunction(state, experimentIds)
);
}

function getHparamFilterMapResultFunction(
hparamState: HparamsState,
combinedDefaultfilterMap: Map<string, DiscreteFilter | IntervalFilter>,
experimentIds: string[]
): Map<string, IntervalFilter | DiscreteFilter> {
const id = getIdFromExperimentIds(experimentIds);
const otherFilter = hparamState.filters[id];

return new Map([
...combinedDefaultfilterMap,
...(otherFilter?.hparams ?? []),
]);
}

for (const experimentId of experimentIds) {
if (!state.specs[experimentId]) {
continue;
}
export const getHparamFilterMap = createSelector(
getHparamsState,
getHparamsDefaultFiltersForExperiments,
getHparamFilterMapResultFunction
);

defaultFilterMaps.push(state.specs[experimentId].metric.defaultFilters);
export function getHparamFilterMapFromExperimentIds(experimentIds: string[]) {
Copy link
Contributor

@JamesHollyer JamesHollyer Apr 17, 2023

Choose a reason for hiding this comment

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

This is the one we want to use in the future?

Copy link
Contributor Author

@rileyajones rileyajones Apr 18, 2023

Choose a reason for hiding this comment

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

Yes

return createSelector(
getHparamsState,
getHparamsDefaultFiltersForExperimentsFromExperimentIds(experimentIds),
(hparamState, combinedDefaultFilterMap) =>
getHparamFilterMapResultFunction(
hparamState,
combinedDefaultFilterMap,
experimentIds
)
);
}

function getMetricsDefaultFiltersForExperimentsResultFunction(
state: HparamsState,
experimentIds: string[]
): Map<string, IntervalFilter> {
const defaultFilterMaps: Array<Map<string, IntervalFilter>> = [];

for (const experimentId of experimentIds) {
if (!state.specs[experimentId]) {
continue;
}

return combineDefaultMetricFilters(defaultFilterMaps);
defaultFilterMaps.push(state.specs[experimentId].metric.defaultFilters);
}

return combineDefaultMetricFilters(defaultFilterMaps);
}

const getMetricsDefaultFiltersForExperiments = createSelector(
getHparamsState,
getMetricsDefaultFiltersForExperimentsResultFunction
);

function getMetricsDefaultFiltersForExperimentsFromExperimentIds(
experimentIds: string[]
) {
return createSelector(getHparamsState, (state) =>
getMetricsDefaultFiltersForExperimentsResultFunction(state, experimentIds)
);
}

function getMetricFilterMapResultFunction(
hparamState: HparamsState,
defaultFilterMap: Map<string, IntervalFilter>,
experimentIds: string[]
): Map<string, IntervalFilter> {
const id = getIdFromExperimentIds(experimentIds);
const otherFilter = hparamState.filters[id];

return new Map([...defaultFilterMap, ...(otherFilter?.metrics ?? [])]);
}

export const getMetricFilterMap = createSelector(
getMetricsDefaultFiltersForExperiments,
getHparamsState,
(
defaultfilterMap,
hparamState,
experimentIds: string[]
): Map<string, IntervalFilter> => {
const id = getIdFromExperimentIds(experimentIds);
const otherFilter = hparamState.filters[id];

return new Map([...defaultfilterMap, ...(otherFilter?.metrics ?? [])]);
}
getMetricsDefaultFiltersForExperiments,
getMetricFilterMapResultFunction
);

export function getMetricFilterMapFromExperimentIds(experimentIds: string[]) {
return createSelector(
getHparamsState,
getMetricsDefaultFiltersForExperimentsFromExperimentIds(experimentIds),
(state, defaultFilterMap) =>
getMetricFilterMapResultFunction(state, defaultFilterMap, experimentIds)
);
}

/**
* Returns Observable that emits hparams and metrics specs of experiments.
*/
Expand Down
Loading