From e5dd6a58375ff3c86f82740f766e36c8f1ab1dc9 Mon Sep 17 00:00:00 2001
From: Anders Smedegaard Pedersen <anders@smedegaard.io>
Date: Fri, 11 Jun 2021 16:49:41 +0200
Subject: [PATCH] fix parse_image_size

---
 efficientdet/.#utils.py    |  1 +
 efficientdet/utils.py      | 14 +++++++++-----
 efficientdet/utils_test.py |  4 +++-
 3 files changed, 13 insertions(+), 6 deletions(-)
 create mode 120000 efficientdet/.#utils.py

diff --git a/efficientdet/.#utils.py b/efficientdet/.#utils.py
new file mode 120000
index 000000000..3c86b7921
--- /dev/null
+++ b/efficientdet/.#utils.py
@@ -0,0 +1 @@
+anders@anders-pc.7481:1623328388
\ No newline at end of file
diff --git a/efficientdet/utils.py b/efficientdet/utils.py
index b7dc9c170..9ae26bb14 100644
--- a/efficientdet/utils.py
+++ b/efficientdet/utils.py
@@ -15,7 +15,7 @@
 """Common utils."""
 import contextlib
 import os
-from typing import Text, Tuple, Union
+from typing import Text, Tuple, Union, Dict
 from absl import logging
 import numpy as np
 import tensorflow.compat.v1 as tf
@@ -482,11 +482,12 @@ def archive_ckpt(ckpt_eval, ckpt_objective, ckpt_path):
   return True
 
 
-def parse_image_size(image_size: Union[Text, int, Tuple[int, int]]):
+def parse_image_size(image_size: Union[Text, int, Tuple[int, int], Dict[int, int]]):
   """Parse the image size and return (height, width).
 
   Args:
-    image_size: A integer, a tuple (H, W), or a string with HxW format.
+    image_size: A integer, a tuple (H, W), a string with HxW format, 
+    or a dict with keys 'height' and 'width' with corresponding int values.
 
   Returns:
     A tuple of integer (height, width).
@@ -496,10 +497,13 @@ def parse_image_size(image_size: Union[Text, int, Tuple[int, int]]):
     return (image_size, image_size)
 
   if isinstance(image_size, str):
-    # image_size is a string with format WxH
-    width, height = image_size.lower().split('x')
+    # image_size is a string with format HxW
+    height, width = image_size.lower().split('x')
     return (int(height), int(width))
 
+  if isinstance(image_size, dict):
+    return (image_size['height'], image_size['width'])
+
   if isinstance(image_size, tuple):
     return image_size
 
diff --git a/efficientdet/utils_test.py b/efficientdet/utils_test.py
index 7ca479e80..bddeb4954 100644
--- a/efficientdet/utils_test.py
+++ b/efficientdet/utils_test.py
@@ -64,9 +64,11 @@ def test_archive_ckpt(self):
     self.assertTrue(tf.io.gfile.exists(os.path.join(model_dir, 'backup')))
 
   def test_image_size(self):
-    self.assertEqual(utils.parse_image_size('1280x640'), (640, 1280))
+    self.assertEqual(utils.parse_image_size('1280x640'), (1280,640))
     self.assertEqual(utils.parse_image_size(1280), (1280, 1280))
     self.assertEqual(utils.parse_image_size((1280, 640)), (1280, 640))
+    self.assertEqual(utils.parse_image_size({'width': 640, 'height': 1280}), (1280, 640))
+    self.assertEqual(utils.parse_image_size({'height': 3744, 'width': 5616}), (3744, 5616))
 
   def test_get_feat_sizes(self):
     feats = utils.get_feat_sizes(640, 2)