Merge pull request #131 from changy1105/gesture

fix(paddlejs-core): fix backend only one

Author: yueshuangyan

.npmrc

@@ -0,0 +1 @@
+PUPPETEER_SKIP_DOWNLOAD

packages/paddlejs-backend-webgl/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paddlejs/paddlejs-backend-webgl",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "",
   "main": "lib/index",
   "scripts": {

packages/paddlejs-backend-webgl/src/index.ts

@@ -8,19 +8,22 @@ import WebGLBackend from './backend';
 import { ops } from './ops';
 import { GLHelper } from './webgl/WebGLUtils';
 import * as webgl_types from './webgl/webgl_types';
+import { GLOBALS } from '@paddlejs/paddlejs-core/globals';
 
-const glInstance = new WebGLBackend();
-
-function registerWebGLBackend() {
+let glInstance;
+function registerWebGLBackend(name?: string) {
+    glInstance = new WebGLBackend();
     registerBackend(
-        'webgl',
+        name || 'webgl',
         glInstance,
-        ops
+        ops,
+        'webgl'
     );
     return glInstance;
 }
 
 registerWebGLBackend();
+GLOBALS.registerTypedBackend = registerWebGLBackend;
 
 export {
     glInstance,

packages/paddlejs-benchmark/src/config.vue

@@ -224,7 +224,7 @@ export default Vue.extend({
                 remainWholeT += t;
                     // this.remainOthersT = +(remainWholeT / (curTimes - 2).toFixed(4));
 
-                const queryList = GLOBALS.backendInstance.queryList;
+                const queryList = GLOBALS[GLOBALS.backend].backendInstance.queryList;
 
 
                 if (queryList && queryList.length) {
@@ -344,4 +344,4 @@ export default Vue.extend({
 .el-table .detail-index-row {
     background-color: #f0f9eb;
 }
-</style>
+</style>

packages/paddlejs-core/__tests__/spec/runner.test.ts

@@ -58,3 +58,45 @@ describe('test runnrer', () => {
         expect(res).toBeUndefined();
     });
 });
+
+describe('test three runnrer', () => {
+    it('test runner init', async () => {
+        const runner1 = new Runner({
+            modelPath,
+            feedShape: {
+                fw: 5,
+                fh: 3
+            },
+            fileCount: 0
+        });
+
+        const runner2 = new Runner({
+            modelPath,
+            feedShape: {
+                fw: 6,
+                fh: 3
+            },
+            fileCount: 0
+        });
+
+        const runner3 = new Runner({
+            modelPath,
+            feedShape: {
+                fw: 7,
+                fh: 3
+            },
+            fileCount: 0
+        });
+        registerBackend(
+            'webgpu',
+            new Backend(),
+            ops as any
+        );
+        await runner1.init();
+        expect(runner1.weightMap.length).toBe(7);
+        await runner2.init();
+        expect(runner2.weightMap.length).toBe(7);
+        await runner3.init();
+        expect(runner3.weightMap.length).toBe(7);
+    });
+});

packages/paddlejs-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paddlejs/paddlejs-core",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "",
   "main": "lib/index",
   "scripts": {

packages/paddlejs-core/src/globals.ts

@@ -8,14 +8,19 @@ interface GLOBALS_INTERFACE {
     opRegistry: OpRegistry;
     backend: string;
     backendInstance: any; // todo Class Backend
+    backendType: string;
+    backendCount: number;
+    registerTypedBackend?: Function;
 }
 
 let GLOBALS: GLOBALS_INTERFACE = {
     opRegistry: {
         ops: {}
     },
     backend: '',
-    backendInstance: null
+    backendInstance: null,
+    backendType: '',
+    backendCount: 0
 };
 
 function registerOp(opInfo: OpInfo, key: string) {
@@ -42,13 +47,18 @@ function registerOp(opInfo: OpInfo, key: string) {
     };
 }
 
-function registerBackend(backend: string, backendInstance: any, ops: Ops) {
+function registerBackend(backend: string, backendInstance: any, ops: Ops, backendType?: string) {
     if (backend) {
         GLOBALS.backend = backend;
+        GLOBALS.backendType = backendType || backend;
+    }
+
+    if (!GLOBALS[GLOBALS.backend]) {
+        GLOBALS[GLOBALS.backend] = {};
     }
 
     if (backendInstance) {
-        GLOBALS.backendInstance = backendInstance;
+        GLOBALS[GLOBALS.backend].backendInstance = backendInstance;
     }
 
     if (ops) {

packages/paddlejs-core/src/opFactory/opDataBuilder.ts

@@ -146,7 +146,8 @@ export default class OpData {
     buildProgram() {
         const name = this.name;
         const inputTensors = this.inputTensors;
-        this.program = this.outputTensors.map((outTensor, index) => GLOBALS.backendInstance.createProgram({
+        const backend = GLOBALS.backend;
+        this.program = this.outputTensors.map((outTensor, index) => GLOBALS[backend]?.backendInstance.createProgram({
             name,
             outTensor,
             inputTensors,
@@ -197,7 +198,7 @@ export default class OpData {
                 data: data.data || null,
                 isPacked: this.isPackedOp || false,
                 binding: index,
-                noLayout: GLOBALS.backendInstance?.noLayout
+                noLayout: GLOBALS[GLOBALS.backend].backendInstance?.noLayout
             });
             if (tensorName === 'out') {
                 this.outputTensors.push(tensor);

packages/paddlejs-core/src/opFactory/opExecutor.ts

@@ -58,7 +58,7 @@ export default class OpExecutor {
      */
     execute(isRendered) {
         if (this.type !== 'feed') {
-            GLOBALS.backendInstance.runProgram(this.opData, isRendered);
+            GLOBALS[GLOBALS.backend].backendInstance.runProgram(this.opData, isRendered);
         }
 
     }

packages/paddlejs-core/src/opFactory/utils.ts

@@ -12,7 +12,7 @@ import { GLOBALS } from '../globals';
  * @returns {Object} texture信息
  */
 export function getTextureInfoFromTensorShape(shape: number[] = [], isPacked = false) {
-    const GPU_TEXTURE_MAX_SIZE = GLOBALS.backendInstance.MAX_TEXTURE_SIZE || 4096;
+    const GPU_TEXTURE_MAX_SIZE = GLOBALS[GLOBALS.backend].backendInstance.MAX_TEXTURE_SIZE || 4096;
     const b = shape[0];
     const c = shape[1];
     const h = shape[2];
@@ -103,7 +103,7 @@ export function formatShape(shape: number[]): number[] {
  * @param {Array} shape shape of tensor
  * @returns {number} total length of shape
  */
- export function accShape(shape: number[]): number {
+export function accShape(shape: number[]): number {
     return shape.reduce((all, num) => all * num);
 }
 
@@ -112,7 +112,7 @@ export function formatShape(shape: number[]): number[] {
  * @param {Array} shape shape of tensor
  * @returns {number} real axis after shape format to 4D
  */
- export function formatAxis(shape: number[], axis): number {
+export function formatAxis(shape: number[], axis): number {
     const shapeLen = shape.length;
     const axis_temp = axis > -1 ? axis : shapeLen + axis;
     return 4 - shapeLen + axis_temp;