Browse Source

pull and fix conflict

will-jl944 4 năm trước cách đây
mục cha
commit
d4c5030792
6 tập tin đã thay đổi với 57 bổ sung18 xóa
  1. 4 0
      README.md
  2. 3 0
      README_cn.md
  3. 0 9
      dygraph/.gitmodules
  4. 1 1
      dygraph/PaddleClas
  5. 7 8
      dygraph/README.md
  6. 42 0
      dygraph/setup.py

+ 4 - 0
README.md

@@ -15,6 +15,10 @@
 [![License](https://img.shields.io/badge/license-Apache%202-red.svg)](LICENSE) [![Version](https://img.shields.io/github/release/PaddlePaddle/PaddleX.svg)](https://github.com/PaddlePaddle/PaddleX/releases) ![python version](https://img.shields.io/badge/python-3.6+-orange.svg) ![support os](https://img.shields.io/badge/os-linux%2C%20win%2C%20mac-yellow.svg)
  ![QQGroup](https://img.shields.io/badge/QQ_Group-1045148026-52B6EF?style=social&logo=tencent-qq&logoColor=000&logoWidth=20)
 
+
+## PaddleX dygraph mode is ready! Static mode is set by default and dygraph graph code base is in [dygraph](https://github.com/PaddlePaddle/PaddleX/tree/develop/dygraph). If you want to use static mode, the version 1.3.10 can be installed by pip. The version 2.0.0rc0 corresponds to the dygraph mode.
+
+
 :hugs:  PaddleX integrated the abilities of **Image classification**, **Object detection**, **Semantic segmentation**, and **Instance segmentation** in the Paddle CV toolkits, and get through the whole-process development from **Data preparation** and **Model training and optimization** to **Multi-end deployment**. At the same time, PaddleX provides **Succinct APIs** and a **Graphical User Interface**. Developers can quickly complete the end-to-end process development of the Paddle in a form of **low-code**  without installing different libraries.
 
 **:factory: PaddleX** has been validated in a dozen of industry application scenarios such as **Quality Inspection**, **Security**, **Patrol Inspection**, **Remote Sensing**, **Retail**,  **Medical** etc.. In addition, it **provides a wealth of case practice tutorials**, to help developer could apply to actual cases easily.

+ 3 - 0
README_cn.md

@@ -11,6 +11,9 @@
 [![License](https://img.shields.io/badge/license-Apache%202-red.svg)](LICENSE) [![Version](https://img.shields.io/github/release/PaddlePaddle/PaddleX.svg)](https://github.com/PaddlePaddle/PaddleX/releases) ![python version](https://img.shields.io/badge/python-3.6+-orange.svg) ![support os](https://img.shields.io/badge/os-linux%2C%20win%2C%20mac-yellow.svg)
  ![QQGroup](https://img.shields.io/badge/QQ_Group-1045148026-52B6EF?style=social&logo=tencent-qq&logoColor=000&logoWidth=20)
 
+
+## PaddleX全面升级动态图,目前默认使用静态图版本,动态图版本位于[dygraph](https://github.com/PaddlePaddle/PaddleX/tree/develop/dygraph)中。pip安装1.3.10版本对应使用静态图版本,pip安装2.0.0rc0即使用动态图版本。
+
 :hugs: PaddleX 集成飞桨智能视觉领域**图像分类**、**目标检测**、**语义分割**、**实例分割**任务能力,将深度学习开发全流程从**数据准备**、**模型训练与优化**到**多端部署**端到端打通,并提供**统一任务API接口**及**图形化开发界面Demo**。开发者无需分别安装不同套件,以**低代码**的形式即可快速完成飞桨全流程开发。
 
 :factory: **PaddleX** 经过**质检**、**安防**、**巡检**、**遥感**、**零售**、**医疗**等十多个行业实际应用场景验证,沉淀产业实际经验,**并提供丰富的案例实践教程**,全程助力开发者产业实践落地。

+ 0 - 9
dygraph/.gitmodules

@@ -1,9 +0,0 @@
-[submodule "PaddleSeg"]
-	path = PaddleSeg
-	url = https://github.com/PaddlePaddle/PaddleSeg.git
-[submodule "PaddleDetection"]
-	path = PaddleDetection
-	url = https://github.com/PaddlePaddle/PaddleDetection.git
-[submodule "PaddleClas"]
-	path = PaddleClas
-	url = https://github.com/PaddlePaddle/PaddleClas.git

+ 1 - 1
dygraph/PaddleClas

@@ -1 +1 @@
-Subproject commit b5de5322b9f40449db4d55078044a1e1b44c0644
+Subproject commit 725a8ffda618eb8da16171a6b2006f6ab85e9928

+ 7 - 8
dygraph/README.md

@@ -1,10 +1,9 @@
 # PaddleX全面升级动态图,2.0.0-rc发布!
 
-> 原版本代码分支在[release/1.3](https://github.com/PaddlePaddle/PaddleX/tree/release/1.3),也可以通过pip安装1.3.10版本进行使用。
 
 
 <p align="center">
-  <img src="./docs/gui/images/paddlex.png" width="360" height ="55" alt="PaddleX" align="middle" />
+  <img src="../docs/gui/images/paddlex.png" width="360" height ="55" alt="PaddleX" align="middle" />
 </p>
  <p align= "center"> PaddleX -- 飞桨全流程开发工具,以低代码的形式支持开发者快速实现产业实际项目落地 </p>
 
@@ -21,7 +20,7 @@
 
 
 
-![](./docs/gui/images/paddlexoverview.png)
+![](../docs/gui/images/paddlexoverview.png)
 
 
 
@@ -50,13 +49,13 @@ pip install paddlex==2.0.0rc -i https://mirror.baidu.com/pypi/simple
 
 - 前往[PaddleX官网](https://www.paddlepaddle.org.cn/paddle/paddlex),申请下载PaddleX GUI一键绿色安装包。
 
-- 前往[PaddleX GUI使用教程](./docs/gui/how_to_use.md)了解PaddleX GUI使用详情。
+- 前往[PaddleX GUI使用教程](../docs/gui/how_to_use.md)了解PaddleX GUI使用详情。
 
-- [PaddleX GUI安装环境说明](./docs/gui/download.md)
+- [PaddleX GUI安装环境说明](../docs/gui/download.md)
 
 3. **PaddleX Restful:**  
   使用基于RESTful API开发的GUI与Web Demo实现远程的深度学习全流程开发;同时开发者也可以基于RESTful API开发个性化的可视化界面
-- 前往[PaddleX RESTful API使用教程](./docs/gui/restful/introduction.md)  
+- 前往[PaddleX RESTful API使用教程](../docs/gui/restful/introduction.md)  
 
 
 ## 使用教程
@@ -65,7 +64,7 @@ pip install paddlex==2.0.0rc -i https://mirror.baidu.com/pypi/simple
 - [模型剪裁教程](https://github.com/PaddlePaddle/PaddleX/tree/release/2.0-rc/tutorials/slim/prune)
 
 
-## :question:[FAQ](./docs/gui/faq.md):question:
+## :question:[FAQ](../docs/gui/faq.md):question:
 
 ## 交流与反馈
 
@@ -74,7 +73,7 @@ pip install paddlex==2.0.0rc -i https://mirror.baidu.com/pypi/simple
 - PaddleX用户交流群:957286141 (手机QQ扫描如下二维码快速加入)  
 
   <p align="center">
-    <img src="./docs/gui/images/QR2.jpg" width="250" height ="360" alt="QR" align="middle" />
+    <img src="../docs/gui/images/QR2.jpg" width="250" height ="360" alt="QR" align="middle" />
   </p>
 
 

+ 42 - 0
dygraph/setup.py

@@ -0,0 +1,42 @@
+# copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved.
+#
+# 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 setuptools
+import sys
+
+long_description = "PaddlePaddle Entire Process Development Toolkit"
+
+setuptools.setup(
+    name="paddlex",
+    version='2.0.0rc0',
+    author="paddlex",
+    author_email="paddlex@baidu.com",
+    description=long_description,
+    long_description=long_description,
+    long_description_content_type="text/plain",
+    url="https://github.com/PaddlePaddle/PaddleX",
+    packages=setuptools.find_packages(),
+    setup_requires=['cython', 'numpy'],
+    install_requires=[
+        "pycocotools;platform_system!='Windows'", 'pyyaml', 'colorama', 'tqdm',
+        'paddleslim==2.0.0', 'visualdl>=2.1.1', 'shapely>=1.7.0',
+        'opencv-python', 'scipy'
+    ],
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: Apache Software License",
+        "Operating System :: OS Independent",
+    ],
+    license='Apache 2.0',
+    entry_points={'console_scripts': ['paddlex=paddlex.command:main', ]})