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

Add minimum required driver version messaging in samples #32

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add minimum required driver version messaging in samples #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 33 additions & 1 deletion assets/js/common_utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,18 @@ const KNOWN_COMPATIBLE_CHROMIUM_VERSION = {
'segment-anything': '129.0.6617.0',
'whisper-base': '129.0.6617.0',
'image-classification': '129.0.6617.0'
}
};

const KNOWN_COMPATIBLE_DRIVER_VERSION = {
'whisper-base': {
'intel': '32.0.100.2688',
'qualcomm': '30.0.31.225'
},
'image-classification': {
'intel': '32.0.100.2688',
'qualcomm': '30.0.31.176'
}
};

export const showCompatibleChromiumVersion = (key) => {
const version = KNOWN_COMPATIBLE_CHROMIUM_VERSION[key]
Expand All @@ -22,6 +33,27 @@ export const showCompatibleChromiumVersion = (key) => {
</a>
`;
}
};

export const showCompatibleDriverVersion = (key) => {
const versionInfo = KNOWN_COMPATIBLE_DRIVER_VERSION[key];
if (versionInfo) {
// versionInfo will contain both qc and intel driver info
const driverVersionElement = document.querySelector('#driverinfo');
driverVersionElement.innerHTML = `
Known compatible driver version:
<a href="https://github.com/microsoft/webnn-developer-preview#breaking-changes" title="Known compatible driver version">
<span>Qualcomm: ${versionInfo.qualcomm}</span>
<span>Intel: ${versionInfo.intel}<span>
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368">
<path d="M440-280h80v-240h-80v240Zm40-320q17 0 28.5-11.5T520-640q0-17-11.5-28.5T480-680q-17 0-28.5 11.5T440-640q0
17 11.5 28.5T480-600Zm0 520q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83
0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0
227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z"/>
</svg>
</a>
`
}
}

export const loadScript = async (id, url) => {
Expand Down
1 change: 1 addition & 0 deletions demos/image-classification/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ <h1 class="title">
</div>
<div id="versions">
<div id="chromiumversion"></div>
<div id="driverinfo"></div>
<div id="ortversion"></div>
</div>
</div>
Expand Down
4 changes: 3 additions & 1 deletion demos/image-classification/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ import {
getMinimum,
asyncErrorHandling,
getMode,
showCompatibleChromiumVersion
showCompatibleChromiumVersion,
showCompatibleDriverVersion
} from "../../assets/js/common_utils.js";

transformers.env.backends.onnx.wasm.proxy = false;
Expand Down Expand Up @@ -558,6 +559,7 @@ const ui = async () => {
updateUi();
await setupORT();
showCompatibleChromiumVersion('image-classification');
showCompatibleDriverVersion('image-classification');
const ortversion = document.querySelector("#ortversion");
let transformersJswithOrtVersion = ortversion.innerHTML;
ortversion.innerHTML = `${transformersJswithOrtVersion} · <a href="https://huggingface.co/docs/transformers.js/en/index">Transformer.js</a>`;
Expand Down
1 change: 1 addition & 0 deletions demos/whisper-base/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ <h1 class="title">
<div id="webnnstatus"><span id="circle"></span> <span id="info">WebNN</span></div>
<div id="versions">
<div id="chromiumversion"></div>
<div id="driverinfo"></div>
<div id="ortversion"></div>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion demos/whisper-base/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { Whisper } from "./whisper.js";
import { getQueryValue, webNnStatus, log, logError, concatBuffer, concatBufferArray, logUser, getMode } from "./utils.js";
import { setupORT, showCompatibleChromiumVersion } from '../../assets/js/common_utils.js';
import { setupORT, showCompatibleChromiumVersion, showCompatibleDriverVersion } from '../../assets/js/common_utils.js';
import VADBuilder, { VADMode, VADEvent } from "./vad/embedded.js";
import AudioMotionAnalyzer from './static/js/audioMotion-analyzer.js?min';
import { lcm } from "./vad/math.js";
Expand Down Expand Up @@ -604,6 +604,7 @@ const main = async () => {

await setupORT();
showCompatibleChromiumVersion('whisper-base');
showCompatibleDriverVersion('whisper-base');
ort.env.wasm.numThreads = 1;
ort.env.wasm.simd = true;

Expand Down