修复单仓重复头文件问题-ops-nn-AtomGit

已合并

修复单仓重复头文件问题 #8533

XianyongWang创建于 8月11日从XianyongWang/ops-nn： fix/duplicate-header-files 合入到 cann/ops-nn： master

修复单仓重复头文件问题 #8533

已合并

XianyongWang创建于 8月11日

从XianyongWang/ops-nn fix/duplicate-header-files合入到cann/ops-nn master

共 11 个文件变更+27-27

Rconv/common/op_kernel/arch35/conv_common_func.h→conv/common/op_kernel/arch35/conv_common_func_arch35.h+4-4

	@@ -9,16 +9,16 @@
9	*/	9	*/
10		10
11	/*!	11	/*!
12	- * \file conv_common_func.h	12	+ * \file conv_common_func_arch35.h
13	* \brief	13	* \brief
14	*/	14	*/
15		15
16	-#ifndef CONV_COMMON_FUNC_H	16	+#ifndef CONV_COMMON_FUNC_ARCH35_H
17	-#define CONV_COMMON_FUNC_H	17	+#define CONV_COMMON_FUNC_ARCH35_H
18		18
19	#include <cstring>	19	#include <cstring>
20	#include "conv_config.h"	20	#include "conv_config.h"
21	-#include "conv_framework_util.h"	21	+#include "conv_framework_util_arch35.h"
22	#include "conv_iterate_impl.h"	22	#include "conv_iterate_impl.h"
23	#include "conv_opt_group_impl.h"	23	#include "conv_opt_group_impl.h"
24	#include "conv_util.h"	24	#include "conv_util.h"

Rconv/common/op_kernel/arch35/conv_framework_util.h→conv/common/op_kernel/arch35/conv_framework_util_arch35.h+4-4

	@@ -9,12 +9,12 @@
9	*/	9	*/
10		10
11	/*!	11	/*!
12	- * \file conv_framework_util.h	12	+ * \file conv_framework_util_arch35.h
13	* \brief	13	* \brief
14	*/	14	*/
15		15
16	-#ifndef CONV_FRAMEWORK_UTIL_H	16	+#ifndef CONV_FRAMEWORK_UTIL_ARCH35_H
17	-#define CONV_FRAMEWORK_UTIL_H	17	+#define CONV_FRAMEWORK_UTIL_ARCH35_H
18		18
19	#include "kernel_common.h"	19	#include "kernel_common.h"
20		20
	@@ -127,4 +127,4 @@ public \
127	// Check whether T::M is const var.	127	// Check whether T::M is const var.
128	#define CONV_CHECK_CONST(T, M) (T::__CONST_TYPE_##M)	128	#define CONV_CHECK_CONST(T, M) (T::__CONST_TYPE_##M)
129		129
130	-#endif // CONV_FRAMEWORK_UTIL_H	130	+#endif // CONV_FRAMEWORK_UTIL_ARCH35_H

Mconv/common/op_kernel/arch35/conv_iterate_impl.h+1-1

	@@ -17,7 +17,7 @@
17	#define CONV_ITERATE_IMPL_H	17	#define CONV_ITERATE_IMPL_H
18		18
19	#include "conv_config.h"	19	#include "conv_config.h"
20	-#include "conv_framework_util.h"	20	+#include "conv_framework_util_arch35.h"
21	#include "conv_iterate_base_impl.h"	21	#include "conv_iterate_base_impl.h"
22	#include "conv_iterate_hw_mode_impl.h"	22	#include "conv_iterate_hw_mode_impl.h"
23	#include "conv_iterate_m_mode_impl.h"	23	#include "conv_iterate_m_mode_impl.h"

Mconv/common/op_kernel/arch35/conv_opt_group_impl.h+1-1

	@@ -17,7 +17,7 @@
