fix test cases (google#1011)

* fix test cases

* fix float32 pp

Author: fsx950223

efficientdet/efficientdet_arch_test.py

@@ -45,72 +45,72 @@ def build_model(self,
     return utils.num_params_flops(False)
 
   def test_efficientdet_d0(self):
-    self.assertSequenceEqual((3880067, 2532997127),
+    self.assertSequenceEqual((3880067.0, 2535456183),
                              self.build_model('efficientdet-d0', 512))
 
   def test_efficientdet_d0_channel_first(self):
     self.assertSequenceEqual(
-        (3880067, 2531799047),
+        (3880067.0, 2534258103),
         self.build_model('efficientdet-d0', 512, data_format='channels_first'))
 
   def test_efficientdet_d0_511_513(self):
-    self.assertSequenceEqual((3880067, 2610687851),
+    self.assertSequenceEqual((3880067.0, 2613160475),
                              self.build_model('efficientdet-d0', (511, 513)))
 
   def test_efficientdet_d1(self):
-    self.assertSequenceEqual((6625898, 6095640824),
+    self.assertSequenceEqual((6625898.0, 6101276568),
                              self.build_model('efficientdet-d1', 640))
 
   def test_efficientdet_d1_640_1280(self):
-    self.assertSequenceEqual((6625898, 12186897999),
+    self.assertSequenceEqual((6625898.0, 12194901743),
                              self.build_model('efficientdet-d1', (640, 1280)))
 
   def test_efficientdet_d2(self):
-    self.assertSequenceEqual((8097039, 10986053156),
+    self.assertSequenceEqual((8097039.0, 10993616292),
                              self.build_model('efficientdet-d2', 768))
 
   def test_efficientdet_d3(self):
-    self.assertSequenceEqual((12032296, 24869554579),
+    self.assertSequenceEqual((12032296.0, 24882174639),
                              self.build_model('efficientdet-d3', 896))
 
   def test_efficientdet_d4(self):
-    self.assertSequenceEqual((20723675, 55146068329),
+    self.assertSequenceEqual((20723675.0, 55167980877),
                              self.build_model('efficientdet-d4', 1024))
 
   def test_efficientdet_d5(self):
-    self.assertSequenceEqual((33653315, 135306619957),
+    self.assertSequenceEqual((33653315.0, 135353202989),
                              self.build_model('efficientdet-d5', 1280))
 
   def test_efficientdet_d6(self):
-    self.assertSequenceEqual((51871782, 225467043531),
+    self.assertSequenceEqual((51871782.0, 225532115747),
                              self.build_model('efficientdet-d6', 1280))
 
   def test_efficientdet_d7(self):
-    self.assertSequenceEqual((51871782, 324657914255),
+    self.assertSequenceEqual((51871782.0, 324740293607),
                              self.build_model('efficientdet-d7', 1536))
 
   def test_efficientdet_lite0(self):
-    self.assertSequenceEqual((3243470, 977617221),
+    self.assertSequenceEqual((3243470.0, 979428213),
                              self.build_model('efficientdet-lite0'))
 
   def test_efficientdet_lite1(self):
-    self.assertSequenceEqual((4248318, 1973728714),
+    self.assertSequenceEqual((4248318.0, 1976353506),
                              self.build_model('efficientdet-lite1'))
 
   def test_efficientdet_lite2(self):
-    self.assertSequenceEqual((5252334, 3383232590),
+    self.assertSequenceEqual((5252334.0, 3386596870),
                              self.build_model('efficientdet-lite2'))
 
   def test_efficientdet_lite3(self):
-    self.assertSequenceEqual((8350862, 7503764515),
+    self.assertSequenceEqual((8350862.0, 7509226979),
                              self.build_model('efficientdet-lite3'))
 
   def test_efficientdet_lite3x(self):
-    self.assertSequenceEqual((9280862, 14019809178),
+    self.assertSequenceEqual((9280862.0, 14026487930),
                              self.build_model('efficientdet-lite3x'))
 
   def test_efficientdet_lite4(self):
-    self.assertSequenceEqual((15130894, 20221443966),
+    self.assertSequenceEqual((15130894.0, 20232158598),
                              self.build_model('efficientdet-lite4'))
 
 
@@ -237,6 +237,6 @@ def test_channel_fastattn(self):
 
 
 if __name__ == '__main__':
-  logging.set_verbosity(logging.WARNING)
+  logging.set_verbosity(logging.ERROR)
   tf.disable_eager_execution()
   tf.test.main()

efficientdet/keras/infer_lib_test.py

@@ -32,6 +32,11 @@ def setUp(self):
     model.build([1, 512, 512, 3])
     model.save_weights(os.path.join(self.tmp_path, 'model'))
 
+    lite_model = efficientdet_keras.EfficientDetModel('efficientdet-lite0')
+    self.lite_tmp_path = tempfile.mkdtemp()
+    lite_model.build([1, 512, 512, 3])
+    lite_model.save_weights(os.path.join(self.lite_tmp_path, 'model'))
+
   def test_export(self):
     saved_model_path = os.path.join(self.tmp_path, 'saved_model')
     driver = infer_lib.ServingDriver('efficientdet-d0', self.tmp_path)
@@ -42,9 +47,9 @@ def test_export(self):
     driver.load(os.path.join(saved_model_path, 'efficientdet-d0_frozen.pb'))
 
   def test_export_tflite_only_network(self):
-    saved_model_path = os.path.join(self.tmp_path, 'saved_model')
+    saved_model_path = os.path.join(self.lite_tmp_path, 'saved_model')
     driver = infer_lib.ServingDriver(
-        'efficientdet-lite0', self.tmp_path, only_network=True)
+        'efficientdet-lite0', self.lite_tmp_path, only_network=True)
     driver.export(saved_model_path, tflite='FP32')
     self.assertTrue(
         tf.io.gfile.exists(os.path.join(saved_model_path, 'fp32.tflite')))
@@ -63,9 +68,9 @@ def test_export_tflite_only_network(self):
         tf.io.gfile.exists(os.path.join(saved_model_path, 'int8.tflite')))
 
   def test_export_tflite_with_post_processing(self):
-    saved_model_path = os.path.join(self.tmp_path, 'saved_model')
+    saved_model_path = os.path.join(self.lite_tmp_path, 'saved_model')
     driver = infer_lib.ServingDriver(
-        'efficientdet-lite0', self.tmp_path, only_network=False)
+        'efficientdet-lite0', self.lite_tmp_path, only_network=False)
     driver.export(saved_model_path, tflite='FP32')
     self.assertTrue(
         tf.io.gfile.exists(os.path.join(saved_model_path, 'fp32.tflite')))