diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 83fe9af768964003130d02b7d913ad1c2102dd1d..59661c9c1da53a2ddac0127ed1827fedde811a1d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -31,6 +31,3 @@ - id: go-fmt types: - go - - id: gometalinter - types: - - go diff --git a/go/glide.lock b/go/glide.lock index 1ecdd217520e0a62b546b4c7048a25f4316d3f37..aabc03657fff299581c61ed2a220e1c615cd6dfe 100644 --- a/go/glide.lock +++ b/go/glide.lock @@ -1,6 +1,8 @@ -hash: 1b9b07408ca7fac27a374dc2ccd2433e4bff090484008a037df967284949a582 -updated: 2017-08-07T23:37:48.867469328Z +hash: 328e7b9b7306b45e7b9879139a9f86698115981f6283032e1312093a6a6ddb04 +updated: 2017-10-16T08:00:23.484693528Z 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 + diff --git a/go/glide.yaml b/go/glide.yaml index a90e71b615de92d64c79823e2a04c46001963932..4b22ab2caaae2272e3aab0eeba0758925c67d448 100644 --- a/go/glide.yaml +++ b/go/glide.yaml @@ -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 diff --git a/paddle/pserver/LightNetwork.cpp b/paddle/pserver/LightNetwork.cpp index 4203f2616456244df616ee2109436ab7caef9741..0e8e5a83a47bee3436450e6bf7db5e26dc037016 100644 --- a/paddle/pserver/LightNetwork.cpp +++ b/paddle/pserver/LightNetwork.cpp @@ -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; diff --git a/paddle/scripts/travis/check_style.sh b/paddle/scripts/travis/check_style.sh index cb483b0ffc0a1d99978508bc16464a7716d2bac2..e71d243efa2041cc0624b8273e1bfabaa03ce106 100755 --- a/paddle/scripts/travis/check_style.sh +++ b/paddle/scripts/travis/check_style.sh @@ -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 diff --git a/python/paddle/trainer/config_parser.py b/python/paddle/trainer/config_parser.py index 098a51ab8791290d3e0ffa2c3703c724dd2387b9..09c92d3513e86a7657880c01736f5f41f53cfcf6 100644 --- a/python/paddle/trainer/config_parser.py +++ b/python/paddle/trainer/config_parser.py @@ -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 diff --git a/python/paddle/trainer_config_helpers/layers.py b/python/paddle/trainer_config_helpers/layers.py index 5043fb811de09638ef8261eb6a9c7d21685bf29c..09315b9d9224076d91c16a6c0b949d4ab289bf70 100644 --- a/python/paddle/trainer_config_helpers/layers.py +++ b/python/paddle/trainer_config_helpers/layers.py @@ -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,