feat(core): support modelConfig interface modelObj to enable use local model obj

Author: JingyuanZhang

packages/paddlejs-core/package.json

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

packages/paddlejs-core/src/commons/interface.ts

@@ -59,8 +59,14 @@ export interface FeedShape {
     fw: number;
     fh: number;
 };
+
+interface ModelObj {
+    model: Model;
+    params: Float32Array
+}
 export interface RunnerConfig {
-    modelPath: string;
+    modelPath?: string;
+    modelObj?: ModelObj;
     modelName?: string;
     feedShape?: FeedShape;
     fill?: string; // 缩放后用什么颜色填充不足方形部分

packages/paddlejs-core/src/loader.ts

@@ -70,7 +70,7 @@ export default class ModelLoader {
         if (this.separateChunk) {
             if (this.dataType === 'binary') {
                 await this.fetchChunks().then(allChunksData =>
-                    this.traverse(modelInfo.vars, allChunksData)
+                    ModelLoader.allocateParamsVar(modelInfo.vars, allChunksData)
                 );
             }
         }
@@ -105,9 +105,7 @@ export default class ModelLoader {
                 this.fetchOneChunk(this.urlConf.dir + this.getFileName(i))
             );
         }
-        // console.time('加载时间');
         return Promise.all(chunkArray).then(chunks => {
-            // console.timeEnd('加载时间');
             let chunksLength = 0;
             const f32Array: any[] = [];
             let float32Chunk;
@@ -128,7 +126,7 @@ export default class ModelLoader {
         });
     }
 
-    traverse(vars, allChunksData: Float32Array) {
+    static allocateParamsVar(vars, allChunksData: Float32Array) {
         let marker = 0; // 读到哪个位置了
         let len; // 当前op长度
         traverseVars(vars, item => {

packages/paddlejs-core/src/runner.ts

@@ -74,9 +74,19 @@ export default class Runner {
     }
 
     async load() {
-        const { modelPath } = this.runnerConfig;
-        const loader = new Loader(modelPath);
-        this.model = await loader.load();
+        const { modelPath, modelObj = null } = this.runnerConfig;
+        if (modelPath) {
+            const loader = new Loader(modelPath);
+            this.model = await loader.load();
+        }
+        else if (modelObj?.model && modelObj?.params) {
+            const {
+                model,
+                params
+            } = modelObj;
+            Loader.allocateParamsVar(model.vars, params);
+            this.model = model;
+        }
     }
 
     genGraph() {
@@ -373,8 +383,8 @@ export default class Runner {
 
         if (env.get('debug')
             && op.opData?.outputTensors
-            && op.opData.outputTensors[0]
-            && op.opData.outputTensors[0].tensorId === this.modelName + '_'
+            && op.opData.outputTensors[op.opData.outputTensors.length - 1]
+            && op.opData.outputTensors[op.opData.outputTensors.length - 1].tensorId === this.modelName + '_'
                 + (env.get('ns').layerName || env.get('layerName'))) {
             console.info(op.opData.name + '_' + op.opData.iLayer, 'runner op');
             return;