From 6800a20cbce6a0b45b8c0a3c2c579a9386fc8b03 Mon Sep 17 00:00:00 2001 From: syyxsxx Date: Fri, 10 Jul 2020 02:28:31 +0000 Subject: [PATCH] update of the review --- deploy/openvino/LICENSE | 201 ---------------------- deploy/openvino/README.md | 107 ------------ deploy/openvino/demo/classifier.cpp | 8 +- deploy/openvino/demo/segmenter.cpp | 8 +- deploy/openvino/include/paddlex/paddlex.h | 4 +- deploy/openvino/python/convertor.py | 14 ++ deploy/openvino/python/demo.py | 4 +- 7 files changed, 26 insertions(+), 320 deletions(-) delete mode 100644 deploy/openvino/LICENSE delete mode 100644 deploy/openvino/README.md diff --git a/deploy/openvino/LICENSE b/deploy/openvino/LICENSE deleted file mode 100644 index 261eeb9..0000000 --- a/deploy/openvino/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/deploy/openvino/README.md b/deploy/openvino/README.md deleted file mode 100644 index 9d872ba..0000000 --- a/deploy/openvino/README.md +++ /dev/null @@ -1,107 +0,0 @@ -# PaddelX-openvino -paddlex-openvino提供将PaddleX训练好的模型，部署到装有openvino的硬件上，通过openvino实现对模型预测的加速 - - - -## 部署流程 - -**PaddleX到OoenVINO的部署流程如下**： - - PaddleX -> ONNX -> OpenVINO IR -> OpenVINO Inference Engine - - -### 部署环境 - -* Ubuntu* 16.04 (64-bit) with GCC* 5.4.0 -* CMkae 3.12.3 -* Python 3.7 -* ONNX 1.5.0 -* PaddleX 1.0 -* OpenVINO 2020.3 - -**说明**：PaddleX安装请参考[PaddleX](https://github.com/PaddlePaddle/PaddleX/blob/release-v1.0/README.md) ， OpenVINO相关请参考[OpenVINO](https://github.com/openvinotoolkit/openvino/blob/master/README.md) - -请确保系统已经安装好上述基本软件，**下面所有示例以工作目录 `/root/projects/`演示**。 - -### Step1 软件依赖 -- OpenVINO：编译请参考 [编译文档](https://github.com/openvinotoolkit/openvino/blob/master/build-instruction.md) - -- gflags：编译请参考 [编译文档](https://gflags.github.io/gflags/#download) - -- opencv:编译请参考 -[编译文档](https://docs.opencv.org/master/d7/d9f/tutorial_linux_install.html) -说明：/root/projects/openvino/scripts/bootstrap.sh提供了预编译版本下载，也可自行编译。 - -- ngraph: -说明：openvino编译的过程中会生成ngraph的lib文件，位于{openvino根目录}/bin/intel64/Release/lib/下。 -### Step2: 编译 -编译`cmake`的命令在`scripts/build.sh`中，请根据Step1中编译软件的实际情况修改主要参数，其主要内容说明如下： -``` -# openvino预编译库的路径 -OPENVINO_DIR=/path/to/openvino/inference_engine/ -# gflags预编译库的路径 -GFLAGS_DIR=/path/to/gflags/build/ -# ngraph lib的路径，编译openvino时通常会生成 -NGRAPH_LIB=/path/to/ngraph/lib/ -# opencv预编译库的路径, 如果使用自带预编译版本可不修改 -OPENCV_DIR=$(pwd)/deps/opencv3gcc4.8/ -``` -修改脚本设置好主要参数后，执行`build`脚本： - ```shell - sh ./scripts/build.sh - ``` -### Step3: 模型转换 - -将PaddleX模型转换成ONNX模型： - -``` -paddlex --export_onnx --model_dir=/path/to/PaddleX_model --save_dir=/path/to/onnx_model --fixed_input_shape [w,h] -``` -**说明** ：onnx请使用1.5.0版本否则可能会出现模型转换错误 - -将生成的onnx模型转换为OpenVINO支持的格式 - -``` -cd {openvino根目录}/model-optimizer -python mo_onnx.py --input_model /path/to/onnx_model --output_dir /path/to/openvino_model --input_shape [N,C,H,W] -``` -**说明** ：模型转换好后包括.xml和.bin两个文件，更多细节请参考[Model Optimizer文档](https://docs.openvinotoolkit.org/latest/_docs_MO_DG_Deep_Learning_Model_Optimizer_DevGuide.html) - - -### Step4: 预测 - -编译成功后，分类任务的预测可执行程序为`classifier`，其主要命令参数说明如下： - -| 参数 | 说明 | -| ---- | ---- | -| --model_dir | Model Optimizer生成的.xml文件路径，请保证Model Optimizer生成的三个文件在同一路径下| -| --image | 要预测的图片文件路径 | -| --image_list | 按行存储图片路径的.txt文件 | -| --device | 运行的平台, 默认值为"CPU" | -| --cfg_dir | PaddleX model 的.yml配置文件 | - - -#### 样例 -`样例一`： - -测试图片 `/path/to/test_img.jpeg` - -```shell -./build/classifier --model_dir=/path/to/openvino_model --image=/path/to/test_img.jpeg --cfg_dir=/path/to/PadlleX_model.yml -``` - - -`样例二`: - -预测多个图片`/path/to/image_list.txt`，image_list.txt内容的格式如下： -``` -/path/to/images/test_img1.jpeg -/path/to/images/test_img2.jpeg -... -/path/to/images/test_imgn.jpeg -``` - -```shell -./build/classifier --model_dir=/path/to/models/openvino_model --image_list=/root/projects/images_list.txt --cfg_dir=/path/to/PadlleX_model.yml -``` - diff --git a/deploy/openvino/demo/classifier.cpp b/deploy/openvino/demo/classifier.cpp index 1d84318..b0b219b 100755 --- a/deploy/openvino/demo/classifier.cpp +++ b/deploy/openvino/demo/classifier.cpp @@ -22,7 +22,7 @@ #include "include/paddlex/paddlex.h" DEFINE_string(model_dir, "", "Path of inference model"); -DEFINE_string(cfg_dir, "", "Path of PaddelX model yml file"); +DEFINE_string(cfg_file, "", "Path of PaddelX model yml file"); DEFINE_string(device, "CPU", "Device name"); DEFINE_string(image, "", "Path of test image file"); DEFINE_string(image_list, "", "Path of test image list file"); @@ -35,8 +35,8 @@ int main(int argc, char** argv) { std::cerr << "--model_dir need to be defined" << std::endl; return -1; } - if (FLAGS_cfg_dir == "") { - std::cerr << "--cfg_dir need to be defined" << std::endl; + if (FLAGS_cfg_file == "") { + std::cerr << "--cfg_file need to be defined" << std::endl; return -1; } if (FLAGS_image == "" & FLAGS_image_list == "") { @@ -46,7 +46,7 @@ int main(int argc, char** argv) { // 加载模型 PaddleX::Model model; - model.Init(FLAGS_model_dir, FLAGS_cfg_dir, FLAGS_device); + model.Init(FLAGS_model_dir, FLAGS_cfg_file, FLAGS_device); // 进行预测 if (FLAGS_image_list != "") { diff --git a/deploy/openvino/demo/segmenter.cpp b/deploy/openvino/demo/segmenter.cpp index 831e3df..64ddbe5 100644 --- a/deploy/openvino/demo/segmenter.cpp +++ b/deploy/openvino/demo/segmenter.cpp @@ -25,7 +25,7 @@ DEFINE_string(model_dir, "", "Path of openvino model xml file"); -DEFINE_string(cfg_dir, "", "Path of PaddleX model yaml file"); +DEFINE_string(cfg_file, "", "Path of PaddleX model yaml file"); DEFINE_string(image, "", "Path of test image file"); DEFINE_string(image_list, "", "Path of test image list file"); DEFINE_string(device, "CPU", "Device name"); @@ -38,8 +38,8 @@ int main(int argc, char** argv) { std::cerr << "--model_dir need to be defined" << std::endl; return -1; } - if (FLAGS_cfg_dir == "") { - std::cerr << "--cfg_dir need to be defined" << std::endl; + if (FLAGS_cfg_file == "") { + std::cerr << "--cfg_file need to be defined" << std::endl; return -1; } if (FLAGS_image == "" & FLAGS_image_list == "") { @@ -49,7 +49,7 @@ int main(int argc, char** argv) { // PaddleX::Model model; - model.Init(FLAGS_model_dir, FLAGS_cfg_dir, FLAGS_device); + model.Init(FLAGS_model_dir, FLAGS_cfg_file, FLAGS_device); int imgs = 1; auto colormap = PaddleX::GenerateColorMap(model.labels.size()); diff --git a/deploy/openvino/include/paddlex/paddlex.h b/deploy/openvino/include/paddlex/paddlex.h index 30506ed..3bff606 100755 --- a/deploy/openvino/include/paddlex/paddlex.h +++ b/deploy/openvino/include/paddlex/paddlex.h @@ -37,9 +37,9 @@ namespace PaddleX { class Model { public: void Init(const std::string& model_dir, - const std::string& cfg_dir, + const std::string& cfg_file, std::string device) { - create_predictor(model_dir, cfg_dir, device); + create_predictor(model_dir, cfg_file, device); } void create_predictor(const std::string& model_dir, diff --git a/deploy/openvino/python/convertor.py b/deploy/openvino/python/convertor.py index a1e2832..8dbc61f 100644 --- a/deploy/openvino/python/convertor.py +++ b/deploy/openvino/python/convertor.py @@ -1,3 +1,17 @@ +#copyright (c) 2020 PaddlePaddle Authors. All Rights Reserve. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + import os from six import text_type as _text_type import argparse diff --git a/deploy/openvino/python/demo.py b/deploy/openvino/python/demo.py index 1547c6e..79dddb5 100644 --- a/deploy/openvino/python/demo.py +++ b/deploy/openvino/python/demo.py @@ -49,7 +49,7 @@ def arg_parser(): parser.add_argument( - "--cfg_dir", + "--cfg_file", "-c", type=str, default=None, @@ -63,7 +63,7 @@ def main(): parser = arg_parser() args = parser.parse_args() model_xml = args.model_dir - model_yaml = args.cfg_dir + model_yaml = args.cfg_file #model init if("CPU" not in args.device): -- GitLab