refactoring keras retinanet

weecology · Jun 22, 2020 · 2fc4bca · 2fc4bca
1 parent 68fc565
commit 2fc4bca
Show file tree

Hide file tree

Showing 102 changed files with 42 additions and 56 deletions.
diff --git a/deepforest/data/classes.csv b/deepforest/data/classes.csv
@@ -1 +1,2 @@
-Tree,0
+Dead,0
+Alive,1
diff --git a/deepforest/deepforest.py b/deepforest/deepforest.py
@@ -26,15 +26,12 @@
 from deepforest.retinanet_train import main as retinanet_train
 from deepforest.retinanet_train import parse_args
 
-try:
-    from keras_retinanet import models
-    from keras_retinanet.models import convert_model
-    from keras_retinanet.bin.train import create_models
-    from keras_retinanet.preprocessing.csv_generator import CSVGenerator, _read_classes
-    from keras_retinanet.utils.eval import evaluate
-    from keras_retinanet.utils.visualization import draw_box
-except:
-    pass
+from deepforest.keras_retinanet import models
+from deepforest.keras_retinanet.models import convert_model
+from deepforest.keras_retinanet.bin.train import create_models
+from deepforest.keras_retinanet.preprocessing.csv_generator import CSVGenerator, _read_classes
+from deepforest.keras_retinanet.utils.eval import evaluate
+from deepforest.keras_retinanet.utils.visualization import draw_box
 
 
 class deepforest:

