Move lmnet/lmnet/environment.py to blueoil/environment.py (#832)

blueoil/cmd/convert_weight_from_darknet.py

@@ -20,7 +20,7 @@
 import numpy as np
 import tensorflow as tf
 
-from lmnet import environment
+from blueoil import environment
 from blueoil.networks.classification.darknet import Darknet
 from blueoil.networks.object_detection.yolo_v2 import YoloV2
 from blueoil.utils import config as config_util

blueoil/cmd/evaluate.py

@@ -21,7 +21,7 @@
 import click
 import tensorflow as tf
 
-from lmnet import environment
+from blueoil import environment
 from blueoil.datasets.base import ObjectDetectionBase
 from blueoil.datasets.dataset_iterator import DatasetIterator
 from blueoil.datasets.tfds import TFDSClassification, TFDSObjectDetection

blueoil/cmd/export.py

@@ -21,7 +21,7 @@
 import numpy as np
 import tensorflow as tf
 
-from lmnet import environment
+from blueoil import environment
 from blueoil.utils.image import load_image
 from blueoil.utils import config as config_util
 from blueoil.utils import executor

blueoil/cmd/measure_latency.py

@@ -22,7 +22,7 @@
 import tensorflow as tf
 from tensorflow.python.client import device_lib
 
-from lmnet import environment
+from blueoil import environment
 from blueoil.utils.image import load_image
 from blueoil.utils import config as config_util
 from blueoil.utils import executor

blueoil/cmd/output_event.py

@@ -22,7 +22,7 @@
 from tensorboard.backend.event_processing.event_accumulator import EventAccumulator
 from tensorboard.backend.event_processing.io_wrapper import GetLogdirSubdirectories
 
-from lmnet import environment
+from blueoil import environment
 
 
 def _get_metrics_keys(event_accumulator):

blueoil/cmd/profile_model.py

@@ -21,7 +21,7 @@
 import click
 import tensorflow as tf
 
-from lmnet import environment
+from blueoil import environment
 from blueoil.utils import config as config_util
 from blueoil.utils import executor
 

blueoil/datasets/base.py

@@ -18,7 +18,7 @@
 
 import numpy as np
 
-from lmnet import environment
+from blueoil import environment
 
 
 class Base(metaclass=ABCMeta):

blueoil/utils/config.py

@@ -22,7 +22,7 @@
 from tensorflow.io import gfile
 from yaml.representer import Representer
 
-from lmnet import environment
+from blueoil import environment
 from blueoil.common import Tasks
 from lmnet.data_processor import Processor, Sequence
 

blueoil/utils/executor.py

@@ -18,7 +18,7 @@
 import tensorflow as tf
 from tensorflow.io import gfile
 
-from lmnet import environment
+from blueoil import environment
 
 
 def init_logging(config):

lmnet/executor/predict.py

@@ -22,7 +22,7 @@
 import numpy as np
 import tensorflow as tf
 
-from lmnet import environment
+from blueoil import environment
 from blueoil.utils.image import load_image
 from blueoil.utils import config as config_util
 from blueoil.utils.executor import search_restore_filename

lmnet/executor/train.py

@@ -21,7 +21,7 @@
 from tensorflow.core.util.event_pb2 import SessionLog
 from tensorflow.keras.utils import Progbar
 
-from lmnet import environment
+from blueoil import environment
 from blueoil.common import Tasks
 from blueoil.datasets.base import ObjectDetectionBase
 from blueoil.datasets.dataset_iterator import DatasetIterator

lmnet/tests/conftest.py

@@ -16,7 +16,7 @@
 import pytest
 import tensorflow as tf
 
-from lmnet import environment
+from blueoil import environment
 
 
 @pytest.fixture

lmnet/tests/executor_tests/test_build_tfds.py

@@ -18,7 +18,7 @@
 
 from blueoil.cmd.build_tfds import run
 from executor.train import run as train_run
-from lmnet import environment
+from blueoil import environment
 from blueoil.datasets.dataset_iterator import DatasetIterator
 from blueoil.datasets.tfds import TFDSClassification, TFDSObjectDetection
 from blueoil.utils import config as config_util

lmnet/tests/executor_tests/test_export.py

@@ -17,7 +17,7 @@
 
 from blueoil.cmd.export import run
 from executor.train import run as train_run
-from lmnet.environment import setup_test_environment
+from blueoil.environment import setup_test_environment
 
 # Apply reset_default_graph() in conftest.py to all tests in this file.
 # Set test environment

lmnet/tests/executor_tests/test_predict.py

@@ -17,7 +17,7 @@
 
 from executor.predict import run
 from executor.train import run as train_run
-from lmnet.environment import setup_test_environment
+from blueoil.environment import setup_test_environment
 
 # Apply reset_default_graph() in conftest.py to all tests in this file.
 # Set test environment

lmnet/tests/executor_tests/test_profile.py

@@ -17,7 +17,7 @@
 
 from blueoil.cmd.profile_model import run
 from executor.train import run as train_run
-from lmnet.environment import setup_test_environment
+from blueoil.environment import setup_test_environment
 
 # Apply reset_default_graph() in conftest.py to all tests in this file.
 # Set test environment

lmnet/tests/lmnet_tests/datasets_tests/test_dataset_iterator.py

@@ -64,7 +64,7 @@ def test_dataset_iterator_batch_order():
 
 
 if __name__ == '__main__':
-    from lmnet import environment
+    from blueoil import environment
     environment.setup_test_environment()
     test_dataset_iterator_batch_size()
     test_dataset_iterator_batch_order()

lmnet/tests/lmnet_tests/datasets_tests/test_delta_mark.py

@@ -253,7 +253,7 @@ def test_delta_mark_object_detection_has_validation_path():
 
 
 if __name__ == '__main__':
-    from lmnet.environment import setup_test_environment
+    from blueoil.environment import setup_test_environment
     setup_test_environment()
 
     test_delta_mark_classification()

lmnet/tests/lmnet_tests/datasets_tests/test_image_folder.py

@@ -20,7 +20,7 @@
 import numpy as np
 import pytest
 
-from lmnet import environment
+from blueoil import environment
 from blueoil.datasets.dataset_iterator import DatasetIterator
 from blueoil.datasets.image_folder import ImageFolderBase
 from lmnet.pre_processor import Resize
@@ -125,7 +125,7 @@ def test_image_folder_onthefly():
 
 
 if __name__ == '__main__':
-    from lmnet.environment import setup_test_environment
+    from blueoil.environment import setup_test_environment
     setup_test_environment()
 
     test_image_folder()

lmnet/tests/lmnet_tests/datasets_tests/test_open_images_v4.py

@@ -198,7 +198,7 @@ def test_custom_has_validation_open_images_v4_object_detection():
 
 
 if __name__ == '__main__':
-    from lmnet.environment import setup_test_environment
+    from blueoil.environment import setup_test_environment
     setup_test_environment()
 
     test_open_images_v4_classification()

lmnet/tests/lmnet_tests/networks_tests/classification_test/test_darknet.py

@@ -18,7 +18,7 @@
 from easydict import EasyDict
 
 from executor.train import start_training
-from lmnet import environment
+from blueoil import environment
 from blueoil.common import Tasks
 from blueoil.networks.classification.darknet import Darknet
 from blueoil.datasets.image_folder import ImageFolderBase

lmnet/tests/lmnet_tests/networks_tests/classification_test/test_lm_resnet_quantize.py

@@ -18,7 +18,7 @@
 from easydict import EasyDict
 
 from executor.train import start_training
-from lmnet import environment
+from blueoil import environment
 from blueoil.common import Tasks
 from blueoil.networks.classification.lm_resnet import LmResnetQuantize
 from blueoil.datasets.image_folder import ImageFolderBase

lmnet/tests/lmnet_tests/networks_tests/classification_test/test_lmnet_quantize.py

@@ -18,7 +18,7 @@
 from easydict import EasyDict
 
 from executor.train import start_training
-from lmnet import environment
+from blueoil import environment
 from blueoil.common import Tasks
 from blueoil.networks.classification.lmnet_quantize import LmnetQuantize
 from blueoil.datasets.image_folder import ImageFolderBase

lmnet/tests/lmnet_tests/networks_tests/keypoint_detection_tests/test_lm_single_pose_v1.py

@@ -17,7 +17,7 @@
 import pytest
 import tensorflow as tf
 
-from lmnet import environment
+from blueoil import environment
 from blueoil.common import Tasks
 from blueoil.networks.keypoint_detection.lm_single_pose_v1 import LmSinglePoseV1Quantize
 from blueoil.datasets.mscoco_2017 import MscocoSinglePersonKeypoints

lmnet/tests/lmnet_tests/networks_tests/object_detection_tests/test_yolo_v1.py

@@ -19,7 +19,7 @@
 from easydict import EasyDict
 
 from executor.train import start_training
-from lmnet import environment
+from blueoil import environment
 from blueoil.common import Tasks
 from blueoil.networks.object_detection.yolo_v1 import YoloV1
 from blueoil.datasets.pascalvoc_2007 import Pascalvoc2007

lmnet/tests/lmnet_tests/networks_tests/object_detection_tests/test_yolo_v2.py

@@ -19,7 +19,7 @@
 from easydict import EasyDict
 
 from executor.train import start_training
-from lmnet import environment
+from blueoil import environment
 from blueoil.common import Tasks
 from lmnet.data_processor import Sequence
 from blueoil.networks.object_detection.yolo_v2 import YoloV2

lmnet/tests/lmnet_tests/networks_tests/object_detection_tests/test_yolo_v2_quantize.py

@@ -18,7 +18,7 @@
 from easydict import EasyDict
 
 from executor.train import start_training
-from lmnet import environment
+from blueoil import environment
 from blueoil.common import Tasks
 from blueoil.networks.object_detection.yolo_v2_quantize import YoloV2Quantize
 from blueoil.datasets.pascalvoc_2007 import Pascalvoc2007

lmnet/tests/lmnet_tests/networks_tests/segmentation_tests/test_lm_bisenet.py

@@ -19,7 +19,7 @@
 from easydict import EasyDict
 
 from executor.train import start_training
-from lmnet import environment
+from blueoil import environment
 from blueoil.common import Tasks
 from lmnet.data_processor import Sequence
 from blueoil.networks.segmentation.lm_bisenet import LMBiSeNet

lmnet/tests/test_configs.py

@@ -18,7 +18,7 @@
 
 import pytest
 
-from lmnet import environment
+from blueoil import environment
 from blueoil.utils.config import _load_py, check_config, save_yaml
 
 pytestmark = pytest.mark.usefixtures("set_test_environment")

tests/e2e/conftest.py

@@ -7,7 +7,7 @@
 from blueoil.cmd.convert import convert
 from blueoil.cmd.predict import predict
 from blueoil.cmd.train import train
-from lmnet import environment
+from blueoil import environment
 from blueoil.utils.config import load
 
 
@@ -23,7 +23,7 @@ def init_env():
     environment_originals = {}
     environ_originals = {}
 
-    # TODO: Remove this setting after lmnet.environment has been refactored.
+    # TODO: Remove this setting after blueoil.environment has been refactored.
     envs = {
         "DATA_DIR": os.path.join(blueoil_dir, "lmnet", "tests", "fixtures", "datasets"),
         "OUTPUT_DIR": train_output_dir.name,
@@ -69,15 +69,15 @@ def run_all_steps(dirs, config_file):
     config = load(config_path)
 
     # Train
-    # TODO: Remove this setting after lmnet.environment has been refactored.
+    # TODO: Remove this setting after blueoil.environment has been refactored.
     environment._init_flag = False
     experiment_id, checkpoint_name = train(config_path)
 
     train_output_dir = os.path.join(dirs["train_output_dir"], experiment_id)
     assert os.path.exists(os.path.join(train_output_dir, 'checkpoints'))
 
     # Convert
-    # TODO: Remove this setting after lmnet.environment has been refactored.
+    # TODO: Remove this setting after blueoil.environment has been refactored.
     environment._init_flag = False
     convert(experiment_id)
 
@@ -102,7 +102,7 @@ def run_all_steps(dirs, config_file):
     predict_input_dir = os.path.join(dirs["blueoil_dir"], "lmnet/tests/fixtures/sample_images")
     predict_output_dir = dirs["predict_output_dir"]
 
-    # TODO: Remove this setting after lmnet.environment has been refactored.
+    # TODO: Remove this setting after blueoil.environment has been refactored.
     environment._init_flag = False
     predict(predict_input_dir, predict_output_dir, experiment_id, checkpoint_name)