Clean some shit

xue9981 · Sep 24, 2019 · af3c5ba · af3c5ba
1 parent 436d740
commit af3c5ba
Show file tree

Hide file tree

Showing 171 changed files with 4 additions and 4,112 deletions.
diff --git a/ade20k_labels.py b/ade20k_labels.py
@@ -166,13 +166,3 @@
         Label('flag', 149, (92, 0, 255))]
 
 ade20k_id2label = {label.id: label for label in labels}
-
-
-def import_labels_from_mat():
-    colors = scipy.io.loadmat('utils/colorization/color150.mat')
-    object_names = scipy.io.loadmat('utils/colorization/objectName150.mat')
-    for id in range(150):
-        color = colors['colors'][id]
-        name = object_names['objectNames'][id][0][0]
-        labels.append(Label(name, id, color))
-        print("Label(\'%s\', %i, (%i, %i, %i))," % (name, id, color[0], color[1], color[2]))
diff --git a/cityscapes_labels.py b/cityscapes_labels.py
@@ -150,39 +150,3 @@ def assureSingleInstanceName(name):
         return None
     # all good then
     return name
-
-# --------------------------------------------------------------------------------
-# Main for testing
-# --------------------------------------------------------------------------------
-
-
-# just a dummy main
-if __name__ == "__main__":
-    # Print all the labels
-    print("List of cityscapes labels:")
-    print("")
-    print("    {:>21} | {:>3} | {:>7} | {:>14} | {:>10} | {:>12} | {:>12}".format(
-        'name', 'id', 'trainId', 'category', 'categoryId', 'hasInstances', 'ignoreInEval'))
-    print("    " + ('-' * 98))
-    for label in labels:
-        print("    {:>21} | {:>3} | {:>7} | {:>14} | {:>10} | {:>12} | {:>12}".format(
-            label.name, label.id, label.trainId, label.category, label.categoryId, label.hasInstances, label.ignoreInEval))
-    print("")
-
-    print("Example usages:")
-
-    # Map from name to label
-    name = 'car'
-    id = name2label[name].id
-    print("ID of label '{name}': {id}".format(name=name, id=id))
-
-    # Map from ID to label
-    category = id2label[id].category
-    print("Category of label with ID '{id}': {category}".format(
-        id=id, category=category))
-
-    # Map from trainID to label
-    trainId = 0
-    name = trainId2label[trainId].name
-    print("Name of label with trainID '{id}': {name}".format(
-        id=trainId, name=name))
diff --git a/data b/data
diff --git a/drawImage/__init__.py b/drawImage/__init__.py
diff --git a/drawImage/__init__.pyc b/drawImage/__init__.pyc
diff --git a/drawImage/drawModule.py b/drawImage/drawModule.py
diff --git a/drawImage/drawModule.pyc b/drawImage/drawModule.pyc
diff --git a/pspnet-video.py b/pspnet-video.py
@@ -16,7 +16,7 @@
 from keras.models import model_from_json
 import tensorflow as tf
 import layers_builder as layers
-import utils
+from utils import utils
 import matplotlib.pyplot as plt
 import cv2
 import datetime

diff --git a/pspnet.py b/pspnet.py
@@ -10,7 +10,7 @@
 import tensorflow as tf
 import layers_builder as layers
 from glob import glob
-from python_utils import utils
+from utils import utils
 from keras.utils.generic_utils import CustomObjectScope
 import cv2
 import math

diff --git a/train.py b/train.py
@@ -1,8 +1,8 @@
 from os import path
 from os.path import join
 from scipy.misc import imresize
-from python_utils.preprocessing import data_generator_s31
-from python_utils.callbacks import callbacks
+from utils.preprocessing import data_generator_s31
+from utils.callbacks import callbacks
 from keras.models import load_model
 import layers_builder as layers
 import numpy as np

