Merge the recent two missing changes.

Author: mingxingtan

efficientdet/keras/inference.py

@@ -219,8 +219,9 @@ def benchmark(self, image_arrays, bm_runs=10, trace_filename=None):
       bm_runs: Number of benchmark runs.
       trace_filename: If None, specify the filename for saving trace.
     """
+    _, spec = self._get_model_and_spec()
 
-    @tf.function
+    @tf.function(input_signature=[spec])
     def test_func(image_arrays):
       return self.model(image_arrays)  # pylint: disable=not-callable
 

efficientdet/keras/inspector.py

@@ -163,7 +163,7 @@ def main(_):
           boxes[0],
           classes[0],
           scores[0],
-          min_score_thresh=model_config.nms_configs.score_thresh,
+          min_score_thresh=model_config.nms_configs.score_thresh or 0.4,
           max_boxes_to_draw=model_config.nms_configs.max_output_size)
 
       if out_ptr:

efficientdet/keras/train_lib.py

@@ -407,7 +407,7 @@ def get_callbacks(params, val_dataset=None):
   """Get callbacks for given params."""
   if params['moving_average_decay']:
     avg_callback = AverageModelCheckpoint(
-        filepath=os.path.join(params['model_dir'], 'ckpt'),
+        filepath=os.path.join(params['model_dir'], 'ema_ckpt'),
         verbose=1,
         save_weights_only=True,
         update_weights=False)