Skip to content
This repository was archived by the owner on Sep 9, 2025. It is now read-only.

Commit 463d97f

Browse files
authored
Support ninja build (PaddlePaddle#829)
1 parent c344ae9 commit 463d97f

File tree

7 files changed

+13
-7
lines changed

7 files changed

+13
-7
lines changed

cmake/external/dgc.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ExternalProject_Add(
3333
URL_MD5 "94e6fa1bc97169d0e1aad44570fe3251"
3434
PREFIX "${DGC_PREFIX_DIR}"
3535
CONFIGURE_COMMAND ""
36-
BUILD_COMMAND make -j $(nproc)
36+
BUILD_COMMAND make -j${NPROC}
3737
INSTALL_COMMAND
3838
mkdir -p ${DGC_INSTALL_DIR}/lib/ ${DGC_INCLUDE_DIR}/dgc && cp
3939
${DGC_SOURCES_DIR}/build/lib/libdgc.a ${DGC_LIBRARIES} && cp

cmake/external/gflags.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ else()
2929
set(GFLAGS_LIBRARIES
3030
"${GFLAGS_INSTALL_DIR}/lib/libgflags.a"
3131
CACHE FILEPATH "GFLAGS_LIBRARIES" FORCE)
32-
set(BUILD_COMMAND $(MAKE) --silent)
33-
set(INSTALL_COMMAND $(MAKE) install)
32+
set(INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} install)
3433
endif()
3534

3635
include_directories(${GFLAGS_INCLUDE_DIR})

cmake/external/mkldnn.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ ExternalProject_Add(
8383
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
8484
-DDNNL_BUILD_TESTS=OFF
8585
-DDNNL_BUILD_EXAMPLES=OFF
86-
CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${MKLDNN_INSTALL_DIR})
86+
CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${MKLDNN_INSTALL_DIR}
87+
BUILD_BYPRODUCTS ${MKLDNN_LIB})
8788

8889
message(STATUS "MKLDNN library: ${MKLDNN_LIB}")
8990
add_definitions(-DPADDLE_WITH_MKLDNN)

cmake/external/openblas.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ if(NOT WIN32)
5353
PREFIX ${CBLAS_PREFIX_DIR}
5454
INSTALL_DIR ${CBLAS_INSTALL_DIR}
5555
BUILD_IN_SOURCE 1
56-
BUILD_COMMAND make -j$(nproc) ${COMMON_ARGS} ${OPTIONAL_ARGS}
56+
BUILD_COMMAND make -j${NPROC} ${COMMON_ARGS} ${OPTIONAL_ARGS}
5757
INSTALL_COMMAND make install NO_SHARED=1 NO_LAPACK=1 PREFIX=<INSTALL_DIR>
5858
UPDATE_COMMAND ""
5959
CONFIGURE_COMMAND ""

cmake/external/rocksdb.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ ExternalProject_Add(
4444
${ROCKSDB_PREFIX_DIR}/src/extern_rocksdb/librocksdb.a ${ROCKSDB_LIBRARIES}
4545
&& cp -r ${ROCKSDB_PREFIX_DIR}/src/extern_rocksdb/include
4646
${ROCKSDB_INSTALL_DIR}/
47-
BUILD_IN_SOURCE 1)
47+
BUILD_IN_SOURCE 1
48+
BYPRODUCTS ${ROCKSDB_LIBRARIES})
4849

4950
add_dependencies(extern_rocksdb snappy)
5051

cmake/third_party.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ set(THIRD_PARTY_CACHE_PATH
2727
set(THIRD_PARTY_BUILD_TYPE Release)
2828
set(third_party_deps)
2929

30+
include(ProcessorCount)
31+
ProcessorCount(NPROC)
32+
3033
# cache funciton to avoid repeat download code of third_party.
3134
# This function has 4 parameters, URL / REPOSITOR / TAG / DIR:
3235
# 1. URL: specify download url of 3rd party

paddle/scripts/ipu/github_action/action_build_and_test.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ mkdir /paddle_build
2121
# install requirements
2222
pip install -r /checkout/python/requirements.txt
2323

24+
conda install ninja -y
25+
2426
# todo use ninja
2527
cmake \
2628
-DCMAKE_INSTALL_PREFIX:STRING=install \
@@ -40,7 +42,7 @@ cmake \
4042
-DCMAKE_BUILD_TYPE:STRING=Release \
4143
-DCMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc \
4244
-DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++ \
43-
-G "Unix Makefiles" \
45+
-G "Ninja" \
4446
-H/checkout \
4547
-B/paddle_build
4648

0 commit comments

Comments
 (0)