Skip to content

Commit d4afd49

Browse files
update winmldashboard to use latest winmlrunner and winmltools
1 parent b23aab5 commit d4afd49

File tree

7 files changed

+15
-10
lines changed

7 files changed

+15
-10
lines changed

Tools/WinMLDashboard/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"npm-font-open-sans": "^1.1.0",
6262
"office-ui-fabric-react": "^6.40.0",
6363
"react": "^16.5.2",
64-
"react-app-rewired": "^2.1.5",
64+
"react-app-rewired": "1.6.2",
6565
"react-dom": "^16.4.1",
6666
"react-markdown": "^4.3.1",
6767
"react-redux": "^7.2.0",
-195 KB
Binary file not shown.

Tools/WinMLDashboard/public/convert.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ def get_opset(ONNXVersion):
3434
return 7
3535
elif '1.3' == ONNXVersion:
3636
return 8
37+
elif '1.5' == ONNXVersion:
38+
return 10
3739
else:
3840
return 7
3941

Tools/WinMLDashboard/public/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
coremltools_windows==2.0b1
2-
winmltools==1.3.0
2+
winmltools==1.5.1
33
h5py==2.8.0
44
tensorflow==1.12.2
55
Keras==2.2.4

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ class ConvertView extends React.Component<IComponentProperties, IComponentState>
223223
const ONNXVersionOptions = [
224224
{ value: '1.2', label: '1.2 (opset V7)' },
225225
{ value: '1.3', label: '1.3 (opset V8)' },
226+
{ value: '1.5', label: '1.5 (opset V10)' },
226227
]
227228
const QuantizationOptions = [
228229
{ value: 'none', label: 'None' },

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@ class RunView extends React.Component<IComponentProperties, IComponentState> {
323323
}
324324

325325
private logError = (error: string | Error | Error[]) => {
326+
// tslint:disable-next-line:no-shadowed-variable
326327
const toString = (error: string | Error) => typeof error === 'string' ? error : (`${error.stack ? `${error.stack}: ` : ''}${error.message}`);
327328
if (Array.isArray(error)) {
328329
log.error(error.map(toString).join('\n'));

Tools/WinMLDashboard/yarn.lock

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3040,7 +3040,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
30403040
safe-buffer "^5.0.1"
30413041
sha.js "^2.4.8"
30423042

3043-
[email protected], cross-spawn@^5.0.1:
3043+
[email protected], cross-spawn@^5.0.1, cross-spawn@^5.1.0:
30443044
version "5.1.0"
30453045
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
30463046
integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
@@ -3593,7 +3593,7 @@ [email protected]:
35933593
resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275"
35943594
integrity sha1-3vHxyl1gWdJKdm5YeULCEQbOEnU=
35953595

3596-
3596+
[email protected], dotenv@^4.0.0:
35973597
version "4.0.0"
35983598
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d"
35993599
integrity sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0=
@@ -8256,12 +8256,13 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.1:
82568256
minimist "^1.2.0"
82578257
strip-json-comments "~2.0.1"
82588258

8259-
react-app-rewired@^2.1.5:
8260-
version "2.1.5"
8261-
resolved "https://registry.yarnpkg.com/react-app-rewired/-/react-app-rewired-2.1.5.tgz#592ec2eae5c3c5cd96c80930b5dc3f6c34da1dc6"
8262-
integrity sha512-Gr8KfCeL9/PTQs8Vvxc7v8wQ9vCFMnYPhcAkrMlzkLiMFXS+BgSwm11MoERjZm7dpA2WjTi+Pvbu/w7rujAV+A==
8259+
react-app-rewired@1.6.2:
8260+
version "1.6.2"
8261+
resolved "https://registry.yarnpkg.com/react-app-rewired/-/react-app-rewired-1.6.2.tgz#32ce90abc2c4e2b86c71e4e270bd36663b3b1c9a"
8262+
integrity sha512-TxbP1W9jPPTmj0YJeFNgcJc6IMg7sv845aHUIUvVQtXdA8IWzOZairk3Bth6GHbxoF2QitbvUlM7/NAH4VmmJg==
82638263
dependencies:
8264-
semver "^5.6.0"
8264+
cross-spawn "^5.1.0"
8265+
dotenv "^4.0.0"
82658266

82668267
react-dev-utils@^5.0.2:
82678268
version "5.0.3"
@@ -8977,7 +8978,7 @@ semver-diff@^2.0.0:
89778978
dependencies:
89788979
semver "^5.0.3"
89798980

8980-
"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:
8981+
"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:
89818982
version "5.7.1"
89828983
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
89838984
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==

0 commit comments

Comments
 (0)