chore(core): del deprecated interface targetSize and rename modelConfig to runnerConfig

Author: JingyuanZhang

packages/paddlejs-benchmark/src/config.vue

@@ -47,7 +47,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import { Runner } from '@paddlejs/paddlejs-core';
-import { GLOBALS } from '@paddlejs/paddlejs-core/globals';
+import { GLOBALS } from '@paddlejs/paddlejs-core/src/globals';
 import '@paddlejs/paddlejs-backend-webgl';
 import Utils from './utils';
 
@@ -64,7 +64,6 @@ export default Vue.extend({
                     },
                     fetchShape: [1, 1000, 10, 1],
                     fill: '#fff',
-                    targetSize: { height: 224, width: 224 },
                     needPreheat: false
                 },
                 {
@@ -75,7 +74,6 @@ export default Vue.extend({
                     },
                     fetchShape: [1, 1000, 10, 1],
                     fill: '#fff',
-                    targetSize: { height: 224, width: 224 },
                     needPreheat: false
                 },
                 {
@@ -86,7 +84,6 @@ export default Vue.extend({
                     },
                     fetchShape: [1, 40, 10, 1],
                     fill: '#fff',
-                    targetSize: { height: 224, width: 224 },
                     needPreheat: false
                 },
                 {
@@ -97,7 +94,6 @@ export default Vue.extend({
                     },
                     fetchShape: [1, 1920, 10 , 1],
                     fill: '#fff',
-                    targetSize: { height: 256, width: 256 },
                     needPreheat: false
                 },
                 {
@@ -108,7 +104,6 @@ export default Vue.extend({
                     },
                     fetchShape: [1, 9, 1, 1],
                     fill: '#fff',
-                    targetSize: { height: 224, width: 224 },
                     needPreheat: false
                 },
                 {
@@ -119,7 +114,6 @@ export default Vue.extend({
                     },
                     fetchShape: [1, 2, 192, 192],
                     fill: '#fff',
-                    targetSize: { height: 224, width: 224 },
                     needPreheat: false
                 }
             ],

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

@@ -1,12 +1,12 @@
 import Graph from '../../src/graph';
-import { ModelConfig } from '../../src/commons/interface';
+import { RunnerConfig } from '../../src/commons/interface';
 import modelInfo from '../env/mock/model.json';
 
 describe('test graph', () => {
 
     const graphGenerator = new Graph(modelInfo, {
         type: 'single'
-    } as ModelConfig);
+    } as RunnerConfig);
     const weightMap = graphGenerator.createGraph();
 
 

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

@@ -38,18 +38,14 @@ export interface Model {
     multiOutputs?: ModelVar[]
 }
 
-export interface ModelConfig {
+export interface RunnerConfig {
     modelPath: string;
     modelName?: string;
     feedShape: {
         fc?: number;
         fw: number;
         fh: number;
     };
-    targetSize?: {
-        height: number;
-        width: number;
-    };
     fill?: string; // 缩放后用什么颜色填充不足方形部分
     mean?: number[];
     std?: number[];

packages/paddlejs-core/src/graph.ts

@@ -2,7 +2,7 @@
  * @file ModelGraph，graph 生成器
  */
 
-import { ModelOp, GraphType, Model, ModelVar, ModelConfig } from './commons/interface';
+import { ModelOp, GraphType, Model, ModelVar, RunnerConfig } from './commons/interface';
 import OpExecutor from './opFactory/opExecutor';
 import transformActions from './transform';
 
@@ -28,11 +28,11 @@ export default class ModelGraph {
     weightMap: OpExecutor[] = [];
     ops: ModelOp[] = [];
     vars: ModelVar[] = [];
-    config: ModelConfig = {} as ModelConfig;
+    config: RunnerConfig = {} as RunnerConfig;
     type: GraphType = GraphType.SingleOutput;
     plugins: GraphPlugins = null;
 
-    constructor(model: Model, config: ModelConfig) {
+    constructor(model: Model, config: RunnerConfig) {
         this.ops = model.ops;
         this.vars = model.vars;
         this.type = config.type || this.type;

packages/paddlejs-core/src/mediaProcessor.ts

@@ -109,13 +109,11 @@ export default class MediaProcessor {
      */
     allReshapeToRGB(imageData, opt) {
         // mean和std是介于0-1之间的
-        const { mean, std, targetShape, bgr } = opt;
+        const { mean, std, targetShape, bgr, normalizeType = 0 } = opt;
         const [, c, h, w] = targetShape;
         const data = imageData.data || imageData;
         const result = new Float32Array(h * w * c);
         let offset = 0;
-        // 将数据映射为0~1， 1：映射为-1~1之间
-        const normalizeType = 0;
         // h w c
         for (let i = 0; i < h; ++i) {
             const iw = i * w;

packages/paddlejs-core/src/runner.ts

@@ -1,6 +1,6 @@
 import Loader from './loader';
 import Graph from './graph';
-import { Model, ModelConfig, InputFeed, ModelVar, GraphType } from './commons/interface';
+import { Model, RunnerConfig, InputFeed, ModelVar, GraphType } from './commons/interface';
 import OpData from './opFactory/opDataBuilder';
 import Tensor from './opFactory/tensor';
 import { GLOBALS } from './globals';
@@ -14,7 +14,7 @@ import { accShape } from './opFactory/utils';
 
 export default class Runner {
     // instance field
-    modelConfig: ModelConfig = {} as ModelConfig;
+    runnerConfig: RunnerConfig = {} as RunnerConfig;
     modelName: string;
     isPaused: boolean = false;
     model: Model = {} as Model;
@@ -25,8 +25,8 @@ export default class Runner {
     mediaProcessor: MediaProcessor | null = null;
     needPreheat: boolean = true;
 
-    constructor(options: ModelConfig | null) {
-        this.modelConfig = Object.assign({}, options);
+    constructor(options: RunnerConfig | null) {
+        this.runnerConfig = Object.assign({}, options);
         this.needPreheat = options.needPreheat === undefined ? true : options.needPreheat;
         this.modelName = options.modelName || Date.now().toString();
         this.weightMap = [];
@@ -55,13 +55,13 @@ export default class Runner {
     }
 
     async load() {
-        const { modelPath } = this.modelConfig;
+        const { modelPath } = this.runnerConfig;
         const loader = new Loader(modelPath);
         this.model = await loader.load();
     }
 
     genGraph() {
-        this.graphGenerator = new Graph(this.model, this.modelConfig);
+        this.graphGenerator = new Graph(this.model, this.runnerConfig);
         this.weightMap = this.graphGenerator.createGraph();
     }
 
@@ -115,7 +115,7 @@ export default class Runner {
         else {
             inputFeed = this.mediaProcessor.process(
                 media,
-                this.modelConfig
+                this.runnerConfig
             );
         }
 
@@ -126,7 +126,7 @@ export default class Runner {
     }
 
     async predictWithFeed(data: number[] | InputFeed[] | ImageData, callback?, shape?: number[]) {
-        const { fc = 3, fw, fh } = this.modelConfig.feedShape;
+        const { fc = 3, fw, fh } = this.runnerConfig.feedShape;
         let inputFeed;
 
         if (Array.isArray(data)) {
@@ -171,7 +171,7 @@ export default class Runner {
     }
 
     genFeedData() {
-        const { type, feedShape } = this.modelConfig;
+        const { type, feedShape } = this.runnerConfig;
         const { fc = 3, fh, fw } = feedShape;
         const vars = this.model.vars;
         let preheatFeedData;