diff --git a/utils.py b/utils.py
diff --git a/python_utils/__init__.py → utils/__init__.py b/python_utils/__init__.py → utils/__init__.py
diff --git a/python_utils/callbacks.py → utils/callbacks.py b/python_utils/callbacks.py → utils/callbacks.py
diff --git a/utils/color150/airplane.jpg b/utils/color150/airplane.jpg
diff --git a/utils/color150/animal.jpg b/utils/color150/animal.jpg
diff --git a/utils/color150/apparel.jpg b/utils/color150/apparel.jpg
diff --git a/utils/color150/arcade machine.jpg b/utils/color150/arcade machine.jpg
diff --git a/utils/color150/armchair.jpg b/utils/color150/armchair.jpg
diff --git a/utils/color150/ashcan.jpg b/utils/color150/ashcan.jpg
diff --git a/utils/color150/awning.jpg b/utils/color150/awning.jpg
diff --git a/utils/color150/bag.jpg b/utils/color150/bag.jpg
diff --git a/utils/color150/ball.jpg b/utils/color150/ball.jpg
diff --git a/utils/color150/bannister.jpg b/utils/color150/bannister.jpg
diff --git a/utils/color150/bar.jpg b/utils/color150/bar.jpg
diff --git a/utils/color150/barrel.jpg b/utils/color150/barrel.jpg
diff --git a/utils/color150/base.jpg b/utils/color150/base.jpg
diff --git a/utils/color150/basket.jpg b/utils/color150/basket.jpg
diff --git a/utils/color150/bathtub.jpg b/utils/color150/bathtub.jpg
diff --git a/utils/color150/bed.jpg b/utils/color150/bed.jpg
diff --git a/utils/color150/bench.jpg b/utils/color150/bench.jpg
diff --git a/utils/color150/bicycle.jpg b/utils/color150/bicycle.jpg
diff --git a/utils/color150/bike.jpg b/utils/color150/bike.jpg
diff --git a/utils/color150/blanket.jpg b/utils/color150/blanket.jpg
diff --git a/utils/color150/blind.jpg b/utils/color150/blind.jpg
diff --git a/utils/color150/boat.jpg b/utils/color150/boat.jpg
diff --git a/utils/color150/book.jpg b/utils/color150/book.jpg
diff --git a/utils/color150/bookcase.jpg b/utils/color150/bookcase.jpg
diff --git a/utils/color150/booth.jpg b/utils/color150/booth.jpg
diff --git a/utils/color150/bottle.jpg b/utils/color150/bottle.jpg
diff --git a/utils/color150/box.jpg b/utils/color150/box.jpg
diff --git a/utils/color150/bridge.jpg b/utils/color150/bridge.jpg
diff --git a/utils/color150/buffet.jpg b/utils/color150/buffet.jpg
diff --git a/utils/color150/building.jpg b/utils/color150/building.jpg
diff --git a/utils/color150/bulletin board.jpg b/utils/color150/bulletin board.jpg
diff --git a/utils/color150/bus.jpg b/utils/color150/bus.jpg
diff --git a/utils/color150/cabinet.jpg b/utils/color150/cabinet.jpg
diff --git a/utils/color150/canopy.jpg b/utils/color150/canopy.jpg
diff --git a/utils/color150/car.jpg b/utils/color150/car.jpg
diff --git a/utils/color150/case.jpg b/utils/color150/case.jpg
diff --git a/utils/color150/ceiling.jpg b/utils/color150/ceiling.jpg
diff --git a/utils/color150/chair.jpg b/utils/color150/chair.jpg
diff --git a/utils/color150/chandelier.jpg b/utils/color150/chandelier.jpg
diff --git a/utils/color150/chest of drawers.jpg b/utils/color150/chest of drawers.jpg
diff --git a/utils/color150/clock.jpg b/utils/color150/clock.jpg
diff --git a/utils/color150/coffee table.jpg b/utils/color150/coffee table.jpg
diff --git a/utils/color150/column.jpg b/utils/color150/column.jpg
diff --git a/utils/color150/computer.jpg b/utils/color150/computer.jpg
diff --git a/utils/color150/conveyer belt.jpg b/utils/color150/conveyer belt.jpg
diff --git a/utils/color150/counter.jpg b/utils/color150/counter.jpg
diff --git a/utils/color150/countertop.jpg b/utils/color150/countertop.jpg
diff --git a/utils/color150/cradle.jpg b/utils/color150/cradle.jpg
diff --git a/utils/color150/crt screen.jpg b/utils/color150/crt screen.jpg
diff --git a/utils/color150/curtain.jpg b/utils/color150/curtain.jpg
diff --git a/utils/color150/cushion.jpg b/utils/color150/cushion.jpg
diff --git a/utils/color150/desk.jpg b/utils/color150/desk.jpg
diff --git a/utils/color150/dirt track.jpg b/utils/color150/dirt track.jpg
diff --git a/utils/color150/dishwasher.jpg b/utils/color150/dishwasher.jpg
diff --git a/utils/color150/door.jpg b/utils/color150/door.jpg
diff --git a/utils/color150/earth.jpg b/utils/color150/earth.jpg
diff --git a/utils/color150/escalator.jpg b/utils/color150/escalator.jpg
diff --git a/utils/color150/fan.jpg b/utils/color150/fan.jpg
diff --git a/utils/color150/fence.jpg b/utils/color150/fence.jpg
diff --git a/utils/color150/field.jpg b/utils/color150/field.jpg
diff --git a/utils/color150/fireplace.jpg b/utils/color150/fireplace.jpg
diff --git a/utils/color150/flag.jpg b/utils/color150/flag.jpg
diff --git a/utils/color150/floor.jpg b/utils/color150/floor.jpg
diff --git a/utils/color150/flower.jpg b/utils/color150/flower.jpg
diff --git a/utils/color150/food.jpg b/utils/color150/food.jpg
diff --git a/utils/color150/fountain.jpg b/utils/color150/fountain.jpg
diff --git a/utils/color150/furniture.jpg b/utils/color150/furniture.jpg
diff --git a/utils/color150/glass.jpg b/utils/color150/glass.jpg
diff --git a/utils/color150/grandstand.jpg b/utils/color150/grandstand.jpg
diff --git a/utils/color150/grass.jpg b/utils/color150/grass.jpg
diff --git a/utils/color150/hill.jpg b/utils/color150/hill.jpg
diff --git a/utils/color150/hood.jpg b/utils/color150/hood.jpg
diff --git a/utils/color150/house.jpg b/utils/color150/house.jpg
diff --git a/utils/color150/houseware.jpg b/utils/color150/houseware.jpg
diff --git a/utils/color150/hovel.jpg b/utils/color150/hovel.jpg
diff --git a/utils/color150/kitchen island.jpg b/utils/color150/kitchen island.jpg
diff --git a/utils/color150/lake.jpg b/utils/color150/lake.jpg
diff --git a/utils/color150/lamp.jpg b/utils/color150/lamp.jpg
diff --git a/utils/color150/land.jpg b/utils/color150/land.jpg
diff --git a/utils/color150/light.jpg b/utils/color150/light.jpg
diff --git a/utils/color150/microwave.jpg b/utils/color150/microwave.jpg
diff --git a/utils/color150/minibike.jpg b/utils/color150/minibike.jpg
diff --git a/utils/color150/mirror.jpg b/utils/color150/mirror.jpg
diff --git a/utils/color150/monitor.jpg b/utils/color150/monitor.jpg
diff --git a/utils/color150/mountain.jpg b/utils/color150/mountain.jpg
diff --git a/utils/color150/ottoman.jpg b/utils/color150/ottoman.jpg
diff --git a/utils/color150/oven.jpg b/utils/color150/oven.jpg
diff --git a/utils/color150/painting.jpg b/utils/color150/painting.jpg
diff --git a/utils/color150/palm.jpg b/utils/color150/palm.jpg
diff --git a/utils/color150/path.jpg b/utils/color150/path.jpg
diff --git a/utils/color150/person.jpg b/utils/color150/person.jpg
diff --git a/utils/color150/pier.jpg b/utils/color150/pier.jpg
diff --git a/utils/color150/pillow.jpg b/utils/color150/pillow.jpg
diff --git a/utils/color150/plant.jpg b/utils/color150/plant.jpg
diff --git a/utils/color150/plate.jpg b/utils/color150/plate.jpg
diff --git a/utils/color150/plaything.jpg b/utils/color150/plaything.jpg
diff --git a/utils/color150/pole.jpg b/utils/color150/pole.jpg
diff --git a/utils/color150/pool table.jpg b/utils/color150/pool table.jpg
diff --git a/utils/color150/poster.jpg b/utils/color150/poster.jpg
diff --git a/utils/color150/pot.jpg b/utils/color150/pot.jpg
diff --git a/utils/color150/radiator.jpg b/utils/color150/radiator.jpg
diff --git a/utils/color150/railing.jpg b/utils/color150/railing.jpg
diff --git a/utils/color150/refrigerator.jpg b/utils/color150/refrigerator.jpg
diff --git a/utils/color150/river.jpg b/utils/color150/river.jpg
diff --git a/utils/color150/road.jpg b/utils/color150/road.jpg
diff --git a/utils/color150/rock.jpg b/utils/color150/rock.jpg
diff --git a/utils/color150/rug.jpg b/utils/color150/rug.jpg
diff --git a/utils/color150/runway.jpg b/utils/color150/runway.jpg
diff --git a/utils/color150/sand.jpg b/utils/color150/sand.jpg
diff --git a/utils/color150/sconce.jpg b/utils/color150/sconce.jpg
diff --git a/utils/color150/screen door.jpg b/utils/color150/screen door.jpg
diff --git a/utils/color150/screen.jpg b/utils/color150/screen.jpg
diff --git a/utils/color150/sculpture.jpg b/utils/color150/sculpture.jpg
diff --git a/utils/color150/sea.jpg b/utils/color150/sea.jpg
diff --git a/utils/color150/seat.jpg b/utils/color150/seat.jpg
diff --git a/utils/color150/shelf.jpg b/utils/color150/shelf.jpg
diff --git a/utils/color150/ship.jpg b/utils/color150/ship.jpg
diff --git a/utils/color150/shower.jpg b/utils/color150/shower.jpg
diff --git a/utils/color150/sidewalk.jpg b/utils/color150/sidewalk.jpg
diff --git a/utils/color150/signboard.jpg b/utils/color150/signboard.jpg
diff --git a/utils/color150/sink.jpg b/utils/color150/sink.jpg
diff --git a/utils/color150/sky.jpg b/utils/color150/sky.jpg
diff --git a/utils/color150/skyscraper.jpg b/utils/color150/skyscraper.jpg
diff --git a/utils/color150/sofa.jpg b/utils/color150/sofa.jpg
diff --git a/utils/color150/stage.jpg b/utils/color150/stage.jpg
diff --git a/utils/color150/stairs.jpg b/utils/color150/stairs.jpg
diff --git a/utils/color150/stairway.jpg b/utils/color150/stairway.jpg
diff --git a/utils/color150/step.jpg b/utils/color150/step.jpg
diff --git a/utils/color150/stool.jpg b/utils/color150/stool.jpg
diff --git a/utils/color150/stove.jpg b/utils/color150/stove.jpg
diff --git a/utils/color150/streetlight.jpg b/utils/color150/streetlight.jpg
diff --git a/utils/color150/swimming pool.jpg b/utils/color150/swimming pool.jpg
diff --git a/utils/color150/swivel chair.jpg b/utils/color150/swivel chair.jpg
diff --git a/utils/color150/table.jpg b/utils/color150/table.jpg
diff --git a/utils/color150/tank.jpg b/utils/color150/tank.jpg
diff --git a/utils/color150/television receiver.jpg b/utils/color150/television receiver.jpg
diff --git a/utils/color150/tent.jpg b/utils/color150/tent.jpg
diff --git a/utils/color150/toilet.jpg b/utils/color150/toilet.jpg
diff --git a/utils/color150/towel.jpg b/utils/color150/towel.jpg
diff --git a/utils/color150/tower.jpg b/utils/color150/tower.jpg
diff --git a/utils/color150/trade name.jpg b/utils/color150/trade name.jpg
diff --git a/utils/color150/traffic light.jpg b/utils/color150/traffic light.jpg
diff --git a/utils/color150/tray.jpg b/utils/color150/tray.jpg
diff --git a/utils/color150/tree.jpg b/utils/color150/tree.jpg
diff --git a/utils/color150/truck.jpg b/utils/color150/truck.jpg
diff --git a/utils/color150/van.jpg b/utils/color150/van.jpg
diff --git a/utils/color150/vase.jpg b/utils/color150/vase.jpg
diff --git a/utils/color150/wall.jpg b/utils/color150/wall.jpg
diff --git a/utils/color150/wardrobe.jpg b/utils/color150/wardrobe.jpg
diff --git a/utils/color150/washer.jpg b/utils/color150/washer.jpg
diff --git a/utils/color150/water.jpg b/utils/color150/water.jpg
diff --git a/utils/color150/waterfall.jpg b/utils/color150/waterfall.jpg
diff --git a/utils/color150/windowpane.jpg b/utils/color150/windowpane.jpg
diff --git a/utils/colorization/color150.mat b/utils/colorization/color150.mat
diff --git a/utils/colorization/objectName150.mat b/utils/colorization/objectName150.mat