From 9cdfd9d4722fe8fe9f184998a9a7ba0258e771fe Mon Sep 17 00:00:00 2001 From: "liyefeng803@huawei.com" Date: Thu, 31 Mar 2022 17:28:20 +0800 Subject: [PATCH 01/10] change getop to non input --- tf_adapter/ops/aicore/npu_mixed_precesion_ops.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tf_adapter/ops/aicore/npu_mixed_precesion_ops.cc b/tf_adapter/ops/aicore/npu_mixed_precesion_ops.cc index 2882a6c8a..3ddb05a9c 100644 --- a/tf_adapter/ops/aicore/npu_mixed_precesion_ops.cc +++ b/tf_adapter/ops/aicore/npu_mixed_precesion_ops.cc @@ -55,10 +55,7 @@ REGISTER_OP("NpuGetFloatStatus") .SetIsStateful(); REGISTER_OP("NpuGetFloatStatusV2") - .Input("addr: N * T") - .Output("data: T") - .Attr("N: int >= 0") - .Attr("T: {float}") + .Output("data: float") .SetIsStateful() .SetShapeFn([](InferenceContext *c) { std::vector output_dims; -- Gitee From 990a624736e0730979335fb99bcd7a29736544e4 Mon Sep 17 00:00:00 2001 From: "liyefeng803@huawei.com" Date: Thu, 31 Mar 2022 19:28:43 +0800 Subject: [PATCH 02/10] test --- .../kernels/testcase/n_p_u_get_float_statusV2_test.cc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc b/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc index a81805d05..c412c3064 100644 --- a/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc +++ b/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc @@ -28,7 +28,7 @@ FakeInputFunctor FakeInputStub(DataType dt) { } TEST(NPUGetFloatStatusV2OpTest, TestNPUGetFloatStatusV2) { - DataTypeSlice input_types({DT_FLOAT}); + DataTypeSlice input_types({}); MemoryTypeSlice input_memory_types; DataTypeSlice output_types({DT_FLOAT}); MemoryTypeSlice output_memory_types; @@ -72,15 +72,9 @@ TEST(NPUGetFloatStatusV2OpTest, TestNPUGetFloatStatusV2OShapeInference) { TF_CHECK_OK(OpRegistry::Global()->LookUp("NpuGetFloatStatusV2", ®)); OpDef op_def = reg->op_def; NodeDef def; - std::vector src_list; - src_list.emplace_back("in0", 0, DT_FLOAT); TF_CHECK_OK(NodeDefBuilder("dummy", &op_def) - .Input(src_list) - .Attr("T", DT_FLOAT) - .Attr("N", 1) .Finalize(&def)); - shape_inference::InferenceContext c(0, &def, op_def, {TShape({8})}, {}, {}, {}); - std::vector input_shapes; + shape_inference::InferenceContext c(0, &def, op_def, {}, {}, {}, {}); TF_CHECK_OK(reg->shape_inference_fn(&c)); ASSERT_EQ("[8]", c.DebugString(c.output(0))); } -- Gitee From fa9d07bd103ba5813c6bc959626dcf5e320c7e68 Mon Sep 17 00:00:00 2001 From: "liyefeng803@huawei.com" Date: Thu, 31 Mar 2022 20:05:23 +0800 Subject: [PATCH 03/10] test --- .../tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc b/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc index c412c3064..f75f98a57 100644 --- a/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc +++ b/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc @@ -72,8 +72,6 @@ TEST(NPUGetFloatStatusV2OpTest, TestNPUGetFloatStatusV2OShapeInference) { TF_CHECK_OK(OpRegistry::Global()->LookUp("NpuGetFloatStatusV2", ®)); OpDef op_def = reg->op_def; NodeDef def; - TF_CHECK_OK(NodeDefBuilder("dummy", &op_def) - .Finalize(&def)); shape_inference::InferenceContext c(0, &def, op_def, {}, {}, {}, {}); TF_CHECK_OK(reg->shape_inference_fn(&c)); ASSERT_EQ("[8]", c.DebugString(c.output(0))); -- Gitee From 1b0ca44e72a4610c0eec583768296dcc26e06159 Mon Sep 17 00:00:00 2001 From: "liyefeng803@huawei.com" Date: Thu, 31 Mar 2022 20:29:28 +0800 Subject: [PATCH 04/10] test --- .../tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc b/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc index f75f98a57..c412c3064 100644 --- a/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc +++ b/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc @@ -72,6 +72,8 @@ TEST(NPUGetFloatStatusV2OpTest, TestNPUGetFloatStatusV2OShapeInference) { TF_CHECK_OK(OpRegistry::Global()->LookUp("NpuGetFloatStatusV2", ®)); OpDef op_def = reg->op_def; NodeDef def; + TF_CHECK_OK(NodeDefBuilder("dummy", &op_def) + .Finalize(&def)); shape_inference::InferenceContext c(0, &def, op_def, {}, {}, {}, {}); TF_CHECK_OK(reg->shape_inference_fn(&c)); ASSERT_EQ("[8]", c.DebugString(c.output(0))); -- Gitee From af7c5fbf9a0c8bc6527ccc46a606c7ff75d9b9ab Mon Sep 17 00:00:00 2001 From: "liyefeng803@huawei.com" Date: Thu, 31 Mar 2022 20:49:47 +0800 Subject: [PATCH 05/10] test --- .../tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc b/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc index c412c3064..7645375b8 100644 --- a/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc +++ b/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc @@ -74,7 +74,7 @@ TEST(NPUGetFloatStatusV2OpTest, TestNPUGetFloatStatusV2OShapeInference) { NodeDef def; TF_CHECK_OK(NodeDefBuilder("dummy", &op_def) .Finalize(&def)); - shape_inference::InferenceContext c(0, &def, op_def, {}, {}, {}, {}); + shape_inference::InferenceContext c(0, &def, op_def, {TSshape()}, {}, {}, {}); TF_CHECK_OK(reg->shape_inference_fn(&c)); ASSERT_EQ("[8]", c.DebugString(c.output(0))); } -- Gitee From e601459e0c7858b73f81cb5ad00f5dded2fe1a37 Mon Sep 17 00:00:00 2001 From: "liyefeng803@huawei.com" Date: Thu, 31 Mar 2022 21:18:34 +0800 Subject: [PATCH 06/10] test --- .../tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc b/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc index 7645375b8..189fcc818 100644 --- a/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc +++ b/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc @@ -74,7 +74,7 @@ TEST(NPUGetFloatStatusV2OpTest, TestNPUGetFloatStatusV2OShapeInference) { NodeDef def; TF_CHECK_OK(NodeDefBuilder("dummy", &op_def) .Finalize(&def)); - shape_inference::InferenceContext c(0, &def, op_def, {TSshape()}, {}, {}, {}); + shape_inference::InferenceContext c(0, &def, op_def, {TShape()}, {}, {}, {}); TF_CHECK_OK(reg->shape_inference_fn(&c)); ASSERT_EQ("[8]", c.DebugString(c.output(0))); } -- Gitee From d9d6a58990e498d6ce9655e7d254ce216bf9c427 Mon Sep 17 00:00:00 2001 From: "liyefeng803@huawei.com" Date: Thu, 31 Mar 2022 21:33:36 +0800 Subject: [PATCH 07/10] test --- .../testcase/n_p_u_get_float_statusV2_test.cc | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc b/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc index 189fcc818..e68ea9de6 100644 --- a/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc +++ b/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc @@ -67,17 +67,17 @@ TEST(NPUClearFloatStatusV2OpTest, TestNPUClearFloatStatusV2) { delete context; } -TEST(NPUGetFloatStatusV2OpTest, TestNPUGetFloatStatusV2OShapeInference) { - const OpRegistrationData *reg; - TF_CHECK_OK(OpRegistry::Global()->LookUp("NpuGetFloatStatusV2", ®)); - OpDef op_def = reg->op_def; - NodeDef def; - TF_CHECK_OK(NodeDefBuilder("dummy", &op_def) - .Finalize(&def)); - shape_inference::InferenceContext c(0, &def, op_def, {TShape()}, {}, {}, {}); - TF_CHECK_OK(reg->shape_inference_fn(&c)); - ASSERT_EQ("[8]", c.DebugString(c.output(0))); -} +// TEST(NPUGetFloatStatusV2OpTest, TestNPUGetFloatStatusV2OShapeInference) { +// const OpRegistrationData *reg; +// TF_CHECK_OK(OpRegistry::Global()->LookUp("NpuGetFloatStatusV2", ®)); +// OpDef op_def = reg->op_def; +// NodeDef def; +// TF_CHECK_OK(NodeDefBuilder("dummy", &op_def) +// .Finalize(&def)); +// shape_inference::InferenceContext c(0, &def, op_def, {TShape()}, {}, {}, {}); +// TF_CHECK_OK(reg->shape_inference_fn(&c)); +// ASSERT_EQ("[8]", c.DebugString(c.output(0))); +// } } // namespace } // namespace tensorflow -- Gitee From 130786fc8ac3e4f977e030e82a27ad20158aa022 Mon Sep 17 00:00:00 2001 From: "liyefeng803@huawei.com" Date: Thu, 31 Mar 2022 21:38:10 +0800 Subject: [PATCH 08/10] test --- .../testcase/n_p_u_get_float_statusV2_test.cc | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc b/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc index e68ea9de6..cc3c5de05 100644 --- a/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc +++ b/tf_adapter/tests/st/kernels/testcase/n_p_u_get_float_statusV2_test.cc @@ -67,17 +67,17 @@ TEST(NPUClearFloatStatusV2OpTest, TestNPUClearFloatStatusV2) { delete context; } -// TEST(NPUGetFloatStatusV2OpTest, TestNPUGetFloatStatusV2OShapeInference) { -// const OpRegistrationData *reg; -// TF_CHECK_OK(OpRegistry::Global()->LookUp("NpuGetFloatStatusV2", ®)); -// OpDef op_def = reg->op_def; -// NodeDef def; -// TF_CHECK_OK(NodeDefBuilder("dummy", &op_def) -// .Finalize(&def)); -// shape_inference::InferenceContext c(0, &def, op_def, {TShape()}, {}, {}, {}); -// TF_CHECK_OK(reg->shape_inference_fn(&c)); -// ASSERT_EQ("[8]", c.DebugString(c.output(0))); -// } +TEST(NPUGetFloatStatusV2OpTest, TestNPUGetFloatStatusV2OShapeInference) { + const OpRegistrationData *reg; + TF_CHECK_OK(OpRegistry::Global()->LookUp("NpuGetFloatStatusV2", ®)); + OpDef op_def = reg->op_def; + NodeDef def; + TF_CHECK_OK(NodeDefBuilder("dummy", &op_def) + .Finalize(&def)); + shape_inference::InferenceContext c(0, &def, op_def, {TShape({})}, {}, {}, {}); + TF_CHECK_OK(reg->shape_inference_fn(&c)); + ASSERT_EQ("[8]", c.DebugString(c.output(0))); +} } // namespace } // namespace tensorflow -- Gitee From cf29ef7462fba506ae6f95c596a229ad7c4fdfbb Mon Sep 17 00:00:00 2001 From: "liyefeng803@huawei.com" Date: Thu, 31 Mar 2022 21:58:11 +0800 Subject: [PATCH 09/10] ut st --- .../kernels/testcase/n_p_u_get_float_statusV2_test.cc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tf_adapter/tests/ut/kernels/testcase/n_p_u_get_float_statusV2_test.cc b/tf_adapter/tests/ut/kernels/testcase/n_p_u_get_float_statusV2_test.cc index a81805d05..cc3c5de05 100644 --- a/tf_adapter/tests/ut/kernels/testcase/n_p_u_get_float_statusV2_test.cc +++ b/tf_adapter/tests/ut/kernels/testcase/n_p_u_get_float_statusV2_test.cc @@ -28,7 +28,7 @@ FakeInputFunctor FakeInputStub(DataType dt) { } TEST(NPUGetFloatStatusV2OpTest, TestNPUGetFloatStatusV2) { - DataTypeSlice input_types({DT_FLOAT}); + DataTypeSlice input_types({}); MemoryTypeSlice input_memory_types; DataTypeSlice output_types({DT_FLOAT}); MemoryTypeSlice output_memory_types; @@ -72,15 +72,9 @@ TEST(NPUGetFloatStatusV2OpTest, TestNPUGetFloatStatusV2OShapeInference) { TF_CHECK_OK(OpRegistry::Global()->LookUp("NpuGetFloatStatusV2", ®)); OpDef op_def = reg->op_def; NodeDef def; - std::vector src_list; - src_list.emplace_back("in0", 0, DT_FLOAT); TF_CHECK_OK(NodeDefBuilder("dummy", &op_def) - .Input(src_list) - .Attr("T", DT_FLOAT) - .Attr("N", 1) .Finalize(&def)); - shape_inference::InferenceContext c(0, &def, op_def, {TShape({8})}, {}, {}, {}); - std::vector input_shapes; + shape_inference::InferenceContext c(0, &def, op_def, {TShape({})}, {}, {}, {}); TF_CHECK_OK(reg->shape_inference_fn(&c)); ASSERT_EQ("[8]", c.DebugString(c.output(0))); } -- Gitee From 3ac95b9c88a1dcd8dc2a47b230e7651fb8377480 Mon Sep 17 00:00:00 2001 From: "liyefeng803@huawei.com" Date: Sun, 3 Apr 2022 11:45:37 +0800 Subject: [PATCH 10/10] test --- tf_adapter/ops/aicore/npu_mixed_precesion_ops.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tf_adapter/ops/aicore/npu_mixed_precesion_ops.cc b/tf_adapter/ops/aicore/npu_mixed_precesion_ops.cc index 3ddb05a9c..8a1af5d50 100644 --- a/tf_adapter/ops/aicore/npu_mixed_precesion_ops.cc +++ b/tf_adapter/ops/aicore/npu_mixed_precesion_ops.cc @@ -55,7 +55,7 @@ REGISTER_OP("NpuGetFloatStatus") .SetIsStateful(); REGISTER_OP("NpuGetFloatStatusV2") - .Output("data: float") + .Output("data: int32") .SetIsStateful() .SetShapeFn([](InferenceContext *c) { std::vector output_dims; -- Gitee