Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 0 additions & 19 deletions cmake/external/gloo.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,28 +26,10 @@ set(GLOO_LIBRARY_DIR
CACHE PATH "gloo library directory." FORCE)

# As we add extra features for gloo, we use the non-official repo
set(GLOO_TAG v0.0.3)
set(GLOO_LIBRARIES
${GLOO_INSTALL_DIR}/lib/libgloo.a
CACHE FILEPATH "gloo library." FORCE)

# Setup gloo patch command
set(GLOO_PATCH_COMMAND git checkout -- . && git checkout ${GLOO_TAG})

file(TO_NATIVE_PATH ${PADDLE_SOURCE_DIR}/patches/gloo/device.cc.patch
native_dst)
file(TO_NATIVE_PATH ${PADDLE_SOURCE_DIR}/patches/gloo/types.h.patch
types_header)
file(TO_NATIVE_PATH ${PADDLE_SOURCE_DIR}/patches/gloo/linux.cc.patch
linux_cc_ethtool)

# cmake-format: off
list(APPEND GLOO_PATCH_COMMAND
&& patch -Nd ${GLOO_SOURCE_DIR}/gloo/transport/tcp < ${native_dst}
&& patch -Nd ${GLOO_SOURCE_DIR}/gloo/ < ${types_header}
&& patch -Nd ${GLOO_SOURCE_DIR}/gloo/common/ < ${linux_cc_ethtool})
# cmake-format: on

set(GLOO_CMAKE_C_FLAGS "-O3 -fPIC")
set(GLOO_CMAKE_CXX_FLAGS "-O3 -fPIC")

Expand All @@ -66,7 +48,6 @@ ExternalProject_Add(
${EXTERNAL_PROJECT_LOG_ARGS}
SOURCE_DIR ${GLOO_SOURCE_DIR}
PREFIX ${GLOO_PREFIX_DIR}
PATCH_COMMAND ${GLOO_PATCH_COMMAND}
CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=${GLOO_INSTALL_DIR}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
Expand Down
10 changes: 0 additions & 10 deletions patches/gloo/device.cc.patch

This file was deleted.

13 changes: 0 additions & 13 deletions patches/gloo/linux.cc.patch

This file was deleted.

14 changes: 0 additions & 14 deletions patches/gloo/types.h.patch

This file was deleted.

2 changes: 1 addition & 1 deletion third_party/gloo
Loading