Skip to content

Add dynamicImport as an engine require #14053

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

Merged
merged 2 commits into from
Nov 20, 2023
Merged

Add dynamicImport as an engine require #14053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d1af51
Add dynamicImport as an engine require
davidrapoport Nov 20, 2023
71ef605
Change enum type to webWorkerDynamicImport and add it as a requiremen…
davidrapoport Nov 20, 2023
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
20 changes: 12 additions & 8 deletions ui/ceval/src/engines/engines.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export class Engines {
name: 'Stockfish 16 NNUE · 7MB',
short: 'SF 16 · 7MB',
tech: 'NNUE',
requires: 'simd',
requires: ['simd', 'webWorkerDynamicImport'],
minMem: 1536,
assets: {
version: 'sfw002',
Expand All @@ -54,7 +54,7 @@ export class Engines {
name: 'Stockfish 16 NNUE · 40MB',
short: 'SF 16 · 40MB',
tech: 'NNUE',
requires: 'simd',
requires: ['simd', 'webWorkerDynamicImport'],
minMem: 2048,
assets: {
version: 'sfw002',
Expand All @@ -70,7 +70,7 @@ export class Engines {
name: 'Stockfish 14 NNUE',
short: 'SF 14',
tech: 'NNUE',
requires: 'simd',
requires: ['simd'],
minMem: 2048,
assets: {
version: 'b6939d',
Expand All @@ -87,7 +87,7 @@ export class Engines {
name: 'Fairy Stockfish 14+',
short: 'FSF 14+',
tech: 'HCE',
requires: 'simd',
requires: ['simd', 'webWorkerDynamicImport'],
variants: [
'crazyhouse',
'atomic',
Expand All @@ -112,7 +112,7 @@ export class Engines {
name: 'Stockfish 11 Multi-Variant',
short: 'SF 11 MV',
tech: 'HCE',
requires: 'sharedMem',
requires: ['sharedMem'],
variants: [
'crazyhouse',
'atomic',
Expand Down Expand Up @@ -140,7 +140,7 @@ export class Engines {
name: 'Stockfish 11 HCE',
short: 'SF 11',
tech: 'HCE',
requires: 'sharedMem',
requires: ['sharedMem'],
assets: {
version: 'a022fa',
root: 'npm/stockfish.wasm',
Expand All @@ -157,7 +157,7 @@ export class Engines {
short: 'Stockfish',
tech: 'HCE',
maxThreads: 1,
requires: 'wasm',
requires: ['wasm'],
obsoletedBy: 'sharedMem',
assets: {
version: 'a022fa',
Expand All @@ -184,7 +184,11 @@ export class Engines {
make: (e: BrowserEngineInfo) => new SimpleEngine(e, progress),
},
]
.filter(e => hasFeature(e.info.requires) && !(e.info.obsoletedBy && hasFeature(e.info.obsoletedBy)))
.filter(
e =>
e.info.requires?.map(req => hasFeature(req)).every(x => !!x) &&
!(e.info.obsoletedBy && hasFeature(e.info.obsoletedBy)),
)
.map(e => [e.info.id, { info: withDefaults(e.info as BrowserEngineInfo), make: e.make }]),
);
}
Expand Down
2 changes: 1 addition & 1 deletion ui/ceval/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export interface EngineInfo {
variants?: VariantKey[];
maxThreads?: number;
maxHash?: number;
requires?: Feature;
requires?: Feature[];
}

export interface ExternalEngineInfo extends EngineInfo {
Expand Down
6 changes: 3 additions & 3 deletions ui/ceval/src/view/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ function engineName(ctrl: CevalCtrl): VNode[] {
},
engineTech,
)
: engine.requires === 'simd'
: engine.requires?.includes('simd')
? h(
'span.technology.good',
{
Expand All @@ -119,9 +119,9 @@ function engineName(ctrl: CevalCtrl): VNode[] {
},
engineTech,
)
: engine.requires === 'sharedMem'
: engine.requires?.includes('sharedMem')
? h('span.technology.good', { attrs: { title: 'Multi-threaded WebAssembly' } }, engineTech)
: engine.requires === 'wasm'
: engine.requires?.includes('wasm')
? h('span.technology', { attrs: { title: 'Single-threaded WebAssembly' } }, engineTech)
: h('span.technology', { attrs: { title: 'Single-threaded JavaScript' } }, engineTech),
]
Expand Down
16 changes: 15 additions & 1 deletion ui/common/src/device.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,25 @@ export const isIOS = (constraint?: { below?: number; atLeast?: number }) => {

export const isChrome = (): boolean => /Chrome\//.test(navigator.userAgent);

export const isFirefox = (): boolean => /Firefox/.test(navigator.userAgent);

export const getFirefoxMajorVersion = (): number => {
if (!isFirefox()) {
return 0;
}
const match = /Firefox\/(\d*)/.exec(navigator.userAgent);
if (!match || match.length < 2) return 0;
return parseInt(match[1]);
};

export const isIOSChrome = (): boolean => /CriOS/.test(navigator.userAgent);

export const isTouchDevice = () => !hasMouse();

export const isIPad = (): boolean =>
navigator?.maxTouchPoints > 2 && /iPad|Macintosh/.test(navigator.userAgent);

export type Feature = 'wasm' | 'sharedMem' | 'simd';
export type Feature = 'wasm' | 'sharedMem' | 'simd' | 'webWorkerDynamicImport';

export const hasFeature = (feat?: string) => !feat || features().includes(feat as Feature);

Expand All @@ -80,6 +91,9 @@ export const features = memoize<readonly Feature[]>(() => {
if (WebAssembly.validate(sourceWithSimd)) features.push('simd');
}
}
if (!getFirefoxMajorVersion() || getFirefoxMajorVersion() >= 114) {
features.push('webWorkerDynamicImport');
}
return Object.freeze(features);
});

Expand Down