17	#define CONV_OPT_GROUP_IMPL_H	17	#define CONV_OPT_GROUP_IMPL_H
18		18
19	#include "conv_config.h"	19	#include "conv_config.h"
20	-#include "conv_framework_util.h"	20	+#include "conv_framework_util_arch35.h"
21	#include "conv_opt_group_init_impl.h"	21	#include "conv_opt_group_init_impl.h"
22	#include "conv_util.h"	22	#include "conv_util.h"
23		23

Mconv/common/op_kernel/arch35/conv_opt_group_init_impl.h+2-2

	@@ -17,7 +17,7 @@
17	#define CONV_OPT_GROUP_INIT_IMPL_H	17	#define CONV_OPT_GROUP_INIT_IMPL_H
18		18
19	#include "conv_config.h"	19	#include "conv_config.h"
20	-#include "conv_framework_util.h"	20	+#include "conv_framework_util_arch35.h"
21	#include "conv_util.h"	21	#include "conv_util.h"
22		22
23	namespace ConvFunc {	23	namespace ConvFunc {
	@@ -344,4 +344,4 @@ __aicore__ inline void OptGroupVecInit(Intf* self)
344		344
345	}; // namespace ConvFunc	345	}; // namespace ConvFunc
346		346
347	-#endif // CONV_OPT_GROUP_INIT_IMPL_H	347	+#endif // CONV_OPT_GROUP_INIT_IMPL_H

Mconv/conv2d_v2/op_kernel/arch35/conv2d_v2_api_impl.h+2-2

	@@ -16,7 +16,7 @@
16	#ifndef CONV2D_V2_API_IMPL_H	16	#ifndef CONV2D_V2_API_IMPL_H
17	#define CONV2D_V2_API_IMPL_H	17	#define CONV2D_V2_API_IMPL_H
18		18
19	-#include "../../common/arch35/conv_framework_util.h"	19	+#include "../../common/arch35/conv_framework_util_arch35.h"
20	#include "conv2d_v2_common_func.h"	20	#include "conv2d_v2_common_func.h"
21	#include "conv2d_v2_config.h"	21	#include "conv2d_v2_config.h"
22	#include "conv2d_v2_util.h"	22	#include "conv2d_v2_util.h"
	@@ -191,4 +191,4 @@ public:
191	};	191	};
192	} // namespace conv2d	192	} // namespace conv2d
193		193
194	-#endif // CONV2D_V2_API_IMPL_H	194	+#endif // CONV2D_V2_API_IMPL_H

Mconv/conv2d_v2/op_kernel/arch35/conv2d_v2_common_func.h+2-2

	@@ -16,8 +16,8 @@
16	#ifndef CONV2D_V2_COMMON_FUNC_H	16	#ifndef CONV2D_V2_COMMON_FUNC_H
17	#define CONV2D_V2_COMMON_FUNC_H	17	#define CONV2D_V2_COMMON_FUNC_H
18		18
19	-#include "../../common/arch35/conv_common_func.h"	19	+#include "../../common/arch35/conv_common_func_arch35.h"
20	-#include "../../common/arch35/conv_framework_util.h"	20	+#include "../../common/arch35/conv_framework_util_arch35.h"
21	#include "../../common/arch35/conv_instr.h"	21	#include "../../common/arch35/conv_instr.h"
22	#include "conv2d_v2_c04_impl.h"	22	#include "conv2d_v2_c04_impl.h"
23	#include "conv2d_v2_config.h"	23	#include "conv2d_v2_config.h"

Mconv/conv2d_v2/op_kernel/arch35/conv2d_v2_intf.h+3-3

	@@ -16,8 +16,8 @@
16	#ifndef CONV2D_V2_INTF_H	16	#ifndef CONV2D_V2_INTF_H
17	#define CONV2D_V2_INTF_H	17	#define CONV2D_V2_INTF_H
18		18
19	-#include "../../common/arch35/conv_common_func.h"	19	+#include "../../common/arch35/conv_common_func_arch35.h"
20	-#include "../../common/arch35/conv_framework_util.h"	20	+#include "../../common/arch35/conv_framework_util_arch35.h"
21	#include "conv2d_v2_common_func.h"	21	#include "conv2d_v2_common_func.h"
22	#include "conv2d_v2_config.h"	22	#include "conv2d_v2_config.h"
23	#include "conv2d_v2_util.h"	23	#include "conv2d_v2_util.h"
	@@ -352,4 +352,4 @@ public:
