Skip to content

fix Promise type backend init in Angular #3993

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 6 commits into from
Oct 1, 2020
Merged

fix Promise type backend init in Angular #3993

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0973c9d
fix any Promise type backend (e.g. WASM) initialization done inside A…
deel77 Sep 30, 2020
9f6db5a
fix type checking problem
deel77 Sep 30, 2020
847d641
Merge branch 'master' into fix-angular-wasm
deel77 Sep 30, 2020
40f922b
Merge branch 'master' into fix-angular-wasm
deel77 Oct 1, 2020
50588f8
fix explained in comment
deel77 Oct 1, 2020
a1864d4
Merge branch 'master' into fix-angular-wasm
annxingyuan Oct 1, 2020
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
9 changes: 7 additions & 2 deletions tfjs-core/src/engine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,13 @@ export class Engine implements TensorTracker, DataMover {

try {
const backend = registryFactoryEntry.factory();
// Test if the factory returns a promise.
if (Promise.resolve(backend) === backend) {
/* Test if the factory returns a promise.
Done in a more liberal way than
previous 'Promise.resolve(backend)===backend'
as we needed to account for custom Promise
implementations (e.g. Angular) */
if (backend && !(backend instanceof KernelBackend)
&& typeof backend.then === 'function') {
const promiseId = ++this.pendingBackendInitId;
const success =
backend
Expand Down