From 91a1b7f743232c0df2ac90625d2461f8c1aef583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=93=B2=E7=BB=AD?= Date: Mon, 15 Jul 2024 12:46:20 +0000 Subject: [PATCH] update public address statutement --- CMakePresets.json | 2 +- OWNERS | 3 +- README.md | 59 +-- Third_Party_Open_Source_Software_Notice | 55 +++ Third_Party_Open_Source__Software_Notice | 360 ------------------ cmake/util/code_channel_infer.py | 2 +- cmake/util/const_var.py | 2 +- cmake/util/opdesc_parser.py | 4 - .../common/ops/kernels/op_host/add_relu.cpp | 1 - .../ops/kernels/op_host/dynamic_scatter.cpp | 1 - .../kernels/op_host/dynamic_scatter_grad.cpp | 1 - .../kernels/op_host/dynamic_voxelization.cpp | 1 - .../op_host/furthest_point_sampling.cpp | 1 - .../furthest_point_sampling_with_dist.cpp | 1 - .../op_host/gather_nms3d_mask_tiling.cpp | 1 - mx_driving/common/ops/kernels/op_host/knn.cpp | 1 - .../common/ops/kernels/op_host/max_pool2d.cpp | 1 - .../op_host/multi_scale_deformable_attn.cpp | 1 - .../multi_scale_deformable_attn_grad.cpp | 1 - .../multi_scale_deformable_attn_grad_v2.cpp | 1 - .../common/ops/kernels/op_host/nms3d.cpp | 1 - .../kernels/op_host/nms3d_normal_tiling.cpp | 1 - .../ops/kernels/op_host/points_in_box.cpp | 1 - .../op_host/scatter_max_with_argmax_v2.cpp | 1 - .../ops/kernels/op_host/scatter_mean_grad.cpp | 1 - .../kernels/op_host/voxel_pooling_train.cpp | 1 - .../op_host/voxel_pooling_train_grad.cpp | 1 - .../fused/ops/kernels/op_host/bev_pool.cpp | 7 +- .../ops/kernels/op_host/group_points.cpp | 1 - .../ops/kernels/op_host/group_points_grad.cpp | 1 - .../ops/kernels/op_host/hard_voxelize.cpp | 1 - .../ops/kernels/op_host/point_to_voxel.cpp | 2 - .../ops/kernels/op_host/unique_voxel.cpp | 1 - .../ops/kernels/op_host/vec_pool_grad.cpp | 1 - .../ops/kernels/op_host/boxes_overlap_bev.cpp | 1 - .../ops/kernels/op_host/sparse_conv3d.cpp | 1 - .../kernels/op_host/sparse_conv3d_grad.cpp | 1 - .../spconv/ops/kernels/op_host/to_sparse.cpp | 1 - tests/torch/test_group_points.py | 2 +- 39 files changed, 98 insertions(+), 428 deletions(-) create mode 100644 Third_Party_Open_Source_Software_Notice delete mode 100644 Third_Party_Open_Source__Software_Notice diff --git a/CMakePresets.json b/CMakePresets.json index df65cfaa..dedb6fca 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -23,7 +23,7 @@ }, "ASCEND_COMPUTE_UNIT": { "type": "STRING", - "value": "ascend910b;ascend910;ascend310p;ascend910c" + "value": "ascend910b;ascend910;ascend310p" }, "ENABLE_TEST": { "type": "BOOL", diff --git a/OWNERS b/OWNERS index 216d37ff..28d2d94e 100644 --- a/OWNERS +++ b/OWNERS @@ -6,4 +6,5 @@ reviewers: - wangxiaoxin-sherie - granpad7 - liu_zhi_xu -- zhuweichen \ No newline at end of file +- zhuweichen +- wang-shihao21 \ No newline at end of file diff --git a/README.md b/README.md index d361582d..b0e41c6d 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# mxDriving +# Driving SDK # 简介 -mxDriving是基于昇腾NPU平台开发的适用于自动驾驶场景的算子和模型加速库，提供了一系列高性能的算子和模型加速接口，支持PyTorch框架。 +Driving SDK是基于昇腾NPU平台开发的适用于自动驾驶场景的算子和模型加速库，提供了一系列高性能的算子和模型加速接口，支持PyTorch框架。 # 安装 @@ -20,14 +20,14 @@ mxDriving是基于昇腾NPU平台开发的适用于自动驾驶场景的算子 ## 从源码安装 1. 克隆原始仓。 ```shell -git clone https://gitee.com/ascend/mxDriving.git +git clone https://gitee.com/ascend/DrivingSDK.git -b branch_v6.0.0-RC2 ``` -2. 编译mxDriving。 +2. 编译Driving SDK。 > 注意：请在仓库根目录下执行编译命令 ```shell bash ci/build.sh --python=3.7 ``` -生成的whl包在`mx_driving/dist`目录下, 命名规则为`mx_driving-1.0.0+git{commit_id}-cp{python_version}-linux_{arch}.whl`。 +生成的whl包在`DrivingSDK/dist`目录下, 命名规则为`mx_driving-1.0.0+git{commit_id}-cp{python_version}-linux_{arch}.whl`。 参数`--python`指定编译过程中使用的python版本，支持3.7及以上： | 参数 | 取值范围 | 说明 | 缺省值 | 备注 | @@ -50,15 +50,15 @@ bash ci/build.sh --python=3.7 | | |Python3.8.x,Python3.9.x,Python3.10.x|2.2.0|v2.2.0-6.0.rc2| | | |Python3.8.x,Python3.9.x,Python3.10.x|2.3.1|v2.3.1-6.0.rc2| -3. 安装mxDriving。 +3. 安装Driving SDK。 ```shell+ -cd mx_driving/dist +cd DrivingSDK/dist pip3 install mx_driving-1.0.0+git{commit_id}-cp{python_version}-linux_{arch}.whl ``` 如需要保存安装日志，可在`pip3 install`命令后添加`--log `参数，并对您指定的目录做好权限控制。 # 卸载 Pytorch 框架训练环境的卸载请参考昇腾官方文档[Pytorch框架训练环境卸载](https://hiascend.com/document/detail/zh/ModelZoo/pytorchframework/ptes/ptes_00032.html)。 -mxDriving的卸载只需执行以下命令： +Driving SDK的卸载只需执行以下命令： ```shell pip3 uninstall mx_driving ``` @@ -66,7 +66,7 @@ pip3 uninstall mx_driving # 快速上手 1. source 环境变量。 ```shell -# 查看mx_driving安装路径 +# 查看Driving SDK安装路径 pip3 show mx_driving export ASCEND_CUSTOM_OPP_PATH=xxx/site-packages/mx_driving/packages/vendors/customize/ export LD_LIBRARY_PATH=xxx/site-packages/mx_driving/packages/vendors/customize/op_api/lib/:$LD_LIBRARY_PATH @@ -78,7 +78,7 @@ export LD_LIBRARY_PATH=xxx/site-packages/mx_driving/packages/vendors/customize/o ## 目录结构及说明 ``` . -├── mx_driving +├── DrivingSDK │ ├── __init__.py │ ├── common # 通用模块 │ │ ├── __init__.py @@ -150,7 +150,7 @@ export LD_LIBRARY_PATH=xxx/site-packages/mx_driving/packages/vendors/customize/o ```shell echo 2 > /proc/sys/kernel/randomize_va_space ``` -2. 由于mxDriving需要用户自行编译，建议您对编译后生成的so文件开启`strip`, 又称**移除调试符号信息**, 开启方式如下： +2. 由于Driving SDK需要用户自行编译，建议您对编译后生成的so文件开启`strip`, 又称**移除调试符号信息**, 开启方式如下： ```shell strip -s ``` @@ -159,11 +159,11 @@ export LD_LIBRARY_PATH=xxx/site-packages/mx_driving/packages/vendors/customize/o - mx_driving/packages/vendors/customize/op_proto/lib/linux/aarch64/libcust_opsproto_rt2.0.so - mx_driving/packages/vendors/customize/op_impl/ai_core/tbe/op_tiling/lib/linux/aarch64/libcust_opsproto_rt2.0.so ## 运行用户建议 -出于安全性及权限最小化角度考虑，不建议使用`root`等管理员类型账户使用mx_driving。 +出于安全性及权限最小化角度考虑，不建议使用`root`等管理员类型账户使用Driving SDK。 ## 文件权限控制 -在使用mxDriving时，您可能会进行profiling、调试等操作，建议您对相关目录及文件做好权限控制，以保证文件安全。 -1. 建议您在使用mxDriving时，将umask调整为`0027`及以上，保障新增文件夹默认最高权限为`750`，文件默认最高权限为`640`。 +在使用Driving SDK时，您可能会进行profiling、调试等操作，建议您对相关目录及文件做好权限控制，以保证文件安全。 +1. 建议您在使用Driving SDK时，将umask调整为`0027`及以上，保障新增文件夹默认最高权限为`750`，文件默认最高权限为`640`。 2. 建议您对个人数据、商业资产、源文件、训练过程中保存的各类文件等敏感内容做好权限管控，可参考下表设置安全权限。 ### 文件权限参考 @@ -188,13 +188,13 @@ export LD_LIBRARY_PATH=xxx/site-packages/mx_driving/packages/vendors/customize/o | 加解密接口、加解密脚本 | 500（r-x------） | ## 构建安全声明 -在源码编译安装mxDriving时，需要您自行编译，编译过程中会生成一些中间文件，建议您在编译完成后，对中间文件做好权限控制，以保证文件安全。 +在源码编译安装Driving SDK时，需要您自行编译，编译过程中会生成一些中间文件，建议您在编译完成后，对中间文件做好权限控制，以保证文件安全。 ## 运行安全声明 1. 建议您结合运行环境资源状况编写对应训练脚本。若训练脚本与资源状况不匹配，如数据集加载内存大小超出内存容量限制、训练脚本在本地生成数据超过磁盘空间大小等情况，可能引发错误并导致进程意外退出。 -2. mxDriving在运行异常时(如输入校验异常（请参考api文档说明），环境变量配置错误，算子执行报错等)会退出进程并打印报错信息，属于正常现象。建议用户根据报错提示定位具体错误原因，包括通过设定算子同步执行、查看CANN日志、解析生成的Core Dump文件等方式。 +2. Driving SDK在运行异常时(如输入校验异常（请参考api文档说明），环境变量配置错误，算子执行报错等)会退出进程并打印报错信息，属于正常现象。建议用户根据报错提示定位具体错误原因，包括通过设定算子同步执行、查看CANN日志、解析生成的Core Dump文件等方式。 ## 公网地址声明 -在mx_driving的配置文件和脚本中存在[公网地址](#公网地址)。 +在Driving SDK的配置文件和脚本中存在[公网地址](#公网地址)。 ### 公网地址 @@ -203,7 +203,6 @@ export LD_LIBRARY_PATH=xxx/site-packages/mx_driving/packages/vendors/customize/o | 自研 | 不涉及 | ci/docker/ARM/Dockerfile | https://mirrors.huaweicloud.com/repository/pypi/simple | docker配置文件，用于配置pip源 | | 自研 | 不涉及 | ci/docker/X86/Dockerfile | https://mirrors.huaweicloud.com/repository/pypi/simple | docker配置文件，用于配置pip源 | | 自研 | 不涉及 | ci/docker/ARM/Dockerfile | https://dl.fedoraproject.org/pub/epel/7/aarch64/Packages/n/ninja-build-1.7.2-2.el7.aarch64.rpm | docker配置文件，用于下载ninja-build | -| 自研 | 不涉及 | ci/docker/ARM/build_protobuf.sh | https://gitee.com/it-monkey/protocolbuffers.git | 用于打包whl的url入参 | | 自研 | 不涉及 | setup.cfg | https://gitee.com/ascend/pytorch/tags | 用于打包whl的download_url入参 | | 自研 | 不涉及 | third_party\op-plugin\ci\build.sh | https://gitee.com/ascend/pytorch.git | 编译脚本根据torch_npu仓库地址拉取代码进行编译 | | 自研 | 不涉及 | third_party\op-plugin\ci\exec_ut.sh | https://gitee.com/ascend/pytorch.git | UT脚本根据torch_npu仓库地址下拉取代码进行UT测试 | @@ -211,27 +210,37 @@ export LD_LIBRARY_PATH=xxx/site-packages/mx_driving/packages/vendors/customize/o | 开源引入 | https://gitee.com/it-monkey/protocolbuffers.git | ci/docker/X86/build_protobuf.sh | https://gitee.com/it-monkey/protocolbuffers.git | 用于构建protobuf | ## 公开接口声明 -参考[API清单](./docs/api/README.md)，mxDriving提供了对外的自定义接口。如果一个函数在文档中有展示，则该接口是公开接口。否则，使用该功能前可以在社区询问该功能是否确实是公开的或意外暴露的接口，因为这些未暴露接口将来可能会被修改或者删除。 +参考[API清单](./docs/api/README.md)，Driving SDK提供了对外的自定义接口。如果一个函数在文档中有展示，则该接口是公开接口。否则，使用该功能前可以在社区询问该功能是否确实是公开的或意外暴露的接口，因为这些未暴露接口将来可能会被修改或者删除。 ## 通信安全加固 -mxDriving在运行时依赖于`PyTorch`及`torch_npu`，您需关注通信安全加固，具体方式请参考[torch_npu通信安全加固](https://gitee.com/ascend/pytorch/blob/master/SECURITYNOTE.md#%E9%80%9A%E4%BF%A1%E5%AE%89%E5%85%A8%E5%8A%A0%E5%9B%BA)。 +Driving SDK在运行时依赖于`PyTorch`及`torch_npu`，您需关注通信安全加固，具体方式请参考[torch_npu通信安全加固](https://gitee.com/ascend/pytorch/blob/master/SECURITYNOTE.md#%E9%80%9A%E4%BF%A1%E5%AE%89%E5%85%A8%E5%8A%A0%E5%9B%BA)。 ## 通信矩阵 -mxDriving在运行时依赖于`PyTorch`及`torch_npu`，涉及通信矩阵，具体信息请参考[torch_npu通信矩阵](https://gitee.com/ascend/pytorch/blob/master/SECURITYNOTE.md#%E9%80%9A%E4%BF%A1%E7%9F%A9%E9%98%B5)。 +Driving SDK在运行时依赖于`PyTorch`及`torch_npu`，涉及通信矩阵，具体信息请参考[torch_npu通信矩阵](https://gitee.com/ascend/pytorch/blob/master/SECURITYNOTE.md#%E9%80%9A%E4%BF%A1%E7%9F%A9%E9%98%B5)。 # 软件生命周期说明 ## 分支维护策略 -mxDriving版本分支的维护阶段如下： +Driving SDK版本分支的维护阶段如下： | **状态** | **时间** | **说明** | | ------------------- | -------- | ------------------------------------------------ | | 计划 | 1—3 个月 | 计划特性 | | 开发 | 3 个月 | 开发特性 | -| 维护 | 6-12 个月| 合入所有已解决的问题并发布版本，针对不同的mxDriving版本采取不同的维护策略，常规版本和长期支持版本维护周期分别为6个月和12个月 | +| 维护 | 6-12 个月| 合入所有已解决的问题并发布版本，针对不同的Driving SDK版本采取不同的维护策略，常规版本和长期支持版本维护周期分别为6个月和12个月 | | 无维护 | 0—3 个月 | 合入所有已解决的问题，无专职维护人员，无版本发布 | | 生命周期终止（EOL） | N/A | 分支不再接受任何修改 | -## mxDriving版本维护策略 +## Driving SDK版本维护策略 -| **mxDriving版本** | **维护策略** | **当前状态** | **发布时间** | **后续状态** | **EOL日期** | +| **Driving SDK版本** | **维护策略** | **当前状态** | **发布时间** | **后续状态** | **EOL日期** | |-----------|-----------|--------|------------|-----------------------|-----------| + +# 免责声明 + +## 致Driving SDK使用者 +1. Driving SDK提供的模型仅供您用于非商业目的。 +2. 对于各模型，Driving SDK平台仅提示性地向您建议可用于训练的数据集，华为不提供任何数据集，如您使用这些数据集进行训练，请您特别注意应遵守对应数据集的License，如您因使用数据集而产生侵权纠纷，华为不承担任何责任。 +3. 如您在使用Driving SDK模型过程中，发现任何问题（包括但不限于功能问题、合规问题），请在Gitee提交issue，我们将及时审视并解决。 + +## 致数据集所有者 +如果您不希望您的数据集在Driving SDK中的模型被提及，或希望更新Driving SDK中的模型关于您的数据集的描述，请在Gitee提交issue，我们将根据您的issue要求删除或更新您的数据集描述。衷心感谢您对Driving SDK的理解和贡献。 \ No newline at end of file diff --git a/Third_Party_Open_Source_Software_Notice b/Third_Party_Open_Source_Software_Notice new file mode 100644 index 00000000..c5111288 --- /dev/null +++ b/Third_Party_Open_Source_Software_Notice @@ -0,0 +1,55 @@ +OPEN SOURCE SOFTWARE NOTICE + +Please note we provide an open source software notice along with this product and/or this product firmware (in the following just “this product”). The open source software licenses are granted by the respective right holders. And the open source licenses prevail all other license information with regard to the respective open source software contained in the product, including but not limited to End User Software Licensing Agreement. This notice is provided on behalf of Huawei Technologies Co. Ltd. and any of its local subsidiaries which may have provided this product to you in your local country. + +Warranty Disclaimer +THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. + +Copyright Notice and License Texts +Software: mx_driving v1.0.0 +Copyright notice: +Copyright (c) 2016- Facebook, Inc . +Copyright (c) 2014- Facebook, Inc . +Copyright (c) 2011-2014 Idiap Research Institute +Copyright (c) 2012-2014 Deepmind Technologies +Copyright (c) 2011-2012 NEC Laboratories America (Koray Kavukcuoglu) +Copyright (c) 2011-2013 NYU +Copyright (c) 2006-2010 NEC Laboratories America (Ronan Collobert, Leon Bottou, Iain Melvin, Jason Weston) +Copyright (c) 2006 Idiap Research Institute +Copyright (c) 2001-2004 Idiap Research Institute (Ronan Collobert, Samy Bengio, Johnny Mariethoz) +Copyright (c) 2016-present, Facebook Inc. +Copyright (c) 2016 Facebook Inc. +Copyright (c) 2015 Google Inc. +Copyright (c) 2015 Yangqing Jia +Copyright 2019-2020 Kakao Brain +Copyright (c) 2022 Cruise LLC +Copyright (c) 2024 Tri Dao +Copyright (c) 2021, 2023-2024 Arm Limited and/or its affiliates +Copyright(c) 2013, 2014, 2015, the respective contributors +Copyright(c) 2015, 2016 the respective contributors +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +Copyright 2001-2019 The Apache Software Foundation +Copyright (c) OpenMMLab. All rights reserved +Copyright 2018-2023 OpenMMLab. All rights reserved. +Copyright (C) 1991, 1999 Free Software Foundation, Inc. + +License: BSD 3-Clause License +Copyright (c) , , +All rights reserved. +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Written Offer +This product contains software whose rights holders license it on the terms of the GNU General Public License, version 2 (GPLv2) and/or other open source software licenses. We will provide you and any third party with the source code of the software licensed under an open source software license if you send us a written request by mail or email to the following addresses: +foss@huawei.com +detailing the name of the product and the firmware version for which you need the source code and indicating how we can contact you. + +Please note you need to make a payment before you obtain the complete Corresponding Source Code from us. For how much you will pay and how we will deliver the complete Corresponding Source Code to you, we will further discuss it by mail or email. +This offer is valid to anyone in receipt of this information. + +THIS OFFER IS VALID FOR THREE YEARS FROM THE MOMENT WE DISTRIBUTED THE PRODUCT OR FIRMWARE. \ No newline at end of file diff --git a/Third_Party_Open_Source__Software_Notice b/Third_Party_Open_Source__Software_Notice deleted file mode 100644 index fe44bbda..00000000 --- a/Third_Party_Open_Source__Software_Notice +++ /dev/null @@ -1,360 +0,0 @@ -OPEN SOURCE SOFTWARE NOTICE - -Please note we provide an open source software notice along with this product and/or this product firmware (in the following just “this product”). The open source software licenses are granted by the respective right holders. And the open source licenses prevail all other license information with regard to the respective open source software contained in the product, including but not limited to End User Software Licensing Agreement. This notice is provided on behalf of Huawei Technologies Co. Ltd. and any of its local subsidiaries which may have provided this product to you in your local country. - -Warranty Disclaimer -THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. - -Copyright Notice and License Texts -Software: mx_driving v1.0.0 -Copyright notice: - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. - - -Written Offer -This product contains software whose rights holders license it on the terms of the GNU General Public License, version 2 (GPLv2) and/or other open source software licenses. We will provide you and any third party with the source code of the software licensed under an open source software license if you send us a written request by mail or email to the following addresses: -foss@huawei.com -detailing the name of the product and the firmware version for which you need the source code and indicating how we can contact you. - -Please note you need to make a payment before you obtain the complete Corresponding Source Code from us. For how much you will pay and how we will deliver the complete Corresponding Source Code to you, we will further discuss it by mail or email. -This offer is valid to anyone in receipt of this information. - -THIS OFFER IS VALID FOR THREE YEARS FROM THE MOMENT WE DISTRIBUTED THE PRODUCT OR FIRMWARE. diff --git a/cmake/util/code_channel_infer.py b/cmake/util/code_channel_infer.py index a14913c6..137c9f39 100644 --- a/cmake/util/code_channel_infer.py +++ b/cmake/util/code_channel_infer.py @@ -28,7 +28,7 @@ def _is_v220(op_product: str): Returns: res: True means V220 """ - if op_product in ["ascend910b", "ascend910c"]: + if op_product in ["ascend910b"]: return True return False diff --git a/cmake/util/const_var.py b/cmake/util/const_var.py index 3e71f5ab..8b32c3b9 100644 --- a/cmake/util/const_var.py +++ b/cmake/util/const_var.py @@ -20,7 +20,7 @@ AUTO_GEN_DIR = 'auto_gen_dir' WFLAGS = os.O_WRONLY | os.O_CREAT | os.O_TRUNC WMODES = stat.S_IWUSR | stat.S_IRUSR SOC_MAP_EXT = {'ascend310p': 'Ascend310P3', 'ascend310b': 'Ascend310B1', - 'ascend910': 'Ascend910A', 'ascend910b': 'Ascend910B1', 'ascend910c': 'Ascend910C1'} + 'ascend910': 'Ascend910A', 'ascend910b': 'Ascend910B1'} BIN_CMD = 'opc $1 --main_func={fun} --input_param={param} --soc_version={soc} \ --output=$2 --impl_mode={impl} --simplified_key_mode=0 --op_mode=dynamic\n' CHK_CMD = ''' diff --git a/cmake/util/opdesc_parser.py b/cmake/util/opdesc_parser.py index bc39462b..a13231e1 100644 --- a/cmake/util/opdesc_parser.py +++ b/cmake/util/opdesc_parser.py @@ -22,10 +22,6 @@ SOC_TO_SHORT_SOC_MAP = { "ascend910b2c": "ascend910b", "ascend910b3": "ascend910b", "ascend910b4": "ascend910b", - "ascend910c1": "ascend910c", - "ascend910c2": "ascend910c", - "ascend910c3": "ascend910c", - "ascend910c4": "ascend910c", "ascend310p1": "ascend310p", "ascend310p3": "ascend310p", "ascend310p3vir01": "ascend310p", diff --git a/mx_driving/common/ops/kernels/op_host/add_relu.cpp b/mx_driving/common/ops/kernels/op_host/add_relu.cpp index ce510797..a8d78ad6 100644 --- a/mx_driving/common/ops/kernels/op_host/add_relu.cpp +++ b/mx_driving/common/ops/kernels/op_host/add_relu.cpp @@ -95,7 +95,6 @@ public: this->AICore() .SetTiling(optiling::TilingFunc); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/common/ops/kernels/op_host/dynamic_scatter.cpp b/mx_driving/common/ops/kernels/op_host/dynamic_scatter.cpp index 5bfaf303..fd2ba5f9 100644 --- a/mx_driving/common/ops/kernels/op_host/dynamic_scatter.cpp +++ b/mx_driving/common/ops/kernels/op_host/dynamic_scatter.cpp @@ -225,7 +225,6 @@ public: .DynamicRankSupportFlag(true) .DynamicShapeSupportFlag(true); this->AICore().AddConfig("ascend910b", aicore_config); - this->AICore().AddConfig("ascend910c", aicore_config); } }; diff --git a/mx_driving/common/ops/kernels/op_host/dynamic_scatter_grad.cpp b/mx_driving/common/ops/kernels/op_host/dynamic_scatter_grad.cpp index 0e028450..1e4a60b9 100644 --- a/mx_driving/common/ops/kernels/op_host/dynamic_scatter_grad.cpp +++ b/mx_driving/common/ops/kernels/op_host/dynamic_scatter_grad.cpp @@ -191,7 +191,6 @@ public: .DynamicRankSupportFlag(true) .DynamicShapeSupportFlag(true); this->AICore().AddConfig("ascend910b", aicore_config); - this->AICore().AddConfig("ascend910c", aicore_config); } }; diff --git a/mx_driving/common/ops/kernels/op_host/dynamic_voxelization.cpp b/mx_driving/common/ops/kernels/op_host/dynamic_voxelization.cpp index 70a97e56..e82a422f 100644 --- a/mx_driving/common/ops/kernels/op_host/dynamic_voxelization.cpp +++ b/mx_driving/common/ops/kernels/op_host/dynamic_voxelization.cpp @@ -117,7 +117,6 @@ public: this->SetInferShape(ge::InferShapeForDynamicVoxel); this->AICore().SetTiling(optiling::TilingForDynamicVox); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; OP_ADD(DynamicVoxelization); diff --git a/mx_driving/common/ops/kernels/op_host/furthest_point_sampling.cpp b/mx_driving/common/ops/kernels/op_host/furthest_point_sampling.cpp index 7453f8ed..1d35e87d 100644 --- a/mx_driving/common/ops/kernels/op_host/furthest_point_sampling.cpp +++ b/mx_driving/common/ops/kernels/op_host/furthest_point_sampling.cpp @@ -347,7 +347,6 @@ public: .DynamicRankSupportFlag(true) .DynamicShapeSupportFlag(true); this->AICore().AddConfig("ascend910b", aicore_config); - this->AICore().AddConfig("ascend910c", aicore_config); } }; diff --git a/mx_driving/common/ops/kernels/op_host/furthest_point_sampling_with_dist.cpp b/mx_driving/common/ops/kernels/op_host/furthest_point_sampling_with_dist.cpp index 44584369..89bf348d 100644 --- a/mx_driving/common/ops/kernels/op_host/furthest_point_sampling_with_dist.cpp +++ b/mx_driving/common/ops/kernels/op_host/furthest_point_sampling_with_dist.cpp @@ -136,7 +136,6 @@ public: this->AICore() .SetTiling(optiling::TilingForFurthestPointSamplingWithDist); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/common/ops/kernels/op_host/gather_nms3d_mask_tiling.cpp b/mx_driving/common/ops/kernels/op_host/gather_nms3d_mask_tiling.cpp index efa392f5..49dd0bff 100644 --- a/mx_driving/common/ops/kernels/op_host/gather_nms3d_mask_tiling.cpp +++ b/mx_driving/common/ops/kernels/op_host/gather_nms3d_mask_tiling.cpp @@ -61,7 +61,6 @@ public: .SetTiling(optiling::GatherNms3dMaskTiling); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/common/ops/kernels/op_host/knn.cpp b/mx_driving/common/ops/kernels/op_host/knn.cpp index b2917b1e..7105532b 100644 --- a/mx_driving/common/ops/kernels/op_host/knn.cpp +++ b/mx_driving/common/ops/kernels/op_host/knn.cpp @@ -121,7 +121,6 @@ public: .DynamicRankSupportFlag(true) .DynamicShapeSupportFlag(true); this->AICore().AddConfig("ascend910b", aicore_config); - this->AICore().AddConfig("ascend910c", aicore_config); } }; diff --git a/mx_driving/common/ops/kernels/op_host/max_pool2d.cpp b/mx_driving/common/ops/kernels/op_host/max_pool2d.cpp index 889ba1e0..8deb2004 100644 --- a/mx_driving/common/ops/kernels/op_host/max_pool2d.cpp +++ b/mx_driving/common/ops/kernels/op_host/max_pool2d.cpp @@ -110,7 +110,6 @@ public: aiConfig.DynamicCompileStaticFlag(true); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/common/ops/kernels/op_host/multi_scale_deformable_attn.cpp b/mx_driving/common/ops/kernels/op_host/multi_scale_deformable_attn.cpp index 37e3d3bf..ce434ae7 100644 --- a/mx_driving/common/ops/kernels/op_host/multi_scale_deformable_attn.cpp +++ b/mx_driving/common/ops/kernels/op_host/multi_scale_deformable_attn.cpp @@ -145,7 +145,6 @@ public: aiConfig.DynamicCompileStaticFlag(true); this->AICore().AddConfig("ascend310p", aiConfig); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/common/ops/kernels/op_host/multi_scale_deformable_attn_grad.cpp b/mx_driving/common/ops/kernels/op_host/multi_scale_deformable_attn_grad.cpp index 2427ae32..1d0029bf 100644 --- a/mx_driving/common/ops/kernels/op_host/multi_scale_deformable_attn_grad.cpp +++ b/mx_driving/common/ops/kernels/op_host/multi_scale_deformable_attn_grad.cpp @@ -176,7 +176,6 @@ public: this->SetInferShape(ge::InferShapeForMultiScaleDeformableAttnGrad); this->AICore().SetTiling(optiling::TilingFuncForMultiScaleDeformableAttnGrad); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/common/ops/kernels/op_host/multi_scale_deformable_attn_grad_v2.cpp b/mx_driving/common/ops/kernels/op_host/multi_scale_deformable_attn_grad_v2.cpp index 4f3fccdb..f640beac 100644 --- a/mx_driving/common/ops/kernels/op_host/multi_scale_deformable_attn_grad_v2.cpp +++ b/mx_driving/common/ops/kernels/op_host/multi_scale_deformable_attn_grad_v2.cpp @@ -173,7 +173,6 @@ public: this->SetInferShape(ge::InferShapeForMultiScaleDeformableAttnGradV2); this->AICore().SetTiling(optiling::TilingFuncForMultiScaleDeformableAttnGradV2); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/common/ops/kernels/op_host/nms3d.cpp b/mx_driving/common/ops/kernels/op_host/nms3d.cpp index 50d89fc0..48ce4e53 100644 --- a/mx_driving/common/ops/kernels/op_host/nms3d.cpp +++ b/mx_driving/common/ops/kernels/op_host/nms3d.cpp @@ -89,7 +89,6 @@ public: this->AICore().SetTiling(optiling::Nms3dTilingFunc); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/common/ops/kernels/op_host/nms3d_normal_tiling.cpp b/mx_driving/common/ops/kernels/op_host/nms3d_normal_tiling.cpp index bdfb047f..11222287 100644 --- a/mx_driving/common/ops/kernels/op_host/nms3d_normal_tiling.cpp +++ b/mx_driving/common/ops/kernels/op_host/nms3d_normal_tiling.cpp @@ -105,7 +105,6 @@ public: this->AICore() .SetTiling(optiling::Nms3dNormalTilingFunc); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/common/ops/kernels/op_host/points_in_box.cpp b/mx_driving/common/ops/kernels/op_host/points_in_box.cpp index 135abe1b..e0b64f48 100644 --- a/mx_driving/common/ops/kernels/op_host/points_in_box.cpp +++ b/mx_driving/common/ops/kernels/op_host/points_in_box.cpp @@ -110,7 +110,6 @@ public: this->AICore() .SetTiling(optiling::TilingFunc); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/common/ops/kernels/op_host/scatter_max_with_argmax_v2.cpp b/mx_driving/common/ops/kernels/op_host/scatter_max_with_argmax_v2.cpp index bb386629..5b6fe71e 100644 --- a/mx_driving/common/ops/kernels/op_host/scatter_max_with_argmax_v2.cpp +++ b/mx_driving/common/ops/kernels/op_host/scatter_max_with_argmax_v2.cpp @@ -255,7 +255,6 @@ public: .SetTiling(optiling::ScatterMaxWithArgmaxV2TilingFunc); this->AICore().AddConfig("ascend910"); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/common/ops/kernels/op_host/scatter_mean_grad.cpp b/mx_driving/common/ops/kernels/op_host/scatter_mean_grad.cpp index 95fb1cb8..0bd25f9a 100644 --- a/mx_driving/common/ops/kernels/op_host/scatter_mean_grad.cpp +++ b/mx_driving/common/ops/kernels/op_host/scatter_mean_grad.cpp @@ -239,7 +239,6 @@ public: this->AICore() .SetTiling(optiling::TilingFunc4ScatterMeanGrad); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/common/ops/kernels/op_host/voxel_pooling_train.cpp b/mx_driving/common/ops/kernels/op_host/voxel_pooling_train.cpp index 440eb953..b138a247 100644 --- a/mx_driving/common/ops/kernels/op_host/voxel_pooling_train.cpp +++ b/mx_driving/common/ops/kernels/op_host/voxel_pooling_train.cpp @@ -128,7 +128,6 @@ public: this->SetInferShape(ge::InferShapeForVoxelPoolingTrain); this->AICore().SetTiling(optiling::TilingForVoxelPooling); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; OP_ADD(VoxelPoolingTrain); diff --git a/mx_driving/common/ops/kernels/op_host/voxel_pooling_train_grad.cpp b/mx_driving/common/ops/kernels/op_host/voxel_pooling_train_grad.cpp index df2ea8b8..5fd9e9eb 100644 --- a/mx_driving/common/ops/kernels/op_host/voxel_pooling_train_grad.cpp +++ b/mx_driving/common/ops/kernels/op_host/voxel_pooling_train_grad.cpp @@ -161,7 +161,6 @@ public: this->AICore().SetTiling(optiling::TilingForVoxelPoolingTrainGrad); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/perception/fused/ops/kernels/op_host/bev_pool.cpp b/mx_driving/perception/fused/ops/kernels/op_host/bev_pool.cpp index 5cd2cf57..d9fb273c 100644 --- a/mx_driving/perception/fused/ops/kernels/op_host/bev_pool.cpp +++ b/mx_driving/perception/fused/ops/kernels/op_host/bev_pool.cpp @@ -1,3 +1,6 @@ +/* + * Copyright (c) Huawei Technologies Co., Ltd. 2022-2023. All rights reserved. + */ #include #include @@ -196,7 +199,6 @@ public: this->AICore().SetTiling(optiling::TilingForBEVPool); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; @@ -259,7 +261,6 @@ public: this->AICore().SetTiling(optiling::TilingForBEVPool); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; @@ -319,7 +320,6 @@ public: this->AICore().SetTiling(optiling::TilingForBEVPool); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; @@ -401,7 +401,6 @@ public: this->AICore().SetTiling(optiling::TilingForBEVPool); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; OP_ADD(BEVPool); diff --git a/mx_driving/perception/point/ops/kernels/op_host/group_points.cpp b/mx_driving/perception/point/ops/kernels/op_host/group_points.cpp index cce08ad8..a2a9df05 100644 --- a/mx_driving/perception/point/ops/kernels/op_host/group_points.cpp +++ b/mx_driving/perception/point/ops/kernels/op_host/group_points.cpp @@ -162,7 +162,6 @@ public: this->AICore().SetTiling(optiling::TilingForGroupPoints); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/perception/point/ops/kernels/op_host/group_points_grad.cpp b/mx_driving/perception/point/ops/kernels/op_host/group_points_grad.cpp index 17ca7e61..a6c6b7bd 100644 --- a/mx_driving/perception/point/ops/kernels/op_host/group_points_grad.cpp +++ b/mx_driving/perception/point/ops/kernels/op_host/group_points_grad.cpp @@ -167,7 +167,6 @@ public: this->AICore().SetTiling(optiling::TilingForGroupPointsGrad); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/perception/point/ops/kernels/op_host/hard_voxelize.cpp b/mx_driving/perception/point/ops/kernels/op_host/hard_voxelize.cpp index ff90b83e..62a903fb 100644 --- a/mx_driving/perception/point/ops/kernels/op_host/hard_voxelize.cpp +++ b/mx_driving/perception/point/ops/kernels/op_host/hard_voxelize.cpp @@ -325,7 +325,6 @@ public: this->SetInferShape(ge::InferShapeForHardVoxelize).SetInferDataType(ge::InferDataTypeForHardVoxelize); this->AICore().SetTiling(optiling::TilingForHardVoxelize); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/perception/point/ops/kernels/op_host/point_to_voxel.cpp b/mx_driving/perception/point/ops/kernels/op_host/point_to_voxel.cpp index 9e00d1f1..dcfb6a34 100644 --- a/mx_driving/perception/point/ops/kernels/op_host/point_to_voxel.cpp +++ b/mx_driving/perception/point/ops/kernels/op_host/point_to_voxel.cpp @@ -254,7 +254,6 @@ public: .SetInferDataType(ge::InferDataTypeForPointToVoxel); this->AICore().SetTiling(optiling::TilingForPointToVoxel); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; @@ -283,7 +282,6 @@ public: .SetInferDataType(ge::InferDataTypeForPointToVoxel); this->AICore().SetTiling(optiling::TilingForPointToVoxel); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/perception/point/ops/kernels/op_host/unique_voxel.cpp b/mx_driving/perception/point/ops/kernels/op_host/unique_voxel.cpp index 5f2fe9bf..b13f646a 100644 --- a/mx_driving/perception/point/ops/kernels/op_host/unique_voxel.cpp +++ b/mx_driving/perception/point/ops/kernels/op_host/unique_voxel.cpp @@ -205,7 +205,6 @@ public: this->SetInferShape(ge::InferShapeForUniqueVoxel).SetInferDataType(ge::InferDataTypeForUniqueVoxel); this->AICore().SetTiling(optiling::TilingForUniqueVoxel); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/perception/point/ops/kernels/op_host/vec_pool_grad.cpp b/mx_driving/perception/point/ops/kernels/op_host/vec_pool_grad.cpp index 4bb408c1..97ce89aa 100644 --- a/mx_driving/perception/point/ops/kernels/op_host/vec_pool_grad.cpp +++ b/mx_driving/perception/point/ops/kernels/op_host/vec_pool_grad.cpp @@ -224,7 +224,6 @@ public: this->AICore() .SetTiling(optiling::VecPoolGradTilingFunc); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/perception/vision/ops/kernels/op_host/boxes_overlap_bev.cpp b/mx_driving/perception/vision/ops/kernels/op_host/boxes_overlap_bev.cpp index 850dfe2d..baab1645 100644 --- a/mx_driving/perception/vision/ops/kernels/op_host/boxes_overlap_bev.cpp +++ b/mx_driving/perception/vision/ops/kernels/op_host/boxes_overlap_bev.cpp @@ -145,7 +145,6 @@ public: this->AICore().SetTiling(optiling::TilingFunc4BoxesOverlapBev); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/spconv/ops/kernels/op_host/sparse_conv3d.cpp b/mx_driving/spconv/ops/kernels/op_host/sparse_conv3d.cpp index 32ecfab5..e8eb7736 100644 --- a/mx_driving/spconv/ops/kernels/op_host/sparse_conv3d.cpp +++ b/mx_driving/spconv/ops/kernels/op_host/sparse_conv3d.cpp @@ -175,7 +175,6 @@ public: this->SetInferShape(ge::InferShape); this->AICore().SetTiling(optiling::TilingForSparseConv3d); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/spconv/ops/kernels/op_host/sparse_conv3d_grad.cpp b/mx_driving/spconv/ops/kernels/op_host/sparse_conv3d_grad.cpp index 54878a78..1c6550a4 100644 --- a/mx_driving/spconv/ops/kernels/op_host/sparse_conv3d_grad.cpp +++ b/mx_driving/spconv/ops/kernels/op_host/sparse_conv3d_grad.cpp @@ -135,7 +135,6 @@ public: this->SetInferShape(ge::InferShape); this->AICore().SetTiling(optiling::TilingForSparseConv3dGrad); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/mx_driving/spconv/ops/kernels/op_host/to_sparse.cpp b/mx_driving/spconv/ops/kernels/op_host/to_sparse.cpp index 10920a8b..119905e8 100644 --- a/mx_driving/spconv/ops/kernels/op_host/to_sparse.cpp +++ b/mx_driving/spconv/ops/kernels/op_host/to_sparse.cpp @@ -124,7 +124,6 @@ public: this->AICore().SetTiling(optiling::TilingForToSparse); this->AICore().AddConfig("ascend910b"); - this->AICore().AddConfig("ascend910c"); } }; diff --git a/tests/torch/test_group_points.py b/tests/torch/test_group_points.py index d28f90cd..4a4b7232 100644 --- a/tests/torch/test_group_points.py +++ b/tests/torch/test_group_points.py @@ -25,7 +25,7 @@ class TestGroupPoints(TestCase): output = output.transpose(0, 3, 1, 2) return output - @unittest.skipIf((DEVICE_NAME != 'Ascend910B' and DEVICE_NAME != 'Ascend910C'), "OP `GroupPoints` is only supported on 910B, skip this ut!") + @unittest.skipIf(DEVICE_NAME != 'Ascend910B', "OP `GroupPoints` is only supported on 910B, skipping this ut!") def test_group_points(self): dtype = [torch.float, torch.half] -- Gitee