diff --git a/cmake/external/gloo.cmake b/cmake/external/gloo.cmake index 734e69ca8d8cef..0ac73b397c92d9 100755 --- a/cmake/external/gloo.cmake +++ b/cmake/external/gloo.cmake @@ -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") @@ -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} diff --git a/patches/gloo/device.cc.patch b/patches/gloo/device.cc.patch deleted file mode 100644 index 10769b3e0ca331..00000000000000 --- a/patches/gloo/device.cc.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/device.cc -+++ b/device.cc -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - - #include "gloo/common/linux.h" - #include "gloo/common/logging.h" diff --git a/patches/gloo/linux.cc.patch b/patches/gloo/linux.cc.patch deleted file mode 100644 index d594eeae24e961..00000000000000 --- a/patches/gloo/linux.cc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gloo/common/linux.cc b/gloo/common/linux.cc -index a3726da..9a42a12 100644 ---- a/linux.cc -+++ b/linux.cc -@@ -188,8 +188,8 @@ static int getInterfaceSpeedGLinkSettings(int sock, struct ifreq* ifr) { - #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0) - constexpr auto link_mode_data_nwords = 3 * 127; - struct { -- struct ethtool_link_settings req; - __u32 link_mode_data[link_mode_data_nwords]; -+ struct ethtool_link_settings req; - } ecmd; - int rv; diff --git a/patches/gloo/types.h.patch b/patches/gloo/types.h.patch deleted file mode 100644 index 5d544321cd4958..00000000000000 --- a/patches/gloo/types.h.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/gloo/types.h b/gloo/types.h -index 31e193b..3a8ed74 100755 ---- a/gloo/types.h -+++ b/gloo/types.h -@@ -319,8 +319,7 @@ inline float cpu_half2float(float16 h) { - - unsigned temp = ((sign << 31) | (exponent << 23) | mantissa); - -- void* rp = &temp; -- return *(float*)rp; -+ return (float)temp; - } - - } // namespace gloo diff --git a/third_party/gloo b/third_party/gloo index 5a4c337dd9a99f..54953de0643a09 160000 --- a/third_party/gloo +++ b/third_party/gloo @@ -1 +1 @@ -Subproject commit 5a4c337dd9a99f09aa0a688aa2088ed1f9c1cbcd +Subproject commit 54953de0643a0977a63a79756510739145a681e6