diff --git a/ports/tensorpipe/portfile.cmake b/ports/tensorpipe/portfile.cmake index e9c57002a37..81943bf955e 100644 --- a/ports/tensorpipe/portfile.cmake +++ b/ports/tensorpipe/portfile.cmake @@ -47,7 +47,7 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/Tensorpipe" PACKAGE_NAME "Tensorpipe") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" ) diff --git a/ports/tensorpipe/support-test.patch b/ports/tensorpipe/support-test.patch index af128048582..21a94c37bdc 100644 --- a/ports/tensorpipe/support-test.patch +++ b/ports/tensorpipe/support-test.patch @@ -1,8 +1,8 @@ diff --git a/tensorpipe/test/CMakeLists.txt b/tensorpipe/test/CMakeLists.txt -index 53e8643..c49ada6 100644 +index 53e8643..09baaa0 100644 --- a/tensorpipe/test/CMakeLists.txt +++ b/tensorpipe/test/CMakeLists.txt -@@ -93,25 +93,24 @@ if(TP_USE_CUDA) +@@ -93,25 +93,30 @@ if(TP_USE_CUDA) channel/cuda_ipc/cuda_ipc_test.cc ) endif() @@ -25,13 +25,19 @@ index 53e8643..c49ada6 100644 -add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/googletest - ${PROJECT_BINARY_DIR}/third_party/googletest EXCLUDE_FROM_ALL) +find_package(GTest CONFIG REQUIRED) ++ ++if (TARGET uv) ++ set(LIBUV_LIBRARY uv) ++else() ++ set(LIBUV_LIBRARY uv_a) ++endif() list(APPEND TP_TEST_LINK_LIBRARIES tensorpipe - uv::uv - gmock - gtest_main) -+ unofficial::libuv::libuv ++ ${LIBUV_LIBRARY} + GTest::gmock + GTest::gtest_main) diff --git a/ports/tensorpipe/vcpkg.json b/ports/tensorpipe/vcpkg.json index fc9865ad280..3efe75d8656 100644 --- a/ports/tensorpipe/vcpkg.json +++ b/ports/tensorpipe/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tensorpipe", "version-date": "2022-03-16", - "port-version": 2, + "port-version": 3, "description": "A tensor-aware point-to-point communication primitive for machine learning", "homepage": "https://github.com/pytorch/tensorpipe", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 8eaf9b2e32b..3b9fc93a936 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7782,7 +7782,7 @@ }, "tensorpipe": { "baseline": "2022-03-16", - "port-version": 2 + "port-version": 3 }, "termcolor": { "baseline": "2.1.0", diff --git a/versions/t-/tensorpipe.json b/versions/t-/tensorpipe.json index 97f803c145a..7f1840473f1 100644 --- a/versions/t-/tensorpipe.json +++ b/versions/t-/tensorpipe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea5e9e44827c85ad455621231cb7ca1f2447cdd9", + "version-date": "2022-03-16", + "port-version": 3 + }, { "git-tree": "eed8e7f9952716b9aa7fcde453fad358b6b7bd2f", "version-date": "2022-03-16",