Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[gloo] reenable libuv build (2/N) #396

Closed
wants to merge 7 commits into from
Closed

[gloo] reenable libuv build (2/N) #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1427d34
[gloo] reenable libuv build (2/N)
c-p-i-o Nov 18, 2024
29ef415
Update on "[gloo] reenable libuv build (2/N)"
c-p-i-o Nov 18, 2024
bae994a
Update on "[gloo] reenable libuv build (2/N)"
c-p-i-o Nov 25, 2024
d10b4b3
Update on "[gloo] reenable libuv build (2/N)"
c-p-i-o Nov 26, 2024
967e418
Update on "[gloo] reenable libuv build (2/N)"
c-p-i-o Nov 26, 2024
8d5b86d
Update on "[gloo] reenable libuv build (2/N)"
c-p-i-o Nov 26, 2024
94b7c1b
Update on "[gloo] reenable libuv build (2/N)"
c-p-i-o Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ if(MSVC)
message(STATUS "Set USE_NCCL OFF")
set(USE_RCCL OFF)
message(STATUS "Set USE_RCCL OFF")
set(USE_LIBUV ON)
message(STATUS "Set USE_LIBUV ON")
message(STATUS "Only USE_LIBUV is supported on Windows")
set(USE_LIBUV OFF)
message(STATUS "Set USE_LIBUV OFF")
# message(STATUS "Only USE_LIBUV is supported on Windows")

if(BUILD_BENCHMARK)
message(FATAL_ERROR "BUILD_BENCHMARK is not supported on Windows yet")
Expand Down
11 changes: 5 additions & 6 deletions gloo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
13 changes: 6 additions & 7 deletions gloo/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 3 additions & 4 deletions gloo/transport/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@ if(GLOO_HAVE_TRANSPORT_IBVERBS)
add_subdirectory(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})
Expand Down
Loading