Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PARL
提交
2ad3c4c0
P
PARL
项目概览
PaddlePaddle
/
PARL
通知
68
Star
3
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
18
列表
看板
标记
里程碑
合并请求
3
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PARL
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
18
Issue
18
列表
看板
标记
里程碑
合并请求
3
合并请求
3
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
2ad3c4c0
编写于
8月 12, 2019
作者:
H
Hongsheng Zeng
提交者:
Bo Zhou
8月 12, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix bug of ParamAttr (#126)
* fix bug of ParamAttr * refine imports of unittest
上级
84c94cc4
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
18 addition
and
13 deletion
+18
-13
parl/algorithms/fluid/impala/tests/vtrace_test.py
parl/algorithms/fluid/impala/tests/vtrace_test.py
+1
-1
parl/core/fluid/layers/layer_wrappers.py
parl/core/fluid/layers/layer_wrappers.py
+2
-1
parl/core/fluid/layers/tests/param_name_test.py
parl/core/fluid/layers/tests/param_name_test.py
+7
-3
parl/core/fluid/layers/tests/param_sharing_test.py
parl/core/fluid/layers/tests/param_sharing_test.py
+2
-2
parl/core/fluid/tests/model_base_test.py
parl/core/fluid/tests/model_base_test.py
+6
-6
未找到文件。
parl/algorithms/fluid/impala/tests/vtrace_test.py
浏览文件 @
2ad3c4c0
...
@@ -20,7 +20,7 @@ https://github.com/deepmind/scalable_agent/blob/master/vtrace_test.py
...
@@ -20,7 +20,7 @@ https://github.com/deepmind/scalable_agent/blob/master/vtrace_test.py
import
copy
import
copy
import
numpy
as
np
import
numpy
as
np
import
unittest
import
unittest
from
parl
.core.fluid
import
layers
from
parl
import
layers
from
paddle
import
fluid
from
paddle
import
fluid
from
parameterized
import
parameterized
from
parameterized
import
parameterized
from
parl.algorithms.fluid.impala
import
vtrace
from
parl.algorithms.fluid.impala
import
vtrace
...
...
parl/core/fluid/layers/layer_wrappers.py
浏览文件 @
2ad3c4c0
...
@@ -16,7 +16,7 @@ Wrappers for fluid.layers. It helps to easily share parameters between layers.
...
@@ -16,7 +16,7 @@ Wrappers for fluid.layers. It helps to easily share parameters between layers.
Here is an example:
Here is an example:
```python
```python
import parl.layers as
layers
from parl import
layers
class MLPModel(Model):
class MLPModel(Model):
def __init__(self):
def __init__(self):
...
@@ -67,6 +67,7 @@ def update_attr_name(name, default_name, attr, is_bias):
...
@@ -67,6 +67,7 @@ def update_attr_name(name, default_name, attr, is_bias):
attr
.
name
=
name
attr
.
name
=
name
return
attr
return
attr
attr
=
ParamAttr
.
_to_attr
(
attr
)
name
=
(
default_name
if
name
is
None
else
name
)
name
=
(
default_name
if
name
is
None
else
name
)
suffix
=
"b"
if
is_bias
else
"w"
suffix
=
"b"
if
is_bias
else
"w"
new_name
=
unique_name
.
generate
(
name
+
"."
+
suffix
)
new_name
=
unique_name
.
generate
(
name
+
"."
+
suffix
)
...
...
parl/core/fluid/layers/tests/param_name_test.py
浏览文件 @
2ad3c4c0
...
@@ -12,18 +12,20 @@
...
@@ -12,18 +12,20 @@
# 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
parl.core.fluid.layers
as
layers
import
parl
from
paddle
import
fluid
from
parl
import
layers
import
unittest
import
unittest
from
parl.core.fluid.model
import
Model
class
MyNetWork
(
Model
):
class
MyNetWork
(
parl
.
Model
):
def
__init__
(
self
):
def
__init__
(
self
):
self
.
fc1
=
layers
.
fc
(
100
)
self
.
fc1
=
layers
.
fc
(
100
)
self
.
fc2
=
layers
.
fc
(
100
)
self
.
fc2
=
layers
.
fc
(
100
)
self
.
fc3
=
layers
.
fc
(
100
,
bias_attr
=
False
)
self
.
fc3
=
layers
.
fc
(
100
,
bias_attr
=
False
)
self
.
fc4
=
layers
.
fc
(
100
,
param_attr
=
False
)
self
.
fc4
=
layers
.
fc
(
100
,
param_attr
=
False
)
self
.
fc5
=
layers
.
fc
(
100
,
name
=
"fc"
,
bias_attr
=
False
)
self
.
fc5
=
layers
.
fc
(
100
,
name
=
"fc"
,
bias_attr
=
False
)
self
.
fc6
=
layers
.
fc
(
100
,
param_attr
=
fluid
.
initializer
.
Xavier
())
self
.
embedding
=
layers
.
embedding
((
100
,
128
))
self
.
embedding
=
layers
.
embedding
((
100
,
128
))
self
.
embedding_custom
=
layers
.
embedding
((
100
,
128
),
self
.
embedding_custom
=
layers
.
embedding
((
100
,
128
),
name
=
"embedding_custom"
)
name
=
"embedding_custom"
)
...
@@ -55,6 +57,8 @@ class TestParamName(unittest.TestCase):
...
@@ -55,6 +57,8 @@ class TestParamName(unittest.TestCase):
self
.
assertEqual
(
net
.
fc5
.
param_name
,
"fc.w_4"
)
self
.
assertEqual
(
net
.
fc5
.
param_name
,
"fc.w_4"
)
self
.
assertEqual
(
net
.
fc5
.
bias_name
,
None
)
self
.
assertEqual
(
net
.
fc5
.
bias_name
,
None
)
self
.
assertEqual
(
net
.
fc6
.
param_name
,
"fc.w_5"
)
## embedding layer has no bias
## embedding layer has no bias
self
.
assertEqual
(
net
.
embedding
.
param_name
,
"embedding.w_0"
)
self
.
assertEqual
(
net
.
embedding
.
param_name
,
"embedding.w_0"
)
self
.
assertEqual
(
net
.
embedding
.
bias_name
,
None
)
self
.
assertEqual
(
net
.
embedding
.
bias_name
,
None
)
...
...
parl/core/fluid/layers/tests/param_sharing_test.py
浏览文件 @
2ad3c4c0
...
@@ -14,12 +14,12 @@
...
@@ -14,12 +14,12 @@
import
numpy
as
np
import
numpy
as
np
import
paddle.fluid
as
fluid
import
paddle.fluid
as
fluid
import
parl
import
unittest
import
unittest
from
parl
import
layers
from
parl
import
layers
from
parl.core.fluid.model
import
Model
class
MyNetWork
(
Model
):
class
MyNetWork
(
parl
.
Model
):
def
__init__
(
self
):
def
__init__
(
self
):
self
.
fc1
=
layers
.
fc
(
64
,
bias_attr
=
False
)
self
.
fc1
=
layers
.
fc
(
64
,
bias_attr
=
False
)
self
.
fc2
=
layers
.
fc
(
64
,
bias_attr
=
False
)
self
.
fc2
=
layers
.
fc
(
64
,
bias_attr
=
False
)
...
...
parl/core/fluid/tests/model_base_test.py
浏览文件 @
2ad3c4c0
...
@@ -14,16 +14,16 @@
...
@@ -14,16 +14,16 @@
import
numpy
as
np
import
numpy
as
np
import
paddle.fluid
as
fluid
import
paddle.fluid
as
fluid
import
parl
.core.fluid.layers
as
layers
import
parl
import
unittest
import
unittest
from
copy
import
deepcopy
from
copy
import
deepcopy
from
paddle.fluid
import
ParamAttr
from
paddle.fluid
import
ParamAttr
from
parl
.core.fluid.model
import
Model
from
parl
import
layers
from
parl.utils
import
get_gpu_count
from
parl.utils
import
get_gpu_count
from
parl.core.fluid.plutils
import
fetch_value
from
parl.core.fluid.plutils
import
fetch_value
class
TestModel
(
Model
):
class
TestModel
(
parl
.
Model
):
def
__init__
(
self
):
def
__init__
(
self
):
self
.
fc1
=
layers
.
fc
(
self
.
fc1
=
layers
.
fc
(
size
=
256
,
size
=
256
,
...
@@ -48,7 +48,7 @@ class TestModel(Model):
...
@@ -48,7 +48,7 @@ class TestModel(Model):
return
out
return
out
class
TestModel2
(
Model
):
class
TestModel2
(
parl
.
Model
):
def
__init__
(
self
):
def
__init__
(
self
):
self
.
created_param
=
layers
.
create_parameter
(
self
.
created_param
=
layers
.
create_parameter
(
shape
=
[
100
],
shape
=
[
100
],
...
@@ -60,7 +60,7 @@ class TestModel2(Model):
...
@@ -60,7 +60,7 @@ class TestModel2(Model):
return
out
return
out
class
TestModel3
(
Model
):
class
TestModel3
(
parl
.
Model
):
def
__init__
(
self
):
def
__init__
(
self
):
self
.
fc1
=
layers
.
fc
(
64
,
bias_attr
=
False
)
self
.
fc1
=
layers
.
fc
(
64
,
bias_attr
=
False
)
self
.
batch_norm
=
layers
.
batch_norm
()
self
.
batch_norm
=
layers
.
batch_norm
()
...
@@ -71,7 +71,7 @@ class TestModel3(Model):
...
@@ -71,7 +71,7 @@ class TestModel3(Model):
return
out
return
out
class
TestModel4
(
Model
):
class
TestModel4
(
parl
.
Model
):
def
__init__
(
self
):
def
__init__
(
self
):
self
.
fc1
=
layers
.
fc
(
size
=
256
)
self
.
fc1
=
layers
.
fc
(
size
=
256
)
self
.
fc2
=
layers
.
fc
(
size
=
128
)
self
.
fc2
=
layers
.
fc
(
size
=
128
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录