blue-oil · bo-mergebot · Feb 13, 2020 · Feb 13, 2020 · Feb 13, 2020 · Feb 13, 2020
diff --git a/blueoil/cmd/init.py b/blueoil/cmd/init.py
@@ -24,7 +24,7 @@
 
 import blueoil.data_augmentor as augmentor
 from blueoil.generate_lmnet_config import generate
-from lmnet.data_processor import Processor
+from blueoil.data_processor import Processor
 
 
 task_type_choices = [

diff --git a/blueoil/configs/convert_weight_from_darknet/darknet19.py b/blueoil/configs/convert_weight_from_darknet/darknet19.py
@@ -18,7 +18,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.classification.darknet import Darknet
 from blueoil.datasets.ilsvrc_2012 import Ilsvrc2012
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     Resize,
     DivideBy255,

diff --git a/blueoil/configs/convert_weight_from_darknet/yolo_v2.py b/blueoil/configs/convert_weight_from_darknet/yolo_v2.py
@@ -18,7 +18,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.object_detection.yolo_v2 import YoloV2
 from blueoil.datasets.pascalvoc_2007 import Pascalvoc2007
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     ResizeWithGtBoxes,
     DivideBy255,

diff --git a/blueoil/configs/core/classification/darknet_cifar10.py b/blueoil/configs/core/classification/darknet_cifar10.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.classification.darknet import Darknet
 from blueoil.datasets.cifar10 import Cifar10
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     Resize,
     DivideBy255,

diff --git a/blueoil/configs/core/classification/darknet_quantize_cifar10.py b/blueoil/configs/core/classification/darknet_quantize_cifar10.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.classification.darknet import DarknetQuantize
 from blueoil.datasets.cifar10 import Cifar10
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     Resize,
     DivideBy255,

diff --git a/blueoil/configs/core/classification/darknet_quantize_ilsvrc_2012.py b/blueoil/configs/core/classification/darknet_quantize_ilsvrc_2012.py
@@ -18,7 +18,7 @@
 
 from blueoil.common import Tasks
 from blueoil.datasets.ilsvrc_2012 import Ilsvrc2012
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from blueoil.data_augmentor import (
     Brightness,
     Color,

diff --git a/blueoil/configs/core/classification/lm_resnet_quantize_cifar10.py b/blueoil/configs/core/classification/lm_resnet_quantize_cifar10.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.classification.lm_resnet import LmResnetQuantize
 from blueoil.datasets.cifar10 import Cifar10
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     Resize,
     PerImageStandardization,

diff --git a/blueoil/configs/core/classification/lmnet_cifar10.py b/blueoil/configs/core/classification/lmnet_cifar10.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.classification import Lmnet
 from blueoil.datasets.cifar10 import Cifar10
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     Resize,
     PerImageStandardization,

diff --git a/blueoil/configs/core/classification/lmnet_cifar100.py b/blueoil/configs/core/classification/lmnet_cifar100.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.classification.lmnet import Lmnet
 from blueoil.datasets.cifar100 import Cifar100
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     Resize,
     PerImageStandardization,

diff --git a/blueoil/configs/core/classification/lmnet_openimagesv4.py b/blueoil/configs/core/classification/lmnet_openimagesv4.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.classification import Lmnet
 from blueoil.datasets.open_images_v4 import OpenImagesV4Classification
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     Resize,
     PerImageStandardization,

diff --git a/blueoil/configs/core/classification/lmnet_quantize_cifar10.py b/blueoil/configs/core/classification/lmnet_quantize_cifar10.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.classification import LmnetQuantize
 from blueoil.datasets.cifar10 import Cifar10
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     Resize,
     DivideBy255,

diff --git a/blueoil/configs/core/classification/lmnet_quantize_cifar100.py b/blueoil/configs/core/classification/lmnet_quantize_cifar100.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.classification.lmnet_quantize import LmnetQuantize
 from blueoil.datasets.cifar100 import Cifar100
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     Resize,
     DivideBy255,

diff --git a/blueoil/configs/core/classification/lmnet_v1_cifar10.py b/blueoil/configs/core/classification/lmnet_v1_cifar10.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.classification.lmnet_v1 import LmnetV1
 from blueoil.datasets.cifar10 import Cifar10
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     Resize,
     PerImageStandardization,

diff --git a/blueoil/configs/core/classification/lmnet_v1_quantize_cifar10.py b/blueoil/configs/core/classification/lmnet_v1_quantize_cifar10.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.classification.lmnet_v1 import LmnetV1Quantize
 from blueoil.datasets.cifar10 import Cifar10
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     Resize,
     DivideBy255,

diff --git a/blueoil/configs/core/classification/lmnet_v1_quantize_cifar10_tune.py b/blueoil/configs/core/classification/lmnet_v1_quantize_cifar10_tune.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.classification.lmnet_v1 import LmnetV1Quantize
 from blueoil.datasets.cifar10 import Cifar10
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     Resize,
     DivideBy255,

diff --git a/blueoil/configs/core/classification/mobilenet_v2_cifar10.py b/blueoil/configs/core/classification/mobilenet_v2_cifar10.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.classification.mobilenet_v2 import MobileNetV2
 from blueoil.datasets.cifar10 import Cifar10
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     Resize,
     DivideBy255,

diff --git a/blueoil/configs/core/classification/resnet_cifar10.py b/blueoil/configs/core/classification/resnet_cifar10.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.classification.resnet import Resnet
 from blueoil.datasets.cifar10 import Cifar10
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     Resize,
     PerImageStandardization,

diff --git a/blueoil/configs/core/keypoint_detection/lm_single_pose_v1_quantize_mscoco.py b/blueoil/configs/core/keypoint_detection/lm_single_pose_v1_quantize_mscoco.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.keypoint_detection.lm_single_pose_v1 import LmSinglePoseV1Quantize
 from blueoil.datasets.mscoco_2017 import MscocoSinglePersonKeypoints
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     DivideBy255,
     ResizeWithJoints,

diff --git a/blueoil/configs/core/object_detection/lm_fyolo_bdd100k.py b/blueoil/configs/core/object_detection/lm_fyolo_bdd100k.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.data_augmentor import (Brightness, Color, Contrast, FlipLeftRight,
                                   Hue, SSDRandomCrop)
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from blueoil.networks.object_detection.lm_fyolo import LMFYolo
 from blueoil.datasets.bdd100k import BDD100KObjectDetection
 from lmnet.post_processor import NMS, ExcludeLowScoreBox, FormatYoloV2

diff --git a/blueoil/configs/core/object_detection/lm_fyolo_quantize_pascalvoc_2007_2012.py b/blueoil/configs/core/object_detection/lm_fyolo_quantize_pascalvoc_2007_2012.py
@@ -21,7 +21,7 @@
 
 
 from blueoil.datasets.pascalvoc_2007_2012 import Pascalvoc20072012
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     ResizeWithGtBoxes,
     DivideBy255,

diff --git a/blueoil/configs/core/object_detection/yolo_v2_quantize_pascalvoc_2007_2012.py b/blueoil/configs/core/object_detection/yolo_v2_quantize_pascalvoc_2007_2012.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.object_detection.yolo_v2_quantize import YoloV2Quantize
 from blueoil.datasets.pascalvoc_2007_2012 import Pascalvoc20072012
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     ResizeWithGtBoxes,
     DivideBy255,

diff --git a/blueoil/configs/core/segmentation/lm_bisenet_quantize_camvid.py b/blueoil/configs/core/segmentation/lm_bisenet_quantize_camvid.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.segmentation.lm_bisenet import LMBiSeNetQuantize
 from blueoil.datasets.camvid import Camvid
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     Resize,
     PerImageStandardization,

diff --git a/blueoil/configs/core/segmentation/lm_segnet_v0_quantize_camvid.py b/blueoil/configs/core/segmentation/lm_segnet_v0_quantize_camvid.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.segmentation.lm_segnet_v0 import LmSegnetV0Quantize
 from blueoil.datasets.camvid import Camvid
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     Resize,
     DivideBy255,

diff --git a/blueoil/configs/core/segmentation/lm_segnet_v1_quantize_camvid.py b/blueoil/configs/core/segmentation/lm_segnet_v1_quantize_camvid.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.segmentation.lm_segnet_v1 import LmSegnetV1Quantize
 from blueoil.datasets.camvid import Camvid
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     Resize,
     DivideBy255,

diff --git a/blueoil/configs/core/segmentation/segnet_camvid.py b/blueoil/configs/core/segmentation/segnet_camvid.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.segmentation.lm_segnet import LmSegnet
 from blueoil.datasets.camvid import Camvid
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     PerImageStandardization,
 )

diff --git a/blueoil/configs/core/segmentation/segnet_quantize_bdd100k.py b/blueoil/configs/core/segmentation/segnet_quantize_bdd100k.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.data_augmentor import (Brightness, Color, Contrast, FlipLeftRight,
                                   Hue)
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from blueoil.networks.segmentation.lm_segnet_quantize import LmSegnetQuantize
 from blueoil.datasets.bdd100k import BDD100KSegmentation
 from lmnet.pre_processor import DivideBy255, Resize

diff --git a/blueoil/configs/core/segmentation/segnet_quantize_camvid.py b/blueoil/configs/core/segmentation/segnet_quantize_camvid.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.segmentation.lm_segnet_quantize import LmSegnetQuantize
 from blueoil.datasets.camvid import Camvid
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     DivideBy255,
 )

