fix(core): support backend init async promise in webgpu

JingyuanZhang · Mar 29, 2022 · 12fc5c9 · 12fc5c9
1 parent 61716d9
commit 12fc5c9
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 10 deletions.
diff --git a/e2e/jest.config.js b/e2e/jest.config.js
@@ -108,5 +108,5 @@ module.exports = {
 
     // Whether to use watchman for file crawling
     // watchman: true,
-    testTimeout: 50000
+    testTimeout: 80000
 };
diff --git a/e2e/tests/detect.test.ts b/e2e/tests/detect.test.ts
@@ -5,7 +5,9 @@ describe('e2e test detect model', () => {
     const CUR_URL = 'http://localhost:9898/';
 
     beforeAll(async () => {
-        await page.goto(CUR_URL);
+        await page.goto(CUR_URL, {
+            timeout: 0
+        });
     });
 
     it('detect predict', async () => {

diff --git a/e2e/tests/gesture.test.ts b/e2e/tests/gesture.test.ts
@@ -3,7 +3,9 @@ describe('e2e test gesture model', () => {
     const CUR_URL = 'http://localhost:9898/';
 
     beforeAll(async () => {
-        await page.goto(CUR_URL);
+        await page.goto(CUR_URL, {
+            timeout: 0
+        });
     });
 
     it('gesture predict', async () => {

diff --git a/e2e/tests/humanseg.test.ts b/e2e/tests/humanseg.test.ts
@@ -3,7 +3,9 @@ describe('e2e test humanseg model', () => {
     const CUR_URL = 'http://localhost:9898/';
 
     beforeAll(async () => {
-        await page.goto(CUR_URL);
+        await page.goto(CUR_URL, {
+            timeout: 0
+        });
     });
 
     it('humanseg predict', async () => {

diff --git a/e2e/tests/mobilenet.test.ts b/e2e/tests/mobilenet.test.ts
@@ -5,7 +5,9 @@ describe('e2e test mobilenet model', () => {
     const CUR_URL = 'http://localhost:9898/';
 
     beforeAll(async () => {
-        await page.goto(CUR_URL);
+        await page.goto(CUR_URL, {
+            timeout: 0
+        });
     });
 
     it('check predict data', async () => {

diff --git a/e2e/tests/ocr.test.ts b/e2e/tests/ocr.test.ts
@@ -5,7 +5,9 @@ describe('e2e test ocr model', () => {
     const CUR_URL = 'http://localhost:9898/';
 
     beforeAll(async () => {
-        await page.goto(CUR_URL);
+        await page.goto(CUR_URL, {
+            timeout: 0
+        });
     });
 
     it('ocr predict', async () => {

diff --git a/e2e/tests/predict.test.ts b/e2e/tests/predict.test.ts
@@ -4,7 +4,9 @@ describe('e2e test custom model', () => {
     const CUR_URL = 'http://localhost:9898/';
 
     beforeAll(async () => {
-        await page.goto(CUR_URL);
+        await page.goto(CUR_URL, {
+            timeout: 0
+        });
     });
 
     it('check predict data', async () => {

diff --git a/packages/paddlejs-core/src/opFactory/opBehaviors.ts b/packages/paddlejs-core/src/opFactory/opBehaviors.ts
@@ -224,7 +224,7 @@ const behaviors : Behaviors = {
     processElementwiseAxis() {
         const shape_x = this.tensorDataMap['origin'].shape;
         const shape_y = this.tensorDataMap['counter'].shape;
-        let axis = this.processedAttrs.axis || -1;
+        let axis = this.processedAttrs.axis === undefined ? -1 : this.processedAttrs.axis;
 
         this.processedAttrs.counterLen = shape_y.length;
         // shape x === shape y

diff --git a/packages/paddlejs-core/src/runner.ts b/packages/paddlejs-core/src/runner.ts
@@ -58,8 +58,7 @@ export default class Runner {
             await Promise.all([this.load(), GLOBALS.backendInstance.init()]);
         }
         else {
-            GLOBALS.backendInstance.init();
-            this.isExecuted = false;
+            await GLOBALS.backendInstance.init();
             await this.load();
         }
         this.genFeedData();