Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run cinn when enable_cinn=True for test_bert_prim_cinn #51354

Merged
merged 1 commit into from
Mar 9, 2023
+11 −17
Merged

Run cinn when enable_cinn=True for test_bert_prim_cinn #51354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions python/paddle/fluid/tests/unittests/prim/model/bert.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ def forward(self, hidden_states):


class BertModel(nn.Layer):
def __init__(self, config: BertConfig, to_static):
def __init__(self, config: BertConfig, to_static, enable_cinn):
super(BertModel, self).__init__()
self.config = config
self.pad_token_id = config.pad_token_id
Expand Down Expand Up @@ -248,7 +248,12 @@ def __init__(self, config: BertConfig, to_static):
encoder_layer, config.num_hidden_layers
)
if to_static:
self.encoder = paddle.jit.to_static(self.encoder)
build_strategy = paddle.static.BuildStrategy()
if enable_cinn:
build_strategy.build_cinn_pass = True
self.encoder = paddle.jit.to_static(
self.encoder, None, build_strategy
)
self.pooler = BertPooler(config)
# self.apply(self.init_weights)

Expand Down Expand Up @@ -366,10 +371,10 @@ def forward(


class Bert(nn.Layer):
def __init__(self, to_static):
def __init__(self, to_static, enable_cinn):
super(Bert, self).__init__()
config = BertConfig()
self.bert = BertModel(config, to_static)
self.bert = BertModel(config, to_static, enable_cinn)
self.cls = BertPretrainingHeads(
config,
embedding_weights=self.bert.embeddings.word_embeddings.weight,
Expand Down
15 changes: 2 additions & 13 deletions python/paddle/fluid/tests/unittests/prim/model/test_bert_prim_cinn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,9 @@ def train(to_static, enable_prim, enable_cinn):
worker_init=None,
)

bert = Bert(to_static)
# Now only apply dy2st for encoder
bert = Bert(to_static, enable_cinn)
criterion = BertPretrainingCriterion()
if to_static:
# input_sepc = [
# InputSpec(shape=(-1, -1), dtype=paddle.int64, name='input_ids'),
# InputSpec(shape=(-1, -1), dtype=paddle.int64, name='segment_ids'),
# None,
# InputSpec(shape=(-1, 1, 1, -1), dtype=paddle.float32, name='input_mask'),
# InputSpec(shape=(-1,), dtype=paddle.int32, name='masked_lm_positions'),
# ]
input_sepc = None
build_strategy = paddle.static.BuildStrategy()
if enable_cinn:
build_strategy.build_cinn_pass = True

optimizer = fluid.optimizer.Adam(parameter_list=bert.parameters())

Expand Down