diff --git a/keras_retinanet/__init__.py → deepforest/keras_retinanet/__init__.py b/keras_retinanet/__init__.py → deepforest/keras_retinanet/__init__.py
diff --git a/keras_retinanet/backend/__init__.py → ...orest/keras_retinanet/backend/__init__.py b/keras_retinanet/backend/__init__.py → ...orest/keras_retinanet/backend/__init__.py
diff --git a/keras_retinanet/backend/cntk_backend.py → ...t/keras_retinanet/backend/cntk_backend.py b/keras_retinanet/backend/cntk_backend.py → ...t/keras_retinanet/backend/cntk_backend.py
diff --git a/keras_retinanet/backend/common.py → deepforest/keras_retinanet/backend/common.py b/keras_retinanet/backend/common.py → deepforest/keras_retinanet/backend/common.py
diff --git a/keras_retinanet/backend/dynamic.py → ...forest/keras_retinanet/backend/dynamic.py b/keras_retinanet/backend/dynamic.py → ...forest/keras_retinanet/backend/dynamic.py
diff --git a/...s_retinanet/backend/tensorflow_backend.py → ...s_retinanet/backend/tensorflow_backend.py b/...s_retinanet/backend/tensorflow_backend.py → ...s_retinanet/backend/tensorflow_backend.py
diff --git a/keras_retinanet/backend/theano_backend.py → ...keras_retinanet/backend/theano_backend.py b/keras_retinanet/backend/theano_backend.py → ...keras_retinanet/backend/theano_backend.py
diff --git a/keras_retinanet/bin/__init__.py → deepforest/keras_retinanet/bin/__init__.py b/keras_retinanet/bin/__init__.py → deepforest/keras_retinanet/bin/__init__.py
diff --git a/keras_retinanet/bin/convert_model.py → ...rest/keras_retinanet/bin/convert_model.py b/keras_retinanet/bin/convert_model.py → ...rest/keras_retinanet/bin/convert_model.py
diff --git a/keras_retinanet/bin/debug.py → deepforest/keras_retinanet/bin/debug.py b/keras_retinanet/bin/debug.py → deepforest/keras_retinanet/bin/debug.py
diff --git a/keras_retinanet/bin/evaluate.py → deepforest/keras_retinanet/bin/evaluate.py b/keras_retinanet/bin/evaluate.py → deepforest/keras_retinanet/bin/evaluate.py
diff --git a/keras_retinanet/bin/train.py → deepforest/keras_retinanet/bin/train.py b/keras_retinanet/bin/train.py → deepforest/keras_retinanet/bin/train.py
diff --git a/keras_retinanet/callbacks/__init__.py → ...est/keras_retinanet/callbacks/__init__.py b/keras_retinanet/callbacks/__init__.py → ...est/keras_retinanet/callbacks/__init__.py
diff --git a/keras_retinanet/callbacks/coco.py → deepforest/keras_retinanet/callbacks/coco.py b/keras_retinanet/callbacks/coco.py → deepforest/keras_retinanet/callbacks/coco.py
diff --git a/keras_retinanet/callbacks/common.py → ...orest/keras_retinanet/callbacks/common.py b/keras_retinanet/callbacks/common.py → ...orest/keras_retinanet/callbacks/common.py
diff --git a/keras_retinanet/callbacks/eval.py → deepforest/keras_retinanet/callbacks/eval.py b/keras_retinanet/callbacks/eval.py → deepforest/keras_retinanet/callbacks/eval.py
diff --git a/keras_retinanet/initializers.py → deepforest/keras_retinanet/initializers.py b/keras_retinanet/initializers.py → deepforest/keras_retinanet/initializers.py
diff --git a/keras_retinanet/layers/__init__.py → ...forest/keras_retinanet/layers/__init__.py b/keras_retinanet/layers/__init__.py → ...forest/keras_retinanet/layers/__init__.py
diff --git a/keras_retinanet/layers/_misc.py → deepforest/keras_retinanet/layers/_misc.py b/keras_retinanet/layers/_misc.py → deepforest/keras_retinanet/layers/_misc.py
diff --git a/keras_retinanet/layers/filter_detections.py → ...ras_retinanet/layers/filter_detections.py b/keras_retinanet/layers/filter_detections.py → ...ras_retinanet/layers/filter_detections.py
diff --git a/keras_retinanet/losses.py → deepforest/keras_retinanet/losses.py b/keras_retinanet/losses.py → deepforest/keras_retinanet/losses.py
diff --git a/keras_retinanet/models/__init__.py → ...forest/keras_retinanet/models/__init__.py b/keras_retinanet/models/__init__.py → ...forest/keras_retinanet/models/__init__.py
diff --git a/keras_retinanet/models/densenet.py → ...forest/keras_retinanet/models/densenet.py b/keras_retinanet/models/densenet.py → ...forest/keras_retinanet/models/densenet.py
diff --git a/keras_retinanet/models/mobilenet.py → ...orest/keras_retinanet/models/mobilenet.py b/keras_retinanet/models/mobilenet.py → ...orest/keras_retinanet/models/mobilenet.py
diff --git a/keras_retinanet/models/resnet.py → deepforest/keras_retinanet/models/resnet.py b/keras_retinanet/models/resnet.py → deepforest/keras_retinanet/models/resnet.py
diff --git a/keras_retinanet/models/retinanet.py → ...orest/keras_retinanet/models/retinanet.py b/keras_retinanet/models/retinanet.py → ...orest/keras_retinanet/models/retinanet.py
diff --git a/keras_retinanet/models/vgg.py → deepforest/keras_retinanet/models/vgg.py b/keras_retinanet/models/vgg.py → deepforest/keras_retinanet/models/vgg.py
diff --git a/keras_retinanet/preprocessing/__init__.py → ...keras_retinanet/preprocessing/__init__.py b/keras_retinanet/preprocessing/__init__.py → ...keras_retinanet/preprocessing/__init__.py
diff --git a/keras_retinanet/preprocessing/coco.py → ...est/keras_retinanet/preprocessing/coco.py b/keras_retinanet/preprocessing/coco.py → ...est/keras_retinanet/preprocessing/coco.py
diff --git a/..._retinanet/preprocessing/csv_generator.py → ..._retinanet/preprocessing/csv_generator.py b/..._retinanet/preprocessing/csv_generator.py → ..._retinanet/preprocessing/csv_generator.py
diff --git a/keras_retinanet/preprocessing/generator.py → ...eras_retinanet/preprocessing/generator.py b/keras_retinanet/preprocessing/generator.py → ...eras_retinanet/preprocessing/generator.py
diff --git a/keras_retinanet/preprocessing/kitti.py → ...st/keras_retinanet/preprocessing/kitti.py b/keras_retinanet/preprocessing/kitti.py → ...st/keras_retinanet/preprocessing/kitti.py
diff --git a/keras_retinanet/preprocessing/open_images.py → ...as_retinanet/preprocessing/open_images.py b/keras_retinanet/preprocessing/open_images.py → ...as_retinanet/preprocessing/open_images.py
diff --git a/keras_retinanet/preprocessing/pascal_voc.py → ...ras_retinanet/preprocessing/pascal_voc.py b/keras_retinanet/preprocessing/pascal_voc.py → ...ras_retinanet/preprocessing/pascal_voc.py
diff --git a/keras_retinanet/utils/__init__.py → deepforest/keras_retinanet/utils/__init__.py b/keras_retinanet/utils/__init__.py → deepforest/keras_retinanet/utils/__init__.py
diff --git a/keras_retinanet/utils/anchors.py → deepforest/keras_retinanet/utils/anchors.py b/keras_retinanet/utils/anchors.py → deepforest/keras_retinanet/utils/anchors.py
diff --git a/keras_retinanet/utils/coco_eval.py → ...forest/keras_retinanet/utils/coco_eval.py b/keras_retinanet/utils/coco_eval.py → ...forest/keras_retinanet/utils/coco_eval.py
diff --git a/keras_retinanet/utils/colors.py → deepforest/keras_retinanet/utils/colors.py b/keras_retinanet/utils/colors.py → deepforest/keras_retinanet/utils/colors.py
diff --git a/keras_retinanet/utils/compute_overlap.c → ...t/keras_retinanet/utils/compute_overlap.c b/keras_retinanet/utils/compute_overlap.c → ...t/keras_retinanet/utils/compute_overlap.c
diff --git a/...ils/compute_overlap.cpython-36m-darwin.so → ...ils/compute_overlap.cpython-36m-darwin.so b/...ils/compute_overlap.cpython-36m-darwin.so → ...ils/compute_overlap.cpython-36m-darwin.so
diff --git a/keras_retinanet/utils/compute_overlap.pyx → ...keras_retinanet/utils/compute_overlap.pyx b/keras_retinanet/utils/compute_overlap.pyx → ...keras_retinanet/utils/compute_overlap.pyx
diff --git a/keras_retinanet/utils/config.py → deepforest/keras_retinanet/utils/config.py b/keras_retinanet/utils/config.py → deepforest/keras_retinanet/utils/config.py
diff --git a/keras_retinanet/utils/eval.py → deepforest/keras_retinanet/utils/eval.py b/keras_retinanet/utils/eval.py → deepforest/keras_retinanet/utils/eval.py
diff --git a/keras_retinanet/utils/gpu.py → deepforest/keras_retinanet/utils/gpu.py b/keras_retinanet/utils/gpu.py → deepforest/keras_retinanet/utils/gpu.py
diff --git a/keras_retinanet/utils/image.py → deepforest/keras_retinanet/utils/image.py b/keras_retinanet/utils/image.py → deepforest/keras_retinanet/utils/image.py
diff --git a/keras_retinanet/utils/keras_version.py → ...st/keras_retinanet/utils/keras_version.py b/keras_retinanet/utils/keras_version.py → ...st/keras_retinanet/utils/keras_version.py
diff --git a/keras_retinanet/utils/model.py → deepforest/keras_retinanet/utils/model.py b/keras_retinanet/utils/model.py → deepforest/keras_retinanet/utils/model.py
diff --git a/keras_retinanet/utils/tf_version.py → ...orest/keras_retinanet/utils/tf_version.py b/keras_retinanet/utils/tf_version.py → ...orest/keras_retinanet/utils/tf_version.py
diff --git a/keras_retinanet/utils/transform.py → ...forest/keras_retinanet/utils/transform.py b/keras_retinanet/utils/transform.py → ...forest/keras_retinanet/utils/transform.py
diff --git a/keras_retinanet/utils/visualization.py → ...st/keras_retinanet/utils/visualization.py b/keras_retinanet/utils/visualization.py → ...st/keras_retinanet/utils/visualization.py
diff --git a/deepforest/predict.py b/deepforest/predict.py
@@ -9,12 +9,9 @@
 import pandas as pd
 import tensorflow as tf
 
