Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
csdn_franckjun
Paddle
提交
94e38bb5
P
Paddle
项目概览
csdn_franckjun
/
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,发现更多精彩内容 >>
提交
94e38bb5
编写于
3月 20, 2017
作者:
Y
Yu Yang
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'develop' of github.com:baidu/Paddle into memory.set_input
上级
bd4ec1b4
53090e34
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
13 addition
and
11 deletion
+13
-11
cmake/FindSphinx.cmake
cmake/FindSphinx.cmake
+1
-1
paddle/gserver/layers/SequencePoolLayer.cpp
paddle/gserver/layers/SequencePoolLayer.cpp
+4
-5
paddle/parameter/Argument.cpp
paddle/parameter/Argument.cpp
+1
-1
paddle/parameter/Argument.h
paddle/parameter/Argument.h
+1
-1
python/paddle/v2/dataset/wmt14.py
python/paddle/v2/dataset/wmt14.py
+1
-1
python/paddle/v2/tests/test_layer.py
python/paddle/v2/tests/test_layer.py
+5
-2
未找到文件。
cmake/FindSphinx.cmake
浏览文件 @
94e38bb5
...
...
@@ -72,7 +72,7 @@ function( Sphinx_add_target target_name builder conf cache source destination )
${
source
}
${
destination
}
COMMENT
"Generating sphinx documentation:
${
builder
}
"
COMMAND cd
${
destination
}
&& ln -s ./index_*.html index.html
COMMAND cd
${
destination
}
&& ln -s
f
./index_*.html index.html
)
set_property
(
...
...
paddle/gserver/layers/SequencePoolLayer.cpp
浏览文件 @
94e38bb5
...
...
@@ -56,17 +56,16 @@ void SequencePoolLayer::forward(PassType passType) {
CHECK_EQ
(
newBatchSize_
,
starts
->
getSize
()
-
1
);
resetOutput
(
newBatchSize_
,
dim
);
if
(
type_
)
{
CHECK
(
input
.
subSequenceStartPositions
)
<<
"when trans_type = seq, input must hasSubseq"
;
}
/* If type_ = kNonSeq, both seq has or not has sub-seq degrade to a non-seq,
* thus, in this case, output_ has no sequenceStartPositions.
* If type_ = kSeq, seq has sub-seq degrades to a seq, thus, only in this
* case, we should compute the new sequenceStartPositions.
*/
if
(
type_
)
{
output_
.
degradeSequence
(
input
,
useGpu_
);
CHECK
(
input
.
subSequenceStartPositions
)
<<
"when trans_type = seq, input must hasSubseq"
;
output_
.
degradeSequence
(
input
);
}
}
...
...
paddle/parameter/Argument.cpp
浏览文件 @
94e38bb5
...
...
@@ -583,7 +583,7 @@ void Argument::checkSubset() const {
}
}
void
Argument
::
degradeSequence
(
const
Argument
&
input
,
bool
useGpu
)
{
void
Argument
::
degradeSequence
(
const
Argument
&
input
)
{
CHECK_EQ
(
input
.
hasSubseq
(),
1UL
);
size_t
numSequences
=
input
.
getNumSequences
();
size_t
numSubSequences
=
input
.
getNumSubSequences
();
...
...
paddle/parameter/Argument.h
浏览文件 @
94e38bb5
...
...
@@ -296,7 +296,7 @@ struct Argument {
/*
sequence has sub-sequence degrades to a sequence.
*/
void
degradeSequence
(
const
Argument
&
input
,
bool
useGpu
);
void
degradeSequence
(
const
Argument
&
input
);
/**
* @brief getValueString will return the argument's output in string. There
...
...
python/paddle/v2/dataset/wmt14.py
浏览文件 @
94e38bb5
...
...
@@ -23,7 +23,7 @@ __all__ = ['train', 'test', 'build_dict']
URL_DEV_TEST
=
'http://www-lium.univ-lemans.fr/~schwenk/cslm_joint_paper/data/dev+test.tgz'
MD5_DEV_TEST
=
'7d7897317ddd8ba0ae5c5fa7248d3ff5'
# this is a small set of data for test. The original data is too large and will be add later.
URL_TRAIN
=
'http://paddlepaddle.
bj
.bcebos.com/demo/wmt_shrinked_data/wmt14.tgz'
URL_TRAIN
=
'http://paddlepaddle.
cdn
.bcebos.com/demo/wmt_shrinked_data/wmt14.tgz'
MD5_TRAIN
=
'a755315dd01c2c35bde29a744ede23a6'
START
=
"<s>"
...
...
python/paddle/v2/tests/test_layer.py
浏览文件 @
94e38bb5
...
...
@@ -22,7 +22,9 @@ import paddle.v2.networks as networks
pixel
=
layer
.
data
(
name
=
'pixel'
,
type
=
data_type
.
dense_vector
(
128
))
label
=
layer
.
data
(
name
=
'label'
,
type
=
data_type
.
integer_value
(
10
))
weight
=
layer
.
data
(
name
=
'weight'
,
type
=
data_type
.
dense_vector
(
10
))
weight
=
layer
.
data
(
name
=
'weight'
,
type
=
data_type
.
dense_vector
(
1
))
combine_weight
=
layer
.
data
(
name
=
'weight_combine'
,
type
=
data_type
.
dense_vector
(
10
))
score
=
layer
.
data
(
name
=
'score'
,
type
=
data_type
.
dense_vector
(
1
))
hidden
=
layer
.
fc
(
input
=
pixel
,
...
...
@@ -81,7 +83,8 @@ class AggregateLayerTest(unittest.TestCase):
class
MathLayerTest
(
unittest
.
TestCase
):
def
test_math_layer
(
self
):
addto
=
layer
.
addto
(
input
=
[
pixel
,
pixel
])
linear_comb
=
layer
.
linear_comb
(
weights
=
weight
,
vectors
=
hidden
,
size
=
10
)
linear_comb
=
layer
.
linear_comb
(
weights
=
combine_weight
,
vectors
=
hidden
,
size
=
10
)
interpolation
=
layer
.
interpolation
(
input
=
[
hidden
,
hidden
],
weight
=
score
)
bilinear
=
layer
.
bilinear_interp
(
input
=
conv
,
out_size_x
=
4
,
out_size_y
=
4
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录