Skip to content

[Dy2St][tests][46-49, 16] paddle.jit.enable_to_static->enable_to_static_guard #59730

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

Merged
SigureMo merged 4 commits into from
Dec 15, 2023
Merged

[Dy2St][tests][46-49, 16] paddle.jit.enable_to_static->enable_to_static_guard #59730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e4c755
add dy2st guard 46-49
gouzil Dec 5, 2023
9cd89a5
clean
gouzil Dec 7, 2023
2b44323
Merge branch 'develop' of github.com:gouzil/Paddle into dy2st_with_en…
gouzil Dec 13, 2023
f1550b4
fix
gouzil Dec 13, 2023
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
41 changes: 24 additions & 17 deletions test/dygraph_to_static/test_lac.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

os.environ["CUDA_VISIBLE_DEVICES"] = "2"

from dygraph_to_static_utils import Dy2StTestBase
from dygraph_to_static_utils import Dy2StTestBase, enable_to_static_guard

import paddle
from paddle import _legacy_C_ops, base
Expand Down Expand Up @@ -531,7 +531,6 @@ def setUp(self):
self.dy_param_path = os.path.join(self.temp_dir.name, 'lac_dy_param')

def train(self, args, to_static):
paddle.jit.enable_to_static(to_static)
place = (
base.CUDAPlace(0)
if base.is_compiled_with_cuda()
Expand Down Expand Up @@ -580,7 +579,9 @@ def train(self, args, to_static):
num_label_chunks,
num_correct_chunks,
) = chunk_eval(
input=crf_decode, label=targets, seq_length=length
input=crf_decode,
label=targets,
seq_length=length,
)
outputs = [avg_cost, precision, recall, f1_score]
avg_cost, precision, recall, f1_score = (
Expand Down Expand Up @@ -619,9 +620,13 @@ def train(self, args, to_static):

return np.array(loss_data)

def _train(self, to_static: bool):
with enable_to_static_guard(to_static):
self.train(self.args, to_static)

def test_train(self):
st_out = self.train(self.args, to_static=True)
dy_out = self.train(self.args, to_static=False)
st_out = self._train(to_static=True)
dy_out = self._train(to_static=False)
np.testing.assert_allclose(
dy_out,
st_out,
Expand All @@ -645,19 +650,21 @@ def verify_predict(self):

def predict_dygraph(self, batch):
words, targets, length = batch
paddle.jit.enable_to_static(False)
with base.dygraph.guard(self.place):
model = LexNet(self.args)
# load dygraph trained parameters
model_dict = paddle.load(self.dy_param_path + ".pdparams")
model.set_dict(model_dict)
model.eval()

_, pred_res = model(
to_variable(words), to_variable(targets), to_variable(length)
)
with enable_to_static_guard(False):
with base.dygraph.guard(self.place):
model = LexNet(self.args)
# load dygraph trained parameters
model_dict = paddle.load(self.dy_param_path + ".pdparams")
model.set_dict(model_dict)
model.eval()

_, pred_res = model(
to_variable(words),
to_variable(targets),
to_variable(length),
)

return pred_res.numpy()
return pred_res.numpy()

def predict_static(self, batch):
"""
Expand Down
Loading