Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
溜达小灰鼠
Paddle
提交
1faf5e03
P
Paddle
项目概览
溜达小灰鼠
/
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,发现更多精彩内容 >>
提交
1faf5e03
编写于
7月 15, 2017
作者:
Y
Yu Yang
提交者:
GitHub
7月 15, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2864 from reyoung/feature/op_creation_methods
Get OpProtos in Python
上级
9b8451cc
d7405e1e
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
70 addition
and
26 deletion
+70
-26
paddle/framework/op_registry.h
paddle/framework/op_registry.h
+5
-5
paddle/pybind/CMakeLists.txt
paddle/pybind/CMakeLists.txt
+1
-1
paddle/pybind/pybind.cc
paddle/pybind/pybind.cc
+21
-0
python/paddle/v2/__init__.py
python/paddle/v2/__init__.py
+1
-3
python/paddle/v2/data_feeder.py
python/paddle/v2/data_feeder.py
+0
-1
python/paddle/v2/event.py
python/paddle/v2/event.py
+1
-2
python/paddle/v2/framework/create_op_creation_methods.py
python/paddle/v2/framework/create_op_creation_methods.py
+11
-0
python/paddle/v2/framework/tests/CMakeLists.txt
python/paddle/v2/framework/tests/CMakeLists.txt
+1
-1
python/paddle/v2/framework/tests/test_op_creation_methods.py
python/paddle/v2/framework/tests/test_op_creation_methods.py
+15
-0
python/paddle/v2/inference.py
python/paddle/v2/inference.py
+2
-2
python/paddle/v2/optimizer.py
python/paddle/v2/optimizer.py
+2
-2
python/paddle/v2/parameters.py
python/paddle/v2/parameters.py
+3
-2
python/paddle/v2/trainer.py
python/paddle/v2/trainer.py
+5
-6
python/setup.py.in
python/setup.py.in
+2
-1
未找到文件。
paddle/framework/op_registry.h
浏览文件 @
1faf5e03
...
...
@@ -216,17 +216,17 @@ class OpRegistry {
return
op
;
}
static
std
::
unordered_map
<
std
::
string
,
OpProto
>&
protos
()
{
static
std
::
unordered_map
<
std
::
string
,
OpProto
>
protos_
;
return
protos_
;
};
private:
static
std
::
unordered_map
<
std
::
string
,
OpCreator
>&
creators
()
{
static
std
::
unordered_map
<
std
::
string
,
OpCreator
>
creators_
;
return
creators_
;
}
static
std
::
unordered_map
<
std
::
string
,
OpProto
>&
protos
()
{
static
std
::
unordered_map
<
std
::
string
,
OpProto
>
protos_
;
return
protos_
;
};
static
std
::
unordered_map
<
std
::
string
,
OpAttrChecker
>&
op_checkers
()
{
static
std
::
unordered_map
<
std
::
string
,
OpAttrChecker
>
op_checkers_
;
return
op_checkers_
;
...
...
paddle/pybind/CMakeLists.txt
浏览文件 @
1faf5e03
cc_library
(
paddle_pybind SHARED SRCS pybind.cc DEPS pybind python
)
cc_library
(
paddle_pybind SHARED SRCS pybind.cc DEPS pybind python
add_op
)
paddle/pybind/pybind.cc
浏览文件 @
1faf5e03
...
...
@@ -13,12 +13,18 @@ See the License for the specific language governing permissions and
limitations under the License. */
#include <Python.h>
#include <paddle/framework/op_registry.h>
#include <paddle/framework/scope.h>
#include <pybind11/pybind11.h>
#include <pybind11/stl.h>
#include <fstream>
#include <vector>
namespace
py
=
pybind11
;
namespace
pd
=
paddle
::
framework
;
USE_OP
(
add_two
);
PYBIND11_PLUGIN
(
core
)
{
py
::
module
m
(
"core"
,
"C++ core of Paddle Paddle"
);
...
...
@@ -43,5 +49,20 @@ All parameter, weight, gradient are variables in Paddle.
&
pd
::
Scope
::
CreateVariable
,
py
::
return_value_policy
::
reference
);
//! @note: Be careful! PyBind will return std::string as an unicode, not
//! Python str. If you want a str object, you should cast them in Python.
m
.
def
(
"get_all_op_protos"
,
[]()
->
std
::
vector
<
std
::
string
>
{
auto
&
protos
=
pd
::
OpRegistry
::
protos
();
std
::
vector
<
std
::
string
>
ret_values
;
for
(
auto
it
=
protos
.
begin
();
it
!=
protos
.
end
();
++
it
)
{
PADDLE_ENFORCE
(
it
->
second
.
IsInitialized
(),
"OpProto must all be initialized"
);
ret_values
.
emplace_back
();
PADDLE_ENFORCE
(
it
->
second
.
SerializeToString
(
&
ret_values
.
back
()),
"Serialize OpProto Error. This could be a bug of Paddle."
);
}
return
ret_values
;
});
return
m
.
ptr
();
}
python/paddle/v2/__init__.py
浏览文件 @
1faf5e03
...
...
@@ -20,7 +20,6 @@ import trainer
import
event
import
data_type
import
topology
import
data_feeder
import
networks
import
evaluator
from
.
import
dataset
...
...
@@ -31,7 +30,6 @@ import op
import
pooling
import
inference
import
networks
import
py_paddle.swig_paddle
as
api
import
minibatch
import
plot
import
image
...
...
@@ -47,7 +45,6 @@ __all__ = [
'data_type'
,
'attr'
,
'pooling'
,
'data_feeder'
,
'dataset'
,
'reader'
,
'topology'
,
...
...
@@ -61,6 +58,7 @@ __all__ = [
def
init
(
**
kwargs
):
import
py_paddle.swig_paddle
as
api
args
=
[]
args_dict
=
{}
# NOTE: append arguments if they are in ENV
...
...
python/paddle/v2/data_feeder.py
浏览文件 @
1faf5e03
...
...
@@ -11,7 +11,6 @@
# 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
py_paddle
import
DataProviderConverter
import
collections
import
paddle.trainer.PyDataProvider2
as
pydp2
...
...
python/paddle/v2/event.py
浏览文件 @
1faf5e03
...
...
@@ -9,8 +9,6 @@ There are:
* BeginPass
* EndPass
"""
import
py_paddle.swig_paddle
as
api
__all__
=
[
'EndIteration'
,
'BeginIteration'
,
'BeginPass'
,
'EndPass'
,
'TestResult'
]
...
...
@@ -18,6 +16,7 @@ __all__ = [
class
WithMetric
(
object
):
def
__init__
(
self
,
evaluator
):
import
py_paddle.swig_paddle
as
api
if
not
isinstance
(
evaluator
,
api
.
Evaluator
):
raise
TypeError
(
"Evaluator should be api.Evaluator type"
)
self
.
__evaluator__
=
evaluator
...
...
python/paddle/v2/framework/create_op_creation_methods.py
0 → 100644
浏览文件 @
1faf5e03
import
paddle.v2.framework.core
as
core
import
paddle.v2.framework.proto.op_proto_pb2
as
op_proto_pb2
def
get_all_op_protos
():
protostrs
=
core
.
get_all_op_protos
()
ret_values
=
[]
for
pbstr
in
protostrs
:
op_proto
=
op_proto_pb2
.
OpProto
.
FromString
(
str
(
pbstr
))
ret_values
.
append
(
op_proto
)
return
ret_values
python/paddle/v2/framework/tests/CMakeLists.txt
浏览文件 @
1faf5e03
add_python_test
(
test_framework test_protobuf.py test_scope.py
test_default_scope_funcs.py
)
test_default_scope_funcs.py
test_op_creation_methods.py
)
python/paddle/v2/framework/tests/test_op_creation_methods.py
0 → 100644
浏览文件 @
1faf5e03
import
unittest
import
paddle.v2.framework.create_op_creation_methods
as
creation
class
TestOpCreationsMethods
(
unittest
.
TestCase
):
def
test_all_protos
(
self
):
all_protos
=
creation
.
get_all_op_protos
()
self
.
assertNotEqual
(
0
,
len
(
all_protos
))
for
each
in
all_protos
:
self
.
assertTrue
(
each
.
IsInitialized
())
if
__name__
==
"__main__"
:
unittest
.
main
()
python/paddle/v2/inference.py
浏览文件 @
1faf5e03
import
numpy
import
py_paddle.swig_paddle
as
api
import
collections
import
topology
import
minibatch
from
data_feeder
import
DataFeeder
__all__
=
[
'infer'
,
'Inference'
]
...
...
@@ -28,6 +26,7 @@ class Inference(object):
"""
def
__init__
(
self
,
output_layer
,
parameters
):
import
py_paddle.swig_paddle
as
api
topo
=
topology
.
Topology
(
output_layer
)
gm
=
api
.
GradientMachine
.
createFromConfigProto
(
topo
.
proto
(),
api
.
CREATE_MODE_TESTING
,
[
api
.
PARAMETER_VALUE
])
...
...
@@ -40,6 +39,7 @@ class Inference(object):
self
.
__data_types__
=
topo
.
data_type
()
def
iter_infer
(
self
,
input
,
feeding
=
None
):
from
data_feeder
import
DataFeeder
feeder
=
DataFeeder
(
self
.
__data_types__
,
feeding
)
batch_size
=
len
(
input
)
...
...
python/paddle/v2/optimizer.py
浏览文件 @
1faf5e03
import
py_paddle.swig_paddle
as
swig_api
import
paddle.trainer_config_helpers.config_parser_utils
as
config_parser_utils
import
paddle.trainer_config_helpers.optimizers
as
v1_optimizers
"""
...
...
@@ -18,6 +16,7 @@ __all__ = [
class
Optimizer
(
object
):
def
__init__
(
self
,
**
kwargs
):
import
py_paddle.swig_paddle
as
swig_api
if
'batch_size'
in
kwargs
:
del
kwargs
[
'batch_size'
]
# not important for python library.
...
...
@@ -268,6 +267,7 @@ ModelAverage = v1_optimizers.ModelAverage
L2Regularization
=
v1_optimizers
.
L2Regularization
if
__name__
==
'__main__'
:
import
py_paddle.swig_paddle
as
swig_api
swig_api
.
initPaddle
(
'--use_gpu=false'
)
for
opt
in
[
Momentum
(),
Adam
(),
Adamax
(),
AdaGrad
(),
DecayedAdaGrad
(),
...
...
python/paddle/v2/parameters.py
浏览文件 @
1faf5e03
import
numpy
as
np
import
py_paddle.swig_paddle
as
api
from
paddle.proto.ParameterConfig_pb2
import
ParameterConfig
import
paddle.trainer.config_parser
as
cp
import
struct
...
...
@@ -124,6 +123,7 @@ class Parameters(object):
:return: parameter value
:rtype: np.ndarray
"""
import
py_paddle.swig_paddle
as
api
shape
=
self
.
get_shape
(
key
)
if
len
(
self
.
__gradient_machines__
)
==
0
:
...
...
@@ -223,7 +223,7 @@ class Parameters(object):
:type gradient_machine: api.GradientMachine
:return:
"""
import
py_paddle.swig_paddle
as
api
if
not
isinstance
(
gradient_machine
,
api
.
GradientMachine
):
raise
ValueError
(
"gradient_machine should be api.GradientMachine"
)
...
...
@@ -359,6 +359,7 @@ def __copy_parameter_to_gradient_machine__(gradient_machine, name, arr):
:return:
:rtype: api.Parameter
"""
import
py_paddle.swig_paddle
as
api
param
=
__get_parameter_in_gradient_machine__
(
gradient_machine
,
name
)
vec
=
param
.
getBuf
(
api
.
PARAMETER_VALUE
)
assert
isinstance
(
vec
,
api
.
Vector
)
...
...
python/paddle/v2/trainer.py
浏览文件 @
1faf5e03
...
...
@@ -2,12 +2,6 @@
Module Trainer
"""
import
collections
import
gzip
import
os
import
py_paddle.swig_paddle
as
api
from
data_feeder
import
DataFeeder
from
topology
import
Topology
from
.
import
event
as
v2_event
from
.
import
optimizer
as
v2_optimizer
...
...
@@ -59,6 +53,7 @@ class SGD(object):
if
not
isinstance
(
update_equation
,
v2_optimizer
.
Optimizer
):
raise
TypeError
(
"update equation parameter must be "
"paddle.v2.optimizer.Optimizer"
)
import
py_paddle.swig_paddle
as
api
topology
=
Topology
(
cost
,
extra_layers
=
extra_layers
)
self
.
__optimizer__
=
update_equation
self
.
__topology__
=
topology
...
...
@@ -124,6 +119,8 @@ class SGD(object):
:type feeding: dict|list
:return:
"""
import
py_paddle.swig_paddle
as
api
from
data_feeder
import
DataFeeder
if
event_handler
is
None
:
event_handler
=
default_event_handler
__check_train_args__
(
**
locals
())
...
...
@@ -187,6 +184,8 @@ class SGD(object):
:type feeding: dict
:return:
"""
import
py_paddle.swig_paddle
as
api
from
data_feeder
import
DataFeeder
feeder
=
DataFeeder
(
self
.
__data_types__
,
feeding
)
evaluator
=
self
.
__gradient_machine__
.
makeEvaluator
()
out_args
=
api
.
Arguments
.
createArguments
(
0
)
...
...
python/setup.py.in
浏览文件 @
1faf5e03
...
...
@@ -19,7 +19,8 @@ setup_requires=["requests",
"recordio",
"matplotlib",
"rarfile",
"scipy>=0.19.0"]
"scipy>=0.19.0",
"nltk"]
if '${CMAKE_SYSTEM_PROCESSOR}' not in ['arm', 'armv7-a', 'aarch64']:
setup_requires+=["opencv-python"]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录