已合并
Conv3D DX/DW算子单仓重名文件修改,arch35与arch22同名头文件添加_arch35后缀避免歧义 #8907
cheng_gao创建于 8月19日
Conv3D DX/DW算子单仓重名文件修改,arch35与arch22同名头文件添加_arch35后缀避免歧义 #8907
已合并
共 30 个文件变更+38-38
| @@ -394,9 +394,9 @@ convolution_backprop@ops-nn: | |||
| 394 | - ops/ops-nn/conv/conv3d_backprop_input_v2/op_kernel/arch35/conv3d_backprop_input_v2/conv3d_bp_common_func.h | 394 | - ops/ops-nn/conv/conv3d_backprop_input_v2/op_kernel/arch35/conv3d_backprop_input_v2/conv3d_bp_common_func.h |
| 395 | - ops/ops-nn/conv/conv3d_backprop_input_v2/op_kernel/arch35/conv3d_backprop_input_v2/conv3d_backprop_input_v2_tiling_data.h | 395 | - ops/ops-nn/conv/conv3d_backprop_input_v2/op_kernel/arch35/conv3d_backprop_input_v2/conv3d_backprop_input_v2_tiling_data.h |
| 396 | - ops/ops-nn/conv/conv3d_backprop_input_v2/op_kernel/arch35/conv3d_backprop_input_v2/conv3d_backprop_input_v2.h | 396 | - ops/ops-nn/conv/conv3d_backprop_input_v2/op_kernel/arch35/conv3d_backprop_input_v2/conv3d_backprop_input_v2.h |
| 397 | - - ops/ops-nn/conv/conv3d_backprop_input_v2/op_kernel/arch35/conv3d_backprop_input_v2/conv3d_backprop_input_v2_init_output.h | 397 | + - ops/ops-nn/conv/conv3d_backprop_input_v2/op_kernel/arch35/conv3d_backprop_input_v2/conv3d_backprop_input_v2_init_output_arch35.h |
| 398 | - - ops/ops-nn/conv/conv3d_backprop_input_v2/op_kernel/arch35/convolution_3d_backprop/conv3d_bp_util.h | 398 | + - ops/ops-nn/conv/conv3d_backprop_input_v2/op_kernel/arch35/convolution_3d_backprop/conv3d_bp_util_arch35.h |
| 399 | - - ops/ops-nn/conv/conv3d_backprop_input_v2/op_kernel/arch35/convolution_3d_backprop/conv3d_bp_func.h | 399 | + - ops/ops-nn/conv/conv3d_backprop_input_v2/op_kernel/arch35/convolution_3d_backprop/conv3d_bp_func_arch35.h |
| 400 | - ops/ops-nn/conv/conv3d_backprop_input_v2/op_kernel/conv3d_backprop_input_v2_arch35_tiling_key.h | 400 | - ops/ops-nn/conv/conv3d_backprop_input_v2/op_kernel/conv3d_backprop_input_v2_arch35_tiling_key.h |
| 401 | - ops/ops-nn/conv/conv3d_transpose_v2/op_host/op_tiling/arch35/ | 401 | - ops/ops-nn/conv/conv3d_transpose_v2/op_host/op_tiling/arch35/ |
| 402 | - ops/ops-nn/conv/conv3d_transpose_v2/op_kernel/conv3d_transpose_v2_arch35_tiling_key.h | 402 | - ops/ops-nn/conv/conv3d_transpose_v2/op_kernel/conv3d_transpose_v2_arch35_tiling_key.h |
| @@ -404,7 +404,7 @@ convolution_backprop@ops-nn: | |||
| 404 | - ops/ops-nn/conv/conv3d_backprop_filter_v2/op_host/op_tiling/arch35/ | 404 | - ops/ops-nn/conv/conv3d_backprop_filter_v2/op_host/op_tiling/arch35/ |
| 405 | - ops/ops-nn/conv/conv3d_backprop_filter_v2/op_host/config/ascend950/ | 405 | - ops/ops-nn/conv/conv3d_backprop_filter_v2/op_host/config/ascend950/ |
| 406 | - ops/ops-nn/conv/conv3d_backprop_filter_v2/op_kernel/arch35/ | 406 | - ops/ops-nn/conv/conv3d_backprop_filter_v2/op_kernel/arch35/ |
| 407 | - - ops/ops-nn/conv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop/conv_bp_func.h | 407 | + - ops/ops-nn/conv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop/conv_bp_func_arch35.h |
| 408 | - ops/ops-nn/conv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop/conv_bp_impl_base.h | 408 | - ops/ops-nn/conv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop/conv_bp_impl_base.h |
| 409 | - ops/ops-nn/conv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop/impl/dav_v310/conv_bp_sub_func_deterministic_calculate.h | 409 | - ops/ops-nn/conv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop/impl/dav_v310/conv_bp_sub_func_deterministic_calculate.h |
| 410 | - ops/ops-nn/conv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop_filter_v2/conv3d_backprop_filter_v2.h | 410 | - ops/ops-nn/conv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop_filter_v2/conv3d_backprop_filter_v2.h |
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | -#include "conv_bp_util.h" | 19 | +#include "conv_bp_util_arch35.h" |
| 20 | 20 | ||
| 21 | using namespace AscendC; | 21 | using namespace AscendC; |
| 22 | 22 | ||
Rconv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop/conv_bp_func.h→conv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop/conv_bp_func_arch35.h+1-1
| @@ -17,7 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | -#include "conv_bp_util.h" | 20 | +#include "conv_bp_util_arch35.h" |
| 21 | 21 | ||
| 22 | 22 | ||
| 23 | 23 | ||
| @@ -17,8 +17,8 @@ | |||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | -#include "conv_bp_func.h" | 20 | +#include "conv_bp_func_arch35.h" |
| 21 | -#include "conv_bp_util.h" | 21 | +#include "conv_bp_util_arch35.h" |
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | 24 | ||
Rconv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop/conv_bp_intf_base.h→conv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop/conv_bp_intf_base_arch35.h+3-3
| @@ -16,8 +16,8 @@ | |||
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | -#include "conv_bp_func.h" | 19 | +#include "conv_bp_func_arch35.h" |
| 20 | -#include "conv_bp_util.h" | 20 | +#include "conv_bp_util_arch35.h" |
| 21 | 21 | ||
| 22 | 22 | ||
| 23 | 23 | ||
| @@ -174,4 +174,4 @@ public: | |||
| 174 | }; | 174 | }; |
| 175 | } // namespace ConvolutionBackprop | 175 | } // namespace ConvolutionBackprop |
| 176 | 176 | ||
| 177 | -#endif | 177 | +#endif |
| @@ -17,7 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | -#include "conv_bp_util.h" | 20 | +#include "conv_bp_util_arch35.h" |
| 21 | 21 | ||
| 22 | 22 | ||
| 23 | 23 | ||
Rconv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop/conv_bp_register.h→conv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop/conv_bp_register_arch35.h+1-1
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | 20 | ||
| 21 | -#include "conv_bp_intf_base.h" | 21 | +#include "conv_bp_intf_base_arch35.h" |
| 22 | 22 | ||
| 23 | namespace ConvolutionBackprop { | 23 | namespace ConvolutionBackprop { |
| 24 | // 注册,通过别名定义用户接口 | 24 | // 注册,通过别名定义用户接口 |
Rconv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop/conv_bp_util.h→conv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop/conv_bp_util_arch35.h+0-0
文件重命名但无更改。
Rconv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop_filter_v2/conv3d_backprop_filter_v2_init_output.h→conv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop_filter_v2/conv3d_backprop_filter_v2_init_output_arch35.h+0-0
文件重命名但无更改。
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | -#include "../conv3d_backprop/conv_bp_register.h" | 19 | +#include "../conv3d_backprop/conv_bp_register_arch35.h" |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | 22 | ||
Mconv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop_filter_v2/conv3d_bp_filter_impl.h+3-3
| @@ -18,8 +18,8 @@ | |||
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | 20 | ||
| 21 | -#include "../conv3d_backprop/conv_bp_func.h" | 21 | +#include "../conv3d_backprop/conv_bp_func_arch35.h" |
| 22 | -#include "../conv3d_backprop/conv_bp_util.h" | 22 | +#include "../conv3d_backprop/conv_bp_util_arch35.h" |
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | namespace ConvolutionBackprop { | 25 | namespace ConvolutionBackprop { |
| @@ -34,4 +34,4 @@ public: | |||
| 34 | 34 | ||
| 35 | } // namespace ConvolutionBackprop | 35 | } // namespace ConvolutionBackprop |
| 36 | 36 | ||
| 37 | -#endif | 37 | +#endif |
Mconv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop_filter_v2/conv3d_bp_filter_intf.h+2-2
| @@ -16,8 +16,8 @@ | |||
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | -#include "../conv3d_backprop/conv_bp_func.h" | 19 | +#include "../conv3d_backprop/conv_bp_func_arch35.h" |
| 20 | -#include "../conv3d_backprop/conv_bp_util.h" | 20 | +#include "../conv3d_backprop/conv_bp_util_arch35.h" |
| 21 | 21 | ||
| 22 | namespace ConvolutionBackprop { | 22 | namespace ConvolutionBackprop { |
| 23 | template <class Config_, template <typename, class> class Impl> | 23 | template <class Config_, template <typename, class> class Impl> |
Rconv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop_filter_v2/conv3d_dw_v2_basic_block.h→conv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop_filter_v2/conv3d_dw_v2_basic_block_arch35.h+0-0
文件重命名但无更改。
| @@ -16,8 +16,8 @@ | |||
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | -#include "conv3d_backprop_filter_v2/conv3d_backprop_filter_v2_init_output.h" | 19 | +#include "conv3d_backprop_filter_v2/conv3d_backprop_filter_v2_init_output_arch35.h" |
| 20 | -#include "conv3d_backprop_filter_v2/conv3d_dw_v2_basic_block.h" | 20 | +#include "conv3d_backprop_filter_v2/conv3d_dw_v2_basic_block_arch35.h" |
| 21 | 21 | ||
| 22 | 22 | ||
| 23 | 23 | ||
Rconv/conv3d_backprop_input_v2/op_kernel/arch35/conv3d_backprop_input_v2/conv3d_backprop_input_v2_init_output.h→conv/conv3d_backprop_input_v2/op_kernel/arch35/conv3d_backprop_input_v2/conv3d_backprop_input_v2_init_output_arch35.h+0-0
文件重命名但无更改。
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | -#include "../convolution_3d_backprop/conv3d_bp_register.h" | 19 | +#include "../convolution_3d_backprop/conv3d_bp_register_arch35.h" |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | 22 | ||
| @@ -16,9 +16,9 @@ | |||
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | -#include "../convolution_3d_backprop/conv3d_bp_func.h" | 19 | +#include "../convolution_3d_backprop/conv3d_bp_func_arch35.h" |
| 20 | 20 | ||
| 21 | -#include "../convolution_3d_backprop/conv3d_bp_util.h" | 21 | +#include "../convolution_3d_backprop/conv3d_bp_util_arch35.h" |
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | 24 | ||
| @@ -34,4 +34,4 @@ public: | |||
| 34 | 34 | ||
| 35 | } // namespace Convolution3DBackprop | 35 | } // namespace Convolution3DBackprop |
| 36 | 36 | ||
| 37 | -#endif | 37 | +#endif |
| @@ -16,8 +16,8 @@ | |||
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | -#include "../convolution_3d_backprop/conv3d_bp_func.h" | 19 | +#include "../convolution_3d_backprop/conv3d_bp_func_arch35.h" |
| 20 | -#include "../convolution_3d_backprop/conv3d_bp_util.h" | 20 | +#include "../convolution_3d_backprop/conv3d_bp_util_arch35.h" |
| 21 | 21 | ||
| 22 | namespace Convolution3DBackprop { | 22 | namespace Convolution3DBackprop { |
| 23 | template <class Config_, template <typename, class> class Impl> | 23 | template <class Config_, template <typename, class> class Impl> |
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | -#include "conv3d_backprop_input_v2/conv3d_backprop_input_v2_init_output.h" | 19 | +#include "conv3d_backprop_input_v2/conv3d_backprop_input_v2_init_output_arch35.h" |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | 22 | ||
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | -#include "conv3d_bp_util.h" | 19 | +#include "conv3d_bp_util_arch35.h" |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | 22 | ||
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | -#include "conv3d_bp_util.h" | 19 | +#include "conv3d_bp_util_arch35.h" |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | 22 | ||
Rconv/conv3d_backprop_input_v2/op_kernel/arch35/convolution_3d_backprop/conv3d_bp_func.h→conv/conv3d_backprop_input_v2/op_kernel/arch35/convolution_3d_backprop/conv3d_bp_func_arch35.h+0-0
文件重命名但无更改。
| @@ -17,8 +17,8 @@ | |||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | -#include "conv3d_bp_func.h" | 20 | +#include "conv3d_bp_func_arch35.h" |
| 21 | -#include "conv3d_bp_util.h" | 21 | +#include "conv3d_bp_util_arch35.h" |
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | 24 | ||
Rconv/conv3d_backprop_input_v2/op_kernel/arch35/convolution_3d_backprop/conv3d_bp_intf_base.h→conv/conv3d_backprop_input_v2/op_kernel/arch35/convolution_3d_backprop/conv3d_bp_intf_base_arch35.h+2-2
| @@ -17,8 +17,8 @@ | |||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | -#include "conv3d_bp_func.h" | 20 | +#include "conv3d_bp_func_arch35.h" |
| 21 | -#include "conv3d_bp_util.h" | 21 | +#include "conv3d_bp_util_arch35.h" |
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | namespace Convolution3DBackprop { | 24 | namespace Convolution3DBackprop { |
Rconv/conv3d_backprop_input_v2/op_kernel/arch35/convolution_3d_backprop/conv3d_bp_register.h→conv/conv3d_backprop_input_v2/op_kernel/arch35/convolution_3d_backprop/conv3d_bp_register_arch35.h+1-1
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | 20 | ||
| 21 | -#include "conv3d_bp_intf_base.h" | 21 | +#include "conv3d_bp_intf_base_arch35.h" |
| 22 | 22 | ||
| 23 | namespace Convolution3DBackprop { | 23 | namespace Convolution3DBackprop { |
| 24 | // 注册,通过别名定义用户接口 | 24 | // 注册,通过别名定义用户接口 |
Rconv/conv3d_backprop_input_v2/op_kernel/arch35/convolution_3d_backprop/conv3d_bp_util.h→conv/conv3d_backprop_input_v2/op_kernel/arch35/convolution_3d_backprop/conv3d_bp_util_arch35.h+0-0
文件重命名但无更改。
| @@ -15,7 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | -#include "conv3d_transpose_v2_base_tiling.h" | 18 | +#include "conv3d_transpose_v2_base_tiling_arch35.h" |
| 19 | 19 | ||
| 20 | namespace Ops { | 20 | namespace Ops { |
| 21 | namespace NN { | 21 | namespace NN { |
Rconv/conv3d_transpose_v2/op_host/op_tiling/arch35/conv3d_transpose_v2_base_tiling.h→conv/conv3d_transpose_v2/op_host/op_tiling/arch35/conv3d_transpose_v2_base_tiling_arch35.h+0-0
文件重命名但无更改。
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | -#include "../conv3d_backprop_input_v2/arch35/conv3d_backprop_input_v2/conv3d_backprop_input_v2_init_output.h" | 19 | +#include "../conv3d_backprop_input_v2/arch35/conv3d_backprop_input_v2/conv3d_backprop_input_v2_init_output_arch35.h" |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | 22 | ||
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | -#include "../conv3d_backprop_input_v2/arch35/conv3d_backprop_input_v2/conv3d_backprop_input_v2_init_output.h" | 19 | +#include "../conv3d_backprop_input_v2/arch35/conv3d_backprop_input_v2/conv3d_backprop_input_v2_init_output_arch35.h" |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | 22 | ||