diff --git a/blueoil/configs/core/segmentation/segnet_quantize_camvid_tune.py b/blueoil/configs/core/segmentation/segnet_quantize_camvid_tune.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.segmentation.lm_segnet_v1 import LmSegnetV1Quantize
 from blueoil.datasets.camvid import Camvid
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     Resize,
     DivideBy255,

diff --git a/blueoil/configs/core/segmentation/segnet_quantize_cityscapes.py b/blueoil/configs/core/segmentation/segnet_quantize_cityscapes.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.segmentation.lm_segnet_quantize import LmSegnetQuantize
 from blueoil.datasets.cityscapes import Cityscapes
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     DivideBy255,
     Resize

diff --git a/blueoil/configs/example/classification.py b/blueoil/configs/example/classification.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.classification.lmnet_v0 import LmnetV0Quantize
 from blueoil.datasets.cifar10 import Cifar10
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     Resize,
     PerImageStandardization,

diff --git a/blueoil/configs/example/classification.yaml b/blueoil/configs/example/classification.yaml
@@ -11,7 +11,7 @@ CLASSES:
 - ship
 - truck
 DATASET:
-  AUGMENTOR: !!python/object:lmnet.data_processor.Sequence
+  AUGMENTOR: !!python/object:blueoil.data_processor.Sequence
     processors:
     - !!python/object:blueoil.data_augmentor.FlipLeftRight
       probability: 0.5
