Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows system supports Ninja compilation #31161

Merged
merged 20 commits into from
Mar 4, 2021
Merged
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d07d999
support for compiling with Ninja, test changes have no effect without…
Avin0323 Feb 23, 2021
400cacc
fix compilation error with ninja, test=develop
Avin0323 Feb 24, 2021
00f2be6
test compliation with Ninja on Windows CI, test=develop
Avin0323 Feb 24, 2021
6f20935
Merge branch 'develop' into compile-with-ninja
Avin0323 Feb 24, 2021
adfce13
test compliation with Ninja on Windows CI, notest, test=windows_ci
Avin0323 Feb 24, 2021
47ddb12
test compliation with Ninja on Windows CI, notest, test=windows_ci
Avin0323 Feb 24, 2021
22435e8
test compliation with Ninja on Windows CI, notest, test=windows_ci
Avin0323 Feb 24, 2021
5dafcdc
test compliation with Ninja on Windows CI, notest, test=windows_ci
Avin0323 Feb 24, 2021
1d03798
fix compile tool warnings info on Windows, test=develop
Avin0323 Feb 24, 2021
ad0bb6a
fix compilaton error with Ninja on Windows, test=develop
Avin0323 Feb 25, 2021
fafe2e4
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
Avin0323 Feb 25, 2021
02f0c4f
fix compilaton error with Ninja on Windows, test=develop
Avin0323 Feb 25, 2021
111fb03
merge develop
Avin0323 Mar 1, 2021
6aa33cb
add comments and modify build script using MSVC and Ninja, test=develop
Avin0323 Mar 2, 2021
3675a65
fix inference_lib path error on Windows, test=develop
Avin0323 Mar 2, 2021
9cc124b
fix inference lib path error, test=develop
Avin0323 Mar 3, 2021
a7ac841
remove test code, test=develop
Avin0323 Mar 3, 2021
d9bb8ed
fix compare string error on Windows, test=develop
Avin0323 Mar 3, 2021
002da93
fix compare string error on Windows, test=develop
Avin0323 Mar 3, 2021
7c35a9a
remove analysis_predictor depend of paddle_inference, test=develop
Avin0323 Mar 3, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix compile tool warnings info on Windows, test=develop
Avin0323 committed Feb 24, 2021
commit 1d03798247ce8997ef05fb34b647b26c3cfade77
6 changes: 4 additions & 2 deletions cmake/flags.cmake
Original file line number Diff line number Diff line change
@@ -28,15 +28,17 @@ function(CheckCompilerCXX11Flag)
endfunction()

CheckCompilerCXX11Flag()
if (WITH_GPU)
if (${CMAKE_CUDA_COMPILER_VERSION} GREATER_EQUAL 11.0)
if(NOT WIN32)
if(WITH_GPU)
if(${CMAKE_CUDA_COMPILER_VERSION} GREATER_EQUAL 11.0)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif()
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif()
endif(NOT WIN32)
# safe_set_flag
#
# Set a compile flag only if compiler is support
12 changes: 7 additions & 5 deletions cmake/generic.cmake
Original file line number Diff line number Diff line change
@@ -95,11 +95,13 @@ include_directories("${PADDLE_SOURCE_DIR}/paddle/fluid/framework/io")
if(NOT APPLE)
find_package(Threads REQUIRED)
link_libraries(${CMAKE_THREAD_LIBS_INIT})
if(WITH_PSLIB OR WITH_DISTRIBUTE)
set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -pthread -ldl -lrt -lz -lssl")
else()
set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -pthread -ldl -lrt")
endif()
if(NOT WIN32)
if(WITH_PSLIB OR WITH_DISTRIBUTE)
set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -pthread -ldl -lrt -lz -lssl")
else()
set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -pthread -ldl -lrt")
endif()
endif(NOT WIN32)
endif(NOT APPLE)

set_property(GLOBAL PROPERTY FLUID_MODULES "")