Unverified Commit 2e42d1d8 authored by liuzhe-lz's avatar liuzhe-lz Committed by GitHub
Browse files

Merge pull request #2144 from microsoft/v1.4.1

Merge v1.4.1 back to master
parents f002fcd5 639f7eaf
...@@ -88,7 +88,7 @@ jobs: ...@@ -88,7 +88,7 @@ jobs:
export IMG_NAME=$(dev_docker_img) export IMG_NAME=$(dev_docker_img)
export IMG_TAG=`git describe --tags --abbrev=0`.`date -u +%y%m%d%H%M` export IMG_TAG=`git describe --tags --abbrev=0`.`date -u +%y%m%d%H%M`
echo 'updating docker file for testpyi...' echo 'updating docker file for testpyi...'
sed -ie 's/RUN python3 -m pip --no-cache-dir install nni/RUN python3 -m pip install --user --no-cache-dir --index-url https:\/\/test.pypi.org\/simple --extra-index-url https:\/\/pypi.org\/simple nni/' Dockerfile sed -ie 's/RUN python3 -m pip --no-cache-dir install nni/RUN python3 -m pip install --no-cache-dir --index-url https:\/\/test.pypi.org\/simple --extra-index-url https:\/\/pypi.org\/simple nni/' Dockerfile
else else
docker login -u $(docker_hub_user) -p $(docker_hub_pwd) docker login -u $(docker_hub_user) -p $(docker_hub_pwd)
export IMG_NAME=msranni/nni export IMG_NAME=msranni/nni
......
...@@ -241,9 +241,15 @@ class TableList extends React.Component<TableListProps, TableListState> { ...@@ -241,9 +241,15 @@ class TableList extends React.Component<TableListProps, TableListState> {
// final result in a succeed trial, it may be a dict. // final result in a succeed trial, it may be a dict.
// get intermediate result dict keys array // get intermediate result dict keys array
const { intermediateKey } = this.state; const { intermediateKey } = this.state;
let otherkeys: string[] = ['default']; const otherkeys: string[] = [ ];
if (res.data.length !== 0) { if (res.data.length !== 0) {
otherkeys = Object.keys(parseMetrics(res.data[0].data)); // just add type=number keys
const intermediateMetrics = parseMetrics(res.data[0].data);
for(const key in intermediateMetrics){
if(typeof intermediateMetrics[key] === 'number') {
otherkeys.push(key);
}
}
} }
// intermediateArr just store default val // intermediateArr just store default val
Object.keys(res.data).map(item => { Object.keys(res.data).map(item => {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment