Add not_equal trt converter #49393

sanbuphy · 2022-12-28T06:31:25Z

PR types

Others

PR changes

Others

Describe

Add not_equal trt converter
#48292

paddle-bot · 2022-12-28T06:31:28Z

你的PR提交成功，感谢你对开源项目的贡献!
请关注后续CI自动化测试结果，详情请参考Paddle-CI手册。
Your PR has been submitted. Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

zhangjun

另外建议not_equal_op.cc和equal_op.cc合并；test_trt_convert_*单测，not_equal也可以和equal公用

zhangjun · 2022-12-28T10:16:56Z

paddle/fluid/inference/tensorrt/convert/not_equal_op.cc

+    }
+    layer = TRT_ENGINE_ADD_LAYER(
+        engine_, ElementWise, *X, *Y, nvinfer1::ElementWiseOperation::kEQUAL);
+    layer = engine_->network()->addUnary(layer->getOutput(0), nvinfer1::UnaryOperation::NOT)


用这种写法TRT_ENGINE_ADD_LAYER(engine_, Unary, *input, trt_op);

用这种写法TRT_ENGINE_ADD_LAYER(engine_, Unary, *input, trt_op);

好的，已经修改

sanbuphy · 2022-12-28T13:37:47Z

另外建议not_equal_op.cc和equal_op.cc合并；test_trt_convert_*单测，not_equal也可以和equal公用

请问合并是什么意思？这样改动比较大我怕我改出问题

zhangjun · 2022-12-28T14:12:16Z

另外建议not_equal_op.cc和equal_op.cc合并；test_trt_convert_*单测，not_equal也可以和equal公用

请问合并是什么意思？这样改动比较大我怕我改出问题

放一个文件，主要是逻辑基本一致

sanbuphy · 2022-12-28T15:00:47Z

另外建议not_equal_op.cc和equal_op.cc合并；test_trt_convert_*单测，not_equal也可以和equal公用

请问合并是什么意思？这样改动比较大我怕我改出问题

放一个文件，主要是逻辑基本一致

合并后只需要一个.cc 那具体的分支要在哪体现呢（就是具体的什么时候走equal什么时候走notequal）

zhangjun · 2022-12-28T15:42:15Z

另外建议not_equal_op.cc和equal_op.cc合并；test_trt_convert_*单测，not_equal也可以和equal公用

请问合并是什么意思？这样改动比较大我怕我改出问题

放一个文件，主要是逻辑基本一致

合并后只需要一个.cc 那具体的分支要在哪体现呢（就是具体的什么时候走equal什么时候走notequal）

类似REGISTER_TRT_OP_CONVERTER(not_equal, NotEqualOpConverter); 一个Converter对应一个OP，这里放一个文件是方便进行统一维护。

至于单测，因为逻辑完全一致，没有必要新建一个文件，增加一个op_type 就行。

sanbuphy · 2022-12-29T01:39:13Z

另外建议not_equal_op.cc和equal_op.cc合并；test_trt_convert_*单测，not_equal也可以和equal公用

请问合并是什么意思？这样改动比较大我怕我改出问题

放一个文件，主要是逻辑基本一致

合并后只需要一个.cc 那具体的分支要在哪体现呢（就是具体的什么时候走equal什么时候走notequal）

类似REGISTER_TRT_OP_CONVERTER(not_equal, NotEqualOpConverter); 一个Converter对应一个OP，这里放一个文件是方便进行统一维护。

至于单测，因为逻辑完全一致，没有必要新建一个文件，增加一个op_type 就行。

OK 已修改完毕

zhangjun · 2022-12-29T02:18:18Z

python/paddle/fluid/tests/unittests/ir/inference/test_trt_convert_equal.py

+                        {
+                            "op_type": "not_equal",
+                            "op_inputs": {
+                                "X": ["input_data1"],
+                                "Y": ["input_data2"],
+                            },
+                            "op_outputs": {"Out": ["compare_output_data"]},
+                            "op_attrs": dics[0],
+                        },


这里是单测组网部分，不需要添加修改；把上面的op_type改成变量，单测加一层for循环进行赋值

这里是单测组网部分，不需要添加修改；把上面的op_type改成变量，单测加一层for循环进行赋值

好的已修改

zhangjun · 2022-12-29T12:12:29Z

paddle/fluid/inference/tensorrt/convert/equal_op.cc

+    layer = TRT_ENGINE_ADD_LAYER(
+        engine_, ElementWise, *X, *Y, NOT(nvinfer1::ElementWiseOperation::kEQUAL));
+
+    layer = TRT_ENGINE_ADD_LAYER(
+        engine_, Unary, *layer->getOutput(0), nvinfer1::UnaryOperation::kNOT);