-try:
-    # Retinanet-viz
-    from keras_retinanet.utils import image as keras_retinanet_image
-    from keras_retinanet.utils.visualization import draw_detections
-except:
-    pass
+# Retinanet-viz
+from deepforest.keras_retinanet.utils import image as keras_retinanet_image
+from deepforest.keras_retinanet.utils.visualization import draw_detections
 
 def predict_image(model,
                   image_path=None,

diff --git a/deepforest/retinanet_train.py b/deepforest/retinanet_train.py
@@ -9,30 +9,26 @@
 import sys
 import warnings
 
-try:
-    import keras
-    import keras.preprocessing.image
-    import tensorflow as tf
-except:
-    pass
-try:
-    # Retinanet
-    from keras_retinanet import layers
-    from keras_retinanet import losses
-    from keras_retinanet import models
-    from keras_retinanet.callbacks import RedirectModel
-    from keras_retinanet.callbacks.eval import Evaluate
-    from keras_retinanet.models.retinanet import retinanet_bbox
-    from keras_retinanet.preprocessing.csv_generator import CSVGenerator
-    from keras_retinanet.utils.anchors import make_shapes_callback
-    from keras_retinanet.utils.config import read_config_file, parse_anchor_parameters
-    from keras_retinanet.utils.keras_version import check_keras_version
-    from keras_retinanet.utils.model import freeze as freeze_model
-    from keras_retinanet.utils.transform import random_transform_generator
-    from keras_retinanet.utils.image import random_visual_effect_generator
-    from keras_retinanet.utils.gpu import setup_gpu
-except:
-    pass
+import keras
+import keras.preprocessing.image
+import tensorflow as tf
+
+# Retinanet
+from deepforest.keras_retinanet import layers
+from deepforest.keras_retinanet import losses
+from deepforest.keras_retinanet import models
+from deepforest.keras_retinanet.callbacks import RedirectModel
+from deepforest.keras_retinanet.callbacks.eval import Evaluate
+from deepforest.keras_retinanet.models.retinanet import retinanet_bbox
+from deepforest.keras_retinanet.preprocessing.csv_generator import CSVGenerator
+from deepforest.keras_retinanet.utils.anchors import make_shapes_callback
+from deepforest.keras_retinanet.utils.config import read_config_file, parse_anchor_parameters
+from deepforest.keras_retinanet.utils.keras_version import check_keras_version
+from deepforest.keras_retinanet.utils.model import freeze as freeze_model
+from deepforest.keras_retinanet.utils.transform import random_transform_generator
+from deepforest.keras_retinanet.utils.image import random_visual_effect_generator
+from deepforest.keras_retinanet.utils.gpu import setup_gpu
+
 from deepforest import tfrecords
 
 

diff --git a/deepforest/tfrecords.py b/deepforest/tfrecords.py
@@ -17,11 +17,8 @@
 import psutil
 import tensorflow as tf
 
-try:
-    from keras_retinanet import models
-    from keras_retinanet.preprocessing.csv_generator import CSVGenerator
-except:
-    pass
+from deepforest.keras_retinanet import models
+from deepforest.keras_retinanet.preprocessing.csv_generator import CSVGenerator
 
 
 def create_tf_example(image, regression_target, class_target, fname, original_image):
@@ -248,7 +245,7 @@ def _parse_fn(example):
     loaded_image = tf.cast(loaded_image, tf.float32)
 
     # Turn loaded image from rgb into bgr and subtract imagenet means,
-    # see keras_retinanet.utils.image.preprocess_image
+    # see deepforest.keras_retinanet.utils.image.preprocess_image
     red, green, blue = tf.unstack(loaded_image, axis=-1)
 
     # Subtract imagenet means

diff --git a/deepforest/utilities.py b/deepforest/utilities.py
@@ -17,11 +17,9 @@
     warnings.filterwarnings("ignore", category=FutureWarning)
     warnings.filterwarnings("ignore", category=DeprecationWarning)
 
-try:
-    from keras_retinanet import models
-    from keras.utils import multi_gpu_model
-except:
-    pass
+from deepforest.keras_retinanet import models
+from keras.utils import multi_gpu_model
+
 from deepforest import _ROOT
 
 

diff --git a/keras_retinanet/__pycache__/__init__.cpython-36.pyc b/keras_retinanet/__pycache__/__init__.cpython-36.pyc
diff --git a/keras_retinanet/__pycache__/__init__.cpython-37.pyc b/keras_retinanet/__pycache__/__init__.cpython-37.pyc
diff --git a/keras_retinanet/__pycache__/initializers.cpython-36.pyc b/keras_retinanet/__pycache__/initializers.cpython-36.pyc
diff --git a/keras_retinanet/__pycache__/losses.cpython-36.pyc b/keras_retinanet/__pycache__/losses.cpython-36.pyc
diff --git a/keras_retinanet/__pycache__/losses.cpython-37.pyc b/keras_retinanet/__pycache__/losses.cpython-37.pyc
diff --git a/keras_retinanet/backend/__pycache__/__init__.cpython-36.pyc b/keras_retinanet/backend/__pycache__/__init__.cpython-36.pyc
diff --git a/keras_retinanet/backend/__pycache__/common.cpython-36.pyc b/keras_retinanet/backend/__pycache__/common.cpython-36.pyc
diff --git a/keras_retinanet/backend/__pycache__/dynamic.cpython-36.pyc b/keras_retinanet/backend/__pycache__/dynamic.cpython-36.pyc
diff --git a/keras_retinanet/backend/__pycache__/tensorflow_backend.cpython-36.pyc b/keras_retinanet/backend/__pycache__/tensorflow_backend.cpython-36.pyc
diff --git a/keras_retinanet/bin/__pycache__/__init__.cpython-36.pyc b/keras_retinanet/bin/__pycache__/__init__.cpython-36.pyc
diff --git a/keras_retinanet/bin/__pycache__/__init__.cpython-37.pyc b/keras_retinanet/bin/__pycache__/__init__.cpython-37.pyc
diff --git a/keras_retinanet/bin/__pycache__/train.cpython-36.pyc b/keras_retinanet/bin/__pycache__/train.cpython-36.pyc
diff --git a/keras_retinanet/bin/__pycache__/train.cpython-37.pyc b/keras_retinanet/bin/__pycache__/train.cpython-37.pyc
diff --git a/keras_retinanet/callbacks/__pycache__/__init__.cpython-36.pyc b/keras_retinanet/callbacks/__pycache__/__init__.cpython-36.pyc
diff --git a/keras_retinanet/callbacks/__pycache__/common.cpython-36.pyc b/keras_retinanet/callbacks/__pycache__/common.cpython-36.pyc
diff --git a/keras_retinanet/callbacks/__pycache__/eval.cpython-36.pyc b/keras_retinanet/callbacks/__pycache__/eval.cpython-36.pyc
diff --git a/keras_retinanet/layers/__pycache__/__init__.cpython-36.pyc b/keras_retinanet/layers/__pycache__/__init__.cpython-36.pyc
diff --git a/keras_retinanet/layers/__pycache__/_misc.cpython-36.pyc b/keras_retinanet/layers/__pycache__/_misc.cpython-36.pyc
diff --git a/keras_retinanet/layers/__pycache__/filter_detections.cpython-36.pyc b/keras_retinanet/layers/__pycache__/filter_detections.cpython-36.pyc
diff --git a/keras_retinanet/models/__pycache__/__init__.cpython-36.pyc b/keras_retinanet/models/__pycache__/__init__.cpython-36.pyc
diff --git a/keras_retinanet/models/__pycache__/resnet.cpython-36.pyc b/keras_retinanet/models/__pycache__/resnet.cpython-36.pyc
diff --git a/keras_retinanet/models/__pycache__/retinanet.cpython-36.pyc b/keras_retinanet/models/__pycache__/retinanet.cpython-36.pyc
diff --git a/keras_retinanet/preprocessing/__pycache__/__init__.cpython-36.pyc b/keras_retinanet/preprocessing/__pycache__/__init__.cpython-36.pyc
diff --git a/keras_retinanet/preprocessing/__pycache__/__init__.cpython-37.pyc b/keras_retinanet/preprocessing/__pycache__/__init__.cpython-37.pyc
diff --git a/keras_retinanet/preprocessing/__pycache__/csv_generator.cpython-36.pyc b/keras_retinanet/preprocessing/__pycache__/csv_generator.cpython-36.pyc
diff --git a/keras_retinanet/preprocessing/__pycache__/csv_generator.cpython-37.pyc b/keras_retinanet/preprocessing/__pycache__/csv_generator.cpython-37.pyc
diff --git a/keras_retinanet/preprocessing/__pycache__/generator.cpython-36.pyc b/keras_retinanet/preprocessing/__pycache__/generator.cpython-36.pyc
diff --git a/keras_retinanet/preprocessing/__pycache__/generator.cpython-37.pyc b/keras_retinanet/preprocessing/__pycache__/generator.cpython-37.pyc
diff --git a/keras_retinanet/preprocessing/__pycache__/kitti.cpython-36.pyc b/keras_retinanet/preprocessing/__pycache__/kitti.cpython-36.pyc
diff --git a/keras_retinanet/preprocessing/__pycache__/open_images.cpython-36.pyc b/keras_retinanet/preprocessing/__pycache__/open_images.cpython-36.pyc
diff --git a/keras_retinanet/preprocessing/__pycache__/pascal_voc.cpython-36.pyc b/keras_retinanet/preprocessing/__pycache__/pascal_voc.cpython-36.pyc
diff --git a/keras_retinanet/utils/__pycache__/__init__.cpython-36.pyc b/keras_retinanet/utils/__pycache__/__init__.cpython-36.pyc
diff --git a/keras_retinanet/utils/__pycache__/anchors.cpython-36.pyc b/keras_retinanet/utils/__pycache__/anchors.cpython-36.pyc
diff --git a/keras_retinanet/utils/__pycache__/colors.cpython-36.pyc b/keras_retinanet/utils/__pycache__/colors.cpython-36.pyc
diff --git a/keras_retinanet/utils/__pycache__/config.cpython-36.pyc b/keras_retinanet/utils/__pycache__/config.cpython-36.pyc
diff --git a/keras_retinanet/utils/__pycache__/eval.cpython-36.pyc b/keras_retinanet/utils/__pycache__/eval.cpython-36.pyc
diff --git a/keras_retinanet/utils/__pycache__/gpu.cpython-36.pyc b/keras_retinanet/utils/__pycache__/gpu.cpython-36.pyc
diff --git a/keras_retinanet/utils/__pycache__/image.cpython-36.pyc b/keras_retinanet/utils/__pycache__/image.cpython-36.pyc
diff --git a/keras_retinanet/utils/__pycache__/keras_version.cpython-36.pyc b/keras_retinanet/utils/__pycache__/keras_version.cpython-36.pyc
diff --git a/keras_retinanet/utils/__pycache__/model.cpython-36.pyc b/keras_retinanet/utils/__pycache__/model.cpython-36.pyc
diff --git a/keras_retinanet/utils/__pycache__/tf_version.cpython-36.pyc b/keras_retinanet/utils/__pycache__/tf_version.cpython-36.pyc
diff --git a/keras_retinanet/utils/__pycache__/transform.cpython-36.pyc b/keras_retinanet/utils/__pycache__/transform.cpython-36.pyc
diff --git a/keras_retinanet/utils/__pycache__/visualization.cpython-36.pyc b/keras_retinanet/utils/__pycache__/visualization.cpython-36.pyc
diff --git a/setup.py b/setup.py
@@ -86,8 +86,8 @@ def run(self, *args, **kwargs):
 
 extensions = [
     Extension(
-        'keras_retinanet.utils.compute_overlap',
-        ['keras_retinanet/utils/compute_overlap.pyx']
+        'deepforest.keras_retinanet.utils.compute_overlap',
+        ['deepforest/keras_retinanet/utils/compute_overlap.pyx']
     ),
 ]
 

diff --git a/tests/test_keras_retinanet.py b/tests/test_keras_retinanet.py
@@ -1,6 +1,6 @@
 # test loading of keras retinanet
 import os
-from keras_retinanet.utils.anchors import compute_overlap
+from deepforest.keras_retinanet.utils.anchors import compute_overlap
 import numpy as np
 
 def test_keras_retinanet():

diff --git a/tests/test_tfrecords.py b/tests/test_tfrecords.py
@@ -9,8 +9,8 @@
 from deepforest import preprocess
 from deepforest import tfrecords
 from deepforest import utilities
-from keras_retinanet import models
-from keras_retinanet.preprocessing import csv_generator
+from deepforest.keras_retinanet import models
+from deepforest.keras_retinanet.preprocessing import csv_generator
 
 
 # Helper function to check filenames
-Original file line number
+Diff line change
@@ -1 +1,2 @@
-    Tree,0
+    Dead,0
+    Alive,1