-
Notifications
You must be signed in to change notification settings - Fork 5.7k
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
+1,309
−25
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 400cacc
fix compilation error with ninja, test=develop
Avin0323 00f2be6
test compliation with Ninja on Windows CI, test=develop
Avin0323 6f20935
Merge branch 'develop' into compile-with-ninja
Avin0323 adfce13
test compliation with Ninja on Windows CI, notest, test=windows_ci
Avin0323 47ddb12
test compliation with Ninja on Windows CI, notest, test=windows_ci
Avin0323 22435e8
test compliation with Ninja on Windows CI, notest, test=windows_ci
Avin0323 5dafcdc
test compliation with Ninja on Windows CI, notest, test=windows_ci
Avin0323 1d03798
fix compile tool warnings info on Windows, test=develop
Avin0323 ad0bb6a
fix compilaton error with Ninja on Windows, test=develop
Avin0323 fafe2e4
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
Avin0323 02f0c4f
fix compilaton error with Ninja on Windows, test=develop
Avin0323 111fb03
merge develop
Avin0323 6aa33cb
add comments and modify build script using MSVC and Ninja, test=develop
Avin0323 3675a65
fix inference_lib path error on Windows, test=develop
Avin0323 9cc124b
fix inference lib path error, test=develop
Avin0323 a7ac841
remove test code, test=develop
Avin0323 d9bb8ed
fix compare string error on Windows, test=develop
Avin0323 002da93
fix compare string error on Windows, test=develop
Avin0323 7c35a9a
remove analysis_predictor depend of paddle_inference, test=develop
Avin0323 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix compilaton error with Ninja on Windows, test=develop
commit ad0bb6ad13344efb38a8ef35526d3c293943b401
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,4 +26,7 @@ cc_library(paddle_inference_c_shared SHARED SRCS ${C_API_SRCS} DEPS paddle_infer | |
set_target_properties(paddle_inference_c_shared PROPERTIES OUTPUT_NAME paddle_inference_c) | ||
if(WIN32) | ||
target_link_libraries(paddle_inference_c_shared shlwapi.lib) | ||
if("${CMAKE_GENERATOR}" STREQUAL "Ninja") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. analysis_predictor 能否直接作为 paddle_inference_c_shared 的DEP There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 这个depend是不需要的了,已删除 |
||
target_link_libraries(paddle_inference_c_shared analysis_predictor) | ||
endif() | ||
endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这里也能改成 $<TARGET_FILE_DIR: paddle_framework_shared> 这种形式吗
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这个就不行了,后面configure_file不能正确解析cmake的生成表达式。