【MODEL UPDATE】Combine params and model by DannyIsFunny · Pull Request #2800 · PaddlePaddle/Paddle-Lite

DannyIsFunny · 2020-02-03T01:36:47Z

本PR目的：修改Paddle-Lite的模型格式，新的模型格式要求请参考：[设计说明]（）
【本PR的修改】：

【1】修改Lite的version，当前代码最后一个commit 不是git log时，将最后一个short commit id作为version ： lite/api/version.h.in

【2】修改model_parser.cc模型保存与加载方法：
模型存储： SaveModelNaive方法，修改为保存为单个文件
模型加载：原来加载方法保存LoadModelNaive、LoadModelNaiveFromMemory(...)
添加新模型的加载方法： LoadModelNaiveFromFile、LoadModelNaiveFromMemory(...)

【3】API接口：
paddle_api.cc: MobileConfig添加新接口set_model_from_file、set_model_from_buffer，添加变 lite_model_file和返回值函数lite_model_file()
light_api.cc: 重载新的Build函数、和predictor的构造函数（老方法保存）。用于light_api加载新格式的模型
light_api_impl.cc: 修改CreatePredictor(MobileConfig)方法，实现根据MobileConfig的值选择调用老接口、还是新接口。（当set_model_dir或set_model_buffer后会使用老方法；set_model_from_file、set_model_from_buffer后会使用新方法）

注意：因为发现light_api实际没有加载pb格式模型的接口，本PR在新的light_predictor::build()函数中去除了model_type接口，只加载naive_buffer格式模型。

【4】相关单测修改：
model_parser_test.cc
light_api_test.cc, cxx_api_test.cc, paddle_api_test.cc, apis_test.cc
其他：subgraph_pass_test.cc (因为调用了SaveOptimizedModel + LoadNaiveModel 过程)

【5】关联模块修改 (因为下面两者都调用了SaveOptimizedModel + LoadNaiveModel过程)
benchmark: benchmark.cc
model_test: model_test.cc

【6】添加Python接口： pybind.cc中mobileconfig添加接口： set_model_from_buffer和set_model_from_file

【7】添加Java接口：在MobileConfig.java和convert_util_jni.h中为JavaAPI添加MobileConfig接口： setModelFromFile和setModelFromBuffer
编译时默认不编译Java API，只有当build_java=ON时才编译java预测库。

【8】本PR将模型转化工具名称修改为opt
编译出的二进制文件名为 opt
流程：输入命令： ./lite/tool/build.sh build_optimize_tool
编译结果：build.opt/lite/api/opt
工具使用方法： ./opt --model_dir= ...

【9】本次修改对预测库体积大小的影响：
经测试：本PR加入前armv8、GCC Android动态库大小：1653528字节，本PR加入后动态库大小1653528字节，对动态库大小没有影响

Superjomn

给出 mobile so 前后的大小变化，避免feature 增加大小

Superjomn · 2020-02-11T03:05:01Z

+  memcpy(paddle_version_table.cursor(), paddle_version.c_str(), 16);
+  paddle_version_table.Consume(16);
+  paddle_version_table.AppendToFile(prog_path);
+  std::cout << "paddle_version:" << paddle_version << std::endl;


所有的 cout 改为 glog
非必须log 可以去掉，或者使用 VLOG

已经🙆‍♂️修改为VLOG（4）

Superjomn · 2020-02-11T03:08:34Z

