From 00a846b8a22ef8f81e6179dfc4326cd5db7cbea4 Mon Sep 17 00:00:00 2001 From: RL Date: Wed, 22 May 2019 08:37:25 +0800 Subject: [PATCH 01/11] Update __init__.py --- src/config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/__init__.py b/src/config/__init__.py index e55ce4c..f60cf54 100644 --- a/src/config/__init__.py +++ b/src/config/__init__.py @@ -1 +1 @@ -from kitti_squeezeSeg_config import kitti_squeezeSeg_config +from config.kitti_squeezeSeg_config import kitti_squeezeSeg_config From 69bcd331f5da035cd634c39048236bb8c67e6c14 Mon Sep 17 00:00:00 2001 From: RL Date: Wed, 22 May 2019 08:42:01 +0800 Subject: [PATCH 02/11] Update __init__.py --- src/config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/__init__.py b/src/config/__init__.py index f60cf54..e55ce4c 100644 --- a/src/config/__init__.py +++ b/src/config/__init__.py @@ -1 +1 @@ -from config.kitti_squeezeSeg_config import kitti_squeezeSeg_config +from kitti_squeezeSeg_config import kitti_squeezeSeg_config From 8b353b3108c11ec30197d2ccd60af21e66294a77 Mon Sep 17 00:00:00 2001 From: RL Date: Wed, 22 May 2019 08:44:37 +0800 Subject: [PATCH 03/11] Add Python3 compatibility --- src/config/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/__init__.py b/src/config/__init__.py index e55ce4c..6ffa4af 100644 --- a/src/config/__init__.py +++ b/src/config/__init__.py @@ -1 +1,4 @@ -from kitti_squeezeSeg_config import kitti_squeezeSeg_config +try: + from from kitti_squeezeSeg_config import kitti_squeezeSeg_config +except ImportError: + from config.kitti_squeezeSeg_config import kitti_squeezeSeg_config From d16496e70bdb5c7d67642513cfc7247dc1c507fb Mon Sep 17 00:00:00 2001 From: RL Date: Wed, 22 May 2019 08:45:20 +0800 Subject: [PATCH 04/11] Update __init__.py --- src/config/__init__.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/config/__init__.py b/src/config/__init__.py index 6ffa4af..e55ce4c 100644 --- a/src/config/__init__.py +++ b/src/config/__init__.py @@ -1,4 +1 @@ -try: - from from kitti_squeezeSeg_config import kitti_squeezeSeg_config -except ImportError: - from config.kitti_squeezeSeg_config import kitti_squeezeSeg_config +from kitti_squeezeSeg_config import kitti_squeezeSeg_config From 7dbfa06f879c24c18b5d895cc3afed434514569c Mon Sep 17 00:00:00 2001 From: RL Date: Wed, 22 May 2019 08:45:56 +0800 Subject: [PATCH 05/11] Add Python3 compatibility --- src/config/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/__init__.py b/src/config/__init__.py index e55ce4c..3df3682 100644 --- a/src/config/__init__.py +++ b/src/config/__init__.py @@ -1 +1,4 @@ -from kitti_squeezeSeg_config import kitti_squeezeSeg_config +try: + from kitti_squeezeSeg_config import kitti_squeezeSeg_config +except ImportError: + from config.kitti_squeezeSeg_config import kitti_squeezeSeg_config From 408b92b929cf2fee0e05c179e281fd3e82ee5508 Mon Sep 17 00:00:00 2001 From: RL Date: Wed, 22 May 2019 08:53:00 +0800 Subject: [PATCH 06/11] Add Python3 compatibility --- src/config/kitti_squeezeSeg_config.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/config/kitti_squeezeSeg_config.py b/src/config/kitti_squeezeSeg_config.py index 59a11c3..ea19421 100644 --- a/src/config/kitti_squeezeSeg_config.py +++ b/src/config/kitti_squeezeSeg_config.py @@ -4,7 +4,11 @@ import numpy as np -from config import base_model_config +try: + from config import base_model_config +except: + from config.config import base_model_config + def kitti_squeezeSeg_config(): """Specify the parameters to tune below.""" From e31711b5fc21c5bffc9d647d2d1267485c8f724f Mon Sep 17 00:00:00 2001 From: RL Date: Wed, 22 May 2019 08:53:47 +0800 Subject: [PATCH 07/11] Update __init__.py --- src/config/__init__.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/config/__init__.py b/src/config/__init__.py index 3df3682..e55ce4c 100644 --- a/src/config/__init__.py +++ b/src/config/__init__.py @@ -1,4 +1 @@ -try: - from kitti_squeezeSeg_config import kitti_squeezeSeg_config -except ImportError: - from config.kitti_squeezeSeg_config import kitti_squeezeSeg_config +from kitti_squeezeSeg_config import kitti_squeezeSeg_config From 2db91d756bbc6f50d46000c649ed1a01a78e80a1 Mon Sep 17 00:00:00 2001 From: RL Date: Wed, 22 May 2019 08:54:33 +0800 Subject: [PATCH 08/11] Add Python3 compatibility --- src/config/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/__init__.py b/src/config/__init__.py index e55ce4c..528bc50 100644 --- a/src/config/__init__.py +++ b/src/config/__init__.py @@ -1 +1,4 @@ -from kitti_squeezeSeg_config import kitti_squeezeSeg_config +try: + from kitti_squeezeSeg_config import kitti_squeezeSeg_config +except: + from config.kitti_squeezeSeg_config import kitti_squeezeSeg_config From ab4e93391c497f14c0bd11c8c5f57fe9cec10685 Mon Sep 17 00:00:00 2001 From: RL Date: Wed, 22 May 2019 08:56:20 +0800 Subject: [PATCH 09/11] Add Python3 compatibility --- src/imdb/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/imdb/__init__.py b/src/imdb/__init__.py index 24ab65b..ffc2ffd 100644 --- a/src/imdb/__init__.py +++ b/src/imdb/__init__.py @@ -1 +1,4 @@ -from kitti import kitti +try: + from kitti import kitti +except: + from imdb.kitti import kitti From 5ba2b59a2045e1302e1ae910ac72fcfcce3bfd46 Mon Sep 17 00:00:00 2001 From: RL Date: Wed, 22 May 2019 08:57:57 +0800 Subject: [PATCH 10/11] Add Python3 compatibility --- src/imdb/kitti.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/imdb/kitti.py b/src/imdb/kitti.py index 12af50b..9d2e074 100644 --- a/src/imdb/kitti.py +++ b/src/imdb/kitti.py @@ -6,7 +6,10 @@ import numpy as np import subprocess -from imdb import imdb +try: + from imdb import imdb +except: + from imdb.imdb import imdb class kitti(imdb): def __init__(self, image_set, data_path, mc): From 02f0d7399e1a06327b906bf5498f0f4f9170e753 Mon Sep 17 00:00:00 2001 From: RL Date: Wed, 22 May 2019 08:59:13 +0800 Subject: [PATCH 11/11] Add Python3 compatibility --- src/nets/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/nets/__init__.py b/src/nets/__init__.py index de576c9..7c4144a 100644 --- a/src/nets/__init__.py +++ b/src/nets/__init__.py @@ -1 +1,4 @@ -from squeezeSeg import SqueezeSeg +try: + from squeezeSeg import SqueezeSeg +except: + from nets.squeezeSeg import SqueezeSeg