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

Fix problems in the UI for v1alpha2 #623

Merged
merged 4 commits into from
Jun 3, 2019
Merged

Fix problems in the UI for v1alpha2 #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e38804
Fix AlgorithmName in Params Submit
andreyvelich Jun 3, 2019
3cef490
Merge remote-tracking branch 'upstream/master' into v1alpha2-fix-ui-i…
andreyvelich Jun 3, 2019
7d271bd
Fix TrialPath in Submit by Params
andreyvelich Jun 3, 2019
b802ad1
Fix name in InputSizes and OutputSizes
andreyvelich Jun 3, 2019
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: 4 additions & 4 deletions pkg/ui/v1alpha2/frontend/build/asset-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"main.js": "./static/js/main.f351e826.chunk.js",
"main.js": "./static/js/main.d78b9e35.chunk.js",
"runtime~main.js": "./static/js/runtime~main.d653cc00.js",
"static/css/2.dc94f09c.chunk.css": "./static/css/2.dc94f09c.chunk.css",
"static/js/2.eeb558c1.chunk.js": "./static/js/2.eeb558c1.chunk.js",
"static/css/2.3e32d45a.chunk.css": "./static/css/2.3e32d45a.chunk.css",
"static/js/2.f25c288f.chunk.js": "./static/js/2.f25c288f.chunk.js",
"index.html": "./index.html",
"precache-manifest.132ad270a2a06bc0699825b1f63d403c.js": "./precache-manifest.132ad270a2a06bc0699825b1f63d403c.js",
"precache-manifest.b5642a08f636bd8c874629e1082b907c.js": "./precache-manifest.b5642a08f636bd8c874629e1082b907c.js",
"service-worker.js": "./service-worker.js"
}
2 changes: 1 addition & 1 deletion pkg/ui/v1alpha2/frontend/build/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script><script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script><script type="text/javascript" src="https://d3js.org/d3.v5.min.js"></script><script type="text/javascript" src="https://underscorejs.org/underscore-min.js"></script><script src="https://ajaxorg.github.io/ace-builds/src-min-noconflict/ace.js" type="text/javascript" charset="utf-8"></script><script src="https://ajaxorg.github.io/ace-builds/src-min-noconflict/mode-xml.js"></script><script src="https://unpkg.com/viz.js@1.8.0/viz.js" type="javascript/worker"></script><meta charset="utf-8"/><link rel="shortcut icon" href="./logo.png"/><meta http-equiv="Access-Control-Allow-Origin" content="*"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><style>body{background-color:#f7f7f7,}</style><title>Katib UI</title><link href="./static/css/2.dc94f09c.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],p[t]&&i.push(p[t][0]),p[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return c.push.apply(c,u||[]),a()}function a(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==p[u]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},p={1:0},c=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="./";var r=window.webpackJsonp=window.webpackJsonp||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="./static/js/2.eeb558c1.chunk.js"></script><script src="./static/js/main.f351e826.chunk.js"></script></body></html>
<!doctype html><html lang="en"><head><script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script><script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script><script type="text/javascript" src="https://d3js.org/d3.v5.min.js"></script><script type="text/javascript" src="https://underscorejs.org/underscore-min.js"></script><script src="https://ajaxorg.github.io/ace-builds/src-min-noconflict/ace.js" type="text/javascript" charset="utf-8"></script><script src="https://ajaxorg.github.io/ace-builds/src-min-noconflict/mode-xml.js"></script><script src="https://unpkg.com/viz.js@1.8.0/viz.js" type="javascript/worker"></script><meta charset="utf-8"/><link rel="shortcut icon" href="./logo.png"/><meta http-equiv="Access-Control-Allow-Origin" content="*"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><style>body{background-color:#f7f7f7,}</style><title>Katib UI</title><link href="./static/css/2.3e32d45a.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],p[t]&&i.push(p[t][0]),p[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return c.push.apply(c,u||[]),a()}function a(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==p[u]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},p={1:0},c=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="./";var r=window.webpackJsonp=window.webpackJsonp||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="./static/js/2.f25c288f.chunk.js"></script><script src="./static/js/main.d78b9e35.chunk.js"></script></body></html>
22 changes: 0 additions & 22 deletions pkg/ui/v1alpha2/frontend/build/precache-manifest.132ad270a2a06bc0699825b1f63d403c.js
View file
Open in desktop

This file was deleted.

22 changes: 22 additions & 0 deletions pkg/ui/v1alpha2/frontend/build/precache-manifest.b5642a08f636bd8c874629e1082b907c.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
self.__precacheManifest = [
{
"revision": "8c97409f0ee389fe75da",
"url": "./static/js/runtime~main.d653cc00.js"
},
{
"revision": "a3290cbb6818d0eece98",
"url": "./static/js/main.d78b9e35.chunk.js"
},
{
"revision": "6cfd875360e0c8691af9",
"url": "./static/js/2.f25c288f.chunk.js"
},
{
"revision": "6cfd875360e0c8691af9",
"url": "./static/css/2.3e32d45a.chunk.css"
},
{
"revision": "81edf08805bf6e66d60c19f9dcc0c203",
"url": "./index.html"
}
];
2 changes: 1 addition & 1 deletion pkg/ui/v1alpha2/frontend/build/service-worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");

importScripts(
"./precache-manifest.132ad270a2a06bc0699825b1f63d403c.js"
"./precache-manifest.b5642a08f636bd8c874629e1082b907c.js"
);

workbox.clientsClaim();
Expand Down
9 changes: 9 additions & 0 deletions pkg/ui/v1alpha2/frontend/build/static/css/2.3e32d45a.chunk.css
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions pkg/ui/v1alpha2/frontend/build/static/css/2.dc94f09c.chunk.css
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion pkg/ui/v1alpha2/frontend/build/static/js/2.eeb558c1.chunk.js
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions pkg/ui/v1alpha2/frontend/build/static/js/2.f25c288f.chunk.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions pkg/ui/v1alpha2/frontend/build/static/js/main.d78b9e35.chunk.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion pkg/ui/v1alpha2/frontend/build/static/js/main.f351e826.chunk.js
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions pkg/ui/v1alpha2/frontend/src/components/HP/Create/HPParameters.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,16 +120,17 @@ const HPParameters = (props) => {
data.spec.parameters = []
addParameter(props.parameters, data.spec.parameters)

//TODO: Add support not only for default ConfigMap for Trial-Templates
data.spec.trialTemplate = {
goTemplate: {
templatePath: props.trial
templateSpec: {
configMapName: "trial-template",
configMapNamespace: data.metadata.namespace,
templatePath: props.trial,
}
}
}

console.log("DATA BEFORE BACKEND")
console.log(data)


props.submitHPJob(data)
}

Expand Down
14 changes: 9 additions & 5 deletions pkg/ui/v1alpha2/frontend/src/components/NAS/Create/NASParameters.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,20 +132,24 @@ const NASParameters = (props) => {
data.spec.nasConfig = {}
data.spec.nasConfig.graphConfig = {
numLayers: Number(props.numLayers),
inputSize: props.inputSize.map(size => Number(size)),
outputSize: props.outputSize.map(size => Number(size)),
inputSizes: props.inputSize.map(size => Number(size)),
outputSizes: props.outputSize.map(size => Number(size)),
}
data.spec.nasConfig.operations = []
addOperations(props.operations, data.spec.nasConfig.operations)


//TODO: Add support not only for default ConfigMap for Trial-Templates
data.spec.trialTemplate = {
goTemplate: {
templatePath: props.trial,
templateSpec: {
configMapName: "trial-template",
configMapNamespace: data.metadata.namespace,
templatePath: props.trial,
}
}
}

console.log("DATA BEFORE BACKEND")
console.log(data)
props.submitNASJob(data)
}

Expand Down
8 changes: 4 additions & 4 deletions pkg/ui/v1alpha2/frontend/src/components/NAS/Create/Params/NASConfig.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,10 @@ const NASConfig = (props) => {
<Grid container alignItems={"center"}>
<Grid item xs={12} sm={3}>
<Typography variant={"subheading"}>
<Tooltip title={"Dimensions of input size"}>
<Tooltip title={"Dimensions of input sizes"}>
<HelpOutlineIcon className={classes.help} color={"primary"}/>
</Tooltip>
{"InputSize"}
{"InputSizes"}
</Typography>
</Grid>
<Grid item xs={12} sm={6}>
Expand Down Expand Up @@ -203,10 +203,10 @@ const NASConfig = (props) => {
<Grid container alignItems={"center"}>
<Grid item xs={12} sm={3}>
<Typography variant={"subheading"}>
<Tooltip title={"Dimensions of output size"}>
<Tooltip title={"Dimensions of output sizes"}>
<HelpOutlineIcon className={classes.help} color={"primary"}/>
</Tooltip>
{"OutputSize"}
{"OutputSizes"}
</Typography>
</Grid>
<Grid item xs={12} sm={6}>
Expand Down
2 changes: 1 addition & 1 deletion pkg/ui/v1alpha2/frontend/src/reducers/hpCreate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const initialState = {
value: "accuracy"
}
],
algorithmName: [ "random" ],
algorithmName: "random",
allAlgorithms: ["grid", "random", "hyperband"],
algorithmSettings: [

Expand Down
4 changes: 2 additions & 2 deletions pkg/ui/v1alpha2/frontend/src/reducers/nasCreate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const initialState = {
}
],
additionalMetricNames: [],
algorithmName: [ "nasrl" ],
algorithmName: "nasrl",
allAlgorithms: ["nasrl", "envelopenet"],
algorithmSettings: [
{
Expand Down Expand Up @@ -105,7 +105,7 @@ const initialState = {
}
],
//Graph Config
numLayers: '1',
numLayers: '8',
inputSize: ['32', '32', '3'],
outputSize: ['10'],
operations: [
Expand Down