代码拉取完成,页面将自动刷新
同步操作将从 src-openEuler/pytorch 强制同步,此操作会覆盖自 Fork 仓库以来所做的任何修改,且无法恢复!!!
确定后同步将在后台操作,完成时将刷新页面,请耐心等待。
diff -Naur a/third_party/gloo/gloo/common/linux.cc b/third_party/gloo/gloo/common/linux.cc
--- a/third_party/gloo/gloo/common/linux.cc 2022-03-11 01:01:52.000000000 +0800
+++ b/third_party/gloo/gloo/common/linux.cc 2023-02-16 11:09:11.493631531 +0800
@@ -187,29 +187,28 @@
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];
- } ecmd;
+ constexpr auto bufsize = sizeof(struct ethtool_link_settings) + sizeof(__u32)*link_mode_data_nwords;
+ char buf[bufsize];
+ struct ethtool_link_settings* ecmd = (struct ethtool_link_settings*)buf;
int rv;
- ifr->ifr_data = (__caddr_t)&ecmd;
- memset(&ecmd, 0, sizeof(ecmd));
- ecmd.req.cmd = ETHTOOL_GLINKSETTINGS;
+ ifr->ifr_data = (__caddr_t)buf;
+ memset(buf, 0, bufsize);
+ ecmd->cmd = ETHTOOL_GLINKSETTINGS;
rv = ioctl(sock, SIOCETHTOOL, ifr);
- if (rv < 0 || ecmd.req.link_mode_masks_nwords >= 0) {
+ if (rv < 0 || ecmd->link_mode_masks_nwords >= 0) {
return SPEED_UNKNOWN;
}
- ecmd.req.cmd = ETHTOOL_GLINKSETTINGS;
- ecmd.req.link_mode_masks_nwords = -ecmd.req.link_mode_masks_nwords;
+ ecmd->cmd = ETHTOOL_GLINKSETTINGS;
+ ecmd->link_mode_masks_nwords = - (ecmd->link_mode_masks_nwords);
rv = ioctl(sock, SIOCETHTOOL, ifr);
if (rv < 0) {
return SPEED_UNKNOWN;
}
- return ecmd.req.speed;
+ return ecmd->speed;
#else
(void)sock;
(void)ifr;
diff -Naur a/third_party/gloo/gloo/test/tls_tcp_test.cc b/third_party/gloo/gloo/test/tls_tcp_test.cc
--- a/third_party/gloo/gloo/test/tls_tcp_test.cc 2022-03-11 01:01:52.000000000 +0800
+++ b/third_party/gloo/gloo/test/tls_tcp_test.cc 2023-02-16 11:12:33.779302224 +0800
@@ -72,7 +72,7 @@
}
} catch (::gloo::IoException e) {
exception_thrown = true;
- ASSERT_THAT(e.what(), ::testing::ContainsRegex("unknown ca"));
+ ASSERT_THAT(e.what(), ::testing::ContainsRegex("[unknown ca|Connect timeout|Connection refused]"));
} catch (::gloo::EnforceNotMet e) {
exception_thrown = true;
ASSERT_THAT(e.what(),
此处可能存在不合适展示的内容,页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容,可点击提交进行申诉,我们将尽快为您处理。