update

PaddlePaddle · May 29, 2018 · 3f8b9db · 3f8b9db
1 parent 48d7b70
commit 3f8b9db
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 24 deletions.
diff --git a/paddle/fluid/operators/CMakeLists.txt b/paddle/fluid/operators/CMakeLists.txt
@@ -221,7 +221,7 @@ op_library(cross_entropy_op DEPS cross_entropy)
 op_library(softmax_with_cross_entropy_op DEPS cross_entropy softmax)
 op_library(softmax_op DEPS softmax)
 op_library(sequence_softmax_op DEPS softmax)
-if (TENSORRT_FOUND)
+if (WITH_GPU && TENSORRT_FOUND)
     op_library(tensorrt_engine_op DEPS tensorrt_engine)
 endif()
 op_library(sum_op DEPS selected_rows_functor)
@@ -300,4 +300,3 @@ cc_test(save_load_op_test SRCS save_load_op_test.cc DEPS save_op load_op)
 cc_test(save_load_combine_op_test SRCS save_load_combine_op_test.cc DEPS save_combine_op load_combine_op)
 nv_test(nccl_op_test SRCS nccl_op_test.cu.cc DEPS nccl_op gpu_info device_context)
 nv_test(dropout_op_test SRCS dropout_op_test.cc DEPS dropout_op tensor)
-nv_test(tensorrt_engine_op_test SRCS tensorrt_engine_op_test.cc DEPS tensorrt_engine_op tensorrt_engine)
diff --git a/paddle/fluid/operators/tensorrt_engine_op.cc b/paddle/fluid/operators/tensorrt_engine_op.cc
@@ -13,7 +13,6 @@
    limitations under the License. */
 
 #include "paddle/fluid/operators/tensorrt_engine_op.h"
-
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/inference/tensorrt/convert/op_converter.h"
 #include "paddle/fluid/inference/utils/singleton.h"

diff --git a/paddle/fluid/operators/tensorrt_engine_op_test.cc b/paddle/fluid/operators/tensorrt_engine_op_test.cc