Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
afeixing77
Paddle
提交
01c26972
P
Paddle
项目概览
afeixing77
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
01c26972
编写于
2月 07, 2018
作者:
K
Kexin Zhao
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'upstream/develop' into inf_rnn_encode_decode
上级
ea89bf3e
e80255ce
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
45 addition
and
2 deletion
+45
-2
paddle/gserver/tests/test_CompareSparse.cpp
paddle/gserver/tests/test_CompareSparse.cpp
+4
-0
paddle/operators/nccl_op_test.cu.cc
paddle/operators/nccl_op_test.cu.cc
+3
-0
paddle/platform/nccl_test.cu
paddle/platform/nccl_test.cu
+3
-0
python/paddle/v2/fluid/layers/nn.py
python/paddle/v2/fluid/layers/nn.py
+1
-1
python/paddle/v2/fluid/tests/book/test_fit_a_line.py
python/paddle/v2/fluid/tests/book/test_fit_a_line.py
+4
-0
python/paddle/v2/fluid/tests/book/test_image_classification_train.py
...le/v2/fluid/tests/book/test_image_classification_train.py
+4
-0
python/paddle/v2/fluid/tests/book/test_recognize_digits.py
python/paddle/v2/fluid/tests/book/test_recognize_digits.py
+4
-0
python/paddle/v2/fluid/tests/book/test_recommender_system.py
python/paddle/v2/fluid/tests/book/test_recommender_system.py
+4
-0
python/paddle/v2/fluid/tests/book/test_rnn_encoder_decoder.py
...on/paddle/v2/fluid/tests/book/test_rnn_encoder_decoder.py
+4
-1
python/paddle/v2/fluid/tests/book/test_understand_sentiment.py
...n/paddle/v2/fluid/tests/book/test_understand_sentiment.py
+4
-0
python/paddle/v2/fluid/tests/book/test_word2vec.py
python/paddle/v2/fluid/tests/book/test_word2vec.py
+7
-0
python/paddle/v2/fluid/tests/test_parallel_op.py
python/paddle/v2/fluid/tests/test_parallel_op.py
+3
-0
未找到文件。
paddle/gserver/tests/test_CompareSparse.cpp
浏览文件 @
01c26972
...
@@ -212,6 +212,10 @@ TEST(compareSparse, NeuralNetwork) {
...
@@ -212,6 +212,10 @@ TEST(compareSparse, NeuralNetwork) {
}
}
int
main
(
int
argc
,
char
**
argv
)
{
int
main
(
int
argc
,
char
**
argv
)
{
// FIXME(tonyyang-svail):
// Turn off this test due CI failure:
// https://paddleci.ngrok.io/viewLog.html?buildId=27608&buildTypeId=Paddle_PrCi&tab=buildLog&_focus=10430
return
0
;
testing
::
InitGoogleTest
(
&
argc
,
argv
);
testing
::
InitGoogleTest
(
&
argc
,
argv
);
initMain
(
argc
,
argv
);
initMain
(
argc
,
argv
);
initPython
(
argc
,
argv
);
initPython
(
argc
,
argv
);
...
...
paddle/operators/nccl_op_test.cu.cc
浏览文件 @
01c26972
...
@@ -287,6 +287,9 @@ TEST_F(NCCLTester, ncclBcastOp) {
...
@@ -287,6 +287,9 @@ TEST_F(NCCLTester, ncclBcastOp) {
}
}
int
main
(
int
argc
,
char
**
argv
)
{
int
main
(
int
argc
,
char
**
argv
)
{
// FIXME(tonyyang-svail):
// Due to the driver issue on our CI, disable for now
return
0
;
const
int
dev_count
=
p
::
GetCUDADeviceCount
();
const
int
dev_count
=
p
::
GetCUDADeviceCount
();
if
(
dev_count
<=
1
)
{
if
(
dev_count
<=
1
)
{
LOG
(
WARNING
)
LOG
(
WARNING
)
...
...
paddle/platform/nccl_test.cu
浏览文件 @
01c26972
...
@@ -127,6 +127,9 @@ TEST(NCCL, all_reduce) {
...
@@ -127,6 +127,9 @@ TEST(NCCL, all_reduce) {
}
// namespace paddle
}
// namespace paddle
int
main
(
int
argc
,
char
**
argv
)
{
int
main
(
int
argc
,
char
**
argv
)
{
// FIXME(tonyyang-svail):
// Due to the driver issue on our CI, disable for now
return
0
;
dev_count
=
paddle
::
platform
::
GetCUDADeviceCount
();
dev_count
=
paddle
::
platform
::
GetCUDADeviceCount
();
if
(
dev_count
<=
1
)
{
if
(
dev_count
<=
1
)
{
LOG
(
WARNING
)
LOG
(
WARNING
)
...
...
python/paddle/v2/fluid/layers/nn.py
浏览文件 @
01c26972
...
@@ -92,7 +92,7 @@ def fc(input,
...
@@ -92,7 +92,7 @@ def fc(input,
.. math::
.. math::
Out = Act({\sum_{i=0}^{N-1}
W_iX
_i + b})
Out = Act({\sum_{i=0}^{N-1}
X_iW
_i + b})
In the above equation:
In the above equation:
...
...
python/paddle/v2/fluid/tests/book/test_fit_a_line.py
浏览文件 @
01c26972
...
@@ -16,6 +16,8 @@ import paddle.v2 as paddle
...
@@ -16,6 +16,8 @@ import paddle.v2 as paddle
import
paddle.v2.fluid
as
fluid
import
paddle.v2.fluid
as
fluid
import
contextlib
import
contextlib
import
unittest
import
unittest
import
math
import
sys
def
main
(
use_cuda
):
def
main
(
use_cuda
):
...
@@ -58,6 +60,8 @@ def main(use_cuda):
...
@@ -58,6 +60,8 @@ def main(use_cuda):
print
(
avg_loss_value
)
print
(
avg_loss_value
)
if
avg_loss_value
[
0
]
<
10.0
:
if
avg_loss_value
[
0
]
<
10.0
:
return
return
if
math
.
isnan
(
float
(
avg_loss_value
)):
sys
.
exit
(
"got NaN loss, training failed."
)
raise
AssertionError
(
"Fit a line cost is too large, {0:2.2}"
.
format
(
raise
AssertionError
(
"Fit a line cost is too large, {0:2.2}"
.
format
(
avg_loss_value
[
0
]))
avg_loss_value
[
0
]))
...
...
python/paddle/v2/fluid/tests/book/test_image_classification_train.py
浏览文件 @
01c26972
...
@@ -17,6 +17,8 @@ from __future__ import print_function
...
@@ -17,6 +17,8 @@ from __future__ import print_function
import
paddle.v2
as
paddle
import
paddle.v2
as
paddle
import
paddle.v2.fluid
as
fluid
import
paddle.v2.fluid
as
fluid
import
contextlib
import
contextlib
import
math
import
sys
import
numpy
import
numpy
import
unittest
import
unittest
...
@@ -145,6 +147,8 @@ def train(net_type, use_cuda, save_dirname):
...
@@ -145,6 +147,8 @@ def train(net_type, use_cuda, save_dirname):
loss_t
,
acc_t
=
exe
.
run
(
program
=
test_program
,
loss_t
,
acc_t
=
exe
.
run
(
program
=
test_program
,
feed
=
feeder
.
feed
(
test_data
),
feed
=
feeder
.
feed
(
test_data
),
fetch_list
=
[
avg_cost
,
acc
])
fetch_list
=
[
avg_cost
,
acc
])
if
math
.
isnan
(
float
(
loss_t
)):
sys
.
exit
(
"got NaN loss, training failed."
)
acc_list
.
append
(
float
(
acc_t
))
acc_list
.
append
(
float
(
acc_t
))
avg_loss_list
.
append
(
float
(
loss_t
))
avg_loss_list
.
append
(
float
(
loss_t
))
break
# Use 1 segment for speeding up CI
break
# Use 1 segment for speeding up CI
...
...
python/paddle/v2/fluid/tests/book/test_recognize_digits.py
浏览文件 @
01c26972
...
@@ -18,6 +18,8 @@ import paddle.v2 as paddle
...
@@ -18,6 +18,8 @@ import paddle.v2 as paddle
import
sys
import
sys
import
numpy
import
numpy
import
unittest
import
unittest
import
math
import
sys
def
parse_arg
():
def
parse_arg
():
...
@@ -148,6 +150,8 @@ def train(nn_type, use_cuda, parallel, save_dirname):
...
@@ -148,6 +150,8 @@ def train(nn_type, use_cuda, parallel, save_dirname):
'PassID {0:1}, BatchID {1:04}, Test Loss {2:2.2}, Acc {3:2.2}'
.
'PassID {0:1}, BatchID {1:04}, Test Loss {2:2.2}, Acc {3:2.2}'
.
format
(
pass_id
,
batch_id
+
1
,
format
(
pass_id
,
batch_id
+
1
,
float
(
avg_loss_val
),
float
(
acc_val
)))
float
(
avg_loss_val
),
float
(
acc_val
)))
if
math
.
isnan
(
float
(
avg_loss_val
)):
sys
.
exit
(
"got NaN loss, training failed."
)
raise
AssertionError
(
"Loss of recognize digits is too large"
)
raise
AssertionError
(
"Loss of recognize digits is too large"
)
...
...
python/paddle/v2/fluid/tests/book/test_recommender_system.py
浏览文件 @
01c26972
...
@@ -12,6 +12,8 @@
...
@@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# See the License for the specific language governing permissions and
# limitations under the License.
# limitations under the License.
import
math
import
sys
import
numpy
as
np
import
numpy
as
np
import
paddle.v2
as
paddle
import
paddle.v2
as
paddle
import
paddle.v2.fluid.core
as
core
import
paddle.v2.fluid.core
as
core
...
@@ -217,6 +219,8 @@ def main():
...
@@ -217,6 +219,8 @@ def main():
if
out
[
0
]
<
6.0
:
if
out
[
0
]
<
6.0
:
# if avg cost less than 6.0, we think our code is good.
# if avg cost less than 6.0, we think our code is good.
exit
(
0
)
exit
(
0
)
if
math
.
isnan
(
float
(
out
[
0
])):
sys
.
exit
(
"got NaN loss, training failed."
)
main
()
main
()
python/paddle/v2/fluid/tests/book/test_rnn_encoder_decoder.py
浏览文件 @
01c26972
...
@@ -19,6 +19,8 @@ import paddle.v2.fluid.core as core
...
@@ -19,6 +19,8 @@ import paddle.v2.fluid.core as core
import
paddle.v2.fluid.framework
as
framework
import
paddle.v2.fluid.framework
as
framework
import
paddle.v2.fluid.layers
as
layers
import
paddle.v2.fluid.layers
as
layers
import
contextlib
import
contextlib
import
math
import
sys
import
unittest
import
unittest
from
paddle.v2.fluid.executor
import
Executor
from
paddle.v2.fluid.executor
import
Executor
...
@@ -207,7 +209,8 @@ def train(use_cuda, save_dirname=None):
...
@@ -207,7 +209,8 @@ def train(use_cuda, save_dirname=None):
avg_cost_val
=
np
.
array
(
outs
[
0
])
avg_cost_val
=
np
.
array
(
outs
[
0
])
print
(
'pass_id='
+
str
(
pass_id
)
+
' batch='
+
str
(
batch_id
)
+
print
(
'pass_id='
+
str
(
pass_id
)
+
' batch='
+
str
(
batch_id
)
+
" avg_cost="
+
str
(
avg_cost_val
))
" avg_cost="
+
str
(
avg_cost_val
))
if
math
.
isnan
(
float
(
avg_cost_val
[
0
])):
sys
.
exit
(
"got NaN loss, training failed."
)
if
batch_id
>
3
:
if
batch_id
>
3
:
if
save_dirname
is
not
None
:
if
save_dirname
is
not
None
:
fluid
.
io
.
save_inference_model
(
fluid
.
io
.
save_inference_model
(
...
...
python/paddle/v2/fluid/tests/book/test_understand_sentiment.py
浏览文件 @
01c26972
...
@@ -16,6 +16,8 @@ import unittest
...
@@ -16,6 +16,8 @@ import unittest
import
paddle.v2.fluid
as
fluid
import
paddle.v2.fluid
as
fluid
import
paddle.v2
as
paddle
import
paddle.v2
as
paddle
import
contextlib
import
contextlib
import
math
import
sys
def
convolution_net
(
data
,
label
,
input_dim
,
class_dim
=
2
,
emb_dim
=
32
,
def
convolution_net
(
data
,
label
,
input_dim
,
class_dim
=
2
,
emb_dim
=
32
,
...
@@ -115,6 +117,8 @@ def main(word_dict, net_method, use_cuda):
...
@@ -115,6 +117,8 @@ def main(word_dict, net_method, use_cuda):
print
(
"cost="
+
str
(
cost_val
)
+
" acc="
+
str
(
acc_val
))
print
(
"cost="
+
str
(
cost_val
)
+
" acc="
+
str
(
acc_val
))
if
cost_val
<
0.4
and
acc_val
>
0.8
:
if
cost_val
<
0.4
and
acc_val
>
0.8
:
return
return
if
math
.
isnan
(
float
(
cost_val
)):
sys
.
exit
(
"got NaN loss, training failed."
)
raise
AssertionError
(
"Cost is too large for {0}"
.
format
(
raise
AssertionError
(
"Cost is too large for {0}"
.
format
(
net_method
.
__name__
))
net_method
.
__name__
))
...
...
python/paddle/v2/fluid/tests/book/test_word2vec.py
浏览文件 @
01c26972
...
@@ -16,6 +16,8 @@ import paddle.v2 as paddle
...
@@ -16,6 +16,8 @@ import paddle.v2 as paddle
import
paddle.v2.fluid
as
fluid
import
paddle.v2.fluid
as
fluid
import
unittest
import
unittest
import
os
import
os
import
math
import
sys
def
main
(
use_cuda
,
is_sparse
,
parallel
):
def
main
(
use_cuda
,
is_sparse
,
parallel
):
...
@@ -112,6 +114,9 @@ def main(use_cuda, is_sparse, parallel):
...
@@ -112,6 +114,9 @@ def main(use_cuda, is_sparse, parallel):
fetch_list
=
[
avg_cost
])
fetch_list
=
[
avg_cost
])
if
avg_cost_np
[
0
]
<
5.0
:
if
avg_cost_np
[
0
]
<
5.0
:
return
return
if
math
.
isnan
(
float
(
avg_cost_np
[
0
])):
sys
.
exit
(
"got NaN loss, training failed."
)
raise
AssertionError
(
"Cost is too large {0:2.2}"
.
format
(
avg_cost_np
[
0
]))
raise
AssertionError
(
"Cost is too large {0:2.2}"
.
format
(
avg_cost_np
[
0
]))
...
@@ -153,4 +158,6 @@ for use_cuda in (False, True):
...
@@ -153,4 +158,6 @@ for use_cuda in (False, True):
inject_test_method
(
use_cuda
,
is_sparse
,
parallel
)
inject_test_method
(
use_cuda
,
is_sparse
,
parallel
)
if
__name__
==
'__main__'
:
if
__name__
==
'__main__'
:
# FIXME(tonyyang-svail):
# This test always fail on MultiGPU CI
unittest
.
main
()
unittest
.
main
()
python/paddle/v2/fluid/tests/test_parallel_op.py
浏览文件 @
01c26972
...
@@ -198,4 +198,7 @@ class ParallelOpTestMultipleInput(BaseParallelForTest):
...
@@ -198,4 +198,7 @@ class ParallelOpTestMultipleInput(BaseParallelForTest):
if
__name__
==
'__main__'
:
if
__name__
==
'__main__'
:
# FIXME(tonyyang-svail):
# This test always fail on MultiGPU CI
exit
(
0
)
unittest
.
main
()
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录