@@ -29,7 +29,7 @@ DATASET:
       min_value: -10
   BATCH_SIZE: 32
   DATA_FORMAT: NHWC
-  PRE_PROCESSOR: !!python/object:lmnet.data_processor.Sequence
+  PRE_PROCESSOR: !!python/object:blueoil.data_processor.Sequence
     processors:
     - !!python/object:lmnet.pre_processor.Resize
       size:
@@ -78,7 +78,7 @@ PRETRAIN_VARS:
 - 'conv5/bias:'
 - 'conv6/kernel:'
 - 'conv6/bias:'
-PRE_PROCESSOR: !!python/object:lmnet.data_processor.Sequence
+PRE_PROCESSOR: !!python/object:blueoil.data_processor.Sequence
   processors:
   - !!python/object:lmnet.pre_processor.Resize
     size:

diff --git a/blueoil/configs/example/object_detection.py b/blueoil/configs/example/object_detection.py
@@ -19,7 +19,7 @@
 from blueoil.common import Tasks
 from blueoil.networks.object_detection.yolo_v2_quantize import YoloV2Quantize
 from blueoil.datasets.pascalvoc_2007_2012 import Pascalvoc20072012
-from lmnet.data_processor import Sequence
+from blueoil.data_processor import Sequence
 from lmnet.pre_processor import (
     ResizeWithGtBoxes,
     DivideBy255,

diff --git a/blueoil/configs/example/object_detection.yaml b/blueoil/configs/example/object_detection.yaml
@@ -21,7 +21,7 @@ CLASSES:
 - train
 - tvmonitor
 DATASET:
-  AUGMENTOR: !!python/object:lmnet.data_processor.Sequence
+  AUGMENTOR: !!python/object:blueoil.data_processor.Sequence
     processors:
     - !!python/object:blueoil.data_augmentor.FlipLeftRight
       probability: 0.5
@@ -60,7 +60,7 @@ DATASET:
         - null
   BATCH_SIZE: 16
   DATA_FORMAT: NCHW
-  PRE_PROCESSOR: !!python/object:lmnet.data_processor.Sequence
+  PRE_PROCESSOR: !!python/object:blueoil.data_processor.Sequence
     processors:
     - !!python/object:lmnet.pre_processor.ResizeWithGtBoxes
       size:
@@ -134,7 +134,7 @@ NETWORK:
   WEIGHT_QUANTIZER_KWARGS: {}
 NETWORK_CLASS: !!python/name:blueoil.networks.object_detection.yolo_v2_quantize.YoloV2Quantize ''
 NMS: !!python/name:lmnet.post_processor.NMS ''
-POST_PROCESSOR: !!python/object:lmnet.data_processor.Sequence
+POST_PROCESSOR: !!python/object:blueoil.data_processor.Sequence
   processors:
   - !!python/object:lmnet.post_processor.FormatYoloV2
     anchors:
@@ -189,7 +189,7 @@ POST_PROCESSOR: !!python/object:lmnet.data_processor.Sequence
 PRETRAIN_DIR: ''
 PRETRAIN_FILE: ''
 PRETRAIN_VARS: []
-PRE_PROCESSOR: !!python/object:lmnet.data_processor.Sequence
+PRE_PROCESSOR: !!python/object:blueoil.data_processor.Sequence
   processors:
   - !!python/object:lmnet.pre_processor.ResizeWithGtBoxes
     size:

diff --git a/blueoil/data_augmentor.py b/blueoil/data_augmentor.py
@@ -21,7 +21,8 @@
 import numpy as np
 from PIL import Image, ImageEnhance, ImageFilter
 
-from lmnet import data_processor, pre_processor
+from blueoil import data_processor
+from lmnet import pre_processor
 from blueoil.utils.box import fill_dummy_boxes, crop_boxes, iou
 
 

diff --git a/lmnet/lmnet/data_processor.py → blueoil/data_processor.py b/lmnet/lmnet/data_processor.py → blueoil/data_processor.py
diff --git a/blueoil/datasets/cifar10.py b/blueoil/datasets/cifar10.py
@@ -19,7 +19,7 @@
 
 import numpy as np
 
-from lmnet import data_processor
+from blueoil import data_processor
 from blueoil.datasets.base import Base
 from blueoil.utils.random import shuffle
 

diff --git a/blueoil/datasets/cifar100.py b/blueoil/datasets/cifar100.py
@@ -19,7 +19,7 @@
 
 import numpy as np
 
-from lmnet import data_processor
+from blueoil import data_processor
 from blueoil.datasets.base import Base
 from blueoil.utils.random import shuffle
 

diff --git a/blueoil/datasets/dataset_iterator.py b/blueoil/datasets/dataset_iterator.py
@@ -316,7 +316,7 @@ def close(self):
 if __name__ == '__main__':
 
     from blueoil.datasets.cifar10 import Cifar10
-    from lmnet.data_processor import Sequence
+    from blueoil.data_processor import Sequence
     from blueoil.data_augmentor import FlipLeftRight, Hue, Blur
 
     cifar10 = Cifar10()

diff --git a/blueoil/datasets/delta_mark.py b/blueoil/datasets/delta_mark.py
@@ -20,7 +20,7 @@
 import numpy as np
 import pandas as pd
 
-from lmnet import data_processor
+from blueoil import data_processor
 from blueoil.datasets.base import Base, ObjectDetectionBase, StoragePathCustomizable
 from blueoil.utils.image import load_image
 from blueoil.utils.random import shuffle, train_test_split

diff --git a/blueoil/datasets/ilsvrc_2012.py b/blueoil/datasets/ilsvrc_2012.py
@@ -20,7 +20,7 @@
 import numpy as np
 import pandas as pd
 
-from lmnet import data_processor
+from blueoil import data_processor
 from blueoil.utils.image import load_image
 from blueoil.datasets.base import Base