Merge pull request #298 from microsoft/user/xianz/updateWinMLDB

update winmldashboard to use latest winmlrunner and winmltools

Author: zhangxiang1993

Tools/WinMLDashboard/README.md

@@ -1,6 +1,6 @@
 # WinML Dashboard (preview)
 
-WinML Dashboard is a tool for **viewing**, **editing**, **converting**, and **validating** machine learning models for [Windows ML](https://docs.microsoft.com/en-us/windows/ai/) inference engine. The engine is built into Windows 10 and evaluates trained models locally on Windows devices using hardware optimizations for CPU and GPU to enable high performance inferences. [(Download Preview Version of the tool)](https://github.com/Microsoft/Windows-Machine-Learning/releases/tag/v0.6.1)   
+WinML Dashboard is a tool for **viewing**, **editing**, **converting**, and **validating** machine learning models for [Windows ML](https://docs.microsoft.com/en-us/windows/ai/) inference engine. The engine is built into Windows 10 and evaluates trained models locally on Windows devices using hardware optimizations for CPU and GPU to enable high performance inferences. [(Download Preview Version of the tool)](https://github.com/Microsoft/Windows-Machine-Learning/releases/tag/v0.7.0)   
 
 Today there are several different frameworks available for training and evaluating machine learning models, which makes it difficult for app developers to integate models into their product. Windows ML uses [ONNX](http://onnx.ai/) machine learning model format that allows conversion from one framework format to another, and this Dashboard makes it easy to convert models from different frameworks to ONNX. 
 
@@ -84,7 +84,7 @@ To debug your model follow these steps:
 
 You can install an early preview version of WinML Dashboard from here.
 
-[Download Preview Version](https://github.com/Microsoft/Windows-Machine-Learning/releases/tag/v0.6.1)
+[Download Preview Version](https://github.com/Microsoft/Windows-Machine-Learning/releases/tag/v0.7.0)
 
 Note that the prerelease version is not currently signed so you may see a warning about the binary being untrusted when you try to download and run the installer. 
 

Tools/WinMLDashboard/build.js

@@ -9,9 +9,9 @@ resultPromise = electronInstaller.createWindowsInstaller({
     loadingGif: './public/progress_bar.gif',
     noMsi: true,
     outputDirectory: path.join('./installer'), 
-    setupExe: 'WinMLDashboard_setup_0.6.1.exe',
+    setupExe: 'WinMLDashboard_setup_0.7.0.exe',
     setupIcon: './public/winml_icon.ico',
-    version: '0.6.1',
+    version: '0.7.0',
   });
 
 // tslint:disable-next-line:no-console

Tools/WinMLDashboard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "WinMLDashboard",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "icon": "public/winml_icon.ico",
   "description": "Dashboard for development in ONNX using Windows ML",
   "author": "Microsoft Corporation",
@@ -61,7 +61,7 @@
     "npm-font-open-sans": "^1.1.0",
     "office-ui-fabric-react": "^6.40.0",
     "react": "^16.5.2",
-    "react-app-rewired": "^2.1.5",
+    "react-app-rewired": "1.6.2",
     "react-dom": "^16.4.1",
     "react-markdown": "^4.3.1",
     "react-redux": "^7.2.0",

Tools/WinMLDashboard/public/WinMLRunner.exe

@@ -13,9 +13,9 @@
     </div>
     <h3 class="title" > WinML DashBoard</h3>
     <div class="description">
-      <div class="Version">Version: 0.6.1 (prerelease)</div>
-      <div class="Commit">Commit: aa3bbca549ea85cb381095b075d62517cb3b541c</div>
-      <div class="Date">Date: Oct 17, 2018</div>
+      <div class="Version">Version: 0.7.0 (prerelease)</div>
+      <div class="Commit">Commit: cb16acb59be3541118c9ef413c498c22158c91f7</div>
+      <div class="Date">Date: Mar 2, 2020</div>
       <div class="Architecture">Architecture: x64</div>
     </div>
   </body>

Tools/WinMLDashboard/public/about.html

@@ -34,6 +34,8 @@ def get_opset(ONNXVersion):
         return 7
     elif '1.3' == ONNXVersion:
         return 8
+    elif '1.5' == ONNXVersion:
+        return 10
     else:
         return 7
 

Tools/WinMLDashboard/public/convert.py

@@ -1,5 +1,5 @@
 coremltools_windows==2.0b1
-winmltools==1.3.0
+winmltools==1.5.1
 h5py==2.8.0
 tensorflow==1.12.2
 Keras==2.2.4

Tools/WinMLDashboard/public/requirements.txt

@@ -223,6 +223,7 @@ class ConvertView extends React.Component<IComponentProperties, IComponentState>
         const ONNXVersionOptions = [
             { value: '1.2', label: '1.2 (opset V7)' },
             { value: '1.3', label: '1.3 (opset V8)' },
+            { value: '1.5', label: '1.5 (opset V10)' },
         ]
         const QuantizationOptions = [
             { value: 'none', label: 'None' },

Tools/WinMLDashboard/src/view/convert/View.tsx

@@ -323,6 +323,7 @@ class RunView extends React.Component<IComponentProperties, IComponentState> {
     }
 
     private logError = (error: string | Error | Error[]) => {
+        // tslint:disable-next-line:no-shadowed-variable
         const toString = (error: string | Error) => typeof error === 'string' ? error : (`${error.stack ? `${error.stack}: ` : ''}${error.message}`);
         if (Array.isArray(error)) {
             log.error(error.map(toString).join('\n'));

Tools/WinMLDashboard/src/view/run/View.tsx

@@ -3040,7 +3040,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-[email protected], cross-spawn@^5.0.1:
+[email protected], cross-spawn@^5.0.1, cross-spawn@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
   integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
@@ -3593,7 +3593,7 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275"
   integrity sha1-3vHxyl1gWdJKdm5YeULCEQbOEnU=
 
-[email protected]:
+[email protected], dotenv@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d"
   integrity sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0=
@@ -8256,12 +8256,13 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.1:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-app-rewired@^2.1.5:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/react-app-rewired/-/react-app-rewired-2.1.5.tgz#592ec2eae5c3c5cd96c80930b5dc3f6c34da1dc6"
-  integrity sha512-Gr8KfCeL9/PTQs8Vvxc7v8wQ9vCFMnYPhcAkrMlzkLiMFXS+BgSwm11MoERjZm7dpA2WjTi+Pvbu/w7rujAV+A==
+react-app-rewired@1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/react-app-rewired/-/react-app-rewired-1.6.2.tgz#32ce90abc2c4e2b86c71e4e270bd36663b3b1c9a"
+  integrity sha512-TxbP1W9jPPTmj0YJeFNgcJc6IMg7sv845aHUIUvVQtXdA8IWzOZairk3Bth6GHbxoF2QitbvUlM7/NAH4VmmJg==
   dependencies:
-    semver "^5.6.0"
+    cross-spawn "^5.1.0"
+    dotenv "^4.0.0"
 
 react-dev-utils@^5.0.2:
   version "5.0.3"
@@ -8977,7 +8978,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0, semver@^5.7.0:
+"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.7.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==