Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
a01663ca
P
Paddle
项目概览
PaddlePaddle
/
Paddle
12 个月 前同步成功
通知
2292
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a01663ca
编写于
12月 25, 2019
作者:
Z
zhouwei25
提交者:
Tao Luo
12月 25, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove patch command and file of cares to Improved quality of Paddle Repo (#21776)
上级
1f3029cb
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
5 addition
and
275 deletion
+5
-275
CMakeLists.txt
CMakeLists.txt
+0
-1
cmake/external/cares.cmake
cmake/external/cares.cmake
+0
-48
cmake/third_party.cmake
cmake/third_party.cmake
+0
-1
paddle/fluid/operators/collective/CMakeLists.txt
paddle/fluid/operators/collective/CMakeLists.txt
+1
-1
paddle/fluid/operators/distributed/CMakeLists.txt
paddle/fluid/operators/distributed/CMakeLists.txt
+1
-1
paddle/fluid/operators/distributed_ops/CMakeLists.txt
paddle/fluid/operators/distributed_ops/CMakeLists.txt
+1
-1
paddle/scripts/paddle_build.sh
paddle/scripts/paddle_build.sh
+2
-1
patches/cares/ares_parse_ptr_reply.c.txt
patches/cares/ares_parse_ptr_reply.c.txt
+0
-221
未找到文件。
CMakeLists.txt
浏览文件 @
a01663ca
...
...
@@ -133,7 +133,6 @@ endif()
include
(
third_party
)
# download, build, install third_party
if
(
WITH_DISTRIBUTE
)
include
(
external/cares
)
if
(
WITH_GRPC
)
message
(
STATUS
"Use grpc framework."
)
include
(
external/grpc
)
...
...
cmake/external/cares.cmake
已删除
100644 → 0
浏览文件 @
1f3029cb
# Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# NOTE: c-ares is needed when linking with grpc.
include
(
ExternalProject
)
SET
(
CARES_SOURCES_DIR
${
THIRD_PARTY_PATH
}
/cares
)
SET
(
CARES_INSTALL_DIR
${
THIRD_PARTY_PATH
}
/install/cares
)
SET
(
CARES_INCLUDE_DIR
"
${
CARES_INSTALL_DIR
}
/include/"
CACHE PATH
"cares include directory."
FORCE
)
if
(
NOT APPLE AND NOT WIN32
)
if
(
${
CMAKE_CXX_COMPILER_VERSION
}
VERSION_GREATER 8.0
)
set
(
PATCH_COMMAND_CARES cp
${
PADDLE_SOURCE_DIR
}
/patches/cares/ares_parse_ptr_reply.c.txt
${
CARES_SOURCES_DIR
}
/src/extern_cares/ares_parse_ptr_reply.c
)
endif
()
endif
()
ExternalProject_Add
(
extern_cares
${
SHALLOW_CLONE
}
GIT_REPOSITORY
"https://github.com/c-ares/c-ares.git"
GIT_TAG
"cares-1_13_0"
PREFIX
${
CARES_SOURCES_DIR
}
UPDATE_COMMAND
""
CONFIGURE_COMMAND ./buildconf && ./configure --disable-shared --prefix=
${
CARES_INSTALL_DIR
}
BUILD_IN_SOURCE 1
PATCH_COMMAND
${
PATCH_COMMAND_CARES
}
BUILD_COMMAND make -j $
(
nproc
)
INSTALL_COMMAND make install
)
ADD_LIBRARY
(
cares STATIC IMPORTED GLOBAL
)
SET_PROPERTY
(
TARGET cares PROPERTY IMPORTED_LOCATION
"
${
CARES_INSTALL_DIR
}
/lib/libcares.a"
)
include_directories
(
${
CARES_INCLUDE_DIR
}
)
ADD_DEPENDENCIES
(
cares extern_cares
)
cmake/third_party.cmake
浏览文件 @
a01663ca
...
...
@@ -249,7 +249,6 @@ if(WITH_BOX_PS)
endif
(
WITH_BOX_PS
)
if
(
WITH_DISTRIBUTE
)
list
(
APPEND third_party_deps extern_cares
)
if
(
WITH_GRPC
)
list
(
APPEND third_party_deps extern_grpc
)
else
()
...
...
paddle/fluid/operators/collective/CMakeLists.txt
浏览文件 @
a01663ca
...
...
@@ -2,7 +2,7 @@ include(operators)
set
(
COLLECTIVE_DEPS
""
)
if
(
WITH_GRPC
)
set
(
COLLECTIVE_DEPS sendrecvop_rpc parameter_send parameter_recv communicator async_sparse_param_update_recorder grpc++_unsecure grpc_unsecure gpr
cares
zlib protobuf node
)
set
(
COLLECTIVE_DEPS sendrecvop_rpc parameter_send parameter_recv communicator async_sparse_param_update_recorder grpc++_unsecure grpc_unsecure gpr zlib protobuf node
)
else
()
set
(
COLLECTIVE_DEPS sendrecvop_rpc parameter_send parameter_recv communicator async_sparse_param_update_recorder brpc leveldb protobuf ssl crypto zlib node
)
if
(
WITH_BRPC_RDMA
)
...
...
paddle/fluid/operators/distributed/CMakeLists.txt
浏览文件 @
a01663ca
...
...
@@ -18,7 +18,7 @@ cc_test(heart_beat_monitor_test SRCS heart_beat_monitor_test.cc DEPS heart_beat_
# FIXME(typhoonzero): use add_subdirectory once we clean the dependency of these files
set
(
DISTRIBUTE_COMPILE_FLAGS
"-Wno-non-virtual-dtor -Wno-error=non-virtual-dtor -Wno-error=delete-non-virtual-dtor"
)
if
(
WITH_GRPC
)
set
(
GRPC_DEPS grpc++_unsecure grpc_unsecure gpr
cares
zlib protobuf
)
set
(
GRPC_DEPS grpc++_unsecure grpc_unsecure gpr zlib protobuf
)
set
(
GRPC_SRCS grpc/grpc_client.cc grpc/grpc_server.cc grpc/grpc_serde.cc grpc/grpc_bytebuffer_stream.cc grpc/grpc_variable_response.cc
)
grpc_library
(
sendrecvop_rpc SRCS sendrecvop_utils.cc
request_handler_impl.cc rpc_client.cc rpc_server.cc
...
...
paddle/fluid/operators/distributed_ops/CMakeLists.txt
浏览文件 @
a01663ca
...
...
@@ -2,7 +2,7 @@ include(operators)
set
(
DISTRIBUTE_DEPS
""
)
if
(
WITH_GRPC
)
set
(
DISTRIBUTE_DEPS sendrecvop_rpc parameter_send parameter_recv communicator async_sparse_param_update_recorder grpc++_unsecure grpc_unsecure gpr
cares
zlib protobuf node
)
set
(
DISTRIBUTE_DEPS sendrecvop_rpc parameter_send parameter_recv communicator async_sparse_param_update_recorder grpc++_unsecure grpc_unsecure gpr zlib protobuf node
)
else
()
set
(
DISTRIBUTE_DEPS sendrecvop_rpc parameter_send parameter_recv communicator async_sparse_param_update_recorder brpc leveldb protobuf ssl crypto zlib node
)
if
(
WITH_BRPC_RDMA
)
...
...
paddle/scripts/paddle_build.sh
浏览文件 @
a01663ca
...
...
@@ -474,7 +474,8 @@ function generate_upstream_develop_api_spec() {
generate_api_spec
"
$1
"
"DEV"
git checkout
$cur_branch
git branch
-D
develop_base_pr
ENABLE_MAKE_CLEAN
=
"OFF"
ENABLE_MAKE_CLEAN
=
"ON"
rm
-rf
${
PADDLE_ROOT
}
/build/Makefile
${
PADDLE_ROOT
}
/build/CMakeCache.txt
}
function
generate_api_spec
()
{
...
...
patches/cares/ares_parse_ptr_reply.c.txt
已删除
100644 → 0
浏览文件 @
1f3029cb
/* Copyright 1998 by the Massachusetts Institute of Technology.
*
* Permission to use, copy, modify, and distribute this
* software and its documentation for any purpose and without
* fee is hereby granted, provided that the above copyright
* notice appear in all copies and that both that copyright
* notice and this permission notice appear in supporting
* documentation, and that the name of M.I.T. not be used in
* advertising or publicity pertaining to distribution of the
* software without specific, written prior permission.
* M.I.T. makes no representations about the suitability of
* this software for any purpose. It is provided "as is"
* without express or implied warranty.
*/
#include "ares_setup.h"
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#ifdef HAVE_NETDB_H
# include <netdb.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
#include "ares.h"
#include "ares_dns.h"
#include "ares_nowarn.h"
#include "ares_private.h"
int ares_parse_ptr_reply(const unsigned char *abuf, int alen, const void *addr,
int addrlen, int family, struct hostent **host)
{
unsigned int qdcount, ancount;
int status, i, rr_type, rr_class, rr_len;
long len;
const unsigned char *aptr;
char *ptrname, *hostname, *rr_name, *rr_data;
struct hostent *hostent;
int aliascnt = 0;
int alias_alloc = 8;
char ** aliases;
size_t rr_data_len;
/* Set *host to NULL for all failure cases. */
*host = NULL;
/* Give up if abuf doesn't have room for a header. */
if (alen < HFIXEDSZ)
return ARES_EBADRESP;
/* Fetch the question and answer count from the header. */
qdcount = DNS_HEADER_QDCOUNT(abuf);
ancount = DNS_HEADER_ANCOUNT(abuf);
if (qdcount != 1)
return ARES_EBADRESP;
/* Expand the name from the question, and skip past the question. */
aptr = abuf + HFIXEDSZ;
status = ares__expand_name_for_response(aptr, abuf, alen, &ptrname, &len);
if (status != ARES_SUCCESS)
return status;
if (aptr + len + QFIXEDSZ > abuf + alen)
{
ares_free(ptrname);
return ARES_EBADRESP;
}
aptr += len + QFIXEDSZ;
/* Examine each answer resource record (RR) in turn. */
hostname = NULL;
aliases = ares_malloc(alias_alloc * sizeof(char *));
if (!aliases)
{
ares_free(ptrname);
return ARES_ENOMEM;
}
for (i = 0; i < (int)ancount; i++)
{
/* Decode the RR up to the data field. */
status = ares__expand_name_for_response(aptr, abuf, alen, &rr_name, &len);
if (status != ARES_SUCCESS)
break;
aptr += len;
if (aptr + RRFIXEDSZ > abuf + alen)
{
ares_free(rr_name);
status = ARES_EBADRESP;
break;
}
rr_type = DNS_RR_TYPE(aptr);
rr_class = DNS_RR_CLASS(aptr);
rr_len = DNS_RR_LEN(aptr);
aptr += RRFIXEDSZ;
if (aptr + rr_len > abuf + alen)
{
ares_free(rr_name);
status = ARES_EBADRESP;
break;
}
if (rr_class == C_IN && rr_type == T_PTR
&& strcasecmp(rr_name, ptrname) == 0)
{
/* Decode the RR data and set hostname to it. */
status = ares__expand_name_for_response(aptr, abuf, alen, &rr_data,
&len);
if (status != ARES_SUCCESS)
{
ares_free(rr_name);
break;
}
if (hostname)
ares_free(hostname);
hostname = rr_data;
rr_data_len = strlen(rr_data)+1;
aliases[aliascnt] = ares_malloc(rr_data_len * sizeof(char));
if (!aliases[aliascnt])
{
ares_free(rr_name);
status = ARES_ENOMEM;
break;
}
strncpy(aliases[aliascnt], rr_data, rr_data_len);
aliascnt++;
if (aliascnt >= alias_alloc) {
char **ptr;
alias_alloc *= 2;
ptr = ares_realloc(aliases, alias_alloc * sizeof(char *));
if(!ptr) {
ares_free(rr_name);
status = ARES_ENOMEM;
break;
}
aliases = ptr;
}
}
if (rr_class == C_IN && rr_type == T_CNAME)
{
/* Decode the RR data and replace ptrname with it. */
status = ares__expand_name_for_response(aptr, abuf, alen, &rr_data,
&len);
if (status != ARES_SUCCESS)
{
ares_free(rr_name);
break;
}
ares_free(ptrname);
ptrname = rr_data;
}
ares_free(rr_name);
aptr += rr_len;
if (aptr > abuf + alen)
{ /* LCOV_EXCL_START: already checked above */
status = ARES_EBADRESP;
break;
} /* LCOV_EXCL_STOP */
}
if (status == ARES_SUCCESS && !hostname)
status = ARES_ENODATA;
if (status == ARES_SUCCESS)
{
/* We got our answer. Allocate memory to build the host entry. */
hostent = ares_malloc(sizeof(struct hostent));
if (hostent)
{
hostent->h_addr_list = ares_malloc(2 * sizeof(char *));
if (hostent->h_addr_list)
{
hostent->h_addr_list[0] = ares_malloc(addrlen);
if (hostent->h_addr_list[0])
{
hostent->h_aliases = ares_malloc((aliascnt+1) * sizeof (char *));
if (hostent->h_aliases)
{
/* Fill in the hostent and return successfully. */
hostent->h_name = hostname;
for (i=0 ; i<aliascnt ; i++)
hostent->h_aliases[i] = aliases[i];
hostent->h_aliases[aliascnt] = NULL;
hostent->h_addrtype = aresx_sitoss(family);
hostent->h_length = aresx_sitoss(addrlen);
memcpy(hostent->h_addr_list[0], addr, addrlen);
hostent->h_addr_list[1] = NULL;
*host = hostent;
ares_free(aliases);
ares_free(ptrname);
return ARES_SUCCESS;
}
ares_free(hostent->h_addr_list[0]);
}
ares_free(hostent->h_addr_list);
}
ares_free(hostent);
}
status = ARES_ENOMEM;
}
for (i=0 ; i<aliascnt ; i++)
if (aliases[i])
ares_free(aliases[i]);
ares_free(aliases);
if (hostname)
ares_free(hostname);
ares_free(ptrname);
return status;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录