Star1009
1936
代码
代码
Issues194
Pull Requests330
Actions
项目讨论
Wiki
分析
Star1009
1936
已合并
处理 禁止从空指针创建string 告警 #2677
yuanbin_22创建于 3月13日
处理 禁止从空指针创建string 告警 #2677
已合并
yuanbin_22创建于 3月13日
从yuanbin_22/ops-nnCleanCode_nullptr合入到cann/ops-nnmaster
共 33 个文件变更+57-29
Mactivation/elu/op_host/arch35/elu_tiling_arch35.cpp+1-0
@@ -61,6 +61,7 @@ ge::graphStatus EluTiling::SetTilingData()
61 auto rawTilingData = tilingContext->GetRawTilingData();61 auto rawTilingData = tilingContext->GetRawTilingData();
62 OP_CHECK_NULL_WITH_CONTEXT(tilingContext, rawTilingData);62 OP_CHECK_NULL_WITH_CONTEXT(tilingContext, rawTilingData);
63 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);63 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);
64+ OP_CHECK_NULL_WITH_CONTEXT(tilingContext, currentWorkspace);
64 currentWorkspace[0] = ELU_WORKSPACE_RESERVE_BYTE;65 currentWorkspace[0] = ELU_WORKSPACE_RESERVE_BYTE;
65 tilingContext->SetTilingKey(ELU_TILING_KEY_ELEMENTWISE);66 tilingContext->SetTilingKey(ELU_TILING_KEY_ELEMENTWISE);
66 tilingContext->SetBlockDim(tiling->baseTiling.blockNum);67 tilingContext->SetBlockDim(tiling->baseTiling.blockNum);
Mactivation/elu_grad/op_host/arch35/elu_grad_tiling_arch35.cpp+1-0
@@ -136,6 +136,7 @@ ge::graphStatus EluGradTiling::RunTiling()
136 size_t usrWorkspaceSize = 0;136 size_t usrWorkspaceSize = 0;
137 size_t sysWorkspaceSize = ASCEND_WORKSPACE;137 size_t sysWorkspaceSize = ASCEND_WORKSPACE;
138 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);138 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);
139+ OP_CHECK_NULL_WITH_CONTEXT(tilingContext, currentWorkspace);
139 currentWorkspace[0] = sysWorkspaceSize + usrWorkspaceSize;140 currentWorkspace[0] = sysWorkspaceSize + usrWorkspaceSize;
140 return ge::GRAPH_SUCCESS;141 return ge::GRAPH_SUCCESS;
141}142}
Mactivation/elu_grad_v2/op_host/arch35/elu_grad_v2_tiling_arch35.cpp+1-0
@@ -198,6 +198,7 @@ ge::graphStatus EluGradV2Tiling::RunTiling()
198 OP_CHECK_NULL_WITH_CONTEXT(tilingContext, tilingContext->GetRawTilingData());198 OP_CHECK_NULL_WITH_CONTEXT(tilingContext, tilingContext->GetRawTilingData());
199 199 
200 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);200 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);
201+ OP_CHECK_NULL_WITH_CONTEXT(tilingContext, currentWorkspace);
201 currentWorkspace[0] = static_cast<uint64_t>(ASCEND_WORKSPACE);202 currentWorkspace[0] = static_cast<uint64_t>(ASCEND_WORKSPACE);
202 203 
203 return ge::GRAPH_SUCCESS;204 return ge::GRAPH_SUCCESS;
Mactivation/erfinv/op_host/arch35/erfinv_tiling_arch35.h+2-2
@@ -35,8 +35,8 @@ protected:
35private:35private:
36 EleBaseTilingDataV2* tiling = nullptr;36 EleBaseTilingDataV2* tiling = nullptr;
37 gert::TilingContext* tilingContext = nullptr;37 gert::TilingContext* tilingContext = nullptr;
38- ge::DataType outputDtype;38+ ge::DataType outputDtype = ge::DT_UNDEFINED;
39- ge::DataType inputDtype;39+ ge::DataType inputDtype = ge::DT_UNDEFINED;
40 uint64_t dType = 0;40 uint64_t dType = 0;
41};41};
42} // namespace optiling42} // namespace optiling
Mactivation/fast_gelu/op_host/arch35/fast_gelu_tiling_arch35.cpp+1-0
@@ -115,6 +115,7 @@ ge::graphStatus FastGeluTiling::RunTiling()
115 size_t usrWorkspaceSize = 0;115 size_t usrWorkspaceSize = 0;
116 size_t sysWorkspaceSize = SYSWORKSPACE;116 size_t sysWorkspaceSize = SYSWORKSPACE;
117 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);117 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);
118+ OP_CHECK_NULL_WITH_CONTEXT(tilingContext, currentWorkspace);
118 currentWorkspace[0] = sysWorkspaceSize + usrWorkspaceSize;119 currentWorkspace[0] = sysWorkspaceSize + usrWorkspaceSize;
119 return ge::GRAPH_SUCCESS;120 return ge::GRAPH_SUCCESS;
120}121}
Mactivation/fast_gelu/op_kernel/arch35/fast_gelu_struct.h+3-3
@@ -10,8 +10,8 @@
10 10 
11#include "ascendc/host_api/tiling/template_argument.h"11#include "ascendc/host_api/tiling/template_argument.h"
12 12 
13-#ifndef CANN_CUSTOM_OPS_FAST_GELU_STRUCT_H_13+#ifndef OPS_NN_ACTIVATION_FAST_GELU_OP_KERNEL_ARCH35_FAST_GELU_STRUCT_H
14-#define CANN_CUSTOM_OPS_FAST_GELU_STRUCT_H_14+#define OPS_NN_ACTIVATION_FAST_GELU_OP_KERNEL_ARCH35_FAST_GELU_STRUCT_H
15 15 
16namespace FastGeluOp {16namespace FastGeluOp {
17#define TPL_FP16 117#define TPL_FP16 1
@@ -36,4 +36,4 @@ ASCENDC_TPL_SEL(
36 ASCENDC_TPL_DTYPE_SEL(dType, TPL_FP32)));36 ASCENDC_TPL_DTYPE_SEL(dType, TPL_FP32)));
37} // namespace FastGeluOp37} // namespace FastGeluOp
38 38 
39-#endif // CANN_CUSTOM_OPS_FAST_GELU_STRUCT_H_39+#endif // OPS_NN_ACTIVATION_FAST_GELU_OP_KERNEL_ARCH35_FAST_GELU_STRUCT_H
Mactivation/fast_gelu_grad/op_host/arch35/fast_gelu_grad_tiling_arch35.cpp+1-0
@@ -140,6 +140,7 @@ ge::graphStatus FastGeluGradTiling::RunTiling()
140 size_t usr_workspaceSize = 0;140 size_t usr_workspaceSize = 0;
141 size_t sys_workspaceSize = SYSWORKSPACE;141 size_t sys_workspaceSize = SYSWORKSPACE;
142 size_t* current_workspace = tilingContext->GetWorkspaceSizes(1);142 size_t* current_workspace = tilingContext->GetWorkspaceSizes(1);
143+ OP_CHECK_NULL_WITH_CONTEXT(tilingContext, current_workspace);
143 current_workspace[0] = sys_workspaceSize + usr_workspaceSize;144 current_workspace[0] = sys_workspaceSize + usr_workspaceSize;
144 return ge::GRAPH_SUCCESS;145 return ge::GRAPH_SUCCESS;
145}146}
Mactivation/fast_gelu_grad/op_kernel/arch35/fast_gelu_grad_struct.h+3-3
@@ -10,8 +10,8 @@
10 10 
11#include "ascendc/host_api/tiling/template_argument.h"11#include "ascendc/host_api/tiling/template_argument.h"
12 12 
13-#ifndef CANN_CUSTOM_OPS_FAST_GELU_GRAD_STRUCT_H_13+#ifndef OPS_NN_ACTIVATION_FAST_GELU_GRAD_OP_KERNEL_ARCH35_FAST_GELU_STRUCT_H
14-#define CANN_CUSTOM_OPS_FAST_GELU_GRAD_STRUCT_H_14+#define OPS_NN_ACTIVATION_FAST_GELU_GRAD_OP_KERNEL_ARCH35_FAST_GELU_STRUCT_H
15 15 
16namespace FastGeluGradOp {16namespace FastGeluGradOp {
17#define TPL_FP16 117#define TPL_FP16 1
@@ -36,4 +36,4 @@ ASCENDC_TPL_SEL(
36 ASCENDC_TPL_DTYPE_SEL(dType, TPL_FP32)));36 ASCENDC_TPL_DTYPE_SEL(dType, TPL_FP32)));
37} // namespace FastGeluGradOp37} // namespace FastGeluGradOp
38 38 
39-#endif // CANN_CUSTOM_OPS_FAST_GELU_GRAD_STRUCT_H_39+#endif // OPS_NN_ACTIVATION_FAST_GELU_GRAD_OP_KERNEL_ARCH35_FAST_GELU_STRUCT_H
Mactivation/ge_glu_grad_v2/op_host/ge_glu_grad_v2_tiling.cpp+1-0
@@ -157,6 +157,7 @@ ge::graphStatus GeGluGradV2Tiling::RunTiling4GeGluGradV2()
157 tilingContext->SetTilingKey(static_cast<uint64_t>(tilingKey));157 tilingContext->SetTilingKey(static_cast<uint64_t>(tilingKey));
158 FillTilingData();158 FillTilingData();
159 size_t* workspaces = tilingContext->GetWorkspaceSizes(1);159 size_t* workspaces = tilingContext->GetWorkspaceSizes(1);
160+ OP_CHECK_NULL_WITH_CONTEXT(tilingContext, workspaces);
160 workspaces[0] = static_cast<size_t>(WORK_SPACE_SIZE + ptrCompileInfo->totalCoreNum * BLOCK_SIZE);161 workspaces[0] = static_cast<size_t>(WORK_SPACE_SIZE + ptrCompileInfo->totalCoreNum * BLOCK_SIZE);
161 return ge::GRAPH_SUCCESS;162 return ge::GRAPH_SUCCESS;
162}163}
Mactivation/ge_glu_v2/op_host/ge_glu_v2_tiling.cpp+1-0
@@ -460,6 +460,7 @@ static ge::graphStatus Tiling4GeGluV2(gert::TilingContext* context)
460 context->SetBlockDim(tilingData.get_realCoreNum());460 context->SetBlockDim(tilingData.get_realCoreNum());
461 context->SetTilingKey(tilingData.get_tilingKey());461 context->SetTilingKey(tilingData.get_tilingKey());
462 size_t* workspaces = context->GetWorkspaceSizes(1);462 size_t* workspaces = context->GetWorkspaceSizes(1);
463+ OP_CHECK_NULL_WITH_CONTEXT(context, workspaces);
463 workspaces[0] = WORK_SPACE_SIZE + tilingParam.coreNum * BYTES_ONE_BLOCK * FP32_DTYPE_BYTES;464 workspaces[0] = WORK_SPACE_SIZE + tilingParam.coreNum * BYTES_ONE_BLOCK * FP32_DTYPE_BYTES;
464 465 
465 OP_LOGD(466 OP_LOGD(
Mactivation/gelu/op_host/arch35/gelu_tiling_arch35.cpp+1-0
@@ -107,6 +107,7 @@ ge::graphStatus GeluTiling::RunTiling()
107 OP_LOGE(tilingContext, "elewiseBaseTiling failed"), return ge::GRAPH_FAILED);107 OP_LOGE(tilingContext, "elewiseBaseTiling failed"), return ge::GRAPH_FAILED);
108 108 
109 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);109 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);
110+ OP_CHECK_NULL_WITH_CONTEXT(tilingContext, currentWorkspace);
110 currentWorkspace[0] = ASCEND_WORKSPACE;111 currentWorkspace[0] = ASCEND_WORKSPACE;
111 112 
112 const uint64_t tilingKey = GET_TPL_TILING_KEY(1, dType);113 const uint64_t tilingKey = GET_TPL_TILING_KEY(1, dType);
Mactivation/gelu_v2/op_host/arch35/gelu_v2_tiling_arch35.cpp+1-0
@@ -156,6 +156,7 @@ ge::graphStatus GeluV2Tiling::RunTiling()
156 return ge::GRAPH_FAILED);156 return ge::GRAPH_FAILED);
157 157
158 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);158 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);
159+ OP_CHECK_NULL_WITH_CONTEXT(tilingContext, currentWorkspace);
159 currentWorkspace[0] = ASCEND_WORKSPACE;160 currentWorkspace[0] = ASCEND_WORKSPACE;
160 161 
161 const uint64_t tilingKey = GET_TPL_TILING_KEY(1, approximate, dType);162 const uint64_t tilingKey = GET_TPL_TILING_KEY(1, approximate, dType);
Mactivation/gelu_v2/op_kernel/arch35/gelu_v2_struct.h+3-3
@@ -15,8 +15,8 @@
15 15 
16 #include "ascendc/host_api/tiling/template_argument.h"16 #include "ascendc/host_api/tiling/template_argument.h"
17 17 
18- #ifndef CANN_CUSTOM_OPS_GELU_V2_STRUCT_H_18+ #ifndef OPS_NN_ACTIVATION_GELU_V2_OP_KERNEL_ARCH35_GELU_V2_STRUCT_H
19- #define CANN_CUSTOM_OPS_GELU_V2_STRUCT_H_19+ #define OPS_NN_ACTIVATION_GELU_V2_OP_KERNEL_ARCH35_GELU_V2_STRUCT_H
20 20
21 #define TPL_FP16 121 #define TPL_FP16 1
22 #define TPL_BF16 222 #define TPL_BF16 2
@@ -41,5 +41,5 @@
41 ASCENDC_TPL_DTYPE_SEL(dType, TPL_FP16, TPL_BF16, TPL_FP32)41 ASCENDC_TPL_DTYPE_SEL(dType, TPL_FP16, TPL_BF16, TPL_FP32)
42 )42 )
43 );43 );
44- #endif // CANN_CUSTOM_OPS_GELU_V2_STRUCT_H_44+ #endif // OPS_NN_ACTIVATION_GELU_V2_OP_KERNEL_ARCH35_GELU_V2_STRUCT_H
45 45
Mactivation/hardtanh_grad/op_host/arch35/hardtanh_grad_tiling_arch35.cpp+1-0
@@ -62,6 +62,7 @@ ge::graphStatus HardtanhGradTiling::SetTilingData()
62 OP_LOGD(tilingContext->GetNodeName(), "HardtanhGradTiling SetTilingData enter.");62 OP_LOGD(tilingContext->GetNodeName(), "HardtanhGradTiling SetTilingData enter.");
63 63 
64 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);64 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);
65+ OP_CHECK_NULL_WITH_CONTEXT(tilingContext, currentWorkspace);
65 currentWorkspace[0] = static_cast<size_t>(ASCEND_WORKSPACE);66 currentWorkspace[0] = static_cast<size_t>(ASCEND_WORKSPACE);
66 67 
67 schMode = tiling->baseTiling.scheMode;68 schMode = tiling->baseTiling.scheMode;
Mactivation/leaky_relu/op_host/arch35/leaky_relu_tiling_arch35.cpp+1-0
@@ -63,6 +63,7 @@ ge::graphStatus LeakyReluTiling::SetTilingData()
63 OP_CHECK_NULL_WITH_CONTEXT(tilingContext, rawTilingData);63 OP_CHECK_NULL_WITH_CONTEXT(tilingContext, rawTilingData);
64 64 
65 size_t *currentWorkspace = tilingContext->GetWorkspaceSizes(1);65 size_t *currentWorkspace = tilingContext->GetWorkspaceSizes(1);
66+ OP_CHECK_NULL_WITH_CONTEXT(tilingContext, currentWorkspace);
66 currentWorkspace[0] = SYS_WORKSPACE;67 currentWorkspace[0] = SYS_WORKSPACE;
67 68 
68 schMode = tiling->baseTiling.scheMode;69 schMode = tiling->baseTiling.scheMode;
Mactivation/leaky_relu/op_kernel/arch35/leaky_relu_dag.h+3-3
@@ -12,8 +12,8 @@
12 * \file leaky_relu_dag.h12 * \file leaky_relu_dag.h
13 * \brief13 * \brief
14 */14 */
15-#ifndef ASCENDC_LEAKY_RELU_DAG_H_15+#ifndef OPS_NN_ACTIVATION_LEAKY_RELU_OP_KERNEL_ARCH35_LEAKY_RELU_DAG_H
16-#define ASCENDC_LEAKY_RELU_DAG_H_16+#define OPS_NN_ACTIVATION_LEAKY_RELU_OP_KERNEL_ARCH35_LEAKY_RELU_DAG_H
17#include "atvoss/util/dag.h"17#include "atvoss/util/dag.h"
18#include "atvoss/util/vec.h"18#include "atvoss/util/vec.h"
19#include "atvoss/util/placeholder.h"19#include "atvoss/util/placeholder.h"
@@ -38,5 +38,5 @@ struct LeakyReluCastDag {
38 using Outputs = Ops::Base::Elems<OpCopyOut>;38 using Outputs = Ops::Base::Elems<OpCopyOut>;
39 using OpDag = Ops::Base::DAGSch<Outputs>;39 using OpDag = Ops::Base::DAGSch<Outputs>;
40};40};
41-#endif // ASCENDC_LEAKY_RELU_DAG_H_
42 41 
42+#endif // OPS_NN_ACTIVATION_LEAKY_RELU_OP_KERNEL_ARCH35_LEAKY_RELU_DAG_H
Mactivation/leaky_relu/op_kernel/arch35/leaky_relu_struct.h+3-3
@@ -15,8 +15,8 @@
15#include "ascendc/host_api/tiling/template_argument.h"15#include "ascendc/host_api/tiling/template_argument.h"
16 16 
17 17 
18-#ifndef CANN_CUSTOM_OPS_LEAKY_RELU_STRUCT_H_18+#ifndef OPS_NN_ACTIVATION_LEAKY_RELU_OP_KERNEL_ARCH35_LEAKY_RELU_STRUCT_H
19-#define CANN_CUSTOM_OPS_LEAKY_RELU_STRUCT_H_19+#define OPS_NN_ACTIVATION_LEAKY_RELU_OP_KERNEL_ARCH35_LEAKY_RELU_STRUCT_H
20 20 
21namespace LeakyReluOp21namespace LeakyReluOp
22{22{
@@ -40,4 +40,4 @@ namespace LeakyReluOp
40 );40 );
41} // namespace LeakyReluOp41} // namespace LeakyReluOp
42 42 
43-#endif // CANN_CUSTOM_OPS_LEAKY_RELU_STRUCT_H_43+#endif // OPS_NN_ACTIVATION_LEAKY_RELU_OP_KERNEL_ARCH35_LEAKY_RELU_STRUCT_H
Mactivation/log_sigmoid/op_host/arch35/log_sigmoid_tiling_arch35.cpp+1-0
@@ -109,6 +109,7 @@ ge::graphStatus LogSigmoidTiling::RunTiling()
109 109 
110 // set workspace, tilingkey and blocknum110 // set workspace, tilingkey and blocknum
111 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);111 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);
112+ OP_CHECK_NULL_WITH_CONTEXT(tilingContext, currentWorkspace);
112 currentWorkspace[0] = LOG_SIGMOID_SYS_WORKSPACE;113 currentWorkspace[0] = LOG_SIGMOID_SYS_WORKSPACE;
113 const uint64_t tilingKey = GET_TPL_TILING_KEY(static_cast<uint64_t>(tiling->scheMode), dType);114 const uint64_t tilingKey = GET_TPL_TILING_KEY(static_cast<uint64_t>(tiling->scheMode), dType);
114 tilingContext->SetTilingKey(tilingKey);115 tilingContext->SetTilingKey(tilingKey);
Mactivation/mish/op_host/arch35/mish_tiling_arch35.cpp+1-0
@@ -122,6 +122,7 @@ ge::graphStatus MishTiling::RunTiling()
122 return ge::GRAPH_FAILED);122 return ge::GRAPH_FAILED);
123 123
124 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);124 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);
125+ OP_CHECK_NULL_WITH_CONTEXT(tilingContext, currentWorkspace);
125 currentWorkspace[0] = ASCEND_WORKSPACE;126 currentWorkspace[0] = ASCEND_WORKSPACE;
126 const uint64_t tilingKey = GET_TPL_TILING_KEY(1, dType);127 const uint64_t tilingKey = GET_TPL_TILING_KEY(1, dType);
127 OP_LOGD(tilingContext->GetNodeName(), "[TilingData] : tilingKey=%lu", tilingKey);128 OP_LOGD(tilingContext->GetNodeName(), "[TilingData] : tilingKey=%lu", tilingKey);
Mactivation/mish_grad/op_host/arch35/mish_grad_tiling_arch35.cpp+1-0
@@ -153,6 +153,7 @@ ge::graphStatus MishGradTiling::RunTiling()
153 return ge::GRAPH_FAILED);153 return ge::GRAPH_FAILED);
154 154
155 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);155 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);
156+ OP_CHECK_NULL_WITH_CONTEXT(tilingContext, currentWorkspace);
156 currentWorkspace[0] = ASCEND_WORKSPACE;157 currentWorkspace[0] = ASCEND_WORKSPACE;
157 const uint64_t tilingKey = GET_TPL_TILING_KEY(1, dType);158 const uint64_t tilingKey = GET_TPL_TILING_KEY(1, dType);
158 OP_LOGD(tilingContext->GetNodeName(), "[TilingData] : tilingKey=%lu", tilingKey);159 OP_LOGD(tilingContext->GetNodeName(), "[TilingData] : tilingKey=%lu", tilingKey);
Mactivation/mish_grad/op_kernel/arch35/mish_grad_struct.h+3-3
@@ -10,8 +10,8 @@
10 10
11#include "ascendc/host_api/tiling/template_argument.h"11#include "ascendc/host_api/tiling/template_argument.h"
12 12 
13-#ifndef CANN_CUSTOM_OPS_MISHGRAD_STRUCT_H_13+#ifndef OPS_NN_ACTIVATION_MISH_GRAD_OP_KERNEL_ARCH35_MISH_GRAD_STRUCT_H
14-#define CANN_CUSTOM_OPS_MISHGRAD_STRUCT_H_14+#define OPS_NN_ACTIVATION_MISH_GRAD_OP_KERNEL_ARCH35_MISH_GRAD_STRUCT_H
15 15 
16#define TPL_FP16 116#define TPL_FP16 1
17#define TPL_BF16 217#define TPL_BF16 2
@@ -47,4 +47,4 @@ ASCENDC_TPL_SEL(
47 ASCENDC_TPL_ARGS_SEL(47 ASCENDC_TPL_ARGS_SEL(
48 ASCENDC_TPL_UINT_SEL(schMode, ASCENDC_TPL_UI_LIST, TPL_SCH_MODE_0, TPL_SCH_MODE_1),48 ASCENDC_TPL_UINT_SEL(schMode, ASCENDC_TPL_UI_LIST, TPL_SCH_MODE_0, TPL_SCH_MODE_1),
49 ASCENDC_TPL_DTYPE_SEL(dType, TPL_FP32_FULL)));49 ASCENDC_TPL_DTYPE_SEL(dType, TPL_FP32_FULL)));
50-#endif // CANN_CUSTOM_OPS_MISHGRAD_STRUCT_H_s50+#endif // OPS_NN_ACTIVATION_MISH_GRAD_OP_KERNEL_ARCH35_MISH_GRAD_STRUCT_H
Mactivation/relu/op_host/arch35/relu_tiling_arch35.cpp+1-0
@@ -79,6 +79,7 @@ ge::graphStatus ReluTiling::RunTiling()
79 return ge::GRAPH_FAILED);79 return ge::GRAPH_FAILED);
80 80 
81 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);81 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);
82+ OP_CHECK_NULL_WITH_CONTEXT(tilingContext, currentWorkspace);
82 currentWorkspace[0] = SYS_WORKSPACE;83 currentWorkspace[0] = SYS_WORKSPACE;
83 if (this->outputDtype == ge::DT_FLOAT16) {84 if (this->outputDtype == ge::DT_FLOAT16) {
84 tilingContext->SetTilingKey(RELU_TILING_KEY_ELEMENTWISE_FP16);85 tilingContext->SetTilingKey(RELU_TILING_KEY_ELEMENTWISE_FP16);
Mactivation/relu_grad_v2/op_host/arch35/relu_grad_v2_tiling_arch35.cpp+1-0
@@ -144,6 +144,7 @@ ge::graphStatus ReluGradV2Tiling::RunTiling()
144 return ge::GRAPH_FAILED);144 return ge::GRAPH_FAILED);
145 145 
146 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);146 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);
147+ OP_CHECK_NULL_WITH_CONTEXT(tilingContext, currentWorkspace);
147 currentWorkspace[0] = ASCEND_WORKSPACE;148 currentWorkspace[0] = ASCEND_WORKSPACE;
148 149 
149 const uint64_t tilingKey = GET_TPL_TILING_KEY(tiling->scheMode, dType);150 const uint64_t tilingKey = GET_TPL_TILING_KEY(tiling->scheMode, dType);
Mactivation/relu_v2/op_host/arch35/relu_v2_tiling_arch35.cpp+1-0
@@ -65,6 +65,7 @@ ge::graphStatus ReluV2Tiling::SetTilingData()
65 OP_CHECK_NULL_WITH_CONTEXT(tilingContext, rawTilingData);65 OP_CHECK_NULL_WITH_CONTEXT(tilingContext, rawTilingData);
66 66 
67 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);67 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);
68+ OP_CHECK_NULL_WITH_CONTEXT(tilingContext, currentWorkspace);
68 currentWorkspace[0] = SYS_WORKSPACE;69 currentWorkspace[0] = SYS_WORKSPACE;
69 70 
70 tilingContext->SetBlockDim(tiling->baseTiling.blockNum);71 tilingContext->SetBlockDim(tiling->baseTiling.blockNum);
Mactivation/silu_grad/op_host/arch35/silu_grad_tiling.cpp+1-0
@@ -252,6 +252,7 @@ ge::graphStatus SiluGradTiling::PostTiling()
252 context_->SetTilingKey(GetTilingKey());252 context_->SetTilingKey(GetTilingKey());
253 context_->SetBlockDim(blockNum);253 context_->SetBlockDim(blockNum);
254 size_t* workspaces = context_->GetWorkspaceSizes(1);254 size_t* workspaces = context_->GetWorkspaceSizes(1);
255+ OP_CHECK_NULL_WITH_CONTEXT(context_, workspaces);
255 workspaces[0] = workspaceSize_;256 workspaces[0] = workspaceSize_;
256 tilingData.SaveToBuffer(context_->GetRawTilingData()->GetData(), context_->GetRawTilingData()->GetCapacity());257 tilingData.SaveToBuffer(context_->GetRawTilingData()->GetData(), context_->GetRawTilingData()->GetCapacity());
257 context_->GetRawTilingData()->SetDataSize(tilingData.GetDataSize());258 context_->GetRawTilingData()->SetDataSize(tilingData.GetDataSize());
Mactivation/swi_glu_grad/op_host/swi_glu_grad_tiling_regbase.cpp+1-0
@@ -213,6 +213,7 @@ ge::graphStatus GluBaseTiling4RegBase::PostTiling()
213 context_->SetBlockDim(static_cast<uint32_t>(usedCoreNum_));213 context_->SetBlockDim(static_cast<uint32_t>(usedCoreNum_));
214 214 
215 size_t* workspaces = context_->GetWorkspaceSizes(1);215 size_t* workspaces = context_->GetWorkspaceSizes(1);
216+ OP_CHECK_NULL_WITH_CONTEXT(context_, workspaces);
216 workspaces[0] = WORK_SPACE_SIZE + usedCoreNum_ * Ops::Base::GetUbBlockSize(context_);217 workspaces[0] = WORK_SPACE_SIZE + usedCoreNum_ * Ops::Base::GetUbBlockSize(context_);
217 return ge::GRAPH_SUCCESS;218 return ge::GRAPH_SUCCESS;
218}219}
Mactivation/swish/op_host/arch35/swish_tiling_arch35.cpp+1-0
@@ -149,6 +149,7 @@ ge::graphStatus SwishTiling::RunTiling()
149 OP_LOGE(tilingContext, "elewiseBaseTiling failed"), return ge::GRAPH_FAILED);149 OP_LOGE(tilingContext, "elewiseBaseTiling failed"), return ge::GRAPH_FAILED);
150 elewiseBaseTiling.SetScalar<float>(attrScale);150 elewiseBaseTiling.SetScalar<float>(attrScale);
151 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);151 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);
152+ OP_CHECK_NULL_WITH_CONTEXT(tilingContext, currentWorkspace);
152 currentWorkspace[0] = ASCEND_WORKSPACE;153 currentWorkspace[0] = ASCEND_WORKSPACE;
153 const uint64_t tilingKey = GET_TPL_TILING_KEY(schMode, attrWork);154 const uint64_t tilingKey = GET_TPL_TILING_KEY(schMode, attrWork);
154 OP_LOGD(tilingContext->GetNodeName(), "[TilingData] : tilingKey=%lu", tilingKey);155 OP_LOGD(tilingContext->GetNodeName(), "[TilingData] : tilingKey=%lu", tilingKey);
Mactivation/swish_grad/op_host/arch35/swish_grad_tiling_arch35.cpp+1-0
@@ -35,6 +35,7 @@ ge::graphStatus SwishGradTiling::SetTilingData() const
35 OP_LOGD(tilingContext->GetNodeName(), "SwishGradTiling SetTilingData enter.");35 OP_LOGD(tilingContext->GetNodeName(), "SwishGradTiling SetTilingData enter.");
36 36 
37 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);37 size_t* currentWorkspace = tilingContext->GetWorkspaceSizes(1);
38+ OP_CHECK_NULL_WITH_CONTEXT(tilingContext, currentWorkspace);
38 currentWorkspace[0] = ASCEND_WORKSPACE;39 currentWorkspace[0] = ASCEND_WORKSPACE;
39 40 
40 const uint64_t tilingKey = GET_TPL_TILING_KEY(tiling->baseTiling.scheMode, dType);41 const uint64_t tilingKey = GET_TPL_TILING_KEY(tiling->baseTiling.scheMode, dType);
Mindex/quant_update_scatter/op_host/arch35/quant_update_scatter_tiling_arch35.cpp+1-0
@@ -674,6 +674,7 @@ ge::graphStatus QuantUpdateScatterRegbaseTiling::DoTiling()
674 context_->SetBlockDim(tilingData_.get_coreNum());674 context_->SetBlockDim(tilingData_.get_coreNum());
675 context_->SetTilingKey(tilingKey_);675 context_->SetTilingKey(tilingKey_);
676 size_t* currentWorkspace = context_->GetWorkspaceSizes(1);676 size_t* currentWorkspace = context_->GetWorkspaceSizes(1);
677+ OP_CHECK_NULL_WITH_CONTEXT(context_, currentWorkspace);
677 currentWorkspace[0] = SYNC_WORKSPACE_SIZE;678 currentWorkspace[0] = SYNC_WORKSPACE_SIZE;
678 679 
679 return ge::GRAPH_SUCCESS;680 return ge::GRAPH_SUCCESS;
Mquant/ascend_quant/op_host/arch35/ascend_quant_tiling_arch35.cpp+4-3
@@ -69,6 +69,10 @@ ge::graphStatus AscendQuantRegbase::DoAscendQuantTiling()
69 CalcTiling();69 CalcTiling();
70 CalcTilingKey();70 CalcTilingKey();
71 WriteTilingData();71 WriteTilingData();
72+ 
73+ size_t* currentWorkspace = context_->GetWorkspaceSizes(1);
74+ OP_CHECK_NULL_WITH_CONTEXT(context_, currentWorkspace);
75+ currentWorkspace[0] = SYNC_WORKSPACE_SIZE;
72 return ge::GRAPH_SUCCESS;76 return ge::GRAPH_SUCCESS;
73}77}
74 78 
@@ -358,9 +362,6 @@ void AscendQuantRegbase::WriteTilingData()
358 tilingData_->baseLen = baseLen_;362 tilingData_->baseLen = baseLen_;
359 363 
360 tilingData_->dim0 = xInputShape_.GetDim(FIRST_DIM);364 tilingData_->dim0 = xInputShape_.GetDim(FIRST_DIM);
361- 
362- size_t* currentWorkspace = context_->GetWorkspaceSizes(1);
363- currentWorkspace[0] = SYNC_WORKSPACE_SIZE;
364}365}
365} // namespace ascendquantregbase366} // namespace ascendquantregbase
366 367 
Mquant/ascend_quant_v2/op_host/ascend_quant_v2_regbase_tiling.cpp+4-3
@@ -63,6 +63,10 @@ ge::graphStatus AscendQuantV2Regbase::DoAscendQuantV2Tiling()
63 CalcTiling();63 CalcTiling();
64 CalcTilingKey();64 CalcTilingKey();
65 WriteTilingData();65 WriteTilingData();
66+ 
67+ size_t* currentWorkspace = context_->GetWorkspaceSizes(1);
68+ OP_CHECK_NULL_WITH_CONTEXT(context_, currentWorkspace);
69+ currentWorkspace[0] = SYNC_WORKSPACE_SIZE;
66 return ge::GRAPH_SUCCESS;70 return ge::GRAPH_SUCCESS;
67}71}
68 72 
@@ -686,9 +690,6 @@ void AscendQuantV2Regbase::WriteTilingData()
686 tilingData_->dim0 = xInputShape_.GetDim(g_FirstShapeDim);690 tilingData_->dim0 = xInputShape_.GetDim(g_FirstShapeDim);
687 tilingData_->dim1 = xInputShape_.GetDim(g_SecondShapeDim);691 tilingData_->dim1 = xInputShape_.GetDim(g_SecondShapeDim);
688 tilingData_->dim2 = xInputShape_.GetDim(g_ThirdShapeDim);692 tilingData_->dim2 = xInputShape_.GetDim(g_ThirdShapeDim);
689- 
690- size_t* currentWorkspace = context_->GetWorkspaceSizes(1);
691- currentWorkspace[0] = SYNC_WORKSPACE_SIZE;
692}693}
693} // namespace ascendquantv2regbase694} // namespace ascendquantv2regbase
694 695 
Mquant/dynamic_quant/op_host/dynamic_quant_tiling_arch35.cpp+3-0
@@ -461,6 +461,7 @@ ge::graphStatus DynamicQuantRegbaseTiling::DoEmptyTensorTiling(gert::TilingConte
461 context->SetTilingKey(tilingKey);461 context->SetTilingKey(tilingKey);
462 462 
463 size_t* workSpaces = context->GetWorkspaceSizes(1);463 size_t* workSpaces = context->GetWorkspaceSizes(1);
464+ OP_CHECK_NULL_WITH_CONTEXT(context, workSpaces);
464 workSpaces[0] = SYS_WORKSPACE_SIZE;465 workSpaces[0] = SYS_WORKSPACE_SIZE;
465 context->SetBlockDim(1);466 context->SetBlockDim(1);
466 return ge::GRAPH_SUCCESS;467 return ge::GRAPH_SUCCESS;
@@ -766,6 +767,8 @@ ge::graphStatus DynamicQuantRegbaseTiling::RunFusionKernelTiling(gert::TilingCon
766 PrintTilingData(context);767 PrintTilingData(context);
767 768 
768 size_t* workSpaces = context->GetWorkspaceSizes(1);769 size_t* workSpaces = context->GetWorkspaceSizes(1);
770+ OP_CHECK_NULL_WITH_CONTEXT(context, workSpaces);
771+ 
769 size_t normalWorkSpace = coreNum * sizeof(float);772 size_t normalWorkSpace = coreNum * sizeof(float);
770 size_t perChannelWorkSpace = totalBatchLen * nLen * sizeof(float);773 size_t perChannelWorkSpace = totalBatchLen * nLen * sizeof(float);
771 workSpaces[0] = SYS_WORKSPACE_SIZE;774 workSpaces[0] = SYS_WORKSPACE_SIZE;
Mquant/quantize/op_host/arch35/quantize_tiling_arch35.cpp+4-3
@@ -86,6 +86,10 @@ ge::graphStatus Quantize::DoQuantizeTiling()
86 CalcTiling();86 CalcTiling();
87 CalTilingKey();87 CalTilingKey();
88 WriteTilingData();88 WriteTilingData();
89+ 
90+ size_t* currentWorkspace = context_->GetWorkspaceSizes(1);
91+ OP_CHECK_NULL_WITH_CONTEXT(context_, currentWorkspace);
92+ currentWorkspace[0] = SYNC_WORKSPACE_SIZE;
89 return ge::GRAPH_SUCCESS;93 return ge::GRAPH_SUCCESS;
90}94}
91 95 
@@ -720,9 +724,6 @@ void Quantize::WriteTilingData()
720 tilingData_->dim1 = xInputShape_.GetDim(SECOND_SHAPE_DIM);724 tilingData_->dim1 = xInputShape_.GetDim(SECOND_SHAPE_DIM);
721 tilingData_->dim2 = xInputShape_.GetDim(THIRD_SHAPE_DIM);725 tilingData_->dim2 = xInputShape_.GetDim(THIRD_SHAPE_DIM);
722 tilingData_->hasZeroPoint = static_cast<int64_t>(hasZeroPoint_);726 tilingData_->hasZeroPoint = static_cast<int64_t>(hasZeroPoint_);
723- 
724- size_t* currentWorkspace = context_->GetWorkspaceSizes(1);
725- currentWorkspace[0] = SYNC_WORKSPACE_SIZE;
726}727}
727} // namespace quantize728} // namespace quantize
728 729