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

Jump to bottom

[Dy2St] Run PT in SOT mode only #59658

Merged
merged 1 commit into from
Dec 5, 2023
Merged

[Dy2St] Run PT in SOT mode only #59658

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
8 changes: 6 additions & 2 deletions python/paddle/jit/dy2static/partial_program.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,9 @@ def __call__(self, inputs):
in_vars, in_var_names = self._prepare_inputs(inputs)
out_vars = self._prepare_outputs()
self._cast_fp16_if_pure_fp16(in_vars)
attrs = self._prepare_attributes()
# TODO(dev): Currently AST + PT has some issues in control flow, so we only
# enable SOT + PT in 2.6, we will fix it later.
attrs = self._prepare_attributes(force_not_use_pt=True)
attrs.extend(["x_names", in_var_names])

self._sync_lr_value_with_scheduler()
Expand Down Expand Up @@ -777,7 +779,7 @@ def _cast_fp16_if_pure_fp16(self, in_vars):
in_vars[i] = var.astype('float16')
in_vars[i].name = name

def _prepare_attributes(self):
def _prepare_attributes(self, force_not_use_pt=False):
attrs = [
'forward_global_block',
self.forward_program.desc.block(0),
Expand Down Expand Up @@ -822,6 +824,8 @@ def _prepare_attributes(self):
is_cinn_enabled = self._build_strategy.build_cinn_pass
if is_prim_enabled or in_cinn_backend or is_cinn_enabled:
in_pir_pt_mode = False
if force_not_use_pt:
in_pir_pt_mode = False
attrs.extend(['in_pir_pt_mode', in_pir_pt_mode])

return attrs
Expand Down
9 changes: 3 additions & 6 deletions python/paddle/jit/sot/symbolic/compile_cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,13 @@ def __call__(self, *args, **kwargs):
),
)
if self.partial_program is None:
with EventGuard("FallbackWrapper: call compiled_fn"):
outputs = self.compiled_fn(*args, **kwargs)
with EventGuard("FallbackWrapper: get_concrete_program"):
(
self.concrete_program,
self.partial_program,
) = self.compiled_fn.get_concrete_program(*args, **kwargs)
else:
# Speed up Resnet from 0.0068 --> 0.0057
with EventGuard("FallbackWrapper: call partial_program"):
outputs = self.partial_program.sot_call(*args, **kwargs)
with EventGuard("FallbackWrapper: sot call partial_program"):
outputs = self.partial_program.sot_call(*args, **kwargs)

clear_eager_tensor_name(outputs)
log_do(
Expand Down