From 9e0a94f069329b430d0843327e474712e079a660 Mon Sep 17 00:00:00 2001 From: Yan Chunwei Date: Mon, 23 Jul 2018 09:08:51 +0800 Subject: [PATCH] inference-api code clean (#12274) --- paddle/fluid/inference/api/CMakeLists.txt | 12 ++++++------ .../api/{test_api_impl.cc => api_impl_tester.cc} | 0 ...ine.cc => api_tensorrt_subgraph_engine_tester.cc} | 0 .../inference/api/{test_api.cc => api_tester.cc} | 0 4 files changed, 6 insertions(+), 6 deletions(-) rename paddle/fluid/inference/api/{test_api_impl.cc => api_impl_tester.cc} (100%) rename paddle/fluid/inference/api/{test_api_tensorrt_subgraph_engine.cc => api_tensorrt_subgraph_engine_tester.cc} (100%) rename paddle/fluid/inference/api/{test_api.cc => api_tester.cc} (100%) diff --git a/paddle/fluid/inference/api/CMakeLists.txt b/paddle/fluid/inference/api/CMakeLists.txt index e28e144fd..7e4b3e9a2 100644 --- a/paddle/fluid/inference/api/CMakeLists.txt +++ b/paddle/fluid/inference/api/CMakeLists.txt @@ -26,13 +26,13 @@ endif() function(inference_api_test TARGET_NAME) if (WITH_TESTING) set(options "") - set(oneValueArgs "") + set(oneValueArgs SRC) set(multiValueArgs ARGS) cmake_parse_arguments(inference_test "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) set(PYTHON_TESTS_DIR ${PADDLE_BINARY_DIR}/python/paddle/fluid/tests) cc_test(${TARGET_NAME} - SRCS ${TARGET_NAME}.cc + SRCS ${inference_test_SRC} DEPS "${inference_deps}" ARGS --dirname=${PYTHON_TESTS_DIR}/book/) if(inference_test_ARGS) @@ -73,10 +73,10 @@ if(NOT APPLE) endif() cc_test(test_paddle_inference_api - SRCS test_api.cc + SRCS api_tester.cc DEPS paddle_inference_api) -inference_api_test(test_api_impl +inference_api_test(test_api_impl SRC api_impl_tester.cc ARGS test_word2vec test_image_classification) if(WITH_GPU AND TENSORRT_FOUND) @@ -84,13 +84,13 @@ cc_library(paddle_inference_tensorrt_subgraph_engine SRCS api_tensorrt_subgraph_engine.cc DEPS paddle_inference_api analysis tensorrt_engine paddle_inference_api paddle_fluid_api tensorrt_converter) -inference_api_test(test_api_tensorrt_subgraph_engine ARGS test_word2vec) +inference_api_test(test_api_tensorrt_subgraph_engine SRC api_tensorrt_subgraph_engine_tester.cc ARGS test_word2vec) endif() if (WITH_ANAKIN) # only needed in CI # Due to Anakin do not have official library releases and the versions of protobuf and cuda do not match Paddle's, # so anakin library will not be merged to our official inference library. To use anakin prediction API, one need to - # compile the libinference_anakin_api.a and compile with anakin.so. + # compile the libinference_anakin_api.a and anakin.so. nv_library(inference_anakin_api SRCS api.cc api_anakin_engine.cc) nv_library(inference_anakin_api_shared SHARED SRCS api.cc api_anakin_engine.cc) target_compile_options(inference_anakin_api BEFORE PUBLIC ${ANAKIN_COMPILE_EXTRA_FLAGS}) diff --git a/paddle/fluid/inference/api/test_api_impl.cc b/paddle/fluid/inference/api/api_impl_tester.cc similarity index 100% rename from paddle/fluid/inference/api/test_api_impl.cc rename to paddle/fluid/inference/api/api_impl_tester.cc diff --git a/paddle/fluid/inference/api/test_api_tensorrt_subgraph_engine.cc b/paddle/fluid/inference/api/api_tensorrt_subgraph_engine_tester.cc similarity index 100% rename from paddle/fluid/inference/api/test_api_tensorrt_subgraph_engine.cc rename to paddle/fluid/inference/api/api_tensorrt_subgraph_engine_tester.cc diff --git a/paddle/fluid/inference/api/test_api.cc b/paddle/fluid/inference/api/api_tester.cc similarity index 100% rename from paddle/fluid/inference/api/test_api.cc rename to paddle/fluid/inference/api/api_tester.cc -- GitLab