From 9a80729573decdd505c679b96d637ac66bc8e129 Mon Sep 17 00:00:00 2001 From: Yancey1989 Date: Wed, 16 May 2018 15:34:44 +0800 Subject: [PATCH 1/2] fix build capi --- paddle/fluid/CMakeLists.txt | 20 +++++++++++--------- paddle/scripts/paddle_build.sh | 1 + 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/paddle/fluid/CMakeLists.txt b/paddle/fluid/CMakeLists.txt index d274d96c29bdbf..d61e76768bdc9a 100644 --- a/paddle/fluid/CMakeLists.txt +++ b/paddle/fluid/CMakeLists.txt @@ -1,9 +1,11 @@ -add_subdirectory(memory) -add_subdirectory(platform) -add_subdirectory(framework) -add_subdirectory(operators) -add_subdirectory(pybind) -add_subdirectory(string) -add_subdirectory(recordio) -# NOTE: please add subdirectory inference at last. -add_subdirectory(inference) +IF(NOT WITH_C_API) + add_subdirectory(memory) + add_subdirectory(platform) + add_subdirectory(framework) + add_subdirectory(operators) + add_subdirectory(pybind) + add_subdirectory(string) + add_subdirectory(recordio) + # NOTE: please add subdirectory inference at last. + add_subdirectory(inference) +ENDIF() diff --git a/paddle/scripts/paddle_build.sh b/paddle/scripts/paddle_build.sh index 5bef232cd8fc44..cb0624eac4f55c 100755 --- a/paddle/scripts/paddle_build.sh +++ b/paddle/scripts/paddle_build.sh @@ -504,6 +504,7 @@ function main() { ;; capi) cmake_gen ${PYTHON_ABI:-""} + build gen_capi_package ;; fluid_inference_lib) From 13d59827dd77664a1dc5f983bf67b7f9f1b2638a Mon Sep 17 00:00:00 2001 From: Yancey1989 Date: Wed, 16 May 2018 15:42:28 +0800 Subject: [PATCH 2/2] update by comment --- paddle/CMakeLists.txt | 2 +- paddle/fluid/CMakeLists.txt | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/paddle/CMakeLists.txt b/paddle/CMakeLists.txt index 8b1ca5e1654833..d722eec1892206 100644 --- a/paddle/CMakeLists.txt +++ b/paddle/CMakeLists.txt @@ -24,6 +24,6 @@ if(NOT WITH_FLUID_ONLY) endif() add_subdirectory(testing) -if(NOT MOBILE_INFERENCE AND NOT RPI) +if(NOT MOBILE_INFERENCE AND NOT RPI AND NOT WITH_C_API) add_subdirectory(fluid) endif() diff --git a/paddle/fluid/CMakeLists.txt b/paddle/fluid/CMakeLists.txt index d61e76768bdc9a..d274d96c29bdbf 100644 --- a/paddle/fluid/CMakeLists.txt +++ b/paddle/fluid/CMakeLists.txt @@ -1,11 +1,9 @@ -IF(NOT WITH_C_API) - add_subdirectory(memory) - add_subdirectory(platform) - add_subdirectory(framework) - add_subdirectory(operators) - add_subdirectory(pybind) - add_subdirectory(string) - add_subdirectory(recordio) - # NOTE: please add subdirectory inference at last. - add_subdirectory(inference) -ENDIF() +add_subdirectory(memory) +add_subdirectory(platform) +add_subdirectory(framework) +add_subdirectory(operators) +add_subdirectory(pybind) +add_subdirectory(string) +add_subdirectory(recordio) +# NOTE: please add subdirectory inference at last. +add_subdirectory(inference)