Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ujs_wantz
Paddle
提交
7e5f0be7
P
Paddle
项目概览
ujs_wantz
/
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,发现更多精彩内容 >>
提交
7e5f0be7
编写于
4月 02, 2017
作者:
J
jacquesqiao
提交者:
GitHub
4月 02, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1736 from jacquesqiao/plot
refine plot_curve
上级
21fa3eb0
b38888f8
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
193 addition
and
49 deletion
+193
-49
python/CMakeLists.txt
python/CMakeLists.txt
+2
-1
python/paddle/v2/plot/__init__.py
python/paddle/v2/plot/__init__.py
+17
-0
python/paddle/v2/plot/plot.py
python/paddle/v2/plot/plot.py
+79
-0
python/paddle/v2/plot/plot_curve.py
python/paddle/v2/plot/plot_curve.py
+0
-48
python/paddle/v2/plot/tests/CMakeLists.txt
python/paddle/v2/plot/tests/CMakeLists.txt
+3
-0
python/paddle/v2/plot/tests/__init__.py
python/paddle/v2/plot/tests/__init__.py
+16
-0
python/paddle/v2/plot/tests/run_tests.sh
python/paddle/v2/plot/tests/run_tests.sh
+36
-0
python/paddle/v2/plot/tests/test_ploter.py
python/paddle/v2/plot/tests/test_ploter.py
+40
-0
未找到文件。
python/CMakeLists.txt
浏览文件 @
7e5f0be7
...
...
@@ -24,8 +24,9 @@ add_custom_target(paddle_python ALL DEPENDS
${
OUTPUT_DIR
}
/.timestamp
)
add_subdirectory
(
paddle/trainer_config_helpers/tests
)
add_subdirectory
(
paddle/v2/reader/tests
)
add_subdirectory
(
paddle/v2/tests
)
add_subdirectory
(
paddle/v2/reader/tests
)
add_subdirectory
(
paddle/v2/plot/tests
)
install
(
DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
/dist/
DESTINATION opt/paddle/share/wheels
...
...
python/paddle/v2/plot/__init__.py
0 → 100644
浏览文件 @
7e5f0be7
# 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.
from
plot
import
Ploter
__all__
=
[
'Ploter'
]
python/paddle/v2/plot/plot.py
0 → 100644
浏览文件 @
7e5f0be7
# 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.
import
os
class
PlotData
(
object
):
def
__init__
(
self
):
self
.
step
=
[]
self
.
value
=
[]
def
append
(
self
,
step
,
value
):
self
.
step
.
append
(
step
)
self
.
value
.
append
(
value
)
def
reset
(
self
):
self
.
step
=
[]
self
.
value
=
[]
class
Ploter
(
object
):
def
__init__
(
self
,
*
args
):
self
.
__args__
=
args
self
.
__plot_data__
=
{}
for
title
in
args
:
self
.
__plot_data__
[
title
]
=
PlotData
()
# demo in notebooks will use Ploter to plot figure, but when we convert
# the ipydb to py file for testing, the import of matplotlib will make the
# script crash. So we can use `export DISABLE_PLOT=True` to disable import
# these libs
self
.
__disable_plot__
=
os
.
environ
.
get
(
"DISABLE_PLOT"
)
if
not
self
.
__plot_is_disabled__
():
import
matplotlib.pyplot
as
plt
from
IPython
import
display
self
.
plt
=
plt
self
.
display
=
display
def
__plot_is_disabled__
(
self
):
return
self
.
__disable_plot__
==
"True"
def
append
(
self
,
title
,
step
,
value
):
assert
isinstance
(
title
,
basestring
)
assert
self
.
__plot_data__
.
has_key
(
title
)
data
=
self
.
__plot_data__
[
title
]
assert
isinstance
(
data
,
PlotData
)
data
.
append
(
step
,
value
)
def
plot
(
self
):
if
self
.
__plot_is_disabled__
():
return
titles
=
[]
for
title
in
self
.
__args__
:
data
=
self
.
__plot_data__
[
title
]
assert
isinstance
(
data
,
PlotData
)
if
len
(
data
.
step
)
>
0
:
titles
.
append
(
title
)
self
.
plt
.
plot
(
data
.
step
,
data
.
value
)
self
.
plt
.
legend
(
titles
,
loc
=
'upper left'
)
self
.
display
.
clear_output
(
wait
=
True
)
self
.
display
.
display
(
self
.
plt
.
gcf
())
self
.
plt
.
gcf
().
clear
()
def
reset
(
self
):
for
key
in
self
.
__plot_data__
:
data
=
self
.
__plot_data__
[
key
]
assert
isinstance
(
data
,
PlotData
)
data
.
reset
()
python/paddle/v2/plot/plot_curve.py
已删除
100644 → 0
浏览文件 @
21fa3eb0
from
IPython
import
display
import
os
class
PlotCost
(
object
):
"""
append train and test cost in event_handle and then call plot.
"""
def
__init__
(
self
):
self
.
train_costs
=
([],
[])
self
.
test_costs
=
([],
[])
self
.
__disable_plot__
=
os
.
environ
.
get
(
"DISABLE_PLOT"
)
if
not
self
.
__plot_is_disabled__
():
import
matplotlib.pyplot
as
plt
self
.
plt
=
plt
def
__plot_is_disabled__
(
self
):
return
self
.
__disable_plot__
==
"True"
def
plot
(
self
):
if
self
.
__plot_is_disabled__
():
return
self
.
plt
.
plot
(
*
self
.
train_costs
)
self
.
plt
.
plot
(
*
self
.
test_costs
)
title
=
[]
if
len
(
self
.
train_costs
[
0
])
>
0
:
title
.
append
(
'Train Cost'
)
if
len
(
self
.
test_costs
[
0
])
>
0
:
title
.
append
(
'Test Cost'
)
self
.
plt
.
legend
(
title
,
loc
=
'upper left'
)
display
.
clear_output
(
wait
=
True
)
display
.
display
(
self
.
plt
.
gcf
())
self
.
plt
.
gcf
().
clear
()
def
append_train_cost
(
self
,
step
,
cost
):
self
.
train_costs
[
0
].
append
(
step
)
self
.
train_costs
[
1
].
append
(
cost
)
def
append_test_cost
(
self
,
step
,
cost
):
self
.
test_costs
[
0
].
append
(
step
)
self
.
test_costs
[
1
].
append
(
cost
)
def
reset
(
self
):
self
.
train_costs
=
([],
[])
self
.
test_costs
=
([],
[])
python/paddle/v2/plot/tests/CMakeLists.txt
0 → 100644
浏览文件 @
7e5f0be7
add_test
(
NAME test_ploter
COMMAND bash
${
PROJ_ROOT
}
/python/paddle/v2/plot/tests/run_tests.sh
${
PYTHON_EXECUTABLE
}
)
python/paddle/v2/plot/tests/__init__.py
0 → 100644
浏览文件 @
7e5f0be7
# 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.
import
test_ploter
__all__
=
[
'test_ploter.py'
]
python/paddle/v2/plot/tests/run_tests.sh
0 → 100755
浏览文件 @
7e5f0be7
#!/bin/bash
# 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.
pushd
`
dirname
$0
`
>
/dev/null
SCRIPTPATH
=
$PWD
popd
>
/dev/null
cd
$SCRIPTPATH
$1
-m
pip
install
../../../../../paddle/dist/
*
.whl
export
DISABLE_PLOT
=
"True"
test_list
=
"test_ploter.py"
export
PYTHONPATH
=
$PWD
/../../../../../python/
for
fn
in
$test_list
do
echo
"test
$fn
"
$1
$fn
if
[
$?
-ne
0
]
;
then
exit
1
fi
done
python/paddle/v2/plot/tests/test_ploter.py
0 → 100644
浏览文件 @
7e5f0be7
# 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.
import
unittest
from
paddle.v2.plot
import
Ploter
class
TestCommon
(
unittest
.
TestCase
):
def
test_append
(
self
):
title1
=
"title1"
title2
=
"title2"
plot_test
=
Ploter
(
title1
,
title2
)
plot_test
.
append
(
title1
,
1
,
2
)
plot_test
.
append
(
title1
,
2
,
5
)
plot_test
.
append
(
title2
,
3
,
4
)
self
.
assertEqual
(
plot_test
.
__plot_data__
[
title1
].
step
,
[
1
,
2
])
self
.
assertEqual
(
plot_test
.
__plot_data__
[
title1
].
value
,
[
2
,
5
])
self
.
assertEqual
(
plot_test
.
__plot_data__
[
title2
].
step
,
[
3
])
self
.
assertEqual
(
plot_test
.
__plot_data__
[
title2
].
value
,
[
4
])
plot_test
.
reset
()
self
.
assertEqual
(
plot_test
.
__plot_data__
[
title1
].
step
,
[])
self
.
assertEqual
(
plot_test
.
__plot_data__
[
title1
].
value
,
[])
self
.
assertEqual
(
plot_test
.
__plot_data__
[
title2
].
step
,
[])
self
.
assertEqual
(
plot_test
.
__plot_data__
[
title2
].
value
,
[])
if
__name__
==
'__main__'
:
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录