fix experimental pkg fail-ops-math-AtomGit

已合并

fix experimental pkg fail #899

liulinxiang创建于 1月25日从liulinxiang/ops-math： master4 合入到 cann/ops-math： master

fix experimental pkg fail #899

已合并

liulinxiang创建于 1月25日

从liulinxiang/ops-math master4合入到cann/ops-math master

共 6 个文件变更+12-31

Mexperimental/conversion/concat_v2/op_host/concat_v2_tiling.cpp+1-20

	@@ -61,26 +61,7 @@ static ge::graphStatus GetPlatformInfo(gert::TilingContext* context, uint64_t& u
61	return ge::GRAPH_SUCCESS;	61	return ge::GRAPH_SUCCESS;
62	}	62	}
63		63
64	-// 获取属性，shape信息	64	+static ge::graphStatus GetWorkspaceSize(gert::TilingContext* context)
65	-ge::graphStatus GetShapeAttrsInfo(gert::TilingContext* context, int64_t& totalIdx, ge::DataType& dataType)
66	-{
67	- // 获取输入shape信息
68	- auto inputX = context->GetInputShape(0);
69	- OP_CHECK_NULL_WITH_CONTEXT(context, inputX);
70	- totalIdx = inputX->GetStorageShape().GetShapeSize();
71	- // dtype校验
72	- const std::set<ge::DataType> supportedDtype = {ge::DT_FLOAT, ge::DT_INT32, ge::DT_INT16, ge::DT_FLOAT16};
73	- auto inputDesc = context->GetInputDesc(0);
74	- OP_CHECK_NULL_WITH_CONTEXT(context, inputDesc);
75	- dataType = inputDesc->GetDataType();
76	- if (supportedDtype.count(dataType) == 0) {
77	- OP_LOGE(context, "invalid dtype");
78	- return ge::GRAPH_FAILED;
79	- }
80	- return ge::GRAPH_SUCCESS;
81	-}
82	-
83	-ge::graphStatus GetWorkspaceSize(gert::TilingContext* context)
84	{	65	{
85	auto ascendcPlatform = platform_ascendc:: PlatformAscendC(context->GetPlatformInfo());	66	auto ascendcPlatform = platform_ascendc:: PlatformAscendC(context->GetPlatformInfo());
86	uint32_t sysWorkspaceSize = ascendcPlatform.GetLibApiWorkSpaceSize();	67	uint32_t sysWorkspaceSize = ascendcPlatform.GetLibApiWorkSpaceSize();

Mexperimental/math/axpy_v2/op_host/axpy_v2_tiling.cpp+2-2

	@@ -14,10 +14,10 @@
14	*/	14	*/
15	#include "log/log.h"	15	#include "log/log.h"
16	#include "util/math_util.h"	16	#include "util/math_util.h"
17	-#include "tiling_base/tiling_util.h"	17	+#include "op_host/tiling_util.h"
18	#include "tiling/platform/platform_ascendc.h"	18	#include "tiling/platform/platform_ascendc.h"
19	#include "register/op_impl_registry.h"	19	#include "register/op_impl_registry.h"
20	-#include "tiling_base/tiling_templates_registry.h"	20	+#include "op_host/tiling_templates_registry.h"
21	#include "../op_kernel/axpy_v2_tiling_data.h"	21	#include "../op_kernel/axpy_v2_tiling_data.h"
22	#include "../op_kernel/axpy_v2_tiling_key.h"	22	#include "../op_kernel/axpy_v2_tiling_key.h"
23		23

Mexperimental/math/complex_v2/op_host/complex_v2_tiling.cpp+1-1

	@@ -65,7 +65,7 @@ static ge::graphStatus GetPlatformInfo(gert::TilingContext* context, PlatformInf
65	}	65	}
66		66
67	// 获取属性，shape信息	67	// 获取属性，shape信息
68	-ge::graphStatus GetShapeAttrsInfo(gert::TilingContext* context, int64_t& totalIdx, ge::DataType& dataType)	68	+static ge::graphStatus GetShapeAttrsInfo(gert::TilingContext* context, int64_t& totalIdx, ge::DataType& dataType)
69	{	69	{
70	// 获取输入shape信息	70	// 获取输入shape信息
71	auto inputX = context->GetInputShape(0);	71	auto inputX = context->GetInputShape(0);

Mexperimental/math/logical_and/op_host/logical_and_tiling.cpp+2-2文件内容审核中，请稍后刷新重试

Mexperimental/math/real_div/op_host/real_div_tiling.cpp+2-2

	@@ -14,10 +14,10 @@
14	*/	14	*/
15	#include "log/log.h"	15	#include "log/log.h"
16	#include "util/math_util.h"	16	#include "util/math_util.h"
17	-#include "tiling_base/tiling_util.h"	17	+#include "op_host/tiling_util.h"
18	#include "tiling/platform/platform_ascendc.h"	18	#include "tiling/platform/platform_ascendc.h"
19	#include "register/op_impl_registry.h"	19	#include "register/op_impl_registry.h"
20	-#include "tiling_base/tiling_templates_registry.h"	20	+#include "op_host/tiling_templates_registry.h"
21	#include "../op_kernel/real_div_tiling_data.h"	21	#include "../op_kernel/real_div_tiling_data.h"
22	#include "../op_kernel/real_div_tiling_key.h"	22	#include "../op_kernel/real_div_tiling_key.h"
23		23

Mexperimental/math/trace_v2/op_host/trace_v2_tiling.cpp+4-4

	@@ -25,8 +25,8 @@
25		25
26	#include "log/log.h"	26	#include "log/log.h"
27	#include "util/math_util.h"	27	#include "util/math_util.h"
28	-#include "tiling_base/tiling_util.h"	28	+#include "op_host/tiling_util.h"
29	-#include "tiling_base/tiling_templates_registry.h"	29	+#include "op_host/tiling_templates_registry.h"
30	#include "../op_kernel/trace_v2_tiling_data.h"	30	#include "../op_kernel/trace_v2_tiling_data.h"
31	#include "../op_kernel/trace_v2_tiling_key.h"	31	#include "../op_kernel/trace_v2_tiling_key.h"
32		32
	@@ -54,7 +54,7 @@ static ge::graphStatus GetPlatformInfo(gert::TilingContext* context, uint64_t& u
54	}	54	}
55		55
56	// 获取属性，shape信息	56	// 获取属性，shape信息
57	-ge::graphStatus GetShapeAttrsInfo(gert::TilingContext* context, int64_t& totalIdx, ge::DataType& dataType)	57	+static ge::graphStatus GetShapeAttrsInfo(gert::TilingContext* context, int64_t& totalIdx, ge::DataType& dataType)
58	{	58	{
59	// 获取输入shape信息	59	// 获取输入shape信息
60	auto inputX = context->GetInputShape(0);	60	auto inputX = context->GetInputShape(0);
	@@ -72,7 +72,7 @@ ge::graphStatus GetShapeAttrsInfo(gert::TilingContext* context, int64_t& totalId
72	return ge::GRAPH_SUCCESS;	72	return ge::GRAPH_SUCCESS;
73	}	73	}
74		74
75	-ge::graphStatus GetWorkspaceSize(gert::TilingContext* context)	75	+static ge::graphStatus GetWorkspaceSize(gert::TilingContext* context)
76	{	76	{
77	auto ascendcPlatform = platform_ascendc:: PlatformAscendC(context->GetPlatformInfo());	77	auto ascendcPlatform = platform_ascendc:: PlatformAscendC(context->GetPlatformInfo());
78	uint32_t sysWorkspaceSize = ascendcPlatform.GetLibApiWorkSpaceSize();	78	uint32_t sysWorkspaceSize = ascendcPlatform.GetLibApiWorkSpaceSize();