From 4f8b9cc0b05a170cdc097edd00e2825155e3fb0c Mon Sep 17 00:00:00 2001 From: kongchibin <530825620@qq.com> Date: Sat, 26 Jun 2021 17:23:12 +0800 Subject: [PATCH 1/3] test --- contrib/build_all.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/build_all.sh b/contrib/build_all.sh index a72ab3315..8ea606aa6 100644 --- a/contrib/build_all.sh +++ b/contrib/build_all.sh @@ -17,6 +17,7 @@ set -e current_folder="$( cd "$(dirname "$0")" ;pwd -P )" SAMPLE_FOLDER=( +../mxVision/MediaCodec/script ) -- Gitee From fd67a770543328d393056687254948f3b6d98503 Mon Sep 17 00:00:00 2001 From: kongchibin <530825620@qq.com> Date: Sat, 26 Jun 2021 20:11:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9CONTRIBUTE.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contrib/CONTRIBUTING.md | 93 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 85 insertions(+), 8 deletions(-) diff --git a/contrib/CONTRIBUTING.md b/contrib/CONTRIBUTING.md index 66fd6fb8e..ade62f6c8 100644 --- a/contrib/CONTRIBUTING.md +++ b/contrib/CONTRIBUTING.md @@ -12,15 +12,21 @@ MindX SDK, 欢迎各位开发者 ### 一、源码 -1、MindX SDK离线推理请使用C++或python代码,符合第四部分编码规范 +1、MindX SDK离线推理请使用`C++`或`python`代码,符合第四部分编码规范 -2、贡献者参考设计代码目录命名规则: "mindxsdk-referenceapps/contrib/参考设计名称(英文)" +2、贡献者参考设计代码目录命名规则 + +```shell +mindxsdk-referenceapps/contrib/参考设计名称(英文) +``` ### 二、License规则 涉及的代码、启动脚本都均需要在开始位置添加华为公司 License [华为公司 License链接](https://gitee.com/mindspore/mindspore/blob/master/LICENSE) -``` +- **C++** + +```c++ /* * Copyright(C) 2021. Huawei Technologies Co.,Ltd. All rights reserved. * @@ -38,19 +44,90 @@ MindX SDK, 欢迎各位开发者 */ ``` +- **python**&**shell** + +```python +# Copyright(C) 2021. Huawei Technologies Co.,Ltd. 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. +``` + > 关于License声明时间,应注意: 2021年新建的文件,应该是Copyright 2021 Huawei Technologies Co., Ltd 2020年创建年份,2020年修改年份,应该是Copyright 2020 Huawei Technologies Co., Ltd -### 三、README +### 三、提交内容 + +- **提交清单** + +| 文件 | 描述 | +| ------------ | ------------------------------------------------------------ | +| **README** | 包含第三方依赖安装、模型转换、编译、运行指导等内容,能指导端到端使用 | +| 代码 | 包含插件的C++代码、CMakeLists.txt、python/C++推理运行代码 | +| 配置文件 | 运行时相关配置文件,用于加载相关运行参数的文件 | +| pipeline文件 | MindX SDK的编排文件 | +| 启动脚本 | 包括编译、运行、测试、模型转换等脚 | + +- **典型的目录结构** + +```bash + +├── config #配置文件目录 +│   └── configure.cfg +├── model #模型目录 +├── pipeline +│   └── test.pipeline +├── Plugin1 #插件1工程目录 +│   ├── CMakeLists.txt +│   ├── Plugin1.cpp +│   └── Plugin1.h +├── Plugin2 #插件2工程目录 +│   ├── CMakeLists.txt +│   ├── Plugin2.cpp +│   └── Plugin2.h +├── main.cpp +├── main.py +├── README.md +├── build.sh +└── run.sh + +``` -详细说明README,包括第三方依赖安装、模型转换、编译、运行指导等内容。 +**注意**:相关输入的数据(图像、视频等)请不要上传到代码上,请在README注明如何获取 -### 四、PR提交 +### 四、代码提交规范 - 关键要求: -1、请将modelzoo仓fork到个人分支,基于个人分支新增、修改和提交PR; +1、请将**`mindxsdk-referenceapps`**仓**fork**到个人分支,基于个人分支提交代码到个人**fork仓**,并创建**`Pull Requests`**,提交合并请求到主仓上 + +**参考Fork+Pull Requests 模式**:https://gitee.com/help/articles/4128#article-header0 + +2、PR标题模板 -2、PR标题:线上活动,请在标题注明[线上贡献];高校活动,请注明 [xxx学校] [高校贡献]]; +``` + [xxx学校] [xxx参考设计] +``` + +3、PR内容模板 + +``` +### 相关的Issue + +### 原因(目的、解决的问题等) + +### 描述(做了什么,变更了什么) + +### 测试用例(新增、改动、可能影响的功能) +``` ### 五、编程规范 -- Gitee From d04ccb9136d3f76f482a34e826ce0efbc2a33631 Mon Sep 17 00:00:00 2001 From: kongchibin <530825620@qq.com> Date: Sat, 26 Jun 2021 20:13:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9build=5Fall.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contrib/build_all.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/build_all.sh b/contrib/build_all.sh index 8ea606aa6..a72ab3315 100644 --- a/contrib/build_all.sh +++ b/contrib/build_all.sh @@ -17,7 +17,6 @@ set -e current_folder="$( cd "$(dirname "$0")" ;pwd -P )" SAMPLE_FOLDER=( -../mxVision/MediaCodec/script ) -- Gitee