Merge pull request #2959 from microsoft/v1.9

Merge v1.9 back to master

azure-pipelines.yml

@@ -101,9 +101,9 @@ jobs:
     displayName: 'Simple test'
 
 
-- job: 'macos_1015_python37'
+- job: 'macos_latest_python37'
   pool:
-    vmImage: 'macOS-10.15'
+    vmImage: 'macOS-latest'
 
   steps:
   - script: |

src/sdk/pynni/nni/compression/torch/speedup/infer_shape.py

@@ -573,7 +573,7 @@ def view_inshape(module_masks, mask, shape):
     step_size = shape['in_shape'][2] * shape['in_shape'][3]
     for loc in mask.mask_index[1]:
         index.extend([loc * step_size + i for i in range(step_size)])
-    output_cmask.add_index_mask(dim=1, index=torch.tensor(index))  # pylint: disable=not-callable
+    output_cmask.add_index_mask(dim=1, index=torch.tensor(index).to(mask.mask_index[1].device))  # pylint: disable=not-callable
     module_masks.set_output_mask(output_cmask)
     return output_cmask
 
@@ -609,7 +609,7 @@ def view_outshape(module_masks, mask, shape):
     step_size = shape['in_shape'][2] * shape['in_shape'][3]
     for loc in mask.mask_index[1]:
         index.extend([loc * step_size + i for i in range(step_size)])
-    input_cmask.add_index_mask(dim=1, index=torch.tensor(index))  # pylint: disable=not-callable
+    input_cmask.add_index_mask(dim=1, index=torch.tensor(index).to(mask.mask_index[1].device))  # pylint: disable=not-callable
     module_masks.set_input_mask(input_cmask)
 
     return input_cmask
@@ -870,7 +870,7 @@ def convert_to_coarse_mask(mask, dim=0):
         if index is None:
             return None, None, None
         else:
-            index = torch.LongTensor(index).to(weight_mask.device)
+            index = index.long().to(weight_mask.device)
             weight_cmask = CoarseMask(num_dim=4)
             weight_cmask.add_index_mask(dim=dim, index=index)
             bias_cmask = None

src/webui/.eslintrc

@@ -28,6 +28,7 @@
         "@typescript-eslint/no-inferrable-types": 0,
         "@typescript-eslint/no-use-before-define": [2, "nofunc"],
         "@typescript-eslint/no-var-requires": 0,
+        "@typescript-eslint/no-unused-vars": [2, { "argsIgnorePattern": "^_" }],
         "arrow-parens": [2, "as-needed"],
         "no-inner-declarations": 0,
         "no-empty": 2,

src/webui/src/App.scss

@@ -26,9 +26,9 @@
 }
 
 .content {
-    width: 89%;
-    min-width: 1024px;
+    width: 87%;
     margin: 0 auto;
+    min-width: 1200px;
     margin-top: 74px;
     margin-bottom: 30px;
 }

src/webui/src/App.tsx

@@ -4,6 +4,7 @@ import { COLUMN } from './static/const';
 import { EXPERIMENT, TRIALS } from './static/datamodel';
 import NavCon from './components/NavCon';
 import MessageInfo from './components/modals/MessageInfo';
+import { TrialConfigButton } from './components/public-child/config/TrialConfigButton';
 import './App.scss';
 
 interface AppState {
@@ -30,12 +31,13 @@ export const AppContext = React.createContext({
     // eslint-disable-next-line @typescript-eslint/no-empty-function, @typescript-eslint/no-unused-vars
     changeMetricGraphMode: (val: 'max' | 'min') => {},
     // eslint-disable-next-line @typescript-eslint/no-empty-function, @typescript-eslint/no-unused-vars
-    changeEntries: (val: string) => {}
+    changeEntries: (val: string) => {},
+    // eslint-disable-next-line @typescript-eslint/no-empty-function, @typescript-eslint/no-unused-vars
+    updateOverviewPage: () => {}
 });
 
 class App extends React.Component<{}, AppState> {
     private timerId!: number | undefined;
-    private dataFormatimer!: number;
     private firstLoad: boolean = false; // when click refresh selector options
     constructor(props: {}) {
         super(props);
@@ -60,35 +62,8 @@ class App extends React.Component<{}, AppState> {
             metricGraphMode: EXPERIMENT.optimizeMode === 'minimize' ? 'min' : 'max'
         }));
         this.timerId = window.setTimeout(this.refresh, this.state.interval * 100);
-        // final result is legal
-        // get a succeed trial，see final result data's format
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        this.dataFormatimer = window.setInterval(this.getFinalDataFormat, this.state.interval * 1000);
     }
 
-    getFinalDataFormat = (): void => {
-        for (let i = 0; this.state.isillegalFinal === false; i++) {
-            if (TRIALS.succeededTrials()[0] !== undefined && TRIALS.succeededTrials()[0].final !== undefined) {
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                const oneSucceedTrial = JSON.parse(JSON.parse(TRIALS.succeededTrials()[0].final!.data));
-                if (typeof oneSucceedTrial === 'number' || oneSucceedTrial.hasOwnProperty('default')) {
-                    window.clearInterval(this.dataFormatimer);
-                    break;
-                } else {
-                    // illegal final data
-                    this.setState(() => ({
-                        isillegalFinal: true,
-                        expWarningMessage:
-                            'WebUI support final result as number and dictornary includes default keys, your experiment final result is illegal, please check your data.'
-                    }));
-                    window.clearInterval(this.dataFormatimer);
-                }
-            } else {
-                break;
-            }
-        }
-    };
-
     changeInterval = (interval: number): void => {
         window.clearTimeout(this.timerId);
         if (interval === 0) {
@@ -116,6 +91,12 @@ class App extends React.Component<{}, AppState> {
         this.setState({ bestTrialEntries: entries });
     };
 
+    updateOverviewPage = (): void => {
+        this.setState(state => ({
+            experimentUpdateBroadcast: state.experimentUpdateBroadcast + 1
+        }));
+    };
+
     shouldComponentUpdate(nextProps: any, nextState: AppState): boolean {
         if (!(nextState.isUpdate || nextState.isUpdate === undefined)) {
             nextState.isUpdate = true;
@@ -155,6 +136,8 @@ class App extends React.Component<{}, AppState> {
                 </div>
                 <Stack className='contentBox'>
                     <Stack className='content'>
+                        {/* search space & config */}
+                        <TrialConfigButton />
                         {/* if api has error field, show error message */}
                         {errorList.map(
                             (item, key) =>
@@ -179,7 +162,8 @@ class App extends React.Component<{}, AppState> {
                                 metricGraphMode,
                                 changeMetricGraphMode: this.changeMetricGraphMode,
                                 bestTrialEntries,
-                                changeEntries: this.changeEntries
+                                changeEntries: this.changeEntries,
+                                updateOverviewPage: this.updateOverviewPage
                             }}
                         >
                             {this.props.children}