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

UI: Support metrics strategies to submit Experiment by parameters #1364

Merged
merged 3 commits into from
Oct 27, 2020
Merged

UI: Support metrics strategies to submit Experiment by parameters #1364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c615e3
Add metric strategies to submit by params Experiment page
andreyvelich Oct 22, 2020
e684463
Fix additional metric names
andreyvelich Oct 22, 2020
f4cba76
Add checkbox style
andreyvelich Oct 22, 2020
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
8 changes: 8 additions & 0 deletions pkg/ui/v1beta1/frontend/src/actions/hpCreateActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,14 @@ export const editMetrics = (index, value) => ({
value,
});

export const CHANGE_METRIC_STRATEGY_HP = 'CHANGE_METRIC_STRATEGY_HP';

export const metricStrategyChange = (index, strategy) => ({
type: CHANGE_METRIC_STRATEGY_HP,
index,
strategy,
});

export const CHANGE_ALGORITHM_NAME_HP = 'CHANGE_ALGORITHM_NAME_HP';

export const changeAlgorithmName = algorithmName => ({
Expand Down
8 changes: 8 additions & 0 deletions pkg/ui/v1beta1/frontend/src/actions/nasCreateActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@ export const editMetrics = (index, value) => ({
value,
});

export const CHANGE_METRIC_STRATEGY_NAS = 'CHANGE_METRIC_STRATEGY_NAS';

export const metricStrategyChange = (index, strategy) => ({
type: CHANGE_METRIC_STRATEGY_NAS,
index,
strategy,
});

export const CHANGE_ALGORITHM_NAME_NAS = 'CHANGE_ALGORITHM_NAME_NAS';

export const changeAlgorithmName = algorithmName => ({
Expand Down
72 changes: 28 additions & 44 deletions pkg/ui/v1beta1/frontend/src/components/HP/Create/HPParameters.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,38 +28,13 @@ const styles = theme => ({
},
submit: {
textAlign: 'center',
marginTop: 10,
},
textField: {
marginLeft: 4,
marginRight: 4,
width: '100%',
},
help: {
padding: 4 / 2,
verticalAlign: 'middle',
},
section: {
padding: 4,
},
parameter: {
padding: 2,
},
formControl: {
margin: 4,
width: '100%',
},
selectEmpty: {
marginTop: 10,
},
button: {
margin: 10,
margin: 20,
},
});

const SectionInTypography = (name, classes) => {
const SectionInTypography = name => {
return (
<div className={classes.section}>
<div>
<Grid container>
<Grid item xs={12} sm={12}>
<Typography variant="h6">{name}</Typography>
Expand Down Expand Up @@ -107,16 +82,29 @@ const addParameter = (source, destination) => {
const HPParameters = props => {
const submitJob = () => {
let data = {};

// Add metadata.
data.metadata = {};
deCapitalizeFirstLetterAndAppend(props.commonParametersMetadata, data.metadata);

// Add common parameters.
data.spec = {};
deCapitalizeFirstLetterAndAppend(props.commonParametersSpec, data.spec);

// Add objective.
data.spec.objective = {};
deCapitalizeFirstLetterAndAppend(props.objective, data.spec.objective);
data.spec.objective.additionalMetricNames = props.additionalMetricNames.map(
(metrics, i) => metrics.value,
);

// Add additional metrics.
data.spec.objective.additionalMetricNames = props.additionalMetricNames;

// Add metric strategies.
data.spec.objective.metricStrategies = props.metricStrategies.map(metric => ({
name: metric.name,
value: metric.strategy,
}));

// Add algorithm.
data.spec.algorithm = {};
data.spec.algorithm.algorithmName = props.algorithmName;
data.spec.algorithm.algorithmSettings = [];
Expand Down Expand Up @@ -209,30 +197,25 @@ const HPParameters = props => {
return (
<div className={classes.root}>
{/* Common Metadata */}
{SectionInTypography('Metadata', classes)}
{SectionInTypography('Metadata')}
<br />
<CommonParametersMeta />
{SectionInTypography('Common Parameters', classes)}
{SectionInTypography('Common Parameters')}
<CommonParametersSpec />
{SectionInTypography('Objective', classes)}
{SectionInTypography('Objective')}
<Objective />
{SectionInTypography('Algorithm', classes)}
{SectionInTypography('Algorithm')}
<Algorithm />

{SectionInTypography('Parameters', classes)}
{SectionInTypography('Parameters')}
<Parameters />
{SectionInTypography('Metrics Collector Spec', classes)}
{SectionInTypography('Metrics Collector Spec')}
<MetricsCollectorSpec jobType={constants.EXPERIMENT_TYPE_HP} />
{SectionInTypography('Trial Template Spec', classes)}
{SectionInTypography('Trial Template Spec')}
<TrialTemplate />

<div className={classes.submit}>
<Button
variant="contained"
color={'primary'}
className={classes.button}
onClick={submitJob}
>
<Button variant="contained" color={'primary'} onClick={submitJob}>
Deploy
</Button>
</div>
Expand Down Expand Up @@ -261,6 +244,7 @@ const mapStateToProps = state => {
commonParametersSpec: state[constants.HP_CREATE_MODULE].commonParametersSpec,
objective: state[constants.HP_CREATE_MODULE].objective,
additionalMetricNames: state[constants.HP_CREATE_MODULE].additionalMetricNames,
metricStrategies: state[constants.HP_CREATE_MODULE].metricStrategies,
algorithmName: state[constants.HP_CREATE_MODULE].algorithmName,
algorithmSettings: state[constants.HP_CREATE_MODULE].algorithmSettings,
parameters: state[constants.HP_CREATE_MODULE].parameters,
Expand Down
4 changes: 0 additions & 4 deletions pkg/ui/v1beta1/frontend/src/components/HP/Create/Params/Algorithm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ import { HP_CREATE_MODULE } from '../../../../constants/constants';

const useStyles = makeStyles({
textField: {
marginLeft: 4,
marginRight: 4,
width: '80%',
},
help: {
Expand All @@ -45,7 +43,6 @@ const useStyles = makeStyles({
verticalAlign: 'middle !important',
},
formControl: {
margin: 4,
width: '100%',
},
addButton: {
Expand Down Expand Up @@ -98,7 +95,6 @@ const Algorithm = props => {
value={props.algorithmName}
onChange={onAlgorithmNameChange}
label="Algorithm Name"
className={classes.select}
>
{props.allAlgorithms.map((algorithm, i) => {
return (
Expand Down
2 changes: 0 additions & 2 deletions pkg/ui/v1beta1/frontend/src/components/HP/Create/Params/CommonMeta.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import { GENERAL_MODULE, HP_CREATE_MODULE } from '../../../../constants/constant

const styles = () => ({
textField: {
marginLeft: 4,
marginRight: 4,
width: '100%',
},
help: {
Expand Down
2 changes: 0 additions & 2 deletions pkg/ui/v1beta1/frontend/src/components/HP/Create/Params/CommonSpec.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import { HP_CREATE_MODULE } from '../../../../constants/constants';

const useStyles = makeStyles({
textField: {
marginLeft: 4,
marginRight: 4,
width: '100%',
},
help: {
Expand Down
Loading