fix comments

Author: NHZlX

paddle/fluid/inference/tensorrt/convert/CMakeLists.txt

@@ -1,12 +1,14 @@
 # Add TRT tests
 nv_library(tensorrt_converter
-  SRCS conv2d_op.cc fc_op.cc
+  SRCS mul_op.cc conv2d_op.cc fc_op.cc
   DEPS tensorrt_engine mul_op)
 
 nv_test(test_op_converter SRCS test_op_converter.cc DEPS
   ${FLUID_CORE_MODULES} tensorrt_engine tensorrt_converter)
 
 nv_test(test_io_converter SRCS test_io_converter.cc io_converter.cc DEPS dynload_cuda dynamic_loader lod_tensor)
+nv_test(test_trt_mul_op SRCS test_mul_op.cc mul_op.cc
+        DEPS ${FLUID_CORE_MODULES} tensorrt_engine mul_op SERIAL)
 nv_test(test_trt_fc_op SRCS test_fc_op.cc fc_op.cc
         DEPS ${FLUID_CORE_MODULES} tensorrt_engine mul_op SERIAL)
 nv_test(test_trt_activation_op SRCS test_activation_op.cc activation_op.cc

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

@@ -116,5 +116,4 @@ class FcOpConverter : public OpConverter {
 }  // namespace inference
 }  // namespace paddle
 
-REGISTER_TRT_OP_CONVERTER(mul, FcOpConverter);
-USE_OP(mul);
+REGISTER_TRT_OP_CONVERTER(fc, FcOpConverter);

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

@@ -50,5 +50,4 @@ class MulOpConverter : public OpConverter {
 }  // namespace paddle
 
 USE_OP(mul);
-// TODO(xingzhaolong): change the name to mul then
-REGISTER_TRT_OP_CONVERTER(mul_temp, MulOpConverter);
+REGISTER_TRT_OP_CONVERTER(mul, MulOpConverter);

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

@@ -24,7 +24,6 @@ TEST(fc_op, test) {
   std::unordered_set<std::string> parameters({"mul-Y"});
   framework::Scope scope;
   TRTConvertValidation validator(10, parameters, scope, 1000);
-
   validator.DeclInputVar("mul-X", nvinfer1::Dims4(1, 10, 1, 1));
   validator.DeclParamVar("mul-Y", nvinfer1::Dims2(10, 2));
   // validator.DeclParamVar("mul-Y", nvinfer1::Dims2(8, 2));
@@ -45,3 +44,4 @@ TEST(fc_op, test) {
 }  // namespace tensorrt
 }  // namespace inference
 }  // namespace paddle
+USE_OP(mul);

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

@@ -0,0 +1,49 @@
+/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License. */
+
+#include <gtest/gtest.h>
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/inference/tensorrt/convert/ut_helper.h"
+
+namespace paddle {
+namespace inference {
+namespace tensorrt {
+
+TEST(MulOpConverter, main) {
+  framework::Scope scope;
+  std::unordered_set<std::string> parameters;
+  TRTConvertValidation validator(10, parameters, scope, 1000);
+  validator.DeclInputVar("mul-X", nvinfer1::Dims2(10, 6));
+  validator.DeclInputVar("mul-Y", nvinfer1::Dims2(6, 10));
+  validator.DeclOutputVar("mul-Out", nvinfer1::Dims2(10, 10));
+
+  // Prepare Op description
+  framework::OpDesc desc;
+  desc.SetType("mul");
+  desc.SetInput("X", {"mul-X"});
+  desc.SetInput("Y", {"mul-Y"});
+  desc.SetOutput("Out", {"mul-Out"});
+
+  LOG(INFO) << "set OP";
+  validator.SetOp(*desc.Proto());
+  LOG(INFO) << "execute";
+
+  validator.Execute(1);
+}
+
+}  // namespace tensorrt
+}  // namespace inference
+}  // namespace paddle
+
+USE_OP(mul);

paddle/fluid/operators/tensorrt_engine_op_test.cc

@@ -66,14 +66,14 @@ TEST(TensorRTEngineOp, manual) {
   framework::BlockDesc block_desc(&program, block_);
   LOG(INFO) << "create fc op";
   auto* fc0 = block_desc.AppendOp();
-  fc0->SetType("mul");
+  fc0->SetType("fc");
   fc0->SetInput("X", std::vector<std::string>({"x"}));     // 4 x 1 x 1
   fc0->SetInput("Y", std::vector<std::string>({"y"}));     // 4 x 6
   fc0->SetOutput("Out", std::vector<std::string>({"z"}));  // 6 x 1 x 1
 
   LOG(INFO) << "create fc op";
   auto* fc1 = block_desc.AppendOp();
-  fc1->SetType("mul");
+  fc1->SetType("fc");
   fc1->SetInput("X", std::vector<std::string>({"z"}));
   fc1->SetInput("Y", std::vector<std::string>({"y0"}));     // 6 x 8
   fc1->SetOutput("Out", std::vector<std::string>({"z0"}));  // 8 x 1 x 1
@@ -208,4 +208,4 @@ TEST(TensorRTEngineOp, fc) { Execute(40, 28, 28); }
 }  // namespace operators
 }  // namespace paddle
 
-USE_TRT_CONVERTER(mul)
+USE_TRT_CONVERTER(fc)