Move lmnet/executor/train.py to blueoil/cmd

blueoil/cmd/main.py

@@ -68,10 +68,15 @@ def init(output):
     '--experiment_id',
     help='ID of this training.',
     default=None,
-    required=False,
 )
-def train(config, experiment_id=None):
-    experiment_id, checkpoint_name = run_train(config, experiment_id)
+@click.option(
+    '--recreate',
+    is_flag=True,
+    help='Delete and recreate experiment id dir',
+    default=False,
+)
+def train(config, experiment_id, recreate):
+    experiment_id, checkpoint_name = run_train(config, experiment_id, recreate)
     click.echo('Next step: blueoil convert -e {} -p {}'.format(
         experiment_id,
         checkpoint_name

lmnet/tests/executor_tests/test_build_tfds.py

@@ -17,7 +17,7 @@
 import pytest
 
 from blueoil.cmd.build_tfds import run
-from executor.train import run as train_run
+from blueoil.cmd.train import run as train_run
 from blueoil import environment
 from blueoil.datasets.dataset_iterator import DatasetIterator
 from blueoil.datasets.tfds import TFDSClassification, TFDSObjectDetection

lmnet/tests/executor_tests/test_export.py

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

lmnet/tests/executor_tests/test_predict.py

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

lmnet/tests/executor_tests/test_profile.py

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

lmnet/tests/executor_tests/test_train.py

@@ -15,7 +15,7 @@
 # =============================================================================
 import pytest
 
-from executor.train import run
+from blueoil.cmd.train import run
 
 # Apply reset_default_graph() in conftest.py to all tests in this file.
 # Set test environment

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

@@ -17,7 +17,7 @@
 import tensorflow as tf
 from easydict import EasyDict
 
-from executor.train import start_training
+from blueoil.cmd.train import start_training
 from blueoil import environment
 from blueoil.common import Tasks
 from blueoil.networks.classification.darknet import Darknet

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

@@ -17,7 +17,7 @@
 import tensorflow as tf
 from easydict import EasyDict
 
-from executor.train import start_training
+from blueoil.cmd.train import start_training
 from blueoil import environment
 from blueoil.common import Tasks
 from blueoil.networks.classification.lm_resnet import LmResnetQuantize

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

@@ -17,7 +17,7 @@
 import tensorflow as tf
 from easydict import EasyDict
 
-from executor.train import start_training
+from blueoil.cmd.train import start_training
 from blueoil import environment
 from blueoil.common import Tasks
 from blueoil.networks.classification.lmnet_quantize import LmnetQuantize

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

@@ -32,7 +32,7 @@
     binary_channel_wise_mean_scaling_quantizer,
     linear_mid_tread_half_quantizer,
 )
-from executor.train import start_training
+from blueoil.cmd.train import start_training
 
 
 # Apply reset_default_graph() in conftest.py to all tests in this file.

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

@@ -18,7 +18,7 @@
 import tensorflow as tf
 from easydict import EasyDict
 
-from executor.train import start_training
+from blueoil.cmd.train import start_training
 from blueoil import environment
 from blueoil.common import Tasks
 from blueoil.networks.object_detection.yolo_v1 import YoloV1

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

@@ -18,7 +18,7 @@
 import tensorflow as tf
 from easydict import EasyDict
 
-from executor.train import start_training
+from blueoil.cmd.train import start_training
 from blueoil import environment
 from blueoil.common import Tasks
 from blueoil.data_processor import Sequence

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

@@ -17,7 +17,7 @@
 import tensorflow as tf
 from easydict import EasyDict
 
-from executor.train import start_training
+from blueoil.cmd.train import start_training
 from blueoil import environment
 from blueoil.common import Tasks
 from blueoil.networks.object_detection.yolo_v2_quantize import YoloV2Quantize

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

@@ -18,7 +18,7 @@
 import tensorflow as tf
 from easydict import EasyDict
 
-from executor.train import start_training
+from blueoil.cmd.train import start_training
 from blueoil import environment
 from blueoil.common import Tasks
 from blueoil.data_processor import Sequence