Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
夏有凉风,冬有雪
Paddle
提交
216b81ac
P
Paddle
项目概览
夏有凉风,冬有雪
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
216b81ac
编写于
10月 16, 2017
作者:
L
Luo Tao
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'develop' into seqpool
上级
97332d7c
4da6e86f
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
34 addition
and
14 deletion
+34
-14
.pre-commit-config.yaml
.pre-commit-config.yaml
+0
-3
go/glide.lock
go/glide.lock
+9
-5
go/glide.yaml
go/glide.yaml
+2
-0
paddle/pserver/LightNetwork.cpp
paddle/pserver/LightNetwork.cpp
+6
-1
paddle/scripts/travis/check_style.sh
paddle/scripts/travis/check_style.sh
+8
-5
python/paddle/trainer/config_parser.py
python/paddle/trainer/config_parser.py
+3
-0
python/paddle/trainer_config_helpers/layers.py
python/paddle/trainer_config_helpers/layers.py
+6
-0
未找到文件。
.pre-commit-config.yaml
浏览文件 @
216b81ac
...
...
@@ -31,6 +31,3 @@
-
id
:
go-fmt
types
:
-
go
-
id
:
gometalinter
types
:
-
go
go/glide.lock
浏览文件 @
216b81ac
hash:
1b9b07408ca7fac27a374dc2ccd2433e4bff090484008a037df967284949a582
updated: 2017-
08-07T23:37:48.8674693
28Z
hash:
328e7b9b7306b45e7b9879139a9f86698115981f6283032e1312093a6a6ddb04
updated: 2017-
10-16T08:00:23.4846935
28Z
imports:
- name: github.com/alecthomas/gometalinter
version: bae2f1293d092fd8167939d5108d1b025eaef9de
- name: github.com/beorn7/perks
version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
subpackages:
...
...
@@ -10,7 +12,7 @@ imports:
- name: github.com/cockroachdb/cmux
version: 112f0506e7743d64a6eb8fedbcff13d9979bbf92
- name: github.com/coreos/etcd
version:
d0d1a87aa96ae14914751d42264262cb69eda170
version:
f1d7dd87da3e8feab4aaf675b8e29c6a5ed5f58b
subpackages:
- alarm
- auth
...
...
@@ -149,7 +151,7 @@ imports:
- name: github.com/satori/go.uuid
version: 879c5887cd475cd7864858769793b2ceb0d44feb
- name: github.com/sirupsen/logrus
version:
a3f95b5c423586578a4e099b11a46c2479628cac
version:
f006c2ac4710855cf0f916dd6b77acf6b048dc6e
- name: github.com/topicai/candy
version: 1b9030d056fa9f8c4b1f9c91b52fe4b8ab4cd8cc
- name: github.com/ugorji/go
...
...
@@ -159,12 +161,13 @@ imports:
- name: github.com/xiang90/probing
version: 07dd2e8dfe18522e9c447ba95f2fe95262f63bb2
- name: golang.org/x/crypto
version:
1351f936d976c60a0a48d728281922cf63eafb8d
version:
9419663f5a44be8b34ca85f08abc5fe1be11f8a3
repo: https://github.com/golang/crypto.git
vcs: git
subpackages:
- bcrypt
- blowfish
- ssh/terminal
- name: golang.org/x/net
version: c8c74377599bd978aee1cf3b9b63a8634051cec2
subpackages:
...
...
@@ -219,3 +222,4 @@ testImports:
version: 05e8a0eda380579888eb53c394909df027f06991
subpackages:
- assert
go/glide.yaml
浏览文件 @
216b81ac
...
...
@@ -24,3 +24,5 @@ import:
vcs
:
git
-
package
:
github.com/satori/go.uuid
version
:
v1.1.0
-
package
:
github.com/alecthomas/gometalinter
version
:
v1.2.1
paddle/pserver/LightNetwork.cpp
浏览文件 @
216b81ac
...
...
@@ -49,6 +49,11 @@ DEFINE_int32(sock_recv_buf_size,
1024
*
1024
*
40
,
"restrict sock recv buff size"
);
/// reasonable sock_listen_queue_size can control maximum pending connections.
DEFINE_int32
(
sock_listen_queue_size
,
1024
,
"listen queue size when pserver listen a TCP port"
);
namespace
paddle
{
/**
...
...
@@ -129,7 +134,7 @@ SocketServer::SocketServer(const std::string &addr, int port, int rdmaCpu)
if
(
rdmaCpu
==
-
1
)
{
tcpRdma_
=
F_TCP
;
socket_
=
0
;
maxPendingConnections_
=
100
;
maxPendingConnections_
=
FLAGS_sock_listen_queue_size
;
}
else
{
tcpRdma_
=
F_RDMA
;
rdmaCpu_
=
rdmaCpu
;
...
...
paddle/scripts/travis/check_style.sh
浏览文件 @
216b81ac
...
...
@@ -11,7 +11,13 @@ set -e
# install glide
curl https://glide.sh/get | bash
eval
"
$(
GIMME_GO_VERSION
=
1.8.3 gimme
)
"
go get
-u
github.com/alecthomas/gometalinter
# set up go environment for running gometalinter
mkdir
-p
$GOPATH
/src/github.com/PaddlePaddle/
ln
-sf
$TRAVIS_BUILD_DIR
$GOPATH
/src/github.com/PaddlePaddle/Paddle
cd
$GOPATH
/src/github.com/PaddlePaddle/Paddle/go
;
glide
install
;
cd
-
go get github.com/alecthomas/gometalinter
gometalinter
--install
cd
$TRAVIS_BUILD_DIR
...
...
@@ -19,10 +25,7 @@ export PATH=/usr/bin:$PATH
pre-commit
install
clang-format
--version
# set up go environment for running gometalinter
mkdir
-p
$GOPATH
/src/github.com/PaddlePaddle/
ln
-sf
$TRAVIS_BUILD_DIR
$GOPATH
/src/github.com/PaddlePaddle/Paddle
cd
$GOPATH
/src/github.com/PaddlePaddle/Paddle/go
;
glide
install
;
cd
-
if
!
pre-commit run
-a
;
then
git diff
...
...
python/paddle/trainer/config_parser.py
浏览文件 @
216b81ac
...
...
@@ -559,6 +559,9 @@ class IdentityOffsetProjection(Projection):
**
xargs
)
self
.
proj_conf
.
offset
=
offset
def
calc_output_size
(
self
,
input_layer_config
):
return
0
# depends on the outside MixedLayer
def
calc_parameter_size
(
self
,
input_size
,
output_size
):
return
0
...
...
python/paddle/trainer_config_helpers/layers.py
浏览文件 @
216b81ac
...
...
@@ -3679,6 +3679,12 @@ def gru_step_naive_layer(input,
if
size
is
None
:
size
=
input
.
size
/
3
if
bias_attr
and
bias_attr
.
attr
.
get
(
"parameter_name"
,
None
)
is
not
None
:
raise
ValueError
(
"You should not specify the field `name` in bias_attr."
" Otherwise, the three biases, which correponding to "
" the two gates and the mixed layer for computing Wx+b"
", will share the same parameter matrix unexpectedly."
)
def
__gate__
(
gate_name
,
offset
):
with
mixed_layer
(
name
=
name
+
"_"
+
gate_name
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录