已合并
增加sparseaply算子宏保护,防止冲突 #8484
李鑫创建于 13 天前
增加sparseaply算子宏保护,防止冲突 #8484
已合并
李鑫创建于 13 天前
3 个文件变更+9-3
Moptim/sparse_apply_ftrl_v2/op_graph/sparse_apply_ftrl_v2_proto.h+3-1
@@ -44,6 +44,8 @@ namespace ge {
44*@par Third-party framework compatibility44*@par Third-party framework compatibility
45*Compatible with the TensorFlow operator ResourceSparseApplyFtrlV2.45*Compatible with the TensorFlow operator ResourceSparseApplyFtrlV2.
46*/46*/
47+#ifndef OPS_PROTO_DEF_SPARSEAPPLYFTRLV2
48+#define OPS_PROTO_DEF_SPARSEAPPLYFTRLV2
47REG_OP(SparseApplyFtrlV2)49REG_OP(SparseApplyFtrlV2)
48 .INPUT(var, TensorType({DT_FLOAT, DT_FLOAT16, DT_BF16}))50 .INPUT(var, TensorType({DT_FLOAT, DT_FLOAT16, DT_BF16}))
49 .INPUT(accum, TensorType({DT_FLOAT, DT_FLOAT16, DT_BF16}))51 .INPUT(accum, TensorType({DT_FLOAT, DT_FLOAT16, DT_BF16}))
@@ -60,7 +62,7 @@ REG_OP(SparseApplyFtrlV2)
60 .OUTPUT(linear, TensorType({DT_FLOAT, DT_FLOAT16, DT_BF16}))62 .OUTPUT(linear, TensorType({DT_FLOAT, DT_FLOAT16, DT_BF16}))
61 .ATTR(use_locking, Bool, false)63 .ATTR(use_locking, Bool, false)
62 .OP_END_FACTORY_REG(SparseApplyFtrlV2)64 .OP_END_FACTORY_REG(SparseApplyFtrlV2)
63- 65+#endif
64} // namespace ge66} // namespace ge
65 67 
66#endif // OPS_OP_PROTO_INC_SPARSE_APPLY_FTRL_V2_H_68#endif // OPS_OP_PROTO_INC_SPARSE_APPLY_FTRL_V2_H_
Moptim/sparse_apply_proximal_adagrad/op_graph/sparse_apply_proximal_adagrad_proto.h+3-1
@@ -40,6 +40,8 @@ namespace ge {
40*@par Third-party framework compatibility40*@par Third-party framework compatibility
41*Compatible with the TensorFlow operator SparseApplyProximalAdagrad.41*Compatible with the TensorFlow operator SparseApplyProximalAdagrad.
42*/42*/
43+#ifndef OPS_PROTO_DEF_SPARSEAPPLYPROXIMALADAGRAD
44+#define OPS_PROTO_DEF_SPARSEAPPLYPROXIMALADAGRAD
43REG_OP(SparseApplyProximalAdagrad)45REG_OP(SparseApplyProximalAdagrad)
44 .INPUT(var, TensorType::NumberType())46 .INPUT(var, TensorType::NumberType())
45 .INPUT(accum, TensorType::NumberType())47 .INPUT(accum, TensorType::NumberType())
@@ -52,7 +54,7 @@ REG_OP(SparseApplyProximalAdagrad)
52 .OUTPUT(accum, TensorType::NumberType())54 .OUTPUT(accum, TensorType::NumberType())
53 .ATTR(use_locking, Bool, false)55 .ATTR(use_locking, Bool, false)
54 .OP_END_FACTORY_REG(SparseApplyProximalAdagrad)56 .OP_END_FACTORY_REG(SparseApplyProximalAdagrad)
55- 57+#endif
56} // namespace ge58} // namespace ge
57 59 
58#endif // OPS_OP_PROTO_INC_SPARSE_APPLY_PROXIMAL_ADAGRAD_H_60#endif // OPS_OP_PROTO_INC_SPARSE_APPLY_PROXIMAL_ADAGRAD_H_
Moptim/sparse_apply_rms_prop/op_graph/sparse_apply_rms_prop_proto.h+3-1
@@ -44,6 +44,8 @@ namespace ge {
44 *@par Third-party framework compatibility44 *@par Third-party framework compatibility
45 *Compatible with the TensorFlow operator SparseApplyRMSProp.45 *Compatible with the TensorFlow operator SparseApplyRMSProp.
46 */46 */
47+#ifndef OPS_PROTO_DEF_SPARSEAPPLYRMSPROP
48+#define OPS_PROTO_DEF_SPARSEAPPLYRMSPROP
47REG_OP(SparseApplyRMSProp)49REG_OP(SparseApplyRMSProp)
48 .INPUT(var, TensorType::NumberType())50 .INPUT(var, TensorType::NumberType())
49 .INPUT(ms, TensorType::NumberType())51 .INPUT(ms, TensorType::NumberType())
@@ -59,7 +61,7 @@ REG_OP(SparseApplyRMSProp)
59 .OUTPUT(mom, TensorType::NumberType())61 .OUTPUT(mom, TensorType::NumberType())
60 .ATTR(use_locking, Bool, false)62 .ATTR(use_locking, Bool, false)
61 .OP_END_FACTORY_REG(SparseApplyRMSProp)63 .OP_END_FACTORY_REG(SparseApplyRMSProp)
62- 64+#endif
63} // namespace ge65} // namespace ge
64 66 
65#endif // OPS_OP_PROTO_INC_SPARSEAPPLYRMSPROP_H_67#endif // OPS_OP_PROTO_INC_SPARSEAPPLYRMSPROP_H_