Merge pull request #442 from JingyuanZhang/master

feat(core): support modelObj.params type ParamObject & publish  @paddlejs/paddlejs-core@2.1.28

Author: JingyuanZhang

packages/paddlejs-core/package.json

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

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

@@ -63,9 +63,13 @@ export interface FeedShape {
     fh: number;
 };
 
+
+export interface ParamObject {
+    [key: string]: number;
+}
 interface ModelObj {
     model: Model;
-    params: Float32Array
+    params: Float32Array | ParamObject
 }
 export interface RunnerConfig {
     modelPath?: string;

packages/paddlejs-core/src/loader.ts

@@ -3,7 +3,7 @@
  */
 
 import env from './env';
-import { Model } from './commons/interface';
+import { Model, ParamObject } from './commons/interface';
 import { traverseVars } from './commons/utils';
 
 interface UrlConf {
@@ -126,14 +126,15 @@ export default class ModelLoader {
         });
     }
 
-    static allocateParamsVar(vars, allChunksData: Float32Array) {
+    static allocateParamsVar(vars, allChunksData: Float32Array | ParamObject) {
         let marker = 0; // 读到哪个位置了
         let len; // 当前op长度
+        const chunkData: number[] = Array.isArray(allChunksData) ? allChunksData : Object.values(allChunksData);
         traverseVars(vars, item => {
             len = item.shape.reduce((a, b) => a * b); // 长度为shape的乘积
             // 为了减少模型体积，模型转换工具不会导出非persistable的数据，这里只需要读取persistable的数据
             if (item.persistable) {
-                item.data = allChunksData.slice(marker, marker + len);
+                item.data = chunkData.slice(marker, marker + len);
                 marker += len;
             }
         });