352		352
353	} // namespace conv2d	353	} // namespace conv2d
354		354
355	-#endif // CONV2D_V2_INTF_H	355	+#endif // CONV2D_V2_INTF_H

Mconv/conv3d_v2/op_kernel/arch35/conv3d_v2_api_impl.h+2-2

	@@ -16,7 +16,7 @@
16	#ifndef CONV3D_V2_API_IMPL_H	16	#ifndef CONV3D_V2_API_IMPL_H
17	#define CONV3D_V2_API_IMPL_H	17	#define CONV3D_V2_API_IMPL_H
18		18
19	-#include "../../common/arch35/conv_framework_util.h"	19	+#include "../../common/arch35/conv_framework_util_arch35.h"
20	#include "conv3d_v2_common_func.h"	20	#include "conv3d_v2_common_func.h"
21	#include "conv3d_v2_config.h"	21	#include "conv3d_v2_config.h"
22	#include "conv3d_v2_util.h"	22	#include "conv3d_v2_util.h"
	@@ -152,4 +152,4 @@ public:
152		152
153	} // namespace conv3d	153	} // namespace conv3d
154		154
155	-#endif // CONV3D_V2_API_IMPL_H	155	+#endif // CONV3D_V2_API_IMPL_H

Mconv/conv3d_v2/op_kernel/arch35/conv3d_v2_common_func.h+3-3

	@@ -16,8 +16,8 @@
16	#ifndef CONV3D_V2_COMMON_FUNC_H	16	#ifndef CONV3D_V2_COMMON_FUNC_H
17	#define CONV3D_V2_COMMON_FUNC_H	17	#define CONV3D_V2_COMMON_FUNC_H
18		18
19	-#include "../../common/arch35/conv_common_func.h"	19	+#include "../../common/arch35/conv_common_func_arch35.h"
20	-#include "../../common/arch35/conv_framework_util.h"	20	+#include "../../common/arch35/conv_framework_util_arch35.h"
21	#include "../../common/arch35/conv_instr.h"	21	#include "../../common/arch35/conv_instr.h"
22	#include "conv3d_v2_config.h"	22	#include "conv3d_v2_config.h"
23	#include "conv3d_v2_dequant_impl.h"	23	#include "conv3d_v2_dequant_impl.h"
	@@ -287,4 +287,4 @@ struct SetOptGroupParams {
287		287
288	} // namespace Conv3dFunc	288	} // namespace Conv3dFunc
289		289
290	-#endif // CONV3D_V2_COMMON_FUNC_H	290	+#endif // CONV3D_V2_COMMON_FUNC_H

Mconv/conv3d_v2/op_kernel/arch35/conv3d_v2_intf.h+3-3

	@@ -16,8 +16,8 @@
16	#ifndef CONV3D_V2_INTF_H	16	#ifndef CONV3D_V2_INTF_H
17	#define CONV3D_V2_INTF_H	17	#define CONV3D_V2_INTF_H
18		18
19	-#include "../../common/arch35/conv_common_func.h"	19	+#include "../../common/arch35/conv_common_func_arch35.h"
20	-#include "../../common/arch35/conv_framework_util.h"	20	+#include "../../common/arch35/conv_framework_util_arch35.h"
21	#include "conv3d_v2_common_func.h"	21	#include "conv3d_v2_common_func.h"
22	#include "conv3d_v2_config.h"	22	#include "conv3d_v2_config.h"
23	#include "conv3d_v2_util.h"	23	#include "conv3d_v2_util.h"
	@@ -270,4 +270,4 @@ private:
270		270
271	} // namespace conv3d	271	} // namespace conv3d
272		272
273	-#endif // CONV3D_V2_INTF_H	273	+#endif // CONV3D_V2_INTF_H