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

Fix save/load error in imperative qat UT. #31937

Merged
merged 1 commit into from
Mar 30, 2021
Merged

Fix save/load error in imperative qat UT. #31937

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
26 changes: 21 additions & 5 deletions python/paddle/fluid/contrib/slim/tests/test_imperative_qat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
import os
import numpy as np
import random
import shutil
import time
import unittest
import logging
import paddle
Expand Down Expand Up @@ -157,6 +159,20 @@ class TestImperativeQat(unittest.TestCase):
QAT = quantization-aware training
"""

@classmethod
def setUpClass(cls):
timestamp = time.strftime('%Y-%m-%d-%H-%M-%S', time.localtime())
cls.root_path = os.path.join(os.getcwd(), "imperative_qat_" + timestamp)
cls.save_path = os.path.join(cls.root_path, "lenet")
cls.dynamic_root_path = os.path.join(os.getcwd(),
"dynamic_mnist_" + timestamp)
cls.dynamic_save_path = os.path.join(cls.dynamic_root_path, "model")

@classmethod
def tearDownClass(cls):
shutil.rmtree(cls.root_path)
shutil.rmtree(cls.dynamic_root_path)

def test_qat_save(self):
imperative_qat = ImperativeQuantAware(
weight_quantize_type='abs_max',
Expand Down Expand Up @@ -206,6 +222,8 @@ def test_qat_save(self):
"Train | At epoch {} step {}: loss = {:}, acc= {:}".
format(epoch, batch_id,
avg_loss.numpy(), acc.numpy()))
if batch_id == 500: # For shortening CI time
break

lenet.eval()
for batch_id, data in enumerate(test_reader()):
Expand Down Expand Up @@ -242,11 +260,9 @@ def test_qat_save(self):
before_save = lenet(test_img)

# save inference quantized model
path = "./qat_infer_model/lenet"
save_dir = "./qat_infer_model"
paddle.jit.save(
layer=lenet,
path=path,
path=TestImperativeQat.save_path,
input_spec=[
paddle.static.InputSpec(
shape=[None, 1, 28, 28], dtype='float32')
Expand All @@ -259,7 +275,7 @@ def test_qat_save(self):
exe = fluid.Executor(place)
[inference_program, feed_target_names,
fetch_targets] = fluid.io.load_inference_model(
dirname=save_dir,
dirname=TestImperativeQat.root_path,
executor=exe,
model_filename="lenet" + INFER_MODEL_SUFFIX,
params_filename="lenet" + INFER_PARAMS_SUFFIX)
Expand Down Expand Up @@ -351,7 +367,7 @@ def _build_static_lenet(main, startup, is_test=False, seed=1000):

paddle.jit.save(
layer=lenet,
path="./dynamic_mnist/model",
path=TestImperativeQat.dynamic_save_path,
input_spec=[
paddle.static.InputSpec(
shape=[None, 1, 28, 28], dtype='float32')
Expand Down
27 changes: 22 additions & 5 deletions python/paddle/fluid/contrib/slim/tests/test_imperative_qat_addquantdequant.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
import os
import numpy as np
import random
import shutil
import time
import unittest
import logging
import paddle
Expand Down Expand Up @@ -185,6 +187,21 @@ def forward(self, inputs):


class TestImperativeAddQuantDequant(unittest.TestCase):
@classmethod
def setUpClass(cls):
timestamp = time.strftime('%Y-%m-%d-%H-%M-%S', time.localtime())
cls.root_path = os.path.join(os.getcwd(),
"imperative_qat_aqd_" + timestamp)
cls.save_path = os.path.join(cls.root_path, "lenet")
cls.dynamic_root_path = os.path.join(os.getcwd(),
"dynamic_mnist_aqd_" + timestamp)
cls.dynamic_save_path = os.path.join(cls.dynamic_root_path, "model")

@classmethod
def tearDownClass(cls):
shutil.rmtree(cls.root_path)
shutil.rmtree(cls.dynamic_root_path)

def test_qat_save(self):

imperative_qat = ImperativeQuantAware(
Expand Down Expand Up @@ -228,6 +245,8 @@ def test_qat_save(self):
"Train | At epoch {} step {}: loss = {:}, acc= {:}".
format(epoch, batch_id,
avg_loss.numpy(), acc.numpy()))
if batch_id == 500: # For shortening CI time
break

lenet.eval()
for batch_id, data in enumerate(test_reader()):
Expand Down Expand Up @@ -264,11 +283,9 @@ def test_qat_save(self):
before_save = lenet(test_img)

# save inference quantized model
path = "./qat_infer_model/lenet"
save_dir = "./qat_infer_model"
paddle.jit.save(
layer=lenet,
path=path,
path=TestImperativeAddQuantDequant.save_path,
input_spec=[
paddle.static.InputSpec(
shape=[None, 1, 28, 28], dtype='float32')
Expand All @@ -280,7 +297,7 @@ def test_qat_save(self):
exe = fluid.Executor(place)
[inference_program, feed_target_names,
fetch_targets] = fluid.io.load_inference_model(
dirname=save_dir,
dirname=TestImperativeAddQuantDequant.root_path,
executor=exe,
model_filename="lenet" + INFER_MODEL_SUFFIX,
params_filename="lenet" + INFER_PARAMS_SUFFIX)
Expand Down Expand Up @@ -378,7 +395,7 @@ def _build_static_lenet(main, startup, is_test=False, seed=1000):
lenet.eval()
paddle.jit.save(
layer=lenet,
path="./dynamic_mnist/model",
path=TestImperativeAddQuantDequant.dynamic_save_path,
input_spec=[
paddle.static.InputSpec(
shape=[None, 1, 28, 28], dtype='float32')
Expand Down