diff --git a/README.md b/README.md index 41c6d26c85beec4cb2c0a09807792e84395b6595..340ccf6ee19fecc19bfd47ae3a8cc9efb7e4603c 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ To help developers quickly master the use of Vision SDK and Index SDK interfaces ## Related Websites -The Ascend Community encourages developers to communicate and learn together. Developers can obtain the latest Mind SDK software, documentation, and other resources through the Ascend Community website; they can also exchange development experiences with other developers through the Ascend Forum. +The Ascend Community encourages developers to communicate and learn together. Developers can obtain the latest MindSDK software, documentation, and other resources through the Ascend Community website; they can also exchange development experiences with other developers through the Ascend Forum. Ascend Community Website: https://www.hiascend.com/ diff --git a/VisionSDK/AiPhysicalAttackAndDetecting/args.py b/VisionSDK/AiPhysicalAttackAndDetecting/args.py index df26eed9f782545a4d46e0f8d87561df5c329c40..090f6c03b1d69a86c1eb47372f3ddcbf368581cd 100644 --- a/VisionSDK/AiPhysicalAttackAndDetecting/args.py +++ b/VisionSDK/AiPhysicalAttackAndDetecting/args.py @@ -3,7 +3,7 @@ """ Copyright (c) Huawei Technologies Co., Ltd. 2023-2023. All rights reserved. Description: Input args parse. -Author: MindX SDK +Author: MindSDK Create: 2023 History: NA """ diff --git a/VisionSDK/AiPhysicalAttackAndDetecting/camera/camera_process.py b/VisionSDK/AiPhysicalAttackAndDetecting/camera/camera_process.py index 30cc71f27eabbe133577e50e877eccb2621fbb32..e5f2419c6e614116e03419bda40b48ce4051e37e 100644 --- a/VisionSDK/AiPhysicalAttackAndDetecting/camera/camera_process.py +++ b/VisionSDK/AiPhysicalAttackAndDetecting/camera/camera_process.py @@ -3,7 +3,7 @@ """ Copyright (c) Huawei Technologies Co., Ltd. 2023-2023. All rights reserved. Description: Input source process. -Author: MindX SDK +Author: MindSDK Create: 2023 History: NA """ diff --git a/VisionSDK/AiPhysicalAttackAndDetecting/darknet_ob_detector/utils.py b/VisionSDK/AiPhysicalAttackAndDetecting/darknet_ob_detector/utils.py index 6a9732003f58787e5e13fb3b09c01c75b490f935..ac9757a0f5b67ae42d238d1981ad77e1587dd1ba 100644 --- a/VisionSDK/AiPhysicalAttackAndDetecting/darknet_ob_detector/utils.py +++ b/VisionSDK/AiPhysicalAttackAndDetecting/darknet_ob_detector/utils.py @@ -3,7 +3,7 @@ """ Copyright (c) Huawei Technologies Co., Ltd. 2023-2023. All rights reserved. Description: Util functions. -Author: MindX SDK +Author: MindSDK Create: 2023 History: NA """ diff --git a/VisionSDK/AiPhysicalAttackAndDetecting/ultrayolo_attack_detector/detect_attack_by_mxbase.py b/VisionSDK/AiPhysicalAttackAndDetecting/ultrayolo_attack_detector/detect_attack_by_mxbase.py index 7bce9c09b4b25cfb5d1398a5e2eeaab992515eeb..90d325d6328f7a54e6c707a9eaf31ed87f5f3c38 100644 --- a/VisionSDK/AiPhysicalAttackAndDetecting/ultrayolo_attack_detector/detect_attack_by_mxbase.py +++ b/VisionSDK/AiPhysicalAttackAndDetecting/ultrayolo_attack_detector/detect_attack_by_mxbase.py @@ -3,7 +3,7 @@ """ Copyright (c) Huawei Technologies Co., Ltd. 2023-2023. All rights reserved. Description: Main process of attack detect. -Author: MindX SDK +Author: MindSDK Create: 2023 History: NA """ diff --git a/VisionSDK/AiPhysicalAttackAndDetecting/ultrayolo_attack_detector/utils.py b/VisionSDK/AiPhysicalAttackAndDetecting/ultrayolo_attack_detector/utils.py index eb5f352e8d8eb25ad9368e16e588cd206187382f..60ecef29c4235f771ae10d0a3ee36aad5111a77d 100644 --- a/VisionSDK/AiPhysicalAttackAndDetecting/ultrayolo_attack_detector/utils.py +++ b/VisionSDK/AiPhysicalAttackAndDetecting/ultrayolo_attack_detector/utils.py @@ -3,7 +3,7 @@ """ Copyright (c) Huawei Technologies Co., Ltd. 2023-2023. All rights reserved. Description: Util functions. -Author: MindX SDK +Author: MindSDK Create: 2023 History: NA """ diff --git a/VisionSDK/Ascendffmpeg/README.md b/VisionSDK/Ascendffmpeg/README.md index aadc294b7d44e7aca56cade2a2fef0c10404550b..c73d294d0370116a6551416ed17318e41fdd7767 100644 --- a/VisionSDK/Ascendffmpeg/README.md +++ b/VisionSDK/Ascendffmpeg/README.md @@ -74,9 +74,9 @@ chmod +x ./ffbuild/*.sh **步骤3：** 添加环境变量 -通过指令`find / -name libavdevice.so`查找到文件所在路径，形如`/PATH/TO/mindxsdk-referenceapps/VisionSDK/Ascendffmpeg/ascend/lib/libavdevice.so`，则执行： +通过指令`find / -name libavdevice.so`查找到文件所在路径，形如`/PATH/TO/mindsdk-referenceapps/VisionSDK/Ascendffmpeg/ascend/lib/libavdevice.so`，则执行： ```bash -export LD_LIBRARY_PATH=/PATH/TO/mindxsdk-referenceapps/VisionSDK/Ascendffmpeg/ascend/lib:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=/PATH/TO/mindsdk-referenceapps/VisionSDK/Ascendffmpeg/ascend/lib:$LD_LIBRARY_PATH ``` **步骤4：** 运行 diff --git a/VisionSDK/OpticalCharacterRecognition/src/AscendBase/Base/Framework/ModuleProcessors/CommonData/CommonData.h b/VisionSDK/OpticalCharacterRecognition/src/AscendBase/Base/Framework/ModuleProcessors/CommonData/CommonData.h index 6b7c47017a22420f2b783367b17cbed0c2bfcc9e..b5ce5aff8cb54455113a10d324cbb56495dd767b 100644 --- a/VisionSDK/OpticalCharacterRecognition/src/AscendBase/Base/Framework/ModuleProcessors/CommonData/CommonData.h +++ b/VisionSDK/OpticalCharacterRecognition/src/AscendBase/Base/Framework/ModuleProcessors/CommonData/CommonData.h @@ -1,7 +1,7 @@ /* * Copyright (c) Huawei Technologies Co., Ltd 2022-2022. All rights reserved. * Description: Common data struct. -* Author: MindX SDK +* Author: MindSDK * Create: 2022 * History: NA */ diff --git a/VisionSDK/OpticalCharacterRecognition/src/AscendBase/Base/Framework/ModuleProcessors/Signal/Signal.cpp b/VisionSDK/OpticalCharacterRecognition/src/AscendBase/Base/Framework/ModuleProcessors/Signal/Signal.cpp index 3b317be1cb3f1342568d34d66c8751c441db6e98..d60a2b067d31f2b37f08b9a61a757eefd42bc5b8 100644 --- a/VisionSDK/OpticalCharacterRecognition/src/AscendBase/Base/Framework/ModuleProcessors/Signal/Signal.cpp +++ b/VisionSDK/OpticalCharacterRecognition/src/AscendBase/Base/Framework/ModuleProcessors/Signal/Signal.cpp @@ -1,7 +1,7 @@ /* * Copyright (c) Huawei Technologies Co., Ltd 2022-2022. All rights reserved. * Description: signal control. -* Author: MindX SDK +* Author: MindSDK * Create: 2022 * History: NA */ diff --git a/VisionSDK/OpticalCharacterRecognition/src/build.sh b/VisionSDK/OpticalCharacterRecognition/src/build.sh index 8a4bd57a3983044414c3a2ce86709a5bae237b93..f2eeee373dc22ae39154f5bb50239544a1c5eae6 100644 --- a/VisionSDK/OpticalCharacterRecognition/src/build.sh +++ b/VisionSDK/OpticalCharacterRecognition/src/build.sh @@ -1,7 +1,7 @@ # !/bin/bash # Copyright (c) Huawei Technologies Co., Ltd. 2022-2022. All rights reserved. # Description: mxOCR c++ build. -# Author: MindX SDK +# Author: MindSDK # Create: 2022 # History: NA diff --git a/VisionSDK/PPYOLOEPlusDetection/README.md b/VisionSDK/PPYOLOEPlusDetection/README.md index 6145ecac3fb8090d3d192b0776e8df9b3e8e7a41..2c70bcd1d514675050feb4c614bd7c049582850c 100644 --- a/VisionSDK/PPYOLOEPlusDetection/README.md +++ b/VisionSDK/PPYOLOEPlusDetection/README.md @@ -47,7 +47,7 @@ paddlepaddle框架的ppyoloe模型推理时，前处理方案包括解码为BGR- │ └── CMakeLists.txt # 用于编译后处理插件 ├── model │ ├── coco.names # 需要下载，下载链接在下方 -│ └── ppyoloe.cfg # 模型后处理配置文件，配置说明参考《mxVision用户指南》中已有模型支持->模型后处理配置参数->YOLOv5模型后处理配置参数 +│ └── ppyoloe.cfg # 模型后处理配置文件，配置说明参考《Vision SDK用户指南》中已有模型支持->模型后处理配置参数->YOLOv5模型后处理配置参数 ├── pipeline │ ├── Sample.pipeline # 参考pipeline文件，用于配置rgb模型，用户需要根据自己需求和模型输入类型进行修改 │ └── SampleYuv.pipeline # 参考pipeline文件，用于配置yuv模型，用户需要根据自己需求和模型输入类型进行修改 diff --git a/VisionSDK/PutTextForMultiVideos/ConfigParser/ConfigParser.cpp b/VisionSDK/PutTextForMultiVideos/ConfigParser/ConfigParser.cpp index da5e939e9c7dffb836c4bcd8b9340cc71f200b66..2c8f5b7183eabd9d29de45534a1b6a8bd7bfec2a 100644 --- a/VisionSDK/PutTextForMultiVideos/ConfigParser/ConfigParser.cpp +++ b/VisionSDK/PutTextForMultiVideos/ConfigParser/ConfigParser.cpp @@ -1,7 +1,7 @@ /* * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Description: ConfigParser implementation. - * Author: MindX SDK + * Author: MindSDK * Create: 2024 * History: NA */ diff --git a/VisionSDK/PutTextForMultiVideos/ConfigParser/ConfigParser.h b/VisionSDK/PutTextForMultiVideos/ConfigParser/ConfigParser.h index c38b1ba35c11687dd11847ddcea35e7512d8ebb7..41354a21636e365f2e5fc92c800fb37b11bde717 100644 --- a/VisionSDK/PutTextForMultiVideos/ConfigParser/ConfigParser.h +++ b/VisionSDK/PutTextForMultiVideos/ConfigParser/ConfigParser.h @@ -1,7 +1,7 @@ /* * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Description: ConfigParser implementation. - * Author: MindX SDK + * Author: MindSDK * Create: 2024 * History: NA */ diff --git a/VisionSDK/RtspServer/README.zh.md b/VisionSDK/RtspServer/README.zh.md index a94e873a616534fc65299e2ff8b74fe9394410c4..c1bcd5bff8edac18ba25f27ffd452c1385bec1ff 100644 --- a/VisionSDK/RtspServer/README.zh.md +++ b/VisionSDK/RtspServer/README.zh.md @@ -69,7 +69,7 @@ openssl rsa -in server.key -out server_no.crt 生成server_no.crt，则说明成功。 - 证书ca.crt、server.crt的制作，请参考mxVision手册证书制作章节。 + 证书ca.crt、server.crt的制作，请参考Vision SDK手册证书制作章节。 ### 4.2 运行 diff --git a/contrib/ADNet/README.md b/contrib/ADNet/README.md index e5d4da3ea5eb9ea0eed8f901d9ce31f3b1fabdd0..1b94e31db564dbdaac1055e9c495dd74af11c975 100644 --- a/contrib/ADNet/README.md +++ b/contrib/ADNet/README.md @@ -74,8 +74,8 @@ pipeline流程如下图所示： ```bash # 执行环境变量脚本使环境变量生效 . ${ascend-toolkit-path}/set_env.sh -. ${mxVision-path}/set_env.sh -# mxVision-path: mxVision安装路径 +. ${Vision-SDK-path}/set_env.sh +# Vision-SDK-path: Vision SDK安装路径 # ascend-toolkit-path: CANN安装路径 ``` ## 3 模型转换 diff --git a/contrib/ActionRecognition/README.md b/contrib/ActionRecognition/README.md index 52582d04c70e8eea29334fadfafcc24b7266cf71..c8cb741904ce4d9b851ff32669d7c9ee821f1428 100644 --- a/contrib/ActionRecognition/README.md +++ b/contrib/ActionRecognition/README.md @@ -169,8 +169,8 @@ **步骤5：** 配置环境变量MX_SDK_HOME： ```bash -export MX_SDK_HOME=/MindX_SDK/mxVision/ -# 此处MX_SDK_HOME请使用MindX_SDK的实际路径 +export MX_SDK_HOME=${Vision SDK的安装路径} +# 此处MX_SDK_HOME请使用Vision SDK的安装路径 ``` **步骤6**：在插件代码目录下创建build文件夹，使用cmake命令进行编译，生成.so文件。下面以单人独处插件的编译过程作为范例： diff --git a/contrib/AutoSpeechRecognition/README.md b/contrib/AutoSpeechRecognition/README.md index 79440dc70a838b581484d41518a4c9fa73ced98d..06e73fe2644c4637d158b1cd9fd6508d153acfdc 100644 --- a/contrib/AutoSpeechRecognition/README.md +++ b/contrib/AutoSpeechRecognition/README.md @@ -78,7 +78,7 @@ apt-get install liblzma-dev #设置CANN环境变量（请确认install_path路径是否正确） . ${ascend-toolkit-path}/set_env.sh -#设置MindX SDK 环境变量，SDK-path为mxVision SDK 安装路径 +#设置Vision SDK 环境变量，SDK-path为Vision SDK 安装路径 . ${SDK-path}/set_env.sh ``` diff --git a/contrib/CONTRIBUTING.md b/contrib/CONTRIBUTING.md index 997618d058f95817ec86ee696711e53e18604eb1..d54617c83bcb855f23ee8726f6502b4c66549d0d 100644 --- a/contrib/CONTRIBUTING.md +++ b/contrib/CONTRIBUTING.md @@ -19,7 +19,7 @@ mindsdk-referenceapps欢迎各位开发者的加入，希望各位开发者遵 | **README** | 包含第三方依赖安装、模型转换、编译、运行指导等内容，能指导端到端使用 | | 代码 | 包含插件开发的C++代码、CMakeLists.txt、python/C++推理运行代码、精度与性能测试代码 | | 配置文件 | 运行时相关配置文件，用于加载相关运行参数的文件 | -| pipeline文件 | Mind SDK的编排文件 | +| pipeline文件 | MindSDK的编排文件 | | 启动脚本 | 包括编译、运行、测试、模型转换等脚本 | - **典型的目录结构** @@ -49,7 +49,7 @@ mindsdk-referenceapps欢迎各位开发者的加入，希望各位开发者遵 ### 二、源码 -1、Mind SDK离线推理请使用`C++`或`python`代码，符合第四部分编码规范 +1、MindSDK离线推理请使用`C++`或`python`代码，符合第四部分编码规范 2、贡献者参考设计代码目录命名规则 diff --git a/contrib/CenterFace/C++/run.sh b/contrib/CenterFace/C++/run.sh index 30883b290499214e9077d361d0955c48388b6123..dbcb991aa4479fd754c03137907293e1ebe2e320 100644 --- a/contrib/CenterFace/C++/run.sh +++ b/contrib/CenterFace/C++/run.sh @@ -23,7 +23,7 @@ env_ready=true function check_env() { - # check MindXSDK env + # check MindSDK env if [ ! "${MX_SDK_HOME}" ]; then env_ready=false echo "please set MX_SDK_HOME path into env." diff --git a/contrib/CenterFace/README.md b/contrib/CenterFace/README.md index c7a522dd30c9c9443030881f7928152538351d79..44304fd685445ff7394aae2ad9c86bdbb850cd0b 100644 --- a/contrib/CenterFace/README.md +++ b/contrib/CenterFace/README.md @@ -80,8 +80,8 @@ ```bash # 执行环境变量脚本使环境变量生效 . ${ascend-toolkit-path}/set_env.sh -. ${mxVision-path}/set_env.sh -# mxVision-path: mxVision安装路径 +. ${Vision-SDK-path}/set_env.sh +# Vision-SDK-path: Vision SDK安装路径 # ascend-toolkit-path: CANN安装路径 ``` ## 3 准备模型 diff --git a/contrib/CenterNet/README.md b/contrib/CenterNet/README.md index 245a7e6e350def107b998fd702c9c8598d251027..020ab55beffa5aa1f117add56c46b98423732463 100644 --- a/contrib/CenterNet/README.md +++ b/contrib/CenterNet/README.md @@ -60,8 +60,8 @@ CenterNet 目标检测后处理插件基于 Vision SDK 开发，对图片中的 ```bash # 执行环境变量脚本使环境变量生效 . ${ascend-toolkit-path}/set_env.sh -. ${mxVision-path}/set_env.sh -# mxVision: mxVision安装路径 +. ${Vision-SDK-path}/set_env.sh +# Vision-SDK-path: Vision SDK安装路径 # ascend-toolkit-path: CANN安装路径 ``` diff --git a/contrib/Collision/README.md b/contrib/Collision/README.md index dbc4f3b4509cbf1403ff42a306afa17d7e236272..52c96cfd33fb7097ccbb0ff6f95d0252da44fc4d 100644 --- a/contrib/Collision/README.md +++ b/contrib/Collision/README.md @@ -90,8 +90,8 @@ ```bash # 执行环境变量脚本使环境变量生效 . ${ascend-toolkit-path}/set_env.sh -. ${mxVision-path}/set_env.sh -# mxVision-path: mxVision安装路径 +. ${Vision-SDK-path}/set_env.sh +# Vision-SDK-path: Vision SDK安装路径 # ascend-toolkit-path: CANN安装路径 ``` diff --git a/contrib/Colorization/README.md b/contrib/Colorization/README.md index 4330c4350c82a0d120b0f34b683b5c501f503b71..4dd035123d68ec5c69446102ea8d4cfbd12c3d4f 100644 --- a/contrib/Colorization/README.md +++ b/contrib/Colorization/README.md @@ -48,7 +48,7 @@ #设置CANN环境变量，ascend-toolkit-path为cann安装路径 . ${ascend-toolkit-path}/set_env.sh -#设置MindX SDK 环境变量，SDK-path为mxVision SDK 安装路径 +#设置Vision SDK 环境变量，SDK-path为Vision SDK 安装路径 . ${SDK-path}/set_env.sh ``` diff --git a/contrib/CrowdCounting/README.md b/contrib/CrowdCounting/README.md index 8ce663bd0236267e3b811e215c86bda128e95ea6..efa9369d1aa90fcdbbb3de6c61a8823c53c13199 100644 --- a/contrib/CrowdCounting/README.md +++ b/contrib/CrowdCounting/README.md @@ -30,7 +30,7 @@ #设置CANN环境变量（请确认install_path路径是否正确） . ${ascend-toolkit-path}/set_env.sh -#设置MindX SDK 环境变量，SDK-path为mxVision SDK 安装路径 +#设置Vision SDK 环境变量，SDK-path为Vision SDK 安装路径 . ${SDK-path}/set_env.sh ``` ## 3 准备模型 diff --git a/contrib/DocumentLayoutAnalysis/README.md b/contrib/DocumentLayoutAnalysis/README.md index df5cb85b0cc3eff853fc320f23ca263197628add..758e29cab4e68af8266246b89e941c07c11d3df3 100644 --- a/contrib/DocumentLayoutAnalysis/README.md +++ b/contrib/DocumentLayoutAnalysis/README.md @@ -65,8 +65,8 @@ ```bash # 执行环境变量脚本使环境变量生效 . ${ascent-tookit-path}/set_env.sh -. ${SDK-path}/set_env.sh -# SDK-path: SDK mxVision安装路径 +. ${Vision-SDK-path}/set_env.sh +# Vision-SDK-path: Vision SDK安装路径 # ascent-tookit-path: CANN安装路径 ``` diff --git a/contrib/DriverStatusRecognition/README.md b/contrib/DriverStatusRecognition/README.md index e48b971400c87f482a1fc27ae4276c2b2074f401..7f61743a02fcf59e76d278cfd78eb1d42f8de99a 100644 --- a/contrib/DriverStatusRecognition/README.md +++ b/contrib/DriverStatusRecognition/README.md @@ -26,8 +26,8 @@ ```bash # 执行环境变量脚本使环境变量生效 . ${ascend-toolkit-path}/set_env.sh -. ${mxVision-path}/set_env.sh -# mxVision-path: mxVision安装路径 +. ${Vision-SDK-path}/set_env.sh +# Vision-SDK-path: Vision SDK安装路径 # ascend-toolkit-path: CANN安装路径 ``` ## 3 准备模型 diff --git a/contrib/DriverStatusRecognition/run.sh b/contrib/DriverStatusRecognition/run.sh index d8fe017ae81cee4436e727c25467e9180eebf7d5..d7f4ec50779b2e024087895719cfb19470d8f8ca 100755 --- a/contrib/DriverStatusRecognition/run.sh +++ b/contrib/DriverStatusRecognition/run.sh @@ -23,7 +23,7 @@ CUR_PATH=$(cd "$(dirname "$0")" || { warn "Failed to check path/to/run.sh" ; exi info() { echo -e "\033[1;34m[INFO ][MxStream] $1\033[1;37m" ; } warn() { echo >&2 -e "\033[1;31m[WARN ][MxStream] $1\033[1;37m" ; } -#export MX_SDK_HOME=/home/xxxx/sdk/MindX_SDK/mxVision +#export MX_SDK_HOME=/home/xxxx/sdk/Mind_SDK/mxVision export LD_LIBRARY_PATH=${MX_SDK_HOME}/lib:${MX_SDK_HOME}/opensource/lib:${MX_SDK_HOME}/opensource/lib64:/usr/local/Ascend/ascend-toolkit/latest/acllib/lib64:${LD_LIBRARY_PATH} export GST_PLUGIN_SCANNER=${MX_SDK_HOME}/opensource/libexec/gstreamer-1.0/gst-plugin-scanner export GST_PLUGIN_PATH=${MX_SDK_HOME}/opensource/lib/gstreamer-1.0:${MX_SDK_HOME}/lib/plugins diff --git a/contrib/EdgeDetectionPicture/README.md b/contrib/EdgeDetectionPicture/README.md index 2a010fbf1217b7bc4d7ecc868c1be7c6c45151f2..f4866667aa28b757d55d6bfb249a19919a324c60 100644 --- a/contrib/EdgeDetectionPicture/README.md +++ b/contrib/EdgeDetectionPicture/README.md @@ -45,7 +45,7 @@ Init > ReadImage >Resize > Inference >PostProcess >DeInit #设置CANN环境变量 . ${ascend-toolkit-path}/set_env.sh -#设置MindX SDK 环境变量，SDK-path为mxVision SDK 安装路径 +#设置Vision SDK 环境变量，SDK-path为Vision SDK 安装路径 . ${SDK-path}/set_env.sh ``` ## 3 准备模型 diff --git a/contrib/EfficientDet/README.md b/contrib/EfficientDet/README.md index e54d767908a67349545853048abdf750b5512262..c4bc23cb26a20b903ef4627e4cfaf28dfd334f31 100644 --- a/contrib/EfficientDet/README.md +++ b/contrib/EfficientDet/README.md @@ -55,8 +55,8 @@ EfficientDet 目标检测后处理插件基于 Vision SDK 开发，对图片中 ```bash # 执行环境变量脚本使环境变量生效 . ${ascend-toolkit-path}/set_env.sh -. ${mxVision-path}/set_env.sh -# mxVision-path: mxVision安装路径 +. ${Vision-SDK-path}/set_env.sh +# Vision-SDK-path: Vision SDK安装路径 # ascend-toolkit-path: CANN安装路径 ``` diff --git a/contrib/ErfnetSegmentation/README.md b/contrib/ErfnetSegmentation/README.md index 36ac81901661e1b697cfe41f10b8a41d5d3565cd..5e0ebc01b3fa7a738794a1b93bb00e5847d6dd1a 100644 --- a/contrib/ErfnetSegmentation/README.md +++ b/contrib/ErfnetSegmentation/README.md @@ -4,7 +4,7 @@ ErfNet是一个语义分割网络，ERFNet可以看作是对ResNet结构的又一改变，ERFNet提出了Factorized Residual Layers，内部全部使用1D的cov(非对称卷积)，以此来降低参数量，提高速度。同时ERFNet也是对ENet的改进，在模型结构上删除了encode中的层和decode层之间的long-range链接，同时所有的downsampling模块都是一组并行的max pooling和conv。 -本项目基于Mind SDK框架实现了ErfNet模型的推理。 +本项目基于Vision SDK框架实现了ErfNet模型的推理。 ### 1.1 支持的产品 diff --git a/contrib/FCOS/README.md b/contrib/FCOS/README.md index b33de11116822b6db3136c3c03b9a2f43132e73c..30186d98270a324e0fdea890939bfc58fd3e1002 100644 --- a/contrib/FCOS/README.md +++ b/contrib/FCOS/README.md @@ -63,8 +63,8 @@ 在项目开始运行前需要设置环境变量： ```bash . ${ascend-toolkit-path}/set_env.sh -. ${mxVision-path}/set_env.sh -# mxVision-path: mxVision安装路径 +. ${Vision-SDK-path}/set_env.sh +# Vision-SDK-path: Vision SDK安装路径 # ascend-toolkit-path: CANN安装路径 ``` diff --git a/contrib/FastSCNN/README.md b/contrib/FastSCNN/README.md index e5297d5f38d60ee5fe54d73938e9b3e738d8bd1e..3a5148a911b22d83fe2afa4c34f4c86c014435c5 100644 --- a/contrib/FastSCNN/README.md +++ b/contrib/FastSCNN/README.md @@ -83,7 +83,7 @@ #设置CANN环境变量（请确认install_path路径是否正确） . ${ascend-toolkit-path}/set_env.sh -#设置MindX SDK 环境变量，SDK-path为mxVision SDK 安装路径 +#设置Vision SDK 环境变量，SDK-path为Vision SDK 安装路径 . ${SDK-path}/set_env.sh #查看环境变量 diff --git a/contrib/Faster_R-CNN/README.md b/contrib/Faster_R-CNN/README.md index 092ee6743819b3fb269a33acd0ef042b977700ec..e7220026d4708b3f5744e0aab73e2eef3ef776c6 100644 --- a/contrib/Faster_R-CNN/README.md +++ b/contrib/Faster_R-CNN/README.md @@ -125,7 +125,7 @@ #设置CANN环境变量（请确认install_path路径是否正确） . ${ascend-toolkit-path}/set_env.sh -#设置MindX SDK 环境变量，SDK-path为mxVision SDK 安装路径 +#设置Vision SDK 环境变量，SDK-path为Vision SDK 安装路径 . ${SDK-path}/set_env.sh ``` diff --git a/contrib/FireDetection/c++/README.md b/contrib/FireDetection/c++/README.md index d0406f6e70639f3465cc3bc1488b94ce4ffee58e..9ab87729d2cdafe00a25f4c93490344d2990762a 100644 --- a/contrib/FireDetection/c++/README.md +++ b/contrib/FireDetection/c++/README.md @@ -56,10 +56,10 @@ ```bash # 执行环境变量脚本使环境变量生效 . ${ascend-toolkit-path}/set_env.sh -. ${mxVision-path}/set_env.sh +. ${Vision-SDK-path}/set_env.sh export FFMPEG_PATH=${ffmpeg-path} export LD_LIBRARY_PATH=${ffmpeg-lib-path}:$LD_LIBRARY_PATH -# mxVision: mxVision安装路径 +# Vision-SDK-path: Vision SDK安装路径 # ascend-toolkit-path: CANN安装路径 # ffmpeg-path: ffmpeg安装路径，通常为/usr/local/ffmpeg # ffmpeg-lib-path: ffmpeg的lib库安装路径，通常为/usr/local/ffmpeg/lib diff --git a/contrib/FireDetection/python/README.md b/contrib/FireDetection/python/README.md index 45c3020a05b57c3aafd31dd4050ebc34cba384f8..8c074fec2602538626dddd4c3c6a64440755cc6d 100644 --- a/contrib/FireDetection/python/README.md +++ b/contrib/FireDetection/python/README.md @@ -43,8 +43,8 @@ ```bash # 执行环境变量脚本使环境变量生效 . ${ascend-toolkit-path}/set_env.sh -. ${mxVision-path}/set_env.sh -# mxVision: mxVision安装路径 +. ${Vision-SDK-path}/set_env.sh +# Vision-SDK-path: Vision SDK安装路径 # ascend-toolkit-path: CANN安装路径 ``` diff --git a/contrib/MeterReader/plugins/process3/build.sh b/contrib/MeterReader/plugins/process3/build.sh index d72c63e98e90e61a13218bdf52e2231aa3e1e92c..e5969b8e24f0334748cf7f245e30a6d9ba323d03 100644 --- a/contrib/MeterReader/plugins/process3/build.sh +++ b/contrib/MeterReader/plugins/process3/build.sh @@ -1,4 +1,4 @@ -# 编译mindx插件，运行环境：华为实验室服务器 +# 编译MindSDK插件，运行环境：华为实验室服务器 # 使用cmake编译插件 diff --git a/contrib/OpenCVPlugin/README.md b/contrib/OpenCVPlugin/README.md index 5bcfb3e7443375431c40b849830f29c0a0d1959c..93ad541e2d1d87348209ea815a50cb8750109f4c 100644 --- a/contrib/OpenCVPlugin/README.md +++ b/contrib/OpenCVPlugin/README.md @@ -127,7 +127,7 @@ CANN 环境变量： - 环境变量介绍 ``` -SDK-path: SDK mxVision 安装路径 +SDK-path: Vision SDK 安装路径 ascend-toolkit-path: CANN 安装路径 ``` diff --git a/contrib/PatchCoreAnomalyDetection/README.md b/contrib/PatchCoreAnomalyDetection/README.md index f98101885499d795b972d9c18dc0ad1ae0b027fb..81a37f3c6db2e879ddaeaf06fcd91176d92ce708 100644 --- a/contrib/PatchCoreAnomalyDetection/README.md +++ b/contrib/PatchCoreAnomalyDetection/README.md @@ -95,7 +95,7 @@ vim ~/.bashrc # 在.bashrc文件中添加以下环境变量 . ${MX_SDK_HOME}/set_env.sh . ${HOME}/Ascend/ascend-toolkit/set_env.sh -# 其中${MX_SDK_HOME}为MindX SDK安装目录，${HOME}为用户目录（如果CANN 开发包装在用户目录，否则为/usr/local/），配置的时候请自行替换成相应目录 +# 其中${MX_SDK_HOME}为Vision SDK安装目录，${HOME}为用户目录（如果CANN 开发包装在用户目录，否则为/usr/local/），配置的时候请自行替换成相应目录 # 保存退出.bashrc文件 # 执行如下命令使环境变量生效 source ~/.bashrc diff --git a/contrib/ReID/README.md b/contrib/ReID/README.md index b16932b215308d7fff426d5e0a3899c6db6434fa..0b0461e44d356b7e3b457a6fae0d8f797bbf0d04 100644 --- a/contrib/ReID/README.md +++ b/contrib/ReID/README.md @@ -61,7 +61,7 @@ ReID #设置CANN环境变量 . ${ascend-toolkit-path}/set_env.sh -#设置MindX SDK 环境变量，SDK-path为mxVision SDK 安装路径 +#设置Vision SDK 环境变量，SDK-path为Vision SDK 安装路径 . ${SDK-path}/set_env.sh ``` diff --git a/contrib/ReIDv2/README.md b/contrib/ReIDv2/README.md index 9d6ebdb90c7aebe112008d85e171671734ed26da..5994896f2a295deb3aa26bd10e51cbf824aa1ca3 100644 --- a/contrib/ReIDv2/README.md +++ b/contrib/ReIDv2/README.md @@ -95,7 +95,7 @@ ReIDv2 #设置CANN环境变量（请确认install_path路径是否正确） . ${ascend-toolkit-path}/set_env.sh -#设置MindX SDK 环境变量，SDK-path为mxVision SDK 安装路径 +#设置Vision SDK环境变量，SDK-path为Vision SDK 安装路径 . ${SDK-path}/set_env.sh ``` ## 3 准备模型 diff --git a/contrib/RemoteSensingSegmentation/README.md b/contrib/RemoteSensingSegmentation/README.md index 1ef9f2520b172f83cb8155a3b648d7406fec85a9..001d77a9a2664755f09f89c490fb27bfd055ee3c 100644 --- a/contrib/RemoteSensingSegmentation/README.md +++ b/contrib/RemoteSensingSegmentation/README.md @@ -67,7 +67,7 @@ #设置CANN环境变量 . ${install_path}/set_env.sh -#设置MindX SDK 环境变量，SDK-path为mxVision SDK 安装路径 +#设置Vision SDK 环境变量，SDK-path为Vision SDK 安装路径 . ${SDK-path}/set_env.sh ``` diff --git a/contrib/SOLOV2/README.md b/contrib/SOLOV2/README.md index 6368f38b89ee24bbeb031fa0364473d46d1576d7..8e967f1be6ca90f2afe7fc1e3996251a434e7c2f 100644 --- a/contrib/SOLOV2/README.md +++ b/contrib/SOLOV2/README.md @@ -112,7 +112,7 @@ CANN 环境变量： - 环境变量介绍 ``` -SDK-path: SDK mxVision 安装路径 +SDK-path: Vision SDK 安装路径 ascend-toolkit-path: CANN 安装路径 ``` diff --git a/contrib/VCOD_SLTNet/README.md b/contrib/VCOD_SLTNet/README.md index 9bde1c7dfbc8015f4518dba1cc9e9c865e5b53f5..a04c710a0b150bc98a1e43ca2aa102f4fc7d34c1 100644 --- a/contrib/VCOD_SLTNet/README.md +++ b/contrib/VCOD_SLTNet/README.md @@ -48,7 +48,7 @@ #设置CANN环境变量，ascend-toolkit-path为cann安装路径 . ${ascend-toolkit-path}/set_env.sh -#设置MindX SDK 环境变量，SDK-path为mxVision SDK 安装路径 +#设置Vision SDK 环境变量，SDK-path为Vision SDK 安装路径 . ${SDK-path}/set_env.sh ``` diff --git a/contrib/VehicleRetrogradeRecognition/README.md b/contrib/VehicleRetrogradeRecognition/README.md index 94cfd107d868c27e1f0be1969ce8ea61c2327f6c..28ff383fd6ec5196b5799827ae4b2437554d2983 100644 --- a/contrib/VehicleRetrogradeRecognition/README.md +++ b/contrib/VehicleRetrogradeRecognition/README.md @@ -113,7 +113,7 @@ VehicleRetrogradeRecognition交通逆行识别后处理插件基于Vision SDK开 #设置CANN环境变量（请确认install_path路径是否正确） . ${ascend-toolkit-path}/set_env.sh -#设置MindX SDK 环境变量，SDK-path为mxVision SDK 安装路径 +#设置MindX SDK 环境变量，SDK-path为Vision SDK 安装路径 . ${SDK-path}/set_env.sh #查看环境变量 diff --git a/contrib/VideoGestureRecognition/run.sh b/contrib/VideoGestureRecognition/run.sh index 4f3b00f4f2b501b3ccf1d83c9a68a1c6ae3a7a3a..61291b8c94da9ef949645d86d0cfb938a48ca080 100644 --- a/contrib/VideoGestureRecognition/run.sh +++ b/contrib/VideoGestureRecognition/run.sh @@ -23,7 +23,7 @@ env_ready=true function check_env() { - # check MindXSDK env + # check MindSDK env if [ ! "${MX_SDK_HOME}" ]; then env_ready=false echo "please set MX_SDK_HOME path into env." diff --git a/contrib/YOLOX/README.md b/contrib/YOLOX/README.md index 7f9c6304296407a6838398b57f208da99de31676..8ed9a91c26c35db08cd30ea5c5543c39c2c6250c 100644 --- a/contrib/YOLOX/README.md +++ b/contrib/YOLOX/README.md @@ -91,7 +91,7 @@ YOLOX 的后处理插件接收模型推理插件输出的特征图，该特征 MindSDK 环境变量: ``` -. ${SDK-path}/set_env.sh # SDK-path: mxVision SDK 安装路径 +. ${SDK-path}/set_env.sh # SDK-path: Vision SDK 安装路径 ``` CANN 环境变量： diff --git a/contrib/facemaskdetection/README.md b/contrib/facemaskdetection/README.md index f6878823138296928ae7296833650af65ebf2d96..583e84977572c322461dce6f91254e0e947b3501 100644 --- a/contrib/facemaskdetection/README.md +++ b/contrib/facemaskdetection/README.md @@ -54,7 +54,7 @@ #设置CANN环境变量，ascend-toolkit-path为cann安装路径 . ${ascend-toolkit-path}/set_env.sh -#设置MindX SDK 环境变量，SDK-path为mxVision SDK 安装路径 +#设置Vision SDK 环境变量，SDK-path为Vision SDK 安装路径 . ${SDK-path}/set_env.sh ``` diff --git "a/docs/quickStart/Cmake\344\273\213\347\273\215.md" "b/docs/quickStart/Cmake\344\273\213\347\273\215.md" index 2f23b4174b426efcd91812b09dcee3c2b1bdae47..cb355e45381dedfd0e82bc02466c77b110ddd8a5 100644 --- "a/docs/quickStart/Cmake\344\273\213\347\273\215.md" +++ "b/docs/quickStart/Cmake\344\273\213\347\273\215.md" @@ -106,7 +106,7 @@ add_compile_options(-fPIC -fstack-protector-all -g -Wl,-z,relro,-z,now,-z -pie - add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0 -Dgoogle=mindxsdk_private) -# 配置环境变量MX_SDK_HOME，如：/home/xxxxxxx/MindX_SDK/mxVision,可在远程环境中用指令env查看 +# 配置环境变量MX_SDK_HOME，如：/home/xxxxxxx/Mind_SDK/mxVision,可在远程环境中用指令env查看 set(MX_SDK_HOME ${用户自己的SDK安装路径}) # 设置所需变量 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/") diff --git a/tutorials/DvppWrapperSample/main.cpp b/tutorials/DvppWrapperSample/main.cpp index 6fa02aab3c9d0027688a0823c232cf796dc72e32..20af217dba652e818209ae35c8888a64b940355b 100644 --- a/tutorials/DvppWrapperSample/main.cpp +++ b/tutorials/DvppWrapperSample/main.cpp @@ -1,7 +1,7 @@ /* * Copyright (c) Huawei Technologies Co., Ltd. 2020-2021. All rights reserved. * Description: Interface sample of DvppWrapper -* Author: MindX SDK +* Author: MindSDK * Create: 2021 * History: NA */ diff --git a/tutorials/ModleSample/python/main.py b/tutorials/ModleSample/python/main.py index 1d3b1739c7e2a20531ba9a3cdd3cdd285f087a0a..043abd856dc9504a908d1aab2315d68d5d4e96ee 100644 --- a/tutorials/ModleSample/python/main.py +++ b/tutorials/ModleSample/python/main.py @@ -1,8 +1,8 @@ import numpy as np from mindx.sdk import Tensor -from mindx.sdk import base # mxVision 推理接口 -from mindx.sdk.base import Model # mxVision 推理接口 +from mindx.sdk import base # Vision SDK 推理接口 +from mindx.sdk.base import Model # Vision SDK 推理接口 def process(): @@ -43,6 +43,6 @@ def process(): print("output numpy array shape", output.shape) if __name__ == "__main__": - base.mx_init() # 初始化 mxVision 资源 + base.mx_init() # 初始化 Vision SDK 资源 process() base.mx_deinit() \ No newline at end of file diff --git a/tutorials/VideoEncoder&VideoDecoder/C++/main.cpp b/tutorials/VideoEncoder&VideoDecoder/C++/main.cpp index c6a5d947cf277f62d017525184cfc6e42ccf0594..03fccf14ae762aa6c1c8f7abd83bde50d86db795 100644 --- a/tutorials/VideoEncoder&VideoDecoder/C++/main.cpp +++ b/tutorials/VideoEncoder&VideoDecoder/C++/main.cpp @@ -199,7 +199,7 @@ void VdecThread(VideoDecoder& videoDecoder) // | // V // |获取解码结果| -// 线程3：用于获取解码结果（获取解码结果的线程由mxVision内部创建，用户仅需自定义回调函数、用于由该线程调用、获取解码结果） +// 线程3：用于获取解码结果（获取解码结果的线程由Vision SDK内部创建，用户仅需自定义回调函数、用于由该线程调用、获取解码结果） APP_ERROR VdecCallBack(MxBase::Image &decodedImage, uint32_t channelId, uint32_t frameId, void *userData) { @@ -248,7 +248,7 @@ void VencThread(VideoEncoder& videoEncoder) // | // V // |获取编码结果| -// 线程5：用于获取编码结果（用于获取编码结果的线程由mxVision内部创建，用户仅需自定义回调函数、用于由该线程调用、获取编码结果） +// 线程5：用于获取编码结果（用于获取编码结果的线程由Vision SDK内部创建，用户仅需自定义回调函数、用于由该线程调用、获取编码结果） APP_ERROR VencCallBack(std::shared_ptr& outDataPtr, uint32_t& outDataSize, uint32_t& channelId, uint32_t& frameId, void* userData) { diff --git a/tutorials/VideoEncoder&VideoDecoder/Python/main.py b/tutorials/VideoEncoder&VideoDecoder/Python/main.py index b88bf0753ef280522c639736411bc912c1a75b5b..63c89d05284d923d22aad3b4ea53757ffdb5e109 100644 --- a/tutorials/VideoEncoder&VideoDecoder/Python/main.py +++ b/tutorials/VideoEncoder&VideoDecoder/Python/main.py @@ -89,7 +89,7 @@ def vdec_thread(video_decoder): # | # V # |获取解码结果| -# 线程3：用于获取解码结果（获取解码结果的线程由mxVision内部创建，用户仅需自定义回调函数、用于由该线程调用、获取解码结果） +# 线程3：用于获取解码结果（获取解码结果的线程由Vision SDK内部创建，用户仅需自定义回调函数、用于由该线程调用、获取解码结果） def vdec_callback_func(decoded_image, channel_id, frame_id): VDEC_TO_VENC_QUEUE.append(DecodedFrame(decoded_image, frame_id, channel_id)) @@ -118,7 +118,7 @@ def venc_thread(video_encoder): # | # V # |获取编码结果| -# 线程5：用于获取编码结果（用于获取编码结果的线程由mxVision内部创建，用户仅需自定义回调函数、用于由该线程调用、获取编码结果） +# 线程5：用于获取编码结果（用于获取编码结果的线程由Vision SDK内部创建，用户仅需自定义回调函数、用于由该线程调用、获取编码结果） def venc_callback_func(output, output_datasize, channel_id, frame_id): VENC_TO_FILE_SAVE_QUEUE.append(EncodedFrame(output, frame_id, channel_id))