Skip to content

Commit 83ddafb

Browse files
authored
Splict cicheks jobs and expose anakin options (#14327)
* Split cichecks test=develop * feat(Anakin): expose anakin options to paddle cmake option Expose ANAKIN_BUILD_FAT_BIN, ANAKIN_BUILD_CROSS_PLANTFORM to Paddle cmake option test=develop
1 parent f8d5775 commit 83ddafb

File tree

3 files changed

+22
-3
lines changed

3 files changed

+22
-3
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ option(WITH_ARM_FP16 "Use half precision support on armv8.2-a cpu" OFF)
6666
option(WITH_CONTRIB "Compile the third-party contributation" OFF)
6767
option(REPLACE_ENFORCE_GLOG "Replace PADDLE_ENFORCE with glog/CHECK for better debug." OFF)
6868
option(WITH_ANAKIN "Compile with Anakin library" OFF)
69+
option(ANAKIN_BUILD_FAT_BIN "Build anakin cuda fat-bin lib for all device plantform, ignored when WITH_ANAKIN=OFF" OFF)
70+
option(ANAKIN_BUILD_CROSS_PLANTFORM "Build anakin lib for any nvidia device plantform. ignored when WITH_ANAKIN=OFF" ON)
6971
option(WITH_GRPC "Use grpc as the default rpc framework" ${WITH_DISTRIBUTE})
7072
option(WITH_BRPC_RDMA "Use brpc rdma as the rpc protocal" OFF)
7173
option(ON_INFER "Turn on inference optimization." OFF)

cmake/external/anakin.cmake

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,21 @@ ExternalProject_Add(
5858
-DPROTOBUF_ROOT=${THIRD_PARTY_PATH}/install/protobuf
5959
-DMKLML_ROOT=${THIRD_PARTY_PATH}/install/mklml
6060
-DENABLE_OP_TIMER=${ANAKIN_ENABLE_OP_TIMER}
61+
-DBUILD_FAT_BIN=${ANAKIN_BUILD_FAT_BIN}
62+
-DBUILD_CROSS_PLANTFORM=${ANAKIN_BUILD_CROSS_PLANTFORM}
6163
${EXTERNAL_OPTIONAL_ARGS}
6264
CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${ANAKIN_INSTALL_DIR}
6365
)
6466

6567
message(STATUS "Anakin for inference is enabled")
6668
message(STATUS "Anakin is set INCLUDE:${ANAKIN_INCLUDE} LIBRARY:${ANAKIN_LIBRARY}")
67-
69+
add_dependencies(extern_anakin protobuf mklml)
6870
add_library(anakin_shared SHARED IMPORTED GLOBAL)
6971
set_property(TARGET anakin_shared PROPERTY IMPORTED_LOCATION ${ANAKIN_SHARED_LIB})
70-
add_dependencies(anakin_shared extern_anakin protobuf mklml)
72+
add_dependencies(anakin_shared extern_anakin)
7173

7274
add_library(anakin_saber SHARED IMPORTED GLOBAL)
7375
set_property(TARGET anakin_saber PROPERTY IMPORTED_LOCATION ${ANAKIN_SABER_LIB})
74-
add_dependencies(anakin_saber extern_anakin protobuf mklml)
76+
add_dependencies(anakin_saber extern_anakin)
7577

7678
list(APPEND external_project_dependencies anakin_shared anakin_saber)

paddle/scripts/paddle_build.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@ function cmake_gen() {
156156
-DWITH_INFERENCE_API_TEST=${WITH_INFERENCE_API_TEST:-ON}
157157
-DINFERENCE_DEMO_INSTALL_DIR=${INFERENCE_DEMO_INSTALL_DIR}
158158
-DWITH_ANAKIN=${WITH_ANAKIN:-OFF}
159+
-DANAKIN_BUILD_FAT_BIN=${ANAKIN_BUILD_FAT_BIN:OFF}
160+
-DANAKIN_BUILD_CROSS_PLANTFORM=${ANAKIN_BUILD_CROSS_PLANTFORM:ON}
159161
-DPY_VERSION=${PY_VERSION:-2.7}
160162
-DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX:-/paddle/build}
161163
========================================
@@ -188,6 +190,8 @@ EOF
188190
-DWITH_INFERENCE_API_TEST=${WITH_INFERENCE_API_TEST:-ON} \
189191
-DINFERENCE_DEMO_INSTALL_DIR=${INFERENCE_DEMO_INSTALL_DIR} \
190192
-DWITH_ANAKIN=${WITH_ANAKIN:-OFF} \
193+
-DANAKIN_BUILD_FAT_BIN=${ANAKIN_BUILD_FAT_BIN:OFF}\
194+
-DANAKIN_BUILD_CROSS_PLANTFORM=${ANAKIN_BUILD_CROSS_PLANTFORM:ON}\
191195
-DPY_VERSION=${PY_VERSION:-2.7} \
192196
-DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX:-/paddle/build}
193197

@@ -777,6 +781,17 @@ function main() {
777781
test_fluid_lib
778782
assert_api_spec_approvals
779783
;;
784+
assert_api)
785+
assert_api_not_changed ${PYTHON_ABI:-""}
786+
;;
787+
test_inference)
788+
gen_capi_package
789+
gen_fluid_lib
790+
test_fluid_lib
791+
;;
792+
assert_api_approvals)
793+
assert_api_spec_approvals
794+
;;
780795
maccheck)
781796
cmake_gen ${PYTHON_ABI:-""}
782797
build_mac

0 commit comments

Comments
 (0)