-      const std::string& param_buffer = "",
-      bool model_from_memory = false,
-      lite_api::LiteModelType model_type = lite_api::LiteModelType::kProtobuf) {
+  LightPredictor(const std::string& lite_model_file,


加注释

已经在MobileConfig中所有函数与成员添加注释，当调用set_model_buffer老接口是LOG(WARNING)输出warning，建议使用新接口。

Superjomn · 2020-02-11T03:11:48Z


 public:
+  void set_model_from_file(const std::string& x) { lite_model_file_ = x; }
+  void set_model_from_buffer(const std::string& x) {


实现都放到.cc 里

头文件里放重要接口和注释文档，方便看代码的人快速了解相关接口，不陷入实现细节里

实现都放到.cc 里

头文件里放重要接口和注释文档，方便看代码的人快速了解相关接口，不陷入实现细节里

已经修改完毕

Superjomn · 2020-02-11T03:13:22Z

+
+  // Save lite_version(char[16]) into file
+  naive_buffer::BinaryTable paddle_version_table;
+  paddle_version_table.Require(16);


不要有 magic number

16 和其他数字，特别跟二进制表格式有关的，用 const 常量定义，并且加注释解释下

不要有 magic number

16 和其他数字，特别跟二进制表格式有关的，用 const 常量定义，并且加注释解释下

已经修改为const int8 paddle_version_length = 16 * sizeof(char);

DannyIsFunny · 2020-02-11T16:59:51Z

给出 mobile so 前后的大小变化，避免feature 增加大小

经测试：本PR加入前armv8、GCC Android动态库大小：1653528字节，本PR加入后动态库大小1653528字节，对动态库大小没有影响

Superjomn · 2020-02-12T03:01:34Z

+    Build(lite_model_file, model_from_memory);
+  }
+
+  // warning: old inference and will be abandened in release/v3.0.0


NOTE: This is a deprecated API and will be removed in latter release.

NOTE: This is a deprecated API and will be removed in latter release.

已经替换

Superjomn · 2020-02-12T03:01:43Z

+  void Build(const std::string& lite_model_file,
+             bool model_from_memory = false);
+
+  // warning: old inference and will be abandened in release/v3.0.0


同上

已经全量修改

Superjomn · 2020-02-12T03:02:27Z

+  lite_model_file_ = x;
+  model_from_memory_ = true;
+}
+// warning: set model data from memory buffer, which is in old format and will


.cc 的实现里面不需要加这个 warning，.h 里面需要。一般人只会看 .h 里面的接口，不会深入到实现

.cc 的实现里面不需要加这个 warning，.h 里面需要。一般人只会看 .h 里面的接口，不会深入到实现
已经删除cc文件中的warning 信息

在comment 中添加信息描述模型的二进制结构，comment内容如下：

Superjomn

LGTM

Superjomn

现在编译出来的二进制文件是叫 opt 吗？

Superjomn · 2020-02-13T07:44:49Z

 # global variables
 BUILD_EXTRA=OFF
-BUILD_JAVA=ON
+BUILD_JAVA=OFF


这里为啥关了？

这里为啥关了？

因为设计评审有一条建议

建议最小库不编译java，所以我将build_java设置为关闭，需要手动设置BUILD_JAVA=ON才可以触发编译

DannyIsFunny

现在编译出来的二进制文件是叫 opt 吗？

是的，编译出的二进制文件名为 opt
流程：输入命令： ./lite/tool/build.sh build_optimize_tool
编译结果：build.opt/lite/api/opt
工具使用方法： ./opt --model_dir= ...

DannyIsFunny · 2020-02-13T06:19:46Z

@@ -296,10 +296,10 @@ if (LITE_ON_TINY_PUBLISH)
 endif()


修改optimize_tool的名称：从OPT 修改为opt

DannyIsFunny · 2020-02-13T07:43:51Z

@@ -64,6 +64,44 @@ public int getPowerModeInt() {
        return powerMode.value();
    }



新增Java API接口

DannyIsFunny · 2020-02-13T07:52:29Z

 # global variables
 BUILD_EXTRA=OFF
-BUILD_JAVA=ON
+BUILD_JAVA=OFF


这里为啥关了？

因为设计评审有一条建议

建议最小库不编译java，所以我将build_java设置为关闭，需要手动设置BUILD_JAVA=ON才可以触发编译

Superjomn

LGTM

DannyIsFunny added 13 commits February 3, 2020 01:34

model update: combine params and model test=develop

bdaff55

add LoadNewModel from file and from memory test=devlop

3e6b6de

fix code style test=develop

c0c817e

test=develop

a8c7422

modify APIs about loading model test=develop

6aa18c3

fix version test=develop

7720ca8

fix apis_test.cc test=develop

5b70f30

fix releated test test=develop

c83fdcd

fix test test=develop

6e424a0

fix model_parser_test test=develop

8c2e8d6

fix paddle_api_test test=develop

e5c633a

fix benchmark and test_model test=develop

a03f6dd

FIX memory load test=develop

0d343b3

Superjomn reviewed Feb 11, 2020

View reviewed changes

DannyIsFunny added 2 commits February 11, 2020 16:09

add python api test=develop

faed5d5

add warning info, test=develop

97e762b

test=develop

454a727

Superjomn suggested changes Feb 12, 2020

View reviewed changes

DannyIsFunny added 4 commits February 12, 2020 15:00

fix code style test=develop

ceebc58

modify comment test=develop

5db80f6

add comment of model binary structure test=develop

c49d589

test=develop

b242189

Superjomn previously approved these changes Feb 13, 2020

View reviewed changes

DannyIsFunny dismissed Superjomn’s stale review via 285e362 February 13, 2020 05:21

DannyIsFunny force-pushed the MODEL_UPDATE branch from 285e362 to b242189 Compare February 13, 2020 05:23

DannyIsFunny added 4 commits February 13, 2020 05:24

fix opt mame test=develop

045ced8

Merge remote-tracking branch 'origin' into MODEL_UPDATE

06d2847

Merge remote-tracking branch 'origin' into MODEL_UPDATE

85cbc47

change optimize_tool's name from OPT to opt test=develop

225eb75

add java api about new model type test=develop

464894e

Superjomn suggested changes Feb 13, 2020

View reviewed changes

DannyIsFunny commented Feb 13, 2020

View reviewed changes

Superjomn approved these changes Feb 13, 2020

View reviewed changes

DannyIsFunny merged commit 63eca0a into PaddlePaddle:develop Feb 13, 2020

DannyIsFunny deleted the MODEL_UPDATE branch February 13, 2020 10:39

This was referenced Feb 17, 2020

[dev] 模型格式修改 & model_optimizer_tool 升级 #2810

Closed

Lite模型格式修改 #2898

Closed

DannyIsFunny changed the title ~~【MODEL UPDATE】: combine params and model~~ 【MODEL UPDATE】Combine params and model Aug 25, 2020

		@@ -64,6 +64,44 @@ public int getPowerModeInt() {
		return powerMode.value();
		}

Conversation

DannyIsFunny commented Feb 3, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Superjomn left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DannyIsFunny commented Feb 11, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Superjomn left a comment

Choose a reason for hiding this comment

Uh oh!

Superjomn left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DannyIsFunny left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Superjomn left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

DannyIsFunny commented Feb 3, 2020 •

edited

Loading

DannyIsFunny left a comment •

edited

Loading