[tensorpipe] better find_package, find_dependency for libuv (#298)

* [tensorpipe] fix find_package(libuv) * [tensorpipe] use find_dependency for libuv * update baseline
luncliff · Nov 23, 2024 · 49e3786 · 49e3786
1 parent 74c57aa
commit 49e3786
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/ports/tensorpipe/TensorpipeConfig.cmake.in b/ports/tensorpipe/TensorpipeConfig.cmake.in
@@ -5,6 +5,8 @@ file(GLOB CONFIG_FILES "${_DIR}/TensorpipeConfig-*.cmake")
 foreach(f ${CONFIG_FILES})
   include(${f})
 endforeach()
+include(CMakeFindDependencyMacro)
+find_dependency(libuv)
 
 # ${_DIR}/TensorpipeTargets-*.cmake will be included here
 include("${_DIR}/TensorpipeTargets.cmake")

diff --git a/ports/tensorpipe/fix-cmakelists.patch b/ports/tensorpipe/fix-cmakelists.patch
@@ -26,7 +26,7 @@ index 5c36064..cfaf0bc 100644
 -list(APPEND TP_LINK_LIBRARIES uv::uv)
 +# `libuv` in vcpkg
 +find_package(libuv CONFIG REQUIRED) 
-+list(APPEND TP_LINK_LIBRARIES libuv::uv)
++list(APPEND TP_LINK_LIBRARIES $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv>)
 
  ### shm
 

diff --git a/ports/tensorpipe/vcpkg.json b/ports/tensorpipe/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "tensorpipe",
   "version-date": "2022-05-14",
+  "port-version": 1,
   "description": "A tensor-aware point-to-point communication primitive for machine learning",
   "homepage": "https://github.com/pytorch/tensorpipe",
   "supports": "linux | osx",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -218,7 +218,7 @@
     },
     "tensorpipe": {
       "baseline": "2022-05-14",
-      "port-version": 0
+      "port-version": 1
     },
     "winpixeventruntime": {
       "baseline": "1.0.240308001",

diff --git a/versions/t-/tensorpipe.json b/versions/t-/tensorpipe.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c63be39eb3e399f41f96fbd39bfa1530951bde15",
+      "version-date": "2022-05-14",
+      "port-version": 1
+    },
     {
       "git-tree": "2db63d9b007bc20c99bd76d48c2ccf80f6bc4a6a",
       "version-date": "2022-05-14",