[tensorpipe] update to latest #23569
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 |
|---|---|---|
| @@ -1,39 +1,39 @@ | ||
| diff --git a/tensorpipe/test/CMakeLists.txt b/tensorpipe/test/CMakeLists.txt | ||
| index 53e8643..c49ada6 100644 | ||
| --- a/tensorpipe/test/CMakeLists.txt | ||
| +++ b/tensorpipe/test/CMakeLists.txt | ||
| @@ -93,25 +93,24 @@ if(TP_USE_CUDA) | ||
| channel/cuda_ipc/cuda_ipc_test.cc | ||
| ) | ||
| endif() | ||
| - | ||
| - list(APPEND TP_TEST_SRCS | ||
| - channel/cuda_gdr/cuda_gdr_test.cc | ||
| - ) | ||
| - | ||
| + if(TP_ENABLE_CUDA_GDR) | ||
| + list(APPEND TP_TEST_SRCS | ||
| + channel/cuda_gdr/cuda_gdr_test.cc | ||
| + ) | ||
| + endif() | ||
| cuda_add_library(tensorpipe_cuda_kernel channel/kernel.cu) | ||
| list(APPEND TP_TEST_LINK_LIBRARIES tensorpipe_cuda_kernel) | ||
|
|
||
| list(APPEND TP_TEST_LINK_LIBRARIES tensorpipe_cuda) | ||
| endif() | ||
|
|
||
| -add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/googletest | ||
| - ${PROJECT_BINARY_DIR}/third_party/googletest EXCLUDE_FROM_ALL) | ||
| +find_package(GTest CONFIG REQUIRED) | ||
|
|
||
| list(APPEND TP_TEST_LINK_LIBRARIES | ||
| tensorpipe | ||
| - uv::uv | ||
|
There was a problem hiding this comment. Are there official libuv targets we should be providing instead now? |
||
| - gmock | ||
| - gtest_main) | ||
| + unofficial::libuv::libuv | ||
| + GTest::gmock | ||
| + GTest::gtest_main) | ||
|
|
||
| add_executable(tensorpipe_test ${TP_TEST_SRCS}) | ||
|
|
||
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 |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| diff --git a/tensorpipe/CMakeLists.txt b/tensorpipe/CMakeLists.txt | ||
| index efcffc2..e167fae 100644 | ||
| --- a/tensorpipe/CMakeLists.txt | ||
| +++ b/tensorpipe/CMakeLists.txt | ||
| @@ -119,8 +119,8 @@ list(APPEND TP_PUBLIC_HDRS | ||
| transport/uv/utility.h) | ||
|
|
||
| # Add uv package | ||
| -find_package(uv REQUIRED) | ||
| -list(APPEND TP_LINK_LIBRARIES uv::uv) | ||
| +find_package(unofficial-libuv CONFIG REQUIRED) | ||
| +list(APPEND TP_LINK_LIBRARIES unofficial::libuv::libuv) | ||
|
|
||
| ### shm | ||
|
|
||
| @@ -184,7 +184,8 @@ configure_file(config.h.in config.h) | ||
| # We should keep libnop headers private as they should not be exposed to downstream users, | ||
| # but they're currently transitively included by tensorpipe/transport/connection.h (which | ||
| # is still unclear whether it should be a public or private header). | ||
| -list(APPEND TP_INCLUDE_DIRS $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/third_party/libnop/include>) | ||
| +find_path(LIBNOP_INCLUDE_DIRS "nop/serializer.h" REQUIRED) | ||
| +list(APPEND TP_INCLUDE_DIRS $<BUILD_INTERFACE:${LIBNOP_INCLUDE_DIRS}>) | ||
|
|
||
|
|
||
| ## Target | ||
| diff --git a/tensorpipe/python/CMakeLists.txt b/tensorpipe/python/CMakeLists.txt | ||
| index b722381..688886a 100644 | ||
| --- a/tensorpipe/python/CMakeLists.txt | ||
| +++ b/tensorpipe/python/CMakeLists.txt | ||
| @@ -4,16 +4,11 @@ | ||
| # This source code is licensed under the BSD-style license found in the | ||
| # LICENSE file in the root directory of this source tree. | ||
|
|
||
| -if(NOT (COMMAND pybind11_add_module)) | ||
| - add_subdirectory( | ||
| - ${PROJECT_SOURCE_DIR}/third_party/pybind11 | ||
| - ${PROJECT_BINARY_DIR}/third_party/pybind11 | ||
| - EXCLUDE_FROM_ALL) | ||
| -endif() | ||
| +find_package(pybind11 CONFIG REQUIRED) | ||
|
|
||
| set(PYBIND11_CPP_STANDARD -std=c++14) | ||
| pybind11_add_module(pytensorpipe tensorpipe.cc) | ||
| -target_link_libraries(pytensorpipe PRIVATE tensorpipe) | ||
| +target_link_libraries(pytensorpipe PRIVATE tensorpipe pybind11::module) | ||
|
|
||
| install(TARGETS pytensorpipe | ||
| EXPORT TensorpipeTargets |
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
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.
I'm not a fan of patches in support of tests we generally don't want to build in the first place, but this is preexsisting. :)