Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
4afaaa4b
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2299
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
4afaaa4b
编写于
12月 12, 2016
作者:
Y
Yu Yang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Autoformat all files
上级
94538798
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
70 addition
and
75 deletion
+70
-75
WORKSPACE
WORKSPACE
+9
-11
demo/sentiment/predict.py
demo/sentiment/predict.py
+5
-6
python/paddle/trainer/config_parser.py
python/paddle/trainer/config_parser.py
+4
-0
python/paddle/trainer_config_helpers/default_decorators.py
python/paddle/trainer_config_helpers/default_decorators.py
+3
-0
python/paddle/trainer_config_helpers/tests/configs/test_config_parser_for_non_file_config.py
...s/tests/configs/test_config_parser_for_non_file_config.py
+23
-21
python/paddle/trainer_config_helpers/tests/test_reset_hook.py
...on/paddle/trainer_config_helpers/tests/test_reset_hook.py
+5
-5
third_party/gtest.BUILD
third_party/gtest.BUILD
+7
-13
third_party/protobuf_test/BUILD
third_party/protobuf_test/BUILD
+13
-16
third_party/protobuf_test/example_lib.cc
third_party/protobuf_test/example_lib.cc
+1
-3
未找到文件。
WORKSPACE
浏览文件 @
4afaaa4b
# External dependency to Google protobuf.
http_archive
(
name
=
"protobuf"
,
url
=
"http://github.com/google/protobuf/archive/v3.1.0.tar.gz"
,
sha256
=
"0a0ae63cbffc274efb573bdde9a253e3f32e458c41261df51c5dbc5ad541e8f7"
,
strip_prefix
=
"protobuf-3.1.0"
,
)
name
=
"protobuf"
,
url
=
"http://github.com/google/protobuf/archive/v3.1.0.tar.gz"
,
sha256
=
"0a0ae63cbffc274efb573bdde9a253e3f32e458c41261df51c5dbc5ad541e8f7"
,
strip_prefix
=
"protobuf-3.1.0"
,
)
# External dependency to gtest 1.7.0. This method comes from
# https://www.bazel.io/versions/master/docs/tutorial/cpp.html.
new_http_archive
(
name
=
"gtest"
,
url
=
"https://github.com/google/googletest/archive/release-1.7.0.zip"
,
sha256
=
"b58cb7547a28b2c718d1e38aee18a3659c9e3ff52440297e965f5edffe34b6d0"
,
build_file
=
"third_party/gtest.BUILD"
,
strip_prefix
=
"googletest-release-1.7.0"
,
)
name
=
"gtest"
,
url
=
"https://github.com/google/googletest/archive/release-1.7.0.zip"
,
sha256
=
"b58cb7547a28b2c718d1e38aee18a3659c9e3ff52440297e965f5edffe34b6d0"
,
build_file
=
"third_party/gtest.BUILD"
,
strip_prefix
=
"googletest-release-1.7.0"
,
)
demo/sentiment/predict.py
浏览文件 @
4afaaa4b
...
...
@@ -71,9 +71,7 @@ class SentimentPrediction():
transform word into integer index according to the dictionary.
"""
words
=
data
.
strip
().
split
()
word_slot
=
[
self
.
word_dict
[
w
]
for
w
in
words
if
w
in
self
.
word_dict
]
word_slot
=
[
self
.
word_dict
[
w
]
for
w
in
words
if
w
in
self
.
word_dict
]
return
word_slot
def
batch_predict
(
self
,
data_batch
):
...
...
@@ -85,8 +83,8 @@ class SentimentPrediction():
if
self
.
label
is
None
:
print
(
"predicting label is %d"
%
(
lab
[
0
]))
else
:
print
(
"predicting label is %s"
%
(
self
.
label
[
lab
[
0
]]))
print
(
"predicting label is %s"
%
(
self
.
label
[
lab
[
0
]]))
def
option_parser
():
usage
=
"python predict.py -n config -w model_dir -d dictionary -i input_file "
...
...
@@ -143,9 +141,10 @@ def main():
batch
.
append
([
predict
.
get_index
(
line
)])
if
len
(
batch
)
==
batch_size
:
predict
.
batch_predict
(
batch
)
batch
=
[]
batch
=
[]
if
len
(
batch
)
>
0
:
predict
.
batch_predict
(
batch
)
if
__name__
==
'__main__'
:
main
()
python/paddle/trainer/config_parser.py
浏览文件 @
4afaaa4b
...
...
@@ -3364,7 +3364,10 @@ def my_fatal(s):
logger
.
critical
(
s
)
raise
Exception
()
_parse_config_hooks
=
set
()
def
register_parse_config_hook
(
f
):
"""
Register a hook function for parse_config. parse_config will invoke the hook
...
...
@@ -3373,6 +3376,7 @@ def register_parse_config_hook(f):
"""
_parse_config_hooks
.
add
(
f
)
def
parse_config
(
config_file
,
config_arg_str
):
'''
@param config_arg_str: a string of the form var1=val1,var2=val2. It will be
...
...
python/paddle/trainer_config_helpers/default_decorators.py
浏览文件 @
4afaaa4b
...
...
@@ -84,12 +84,15 @@ class DefaultNameFactory(object):
_name_factories
=
[]
def
reset_hook
():
for
factory
in
_name_factories
:
factory
.
reset
()
register_parse_config_hook
(
reset_hook
)
def
wrap_name_default
(
name_prefix
=
None
):
"""
Decorator to set "name" arguments default to "{name_prefix}_{invoke_count}".
...
...
python/paddle/trainer_config_helpers/tests/configs/test_config_parser_for_non_file_config.py
浏览文件 @
4afaaa4b
...
...
@@ -17,33 +17,35 @@ import sys
import
re
import
getopt
def
main
(
print_whole_config
,
globals
,
locals
):
'''
'''
this test will all test_config.py
'''
cmdstr
=
"""from paddle.trainer.config_parser import parse_config
\n
"""
importstr
=
""
functionstr
=
""
cmdstr
=
"""from paddle.trainer.config_parser import parse_config
\n
"""
importstr
=
""
functionstr
=
""
for
line
in
sys
.
stdin
:
if
re
.
match
(
"^import"
,
line
)
or
re
.
match
(
"^from.*import"
,
line
):
importstr
=
importstr
+
line
else
:
functionstr
=
functionstr
+
" "
+
line
for
line
in
sys
.
stdin
:
if
re
.
match
(
"^import"
,
line
)
or
re
.
match
(
"^from.*import"
,
line
):
importstr
=
importstr
+
line
cmdstr
=
cmdstr
+
importstr
+
"""def configs():
\n
"""
+
functionstr
#cmdstr = cmdstr + """def configs():\n""" + importstr + functionstr
if
print_whole_config
:
cmdstr
=
cmdstr
+
"""print parse_config(configs, "")"""
else
:
functionstr
=
functionstr
+
" "
+
line
cmdstr
=
cmdstr
+
"""print parse_config(configs, "").model_config"""
cmdstr
=
cmdstr
+
importstr
+
"""def configs():
\n
"""
+
functionstr
#cmdstr = cmdstr + """def configs():\n""" + importstr + functionstr
if
print_whole_config
:
cmdstr
=
cmdstr
+
"""print parse_config(configs, "")"""
else
:
cmdstr
=
cmdstr
+
"""print parse_config(configs, "").model_config"""
exec
(
cmdstr
,
globals
,
locals
)
exec
(
cmdstr
,
globals
,
locals
)
if
__name__
==
'__main__'
:
whole
=
False
opts
,
args
=
getopt
.
getopt
(
sys
.
argv
[
1
:],
""
,
[
"whole"
])
for
op
,
value
in
opts
:
if
op
==
"--whole"
:
whole
=
True
main
(
whole
,
globals
(),
locals
())
whole
=
False
opts
,
args
=
getopt
.
getopt
(
sys
.
argv
[
1
:],
""
,
[
"whole"
])
for
op
,
value
in
opts
:
if
op
==
"--whole"
:
whole
=
True
main
(
whole
,
globals
(),
locals
())
python/paddle/trainer_config_helpers/tests/test_reset_hook.py
浏览文件 @
4afaaa4b
...
...
@@ -14,13 +14,13 @@
import
unittest
from
paddle.trainer.config_parser
import
parse_config
class
TestParse
(
unittest
.
TestCase
):
class
TestParse
(
unittest
.
TestCase
):
def
test_parse
(
self
):
a
=
parse_config
(
'trainer_config_helpers/tests/layers_test_config.py'
,
''
)
b
=
parse_config
(
'trainer_config_helpers/tests/layers_test_config.py'
,
''
)
a
=
parse_config
(
'trainer_config_helpers/tests/layers_test_config.py'
,
''
)
b
=
parse_config
(
'trainer_config_helpers/tests/layers_test_config.py'
,
''
)
self
.
assertEqual
(
a
,
b
)
...
...
third_party/gtest.BUILD
浏览文件 @
4afaaa4b
cc_library(
name = "main",
srcs = glob(
["src/*.cc"],
exclude = ["src/gtest-all.cc"]
),
hdrs = glob([
"include/**/*.h",
"src/*.h"
]),
copts = ["-Iexternal/gtest/include"],
linkopts = ["-pthread"],
visibility = ["//visibility:public"],
)
name="main",
srcs=glob(
["src/*.cc"], exclude=["src/gtest-all.cc"]),
hdrs=glob(["include/**/*.h", "src/*.h"]),
copts=["-Iexternal/gtest/include"],
linkopts=["-pthread"],
visibility=["//visibility:public"], )
third_party/protobuf_test/BUILD
浏览文件 @
4afaaa4b
...
...
@@ -3,25 +3,22 @@ licenses(["notice"]) # Apache 2.0
load
(
"@protobuf//:protobuf.bzl"
,
"cc_proto_library"
)
cc_proto_library
(
name
=
"example_proto"
,
srcs
=
[
"example.proto"
],
protoc
=
"@protobuf//:protoc"
,
default_runtime
=
"@protobuf//:protobuf"
,
)
name
=
"example_proto"
,
srcs
=
[
"example.proto"
],
protoc
=
"@protobuf//:protoc"
,
default_runtime
=
"@protobuf//:protobuf"
,
)
cc_library
(
name
=
"example_lib"
,
srcs
=
[
"example_lib.cc"
],
hdrs
=
[
"example_lib.h"
],
deps
=
[
":example_proto"
],
)
name
=
"example_lib"
,
srcs
=
[
"example_lib.cc"
],
hdrs
=
[
"example_lib.h"
],
deps
=
[
":example_proto"
],
)
cc_test
(
name
=
"example_lib_test"
,
srcs
=
[
"example_lib_test.cc"
],
copts
=
[
"-Iexternal/gtest/include"
],
deps
=
[
name
=
"example_lib_test"
,
srcs
=
[
"example_lib_test.cc"
],
copts
=
[
"-Iexternal/gtest/include"
],
deps
=
[
"@gtest//:main"
,
":example_lib"
,
],
)
],
)
third_party/protobuf_test/example_lib.cc
浏览文件 @
4afaaa4b
...
...
@@ -3,9 +3,7 @@
namespace
third_party
{
namespace
protobuf_test
{
std
::
string
get_greet
(
const
Greeting
&
who
)
{
return
"Hello "
+
who
.
name
();
}
std
::
string
get_greet
(
const
Greeting
&
who
)
{
return
"Hello "
+
who
.
name
();
}
}
// namespace protobuf_test
}
// namespace thrid_party
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录