[gloo] reenable libuv build (2/N)

Summary: As part of reviving CI, reenable libuv that is causing CI errors. Test Plan: Test on github. ghstack-source-id: 73f01769ba3c9bbece7b6ffe1299c3dc6aefe814 Pull Request resolved: #396
facebookincubator · Nov 26, 2024 · 171afa1 · 171afa1
1 parent 8a3d399
commit 171afa1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -68,7 +68,7 @@ jobs:
           git submodule update --init --recursive
           mkdir -p build
           cd build
-          cmake ..  -DBUILD_TEST=ON -Dlibuv_ROOT=${{ env.libuv_path }} -DGTEST_LIBRARY=${{ env.gtest_lib_path }}/lib/gtestd.lib -DGTEST_INCLUDE_DIR=${{ env.gtest_lib_path }}/include -DGTEST_MAIN_LIBRARY=${{ env.gtest_lib_path }}/lib/gtest_maind.lib
+          cmake ..  -DBUILD_TEST=ON -Dlibuv_ROOT=${{ env.libuv_path }} -DGTEST_LIBRARY=${{ env.gtest_lib_path }}/lib/gtestd.lib -DGLOO_HAVE_TRANSPORT_UV=OFF -DGTEST_INCLUDE_DIR=${{ env.gtest_lib_path }}/include -DGTEST_MAIN_LIBRARY=${{ env.gtest_lib_path }}/lib/gtest_maind.lib
           msbuild ALL_BUILD.vcxproj
       - name: Test
         run: |

diff --git a/gloo/CMakeLists.txt b/gloo/CMakeLists.txt
@@ -94,13 +94,12 @@ else()
   set(GLOO_HAVE_TRANSPORT_IBVERBS 0)
 endif()
 
-# TODO: turn ths back on once tests are passing again.
 # Compile uv transport if libuv is available
-#if(USE_LIBUV)
-# set(GLOO_HAVE_TRANSPORT_UV 1)
-#else()
-#  set(GLOO_HAVE_TRANSPORT_UV 0)
-#endif()
+if(USE_LIBUV)
+  set(GLOO_HAVE_TRANSPORT_UV 1)
+else()
+  set(GLOO_HAVE_TRANSPORT_UV 0)
+endif()
 
 add_subdirectory(common)
 add_subdirectory(mpi)

diff --git a/gloo/test/CMakeLists.txt b/gloo/test/CMakeLists.txt
@@ -31,13 +31,12 @@ endif()
 add_executable(gloo_test ${GLOO_TEST_SRCS})
 target_link_libraries(gloo_test gloo gtest ${GLOO_TEST_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto)
 
-#TODO: re-enable LIBUV once CI is green again
-#if(MSVC AND USE_LIBUV)
-#  add_custom_command(TARGET gloo_test POST_BUILD
-#      COMMAND ${CMAKE_COMMAND} -E copy_if_different
-#          "${libuv_DLL_PATH}"
-#          $<TARGET_FILE_DIR:gloo_test>)
-#endif()
+if(MSVC AND USE_LIBUV)
+  add_custom_command(TARGET gloo_test POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different
+          "${libuv_DLL_PATH}"
+          $<TARGET_FILE_DIR:gloo_test>)
+endif()
 
 if(USE_CUDA)
   if(NOT MSVC)

diff --git a/gloo/transport/CMakeLists.txt b/gloo/transport/CMakeLists.txt
@@ -25,9 +25,9 @@ if(GLOO_HAVE_TRANSPORT_IBVERBS)
 endif()
 
 # TODO: skip UV for now until CI is revived.
-#if(GLOO_HAVE_TRANSPORT_UV)
-#  add_subdirectory(uv)
-#endif()
+if(GLOO_HAVE_TRANSPORT_UV)
+  add_subdirectory(uv)
+endif()
 
 list(APPEND GLOO_SRCS ${GLOO_TRANSPORT_SRCS})
 list(APPEND GLOO_HDRS ${GLOO_TRANSPORT_HDRS})