Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleHub
提交
1ce7581a
P
PaddleHub
项目概览
PaddlePaddle
/
PaddleHub
大约 1 年 前同步成功
通知
282
Star
12117
Fork
2091
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
200
列表
看板
标记
里程碑
合并请求
4
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleHub
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
200
Issue
200
列表
看板
标记
里程碑
合并请求
4
合并请求
4
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
1ce7581a
编写于
5月 12, 2020
作者:
K
kinghuin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix bugs
上级
2341277b
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
23 addition
and
24 deletion
+23
-24
paddlehub/finetune/strategy.py
paddlehub/finetune/strategy.py
+4
-7
paddlehub/finetune/task/base_task.py
paddlehub/finetune/task/base_task.py
+12
-12
paddlehub/finetune/task/reading_comprehension_task.py
paddlehub/finetune/task/reading_comprehension_task.py
+1
-1
paddlehub/module/nlp_module.py
paddlehub/module/nlp_module.py
+5
-3
paddlehub/reader/nlp_reader.py
paddlehub/reader/nlp_reader.py
+1
-1
未找到文件。
paddlehub/finetune/strategy.py
浏览文件 @
1ce7581a
...
@@ -511,10 +511,6 @@ class CombinedStrategy(DefaultStrategy):
...
@@ -511,10 +511,6 @@ class CombinedStrategy(DefaultStrategy):
unfreeze_depths
=
self
.
unfreeze_depths
=
self
.
sorted_depth
[:
self
.
max_depth
*
self
.
epoch
//
sorted_depth
[:
self
.
max_depth
*
self
.
epoch
//
self
.
scheduler
[
"gradual_unfreeze"
][
"blocks"
]])
self
.
scheduler
[
"gradual_unfreeze"
][
"blocks"
]])
else
:
logger
.
warning
(
"The max op-depth in the network is %s. That results in that can't use the gradual unfreeze finetune strategy."
%
(
self
.
max_depth
))
elif
self
.
scheduler
[
"gradual_unfreeze"
][
"params_layer"
]:
elif
self
.
scheduler
[
"gradual_unfreeze"
][
"params_layer"
]:
max_layer
=
max
(
max_layer
=
max
(
self
.
scheduler
[
"gradual_unfreeze"
][
"params_layer"
].
values
())
self
.
scheduler
[
"gradual_unfreeze"
][
"params_layer"
].
values
())
...
@@ -631,8 +627,9 @@ class ULMFiTStrategy(CombinedStrategy):
...
@@ -631,8 +627,9 @@ class ULMFiTStrategy(CombinedStrategy):
ratio
=
32
,
ratio
=
32
,
dis_blocks
=
3
,
dis_blocks
=
3
,
factor
=
2.6
,
factor
=
2.6
,
dis_params_layer
=
None
,
frz_blocks
=
3
,
frz_blocks
=
3
,
params_layer
=
None
):
frz_
params_layer
=
None
):
scheduler
=
{
scheduler
=
{
"slanted_triangle"
:
{
"slanted_triangle"
:
{
...
@@ -641,12 +638,12 @@ class ULMFiTStrategy(CombinedStrategy):
...
@@ -641,12 +638,12 @@ class ULMFiTStrategy(CombinedStrategy):
},
},
"gradual_unfreeze"
:
{
"gradual_unfreeze"
:
{
"blocks"
:
frz_blocks
,
"blocks"
:
frz_blocks
,
"params_layer"
:
params_layer
"params_layer"
:
frz_
params_layer
},
},
"discriminative"
:
{
"discriminative"
:
{
"blocks"
:
dis_blocks
,
"blocks"
:
dis_blocks
,
"factor"
:
factor
,
"factor"
:
factor
,
"params_layer"
:
params_layer
"params_layer"
:
dis_
params_layer
}
}
}
}
regularization
=
{}
regularization
=
{}
...
...
paddlehub/finetune/task/base_task.py
浏览文件 @
1ce7581a
...
@@ -951,12 +951,6 @@ class BaseTask(object):
...
@@ -951,12 +951,6 @@ class BaseTask(object):
Returns:
Returns:
RunState: the running result of predict phase
RunState: the running result of predict phase
"""
"""
if
isinstance
(
self
.
_base_data_reader
,
hub
.
reader
.
LACClassifyReader
):
raise
Exception
(
"LACClassifyReader does not support predictor, please close accelerate_mode"
)
global_run_states
=
[]
global_run_states
=
[]
period_run_states
=
[]
period_run_states
=
[]
...
@@ -993,16 +987,22 @@ class BaseTask(object):
...
@@ -993,16 +987,22 @@ class BaseTask(object):
data (list): the data will be predicted.
data (list): the data will be predicted.
load_best_model (bool): load the best model or not
load_best_model (bool): load the best model or not
return_result (bool): return a readable result or just the raw run result
return_result (bool): return a readable result or just the raw run result
accelerate_mode (bool): use high-performance predictor or not
accelerate_mode (bool): use high-performance predictor or not
.
Returns:
Returns:
RunState: the running result of predict phase
RunState: the running result of predict phase
"""
"""
if
not
version_compare
(
paddle
.
__version__
,
"1.6.2"
)
and
accelerate_mode
:
if
accelerate_mode
:
logger
.
warning
(
if
not
version_compare
(
paddle
.
__version__
,
"1.6.1"
):
"Fail to open predict accelerate mode as it does not support paddle < 1.6.2. Please update PaddlePaddle."
logger
.
warning
(
)
"Fail to open predict accelerate mode as it does not support paddle < 1.6.2. Please update PaddlePaddle."
accelerate_mode
=
False
)
accelerate_mode
=
False
if
isinstance
(
self
.
_base_data_reader
,
hub
.
reader
.
LACClassifyReader
):
logger
.
warning
(
"LACClassifyReader does not support predictor, the accelerate_mode is closed now."
)
accelerate_mode
=
False
self
.
accelerate_mode
=
accelerate_mode
self
.
accelerate_mode
=
accelerate_mode
with
self
.
phase_guard
(
phase
=
"predict"
):
with
self
.
phase_guard
(
phase
=
"predict"
):
...
...
paddlehub/finetune/task/reading_comprehension_task.py
浏览文件 @
1ce7581a
...
@@ -205,7 +205,7 @@ def get_predictions(all_examples, all_features, all_results, n_best_size,
...
@@ -205,7 +205,7 @@ def get_predictions(all_examples, all_features, all_results, n_best_size,
for
(
feature_index
,
feature
)
in
enumerate
(
features
):
for
(
feature_index
,
feature
)
in
enumerate
(
features
):
if
feature
.
unique_id
not
in
unique_id_to_result
:
if
feature
.
unique_id
not
in
unique_id_to_result
:
logger
.
info
(
logger
.
info
(
"As using
pyreader
, the last one batch is so small that the feature %s in the last batch is discarded "
"As using
multidevice
, the last one batch is so small that the feature %s in the last batch is discarded "
%
feature
.
unique_id
)
%
feature
.
unique_id
)
continue
continue
result
=
unique_id_to_result
[
feature
.
unique_id
]
result
=
unique_id_to_result
[
feature
.
unique_id
]
...
...
paddlehub/module/nlp_module.py
浏览文件 @
1ce7581a
...
@@ -397,7 +397,8 @@ class TransformerModule(NLPBaseModule):
...
@@ -397,7 +397,8 @@ class TransformerModule(NLPBaseModule):
return
inputs
,
outputs
,
module_program
return
inputs
,
outputs
,
module_program
def
get_embedding
(
self
,
texts
,
use_gpu
=
False
,
batch_size
=
1
):
def
get_embedding
(
self
,
texts
,
max_seq_len
=
512
,
use_gpu
=
False
,
batch_size
=
1
):
"""
"""
get pooled_output and sequence_output for input texts.
get pooled_output and sequence_output for input texts.
Warnings: this method depends on Paddle Inference Library, it may not work properly in PaddlePaddle <= 1.6.2.
Warnings: this method depends on Paddle Inference Library, it may not work properly in PaddlePaddle <= 1.6.2.
...
@@ -405,6 +406,7 @@ class TransformerModule(NLPBaseModule):
...
@@ -405,6 +406,7 @@ class TransformerModule(NLPBaseModule):
Args:
Args:
texts (list): each element is a text sample, each sample include text_a and text_b where text_b can be omitted.
texts (list): each element is a text sample, each sample include text_a and text_b where text_b can be omitted.
for example: [[sample0_text_a, sample0_text_b], [sample1_text_a, sample1_text_b], ...]
for example: [[sample0_text_a, sample0_text_b], [sample1_text_a, sample1_text_b], ...]
max_seq_len (int): the max sequence length.
use_gpu (bool): use gpu or not, default False.
use_gpu (bool): use gpu or not, default False.
batch_size (int): the data batch size, default 1.
batch_size (int): the data batch size, default 1.
...
@@ -417,12 +419,12 @@ class TransformerModule(NLPBaseModule):
...
@@ -417,12 +419,12 @@ class TransformerModule(NLPBaseModule):
)
or
self
.
emb_job
[
"batch_size"
]
!=
batch_size
or
self
.
emb_job
[
)
or
self
.
emb_job
[
"batch_size"
]
!=
batch_size
or
self
.
emb_job
[
"use_gpu"
]
!=
use_gpu
:
"use_gpu"
]
!=
use_gpu
:
inputs
,
outputs
,
program
=
self
.
context
(
inputs
,
outputs
,
program
=
self
.
context
(
trainable
=
True
,
max_seq_len
=
self
.
MAX_SEQ_LEN
)
trainable
=
True
,
max_seq_len
=
max_seq_len
)
reader
=
hub
.
reader
.
ClassifyReader
(
reader
=
hub
.
reader
.
ClassifyReader
(
dataset
=
None
,
dataset
=
None
,
vocab_path
=
self
.
get_vocab_path
(),
vocab_path
=
self
.
get_vocab_path
(),
max_seq_len
=
self
.
MAX_SEQ_LEN
,
max_seq_len
=
max_seq_len
,
sp_model_path
=
self
.
get_spm_path
()
if
hasattr
(
sp_model_path
=
self
.
get_spm_path
()
if
hasattr
(
self
,
"get_spm_path"
)
else
None
,
self
,
"get_spm_path"
)
else
None
,
word_dict_path
=
self
.
get_word_dict_path
()
if
hasattr
(
word_dict_path
=
self
.
get_word_dict_path
()
if
hasattr
(
...
...
paddlehub/reader/nlp_reader.py
浏览文件 @
1ce7581a
...
@@ -1213,7 +1213,7 @@ class LACClassifyReader(BaseReader):
...
@@ -1213,7 +1213,7 @@ class LACClassifyReader(BaseReader):
return
processed
return
processed
if
not
self
.
has_processed
[
phase
]:
if
not
self
.
has_processed
[
phase
]
or
phase
==
"predict"
:
logger
.
info
(
logger
.
info
(
"processing %s data now... this may take a few minutes"
%
phase
)
"processing %s data now... this may take a few minutes"
%
phase
)
for
i
in
range
(
len
(
data
)):
for
i
in
range
(
len
(
data
)):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录