@@ -51,7 +51,6 @@ def forward(self, x):
5151
5252
5353class TestUpsampleBilinear2D :
54- # TODO Use quantized dataset and `atol=1` in the tests.
5554
5655 # noinspection PyMethodMayBeStatic
5756 def assert_delegated (
@@ -61,7 +60,6 @@ def assert_delegated(
6160 mocker ,
6261 request ,
6362 use_qat = False ,
64- atol = None ,
6563 expected_delegated_ops = None ,
6664 ):
6765 if expected_delegated_ops is None :
@@ -76,17 +74,19 @@ def assert_delegated(
7674 # Cover also negative values to thoroughly test the operator.
7775 dataset_creator = RandomDatasetCreator (low = - 2 , high = 2 )
7876
79- kwargs = {"atol" : atol } if atol is not None else {}
80- output_comparator = AllCloseOutputComparator (** kwargs )
77+ # Quantize the dataset and allow a single bit error.
78+ remove_quant_io_ops = True
79+ comparator = AllCloseOutputComparator (atol = 1 )
8180
8281 lower_run_compare (
8382 model ,
8483 input_shape ,
8584 graph_verifier ,
8685 request ,
8786 dataset_creator ,
88- output_comparator ,
87+ comparator ,
8988 use_qat = use_qat ,
89+ remove_quant_io_ops = remove_quant_io_ops ,
9090 )
9191
9292 # noinspection PyMethodMayBeStatic
@@ -103,20 +103,14 @@ def test__qat__align_corners(self, mocker, request, use_qat):
103103 input_shape = (1 , 2 , 3 , 4 )
104104 output_size = (5 , 7 )
105105 model = UpsampleBilinearModule (size = output_size , align_corners = align_corners )
106- atol = 0.015 # ~= output scale -> single bit error.
107- self .assert_delegated (
108- model , input_shape , mocker , request , use_qat = use_qat , atol = atol
109- )
106+ self .assert_delegated (model , input_shape , mocker , request , use_qat = use_qat )
110107
111108 def test__qat__not_align_corners (self , mocker , request , use_qat ):
112109 align_corners = False
113110 input_shape = (1 , 2 , 3 , 4 )
114111 output_size = (6 , 8 )
115112 model = UpsampleBilinearModule (size = output_size , align_corners = align_corners )
116- atol = 0.015 # ~= output scale -> single bit error.
117- self .assert_delegated (
118- model , input_shape , mocker , request , use_qat = use_qat , atol = atol
119- )
113+ self .assert_delegated (model , input_shape , mocker , request , use_qat = use_qat )
120114
121115 @pytest .mark .parametrize (
122116 "input_shape, output_size" ,
@@ -136,8 +130,7 @@ def test__not_align_corners__output_size(
136130 ):
137131 align_corners = False
138132 model = UpsampleBilinearModule (size = output_size , align_corners = align_corners )
139- atol = 0.016 # ~= output scale -> single bit error.
140- self .assert_delegated (model , input_shape , mocker , request , atol = atol )
133+ self .assert_delegated (model , input_shape , mocker , request )
141134
142135 def test__not_align_corners__output_size__unsupported (self ):
143136 align_corners = False
@@ -162,8 +155,7 @@ def test__not_align_corners__output_size__unsupported(self):
162155 def test__not_align_corners__scales (self , mocker , request , input_shape , scale ):
163156 align_corners = False
164157 model = UpsampleBilinearModule (scale = scale , align_corners = align_corners )
165- atol = 0.016 # ~= output scale -> single bit error.
166- self .assert_delegated (model , input_shape , mocker , request , atol = atol )
158+ self .assert_delegated (model , input_shape , mocker , request )
167159
168160 def test__not_align_corners__scales__unsupported (self ):
169161 align_corners = False
@@ -196,8 +188,7 @@ def test__align_corners__output_size(
196188 ):
197189 align_corners = True
198190 model = UpsampleBilinearModule (size = output_size , align_corners = align_corners )
199- atol = 0.016 # ~= output scale -> single bit error.
200- self .assert_delegated (model , input_shape , mocker , request , atol = atol )
191+ self .assert_delegated (model , input_shape , mocker , request )
201192
202193 def test__align_corners__output_size__unsupported (self ):
203194 align_corners = True
@@ -253,8 +244,7 @@ def test__align_corners__output_size__input_size_equal_to_one(self):
253244 def test__align_corners__scales (self , mocker , request , input_shape , scale ):
254245 align_corners = True
255246 model = UpsampleBilinearModule (scale = scale , align_corners = align_corners )
256- atol = 0.016 # ~= output scale -> single bit error.
257- self .assert_delegated (model , input_shape , mocker , request , atol = atol )
247+ self .assert_delegated (model , input_shape , mocker , request )
258248
259249 def test__align_corners__scales__unsupported (self ):
260250 align_corners = True
0 commit comments