这里格式有问题，参考代码贡献流程，确保通过pre-commit检查

zhangjun · 2022-12-29T12:13:38Z

python/paddle/fluid/tests/unittests/ir/inference/test_trt_convert_equal.py

-                                "X": ["input_data1"],
-                                "Y": ["input_data2"],
+
+        for op_type in ["equal","not_equal"]:


格式问题，"equal","not_equal" 之间需要空格

DrRyanHuang · 2022-12-29T12:31:22Z

@sanbuphy
在提交的代码前使用pre-commit 做下格式检查，这样操作

pip install pre-commit==2.17.0
pre-commit install
pre-commit run --files xxxx.cc xxx.py

sanbuphy · 2022-12-29T12:45:30Z

收到，已经修改，谢谢

zhangjun

LGTM

zhangjun · 2022-12-30T03:29:04Z

paddle/fluid/inference/tensorrt/convert/equal_op.cc

+    layer = TRT_ENGINE_ADD_LAYER(
+        engine_, Unary, *layer->getOutput(0), nvinfer1::UnaryOperation::kNOT);
+
+    RreplenishLayerAndOutput(layer, "equal", {output_name}, test_mode);


这里写not_equal

感谢确实看漏了 & 之前修改的时候改掉了

zhangjun

LGTM

luotao1 · 2023-01-03T02:54:59Z

Coverage流水线由于CI环境问题豁免

sanbuphy added 2 commits December 28, 2022 14:28

add not_equal_op

108218b

add not_equal_op

05a4672

paddle-bot bot added contributor External developers status: proposed labels Dec 28, 2022

sanbuphy added 2 commits December 28, 2022 15:46

add not_equal_op

6646e08

add not_equal_op

07f2dc0

DrRyanHuang mentioned this pull request Dec 28, 2022

[tracking issue] Paddle-TensorRT 算子开发 #48292

Closed

zhangjun reviewed Dec 28, 2022

View reviewed changes

fix api

3a2b737

统一equal_op

c97bf0a

zhangjun reviewed Dec 29, 2022

View reviewed changes

luotao1 assigned zhangjun and luotao1 Dec 29, 2022

fix

fa94602

sanbuphy requested a review from zhangjun December 29, 2022 09:13

zhangjun reviewed Dec 29, 2022

View reviewed changes

sanbuphy added 2 commits December 29, 2022 20:42

Merge branch 'develop' of github.com:sanbuphy/Paddle into noequalop

bc5e210

fix format

acf8802

fix format

ccbde58

sanbuphy requested a review from zhangjun December 29, 2022 23:03

zhangjun previously approved these changes Dec 30, 2022

View reviewed changes

去掉版本修饰

d2618d5

sanbuphy dismissed zhangjun’s stale review via d2618d5 December 30, 2022 03:26

zhangjun reviewed Dec 30, 2022

View reviewed changes

去掉版本修饰

8b7b72c

zhangjun approved these changes Dec 30, 2022

View reviewed changes

luotao1 merged commit 822ea0f into PaddlePaddle:develop Jan 3, 2023

sanbuphy deleted the noequalop branch January 3, 2023 03:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add not_equal trt converter #49393

Add not_equal trt converter #49393

sanbuphy commented Dec 28, 2022

paddle-bot bot commented Dec 28, 2022

zhangjun left a comment

zhangjun Dec 28, 2022

sanbuphy Dec 28, 2022

sanbuphy commented Dec 28, 2022

zhangjun commented Dec 28, 2022

sanbuphy commented Dec 28, 2022

zhangjun commented Dec 28, 2022

sanbuphy commented Dec 29, 2022

zhangjun Dec 29, 2022

sanbuphy Dec 29, 2022

zhangjun Dec 29, 2022

zhangjun Dec 29, 2022

DrRyanHuang commented Dec 29, 2022

sanbuphy commented Dec 29, 2022

zhangjun left a comment

zhangjun Dec 30, 2022

sanbuphy Dec 30, 2022

zhangjun left a comment

luotao1 commented Jan 3, 2023

Add not_equal trt converter #49393

Add not_equal trt converter #49393

Conversation

sanbuphy commented Dec 28, 2022

PR types

PR changes

Describe

paddle-bot bot commented Dec 28, 2022

zhangjun left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sanbuphy commented Dec 28, 2022

zhangjun commented Dec 28, 2022

sanbuphy commented Dec 28, 2022

zhangjun commented Dec 28, 2022

sanbuphy commented Dec 29, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DrRyanHuang commented Dec 29, 2022

sanbuphy commented Dec 29, 2022

zhangjun left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zhangjun left a comment

Choose a reason for hiding this comment

luotao1 commented Jan 3, 2023