forked from pytorch/pytorch
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update TensorPipe submodule (pytorch#42522)
Summary: Pull Request resolved: pytorch#42522 Main changes: - Consolidated CMake files to have a single entry point, rather than having a specialized one for PyTorch. - Changed the way the preprocessor flags are provided, and changed their name. There were a few instances in PyTorch's CMake files where we were directly adding TensorPipe's source directory as an include path, which however doesn't contain the auto-generated header we now added. We fix that by adding the `tensorpipe` CMake target as a dependency, so that the include paths defined by TensorPipe are used, which contain that auto-generated header. So instead we link those targets to the tensorpipe target in order for them to pick up the correct include directories. I'm turning off SHM and CMA for now because they have never been covered by the CI. I'll enable them in a separate PR so that if they turn out to be flaky we can revert that change without reverting this one. Test Plan: CI Reviewed By: malfet Differential Revision: D22959472 fbshipit-source-id: 1959a41c4a66ef78bf0f3bd5e3964969a2a1bf67
- Loading branch information
1 parent
bd458b7
commit c30bc6d
Showing
8 changed files
with
25 additions
and
18 deletions.
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
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
Submodule tensorpipe
updated
25 files
+14 −19 | .circleci/config.yml | |
+4 −0 | .gitmodules | |
+9 −13 | CMakeLists.txt | |
+389 −0 | cmake/FindPackageHandleStandardArgs.cmake | |
+50 −0 | cmake/FindPackageMessage.cmake | |
+581 −0 | cmake/FindProtobuf.cmake | |
+40 −6 | cmake/Finduv.cmake | |
+22 −0 | cmake/Options.cmake | |
+73 −0 | cmake/SelectLibraryConfigurations.cmake | |
+0 −184 | cmake/pytorch.cmake | |
+47 −73 | tensorpipe/CMakeLists.txt | |
+2 −1 | tensorpipe/channel/cma/context.cc | |
+3 −1 | tensorpipe/channel/xth/context.cc | |
+5 −18 | tensorpipe/python/tensorpipe.cc | |
+22 −20 | tensorpipe/tensorpipe.h.in | |
+2 −9 | tensorpipe/test/CMakeLists.txt | |
+125 −130 | tensorpipe/test/channel/channel_test.cc | |
+48 −33 | tensorpipe/test/channel/channel_test.h | |
+18 −18 | tensorpipe/test/core/context_test.cc | |
+176 −0 | tensorpipe/test/peer_group.h | |
+42 −69 | tensorpipe/test/transport/connection_test.cc | |
+33 −56 | tensorpipe/test/transport/shm/connection_test.cc | |
+42 −33 | tensorpipe/test/transport/transport_test.h | |
+9 −16 | tensorpipe/test/transport/uv/connection_test.cc | |
+1 −0 | third_party/googletest |
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
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