From 897147f0527de5ad495bd52fb966bf69134b1b1c Mon Sep 17 00:00:00 2001
From: Mathieu Beligon <mathieu@feedly.com>
Date: Tue, 26 Jan 2021 10:13:21 -0500
Subject: [PATCH] [armors] Rename research robots->armors
---
src/polystar/dependency_injection.py | 4 ++--
.../armors_descriptors/armors_color_descriptor.py | 2 +-
.../armors_descriptors/armors_digit_descriptor.py | 2 +-
.../target_pipeline/detected_objects/detected_armor.py | 4 ++--
src/research/{robots => armors}/__init__.py | 0
.../{robots => armors}/armor_color/__init__.py | 0
.../{robots => armors}/armor_color/benchmarker.py | 6 +++---
.../{robots => armors}/armor_color/datasets.py | 4 ++--
.../{robots => armors}/armor_color/pipeline.py | 0
.../{robots => armors}/armor_color/scripts/__init__.py | 0
.../armor_color/scripts/benchmark.py | 4 ++--
.../armor_color/scripts/hyper_tune_cnn.py | 6 +++---
.../{robots => armors}/armor_digit/__init__.py | 0
.../armor_digit/armor_digit_dataset.py | 4 ++--
.../armor_digit/digit_benchmarker.py | 6 +++---
.../{robots => armors}/armor_digit/gcloud/__init__.py | 0
.../armor_digit/gcloud/gather_performances.py | 6 +++---
.../armor_digit/gcloud/hptuning_config.yaml | 0
.../{robots => armors}/armor_digit/gcloud/train.py | 8 ++++----
.../{robots => armors}/armor_digit/gcloud/train_cnn.py | 4 ++--
.../armor_digit/gcloud/train_vgg16.py | 4 ++--
.../armor_digit/gcloud/train_xception.py | 4 ++--
.../{robots => armors}/armor_digit/gcloud/trainer.sh | 0
.../{robots => armors}/armor_digit/pipeline.py | 0
.../{robots => armors}/armor_digit/scripts/__init__.py | 0
.../armor_digit/scripts/benchmark.py | 4 ++--
.../armor_digit/scripts/clean_datasets.py | 2 +-
.../{robots => armors}/armor_digit/scripts/evaluate.py | 2 +-
.../armor_digit/scripts/hyper_tune_cnn.py | 6 +++---
.../scripts/hyper_tune_distiled_vgg16_into_cnn.py | 6 +++---
.../armor_digit/scripts/train_kd_cnn.py | 4 ++--
.../armor_digit/scripts/train_vgg16.py | 4 ++--
.../{robots => armors}/armor_digit/training.py | 4 ++--
src/research/{robots => armors}/dataset/__init__.py | 0
.../dataset/armor_dataset_factory.py | 0
.../dataset/armor_value_dataset_cache.py | 4 ++--
.../dataset/armor_value_dataset_generator.py | 4 ++--
.../dataset/armor_value_target_factory.py | 0
src/research/{robots => armors}/demos/__init__.py | 0
src/research/{robots => armors}/demos/demo_pipeline.py | 0
.../{robots => armors}/demos/demo_pipeline_camera.py | 0
src/research/{robots => armors}/evaluation/__init__.py | 0
.../{robots => armors}/evaluation/benchmarker.py | 10 +++++-----
.../{robots => armors}/evaluation/evaluator.py | 8 ++++----
.../{robots => armors}/evaluation/hyper_tuner.py | 6 +++---
.../{robots => armors}/evaluation/metrics/__init__.py | 0
.../{robots => armors}/evaluation/metrics/accuracy.py | 4 ++--
.../{robots => armors}/evaluation/metrics/f1.py | 4 ++--
.../evaluation/metrics/metric_abc.py | 2 +-
.../{robots => armors}/evaluation/performance.py | 2 +-
src/research/{robots => armors}/evaluation/reporter.py | 8 ++++----
src/research/{robots => armors}/evaluation/set.py | 0
src/research/{robots => armors}/evaluation/trainer.py | 0
53 files changed, 76 insertions(+), 76 deletions(-)
rename src/research/{robots => armors}/__init__.py (100%)
rename src/research/{robots => armors}/armor_color/__init__.py (100%)
rename src/research/{robots => armors}/armor_color/benchmarker.py (70%)
rename src/research/{robots => armors}/armor_color/datasets.py (87%)
rename src/research/{robots => armors}/armor_color/pipeline.py (100%)
rename src/research/{robots => armors}/armor_color/scripts/__init__.py (100%)
rename src/research/{robots => armors}/armor_color/scripts/benchmark.py (95%)
rename src/research/{robots => armors}/armor_color/scripts/hyper_tune_cnn.py (85%)
rename src/research/{robots => armors}/armor_digit/__init__.py (100%)
rename src/research/{robots => armors}/armor_digit/armor_digit_dataset.py (91%)
rename src/research/{robots => armors}/armor_digit/digit_benchmarker.py (69%)
rename src/research/{robots => armors}/armor_digit/gcloud/__init__.py (100%)
rename src/research/{robots => armors}/armor_digit/gcloud/gather_performances.py (89%)
rename src/research/{robots => armors}/armor_digit/gcloud/hptuning_config.yaml (100%)
rename src/research/{robots => armors}/armor_digit/gcloud/train.py (73%)
rename src/research/{robots => armors}/armor_digit/gcloud/train_cnn.py (87%)
rename src/research/{robots => armors}/armor_digit/gcloud/train_vgg16.py (88%)
rename src/research/{robots => armors}/armor_digit/gcloud/train_xception.py (88%)
rename src/research/{robots => armors}/armor_digit/gcloud/trainer.sh (100%)
rename src/research/{robots => armors}/armor_digit/pipeline.py (100%)
rename src/research/{robots => armors}/armor_digit/scripts/__init__.py (100%)
rename src/research/{robots => armors}/armor_digit/scripts/benchmark.py (93%)
rename src/research/{robots => armors}/armor_digit/scripts/clean_datasets.py (94%)
rename src/research/{robots => armors}/armor_digit/scripts/evaluate.py (97%)
rename src/research/{robots => armors}/armor_digit/scripts/hyper_tune_cnn.py (84%)
rename src/research/{robots => armors}/armor_digit/scripts/hyper_tune_distiled_vgg16_into_cnn.py (88%)
rename src/research/{robots => armors}/armor_digit/scripts/train_kd_cnn.py (87%)
rename src/research/{robots => armors}/armor_digit/scripts/train_vgg16.py (84%)
rename src/research/{robots => armors}/armor_digit/training.py (76%)
rename src/research/{robots => armors}/dataset/__init__.py (100%)
rename src/research/{robots => armors}/dataset/armor_dataset_factory.py (100%)
rename src/research/{robots => armors}/dataset/armor_value_dataset_cache.py (95%)
rename src/research/{robots => armors}/dataset/armor_value_dataset_generator.py (96%)
rename src/research/{robots => armors}/dataset/armor_value_target_factory.py (100%)
rename src/research/{robots => armors}/demos/__init__.py (100%)
rename src/research/{robots => armors}/demos/demo_pipeline.py (100%)
rename src/research/{robots => armors}/demos/demo_pipeline_camera.py (100%)
rename src/research/{robots => armors}/evaluation/__init__.py (100%)
rename src/research/{robots => armors}/evaluation/benchmarker.py (86%)
rename src/research/{robots => armors}/evaluation/evaluator.py (95%)
rename src/research/{robots => armors}/evaluation/hyper_tuner.py (88%)
rename src/research/{robots => armors}/evaluation/metrics/__init__.py (100%)
rename src/research/{robots => armors}/evaluation/metrics/accuracy.py (67%)
rename src/research/{robots => armors}/evaluation/metrics/f1.py (83%)
rename src/research/{robots => armors}/evaluation/metrics/metric_abc.py (82%)
rename src/research/{robots => armors}/evaluation/performance.py (98%)
rename src/research/{robots => armors}/evaluation/reporter.py (98%)
rename src/research/{robots => armors}/evaluation/set.py (100%)
rename src/research/{robots => armors}/evaluation/trainer.py (100%)
diff --git a/src/polystar/dependency_injection.py b/src/polystar/dependency_injection.py
index ff7e5c3..857c63e 100644
--- a/src/polystar/dependency_injection.py
+++ b/src/polystar/dependency_injection.py
@@ -27,9 +27,9 @@ from polystar.target_pipeline.objects_linker.simple_objects_linker import Simple
from polystar.target_pipeline.target_factories.ratio_simple_target_factory import RatioSimpleTargetFactory
from polystar.target_pipeline.target_factories.target_factory_abc import TargetFactoryABC
from polystar.utils.serialization import pkl_load
+from research.armors.armor_color.pipeline import ArmorColorPipeline
+from research.armors.armor_color.scripts.benchmark import MeanChannels, RedBlueComparisonClassifier
from research.common.constants import PIPELINES_DIR
-from research.robots.armor_color.pipeline import ArmorColorPipeline
-from research.robots.armor_color.scripts.benchmark import MeanChannels, RedBlueComparisonClassifier
def make_injector() -> Injector:
diff --git a/src/polystar/target_pipeline/armors_descriptors/armors_color_descriptor.py b/src/polystar/target_pipeline/armors_descriptors/armors_color_descriptor.py
index 2e65faf..e2b1b8b 100644
--- a/src/polystar/target_pipeline/armors_descriptors/armors_color_descriptor.py
+++ b/src/polystar/target_pipeline/armors_descriptors/armors_color_descriptor.py
@@ -4,7 +4,7 @@ from typing import List
from polystar.models.image import Image
from polystar.target_pipeline.armors_descriptors.armors_descriptor_abc import ArmorsDescriptorABC
from polystar.target_pipeline.detected_objects.detected_armor import DetectedArmor
-from research.robots.armor_color.pipeline import ArmorColorPipeline
+from research.armors.armor_color.pipeline import ArmorColorPipeline
@dataclass
diff --git a/src/polystar/target_pipeline/armors_descriptors/armors_digit_descriptor.py b/src/polystar/target_pipeline/armors_descriptors/armors_digit_descriptor.py
index 3f26e2b..556efe1 100644
--- a/src/polystar/target_pipeline/armors_descriptors/armors_digit_descriptor.py
+++ b/src/polystar/target_pipeline/armors_descriptors/armors_digit_descriptor.py
@@ -4,7 +4,7 @@ from typing import List
from polystar.models.image import Image
from polystar.target_pipeline.armors_descriptors.armors_descriptor_abc import ArmorsDescriptorABC
from polystar.target_pipeline.detected_objects.detected_armor import DetectedArmor
-from research.robots.armor_digit.pipeline import ArmorDigitPipeline
+from research.armors.armor_digit.pipeline import ArmorDigitPipeline
@dataclass
diff --git a/src/polystar/target_pipeline/detected_objects/detected_armor.py b/src/polystar/target_pipeline/detected_objects/detected_armor.py
index 808d3a3..556b559 100644
--- a/src/polystar/target_pipeline/detected_objects/detected_armor.py
+++ b/src/polystar/target_pipeline/detected_objects/detected_armor.py
@@ -4,8 +4,8 @@ import numpy as np
from polystar.models.roco_object import ArmorColor, ArmorDigit, ObjectType
from polystar.target_pipeline.detected_objects.detected_object import DetectedROCOObject
-from research.robots.armor_color.pipeline import ArmorColorPipeline
-from research.robots.armor_digit.pipeline import ArmorDigitPipeline
+from research.armors.armor_color.pipeline import ArmorColorPipeline
+from research.armors.armor_digit.pipeline import ArmorDigitPipeline
@dataclass
diff --git a/src/research/robots/__init__.py b/src/research/armors/__init__.py
similarity index 100%
rename from src/research/robots/__init__.py
rename to src/research/armors/__init__.py
diff --git a/src/research/robots/armor_color/__init__.py b/src/research/armors/armor_color/__init__.py
similarity index 100%
rename from src/research/robots/armor_color/__init__.py
rename to src/research/armors/armor_color/__init__.py
diff --git a/src/research/robots/armor_color/benchmarker.py b/src/research/armors/armor_color/benchmarker.py
similarity index 70%
rename from src/research/robots/armor_color/benchmarker.py
rename to src/research/armors/armor_color/benchmarker.py
index 79f0a91..29f5d9a 100644
--- a/src/research/robots/armor_color/benchmarker.py
+++ b/src/research/armors/armor_color/benchmarker.py
@@ -1,8 +1,8 @@
from pathlib import Path
-from research.robots.armor_color.datasets import make_armor_color_datasets
-from research.robots.armor_color.pipeline import ArmorColorPipeline
-from research.robots.evaluation.benchmarker import Benchmarker
+from research.armors.armor_color.datasets import make_armor_color_datasets
+from research.armors.armor_color.pipeline import ArmorColorPipeline
+from research.armors.evaluation.benchmarker import Benchmarker
def make_armor_color_benchmarker(report_dir: Path, include_dji: bool = True) -> Benchmarker:
diff --git a/src/research/robots/armor_color/datasets.py b/src/research/armors/armor_color/datasets.py
similarity index 87%
rename from src/research/robots/armor_color/datasets.py
rename to src/research/armors/armor_color/datasets.py
index 55da282..23d52cf 100644
--- a/src/research/robots/armor_color/datasets.py
+++ b/src/research/armors/armor_color/datasets.py
@@ -2,9 +2,9 @@ from typing import List, Tuple
from polystar.models.image import FileImage
from polystar.models.roco_object import Armor, ArmorColor
+from research.armors.dataset.armor_value_dataset_generator import ArmorValueDatasetGenerator
+from research.armors.dataset.armor_value_target_factory import ArmorValueTargetFactory
from research.common.datasets.dataset import Dataset
-from research.robots.dataset.armor_value_dataset_generator import ArmorValueDatasetGenerator
-from research.robots.dataset.armor_value_target_factory import ArmorValueTargetFactory
def make_armor_color_datasets(
diff --git a/src/research/robots/armor_color/pipeline.py b/src/research/armors/armor_color/pipeline.py
similarity index 100%
rename from src/research/robots/armor_color/pipeline.py
rename to src/research/armors/armor_color/pipeline.py
diff --git a/src/research/robots/armor_color/scripts/__init__.py b/src/research/armors/armor_color/scripts/__init__.py
similarity index 100%
rename from src/research/robots/armor_color/scripts/__init__.py
rename to src/research/armors/armor_color/scripts/__init__.py
diff --git a/src/research/robots/armor_color/scripts/benchmark.py b/src/research/armors/armor_color/scripts/benchmark.py
similarity index 95%
rename from src/research/robots/armor_color/scripts/benchmark.py
rename to src/research/armors/armor_color/scripts/benchmark.py
index 909add8..4862070 100644
--- a/src/research/robots/armor_color/scripts/benchmark.py
+++ b/src/research/armors/armor_color/scripts/benchmark.py
@@ -13,9 +13,9 @@ from polystar.pipeline.featurizers.histogram_2d import Histogram2D
from polystar.pipeline.featurizers.histogram_blocs_2d import HistogramBlocs2D
from polystar.pipeline.pipe_abc import PipeABC
from polystar.pipeline.preprocessors.rgb_to_hsv import RGB2HSV
+from research.armors.armor_color.benchmarker import make_armor_color_benchmarker
+from research.armors.armor_color.pipeline import ArmorColorPipeline
from research.common.utils.experiment_dir import prompt_experiment_dir
-from research.robots.armor_color.benchmarker import make_armor_color_benchmarker
-from research.robots.armor_color.pipeline import ArmorColorPipeline
@dataclass
diff --git a/src/research/robots/armor_color/scripts/hyper_tune_cnn.py b/src/research/armors/armor_color/scripts/hyper_tune_cnn.py
similarity index 85%
rename from src/research/robots/armor_color/scripts/hyper_tune_cnn.py
rename to src/research/armors/armor_color/scripts/hyper_tune_cnn.py
index 656459f..0179a79 100644
--- a/src/research/robots/armor_color/scripts/hyper_tune_cnn.py
+++ b/src/research/armors/armor_color/scripts/hyper_tune_cnn.py
@@ -4,10 +4,10 @@ from pathlib import Path
from optuna import Trial
+from research.armors.armor_color.benchmarker import make_armor_color_benchmarker
+from research.armors.armor_color.pipeline import ArmorColorKerasPipeline
+from research.armors.evaluation.hyper_tuner import HyperTuner
from research.common.utils.experiment_dir import make_experiment_dir
-from research.robots.armor_color.benchmarker import make_armor_color_benchmarker
-from research.robots.armor_color.pipeline import ArmorColorKerasPipeline
-from research.robots.evaluation.hyper_tuner import HyperTuner
def cnn_pipeline_factory(report_dir: Path, trial: Trial) -> ArmorColorKerasPipeline:
diff --git a/src/research/robots/armor_digit/__init__.py b/src/research/armors/armor_digit/__init__.py
similarity index 100%
rename from src/research/robots/armor_digit/__init__.py
rename to src/research/armors/armor_digit/__init__.py
diff --git a/src/research/robots/armor_digit/armor_digit_dataset.py b/src/research/armors/armor_digit/armor_digit_dataset.py
similarity index 91%
rename from src/research/robots/armor_digit/armor_digit_dataset.py
rename to src/research/armors/armor_digit/armor_digit_dataset.py
index ad17967..78eda33 100644
--- a/src/research/robots/armor_digit/armor_digit_dataset.py
+++ b/src/research/armors/armor_digit/armor_digit_dataset.py
@@ -4,10 +4,10 @@ from typing import List, Tuple
from polystar.filters.exclude_filter import ExcludeFilter
from polystar.models.image import FileImage
from polystar.models.roco_object import Armor, ArmorDigit
+from research.armors.dataset.armor_value_dataset_generator import ArmorValueDatasetGenerator
+from research.armors.dataset.armor_value_target_factory import ArmorValueTargetFactory
from research.common.datasets.dataset import Dataset
from research.common.datasets.roco.zoo.roco_dataset_zoo import ROCODatasetsZoo
-from research.robots.dataset.armor_value_dataset_generator import ArmorValueDatasetGenerator
-from research.robots.dataset.armor_value_target_factory import ArmorValueTargetFactory
def default_armor_digit_datasets() -> Tuple[
diff --git a/src/research/robots/armor_digit/digit_benchmarker.py b/src/research/armors/armor_digit/digit_benchmarker.py
similarity index 69%
rename from src/research/robots/armor_digit/digit_benchmarker.py
rename to src/research/armors/armor_digit/digit_benchmarker.py
index 96473be..09bc31c 100644
--- a/src/research/robots/armor_digit/digit_benchmarker.py
+++ b/src/research/armors/armor_digit/digit_benchmarker.py
@@ -1,8 +1,8 @@
from pathlib import Path
-from research.robots.armor_digit.armor_digit_dataset import default_armor_digit_datasets
-from research.robots.armor_digit.pipeline import ArmorDigitPipeline
-from research.robots.evaluation.benchmarker import Benchmarker
+from research.armors.armor_digit.armor_digit_dataset import default_armor_digit_datasets
+from research.armors.armor_digit.pipeline import ArmorDigitPipeline
+from research.armors.evaluation.benchmarker import Benchmarker
def make_default_digit_benchmarker(report_dir: Path) -> Benchmarker:
diff --git a/src/research/robots/armor_digit/gcloud/__init__.py b/src/research/armors/armor_digit/gcloud/__init__.py
similarity index 100%
rename from src/research/robots/armor_digit/gcloud/__init__.py
rename to src/research/armors/armor_digit/gcloud/__init__.py
diff --git a/src/research/robots/armor_digit/gcloud/gather_performances.py b/src/research/armors/armor_digit/gcloud/gather_performances.py
similarity index 89%
rename from src/research/robots/armor_digit/gcloud/gather_performances.py
rename to src/research/armors/armor_digit/gcloud/gather_performances.py
index e345ea7..4ebe943 100644
--- a/src/research/robots/armor_digit/gcloud/gather_performances.py
+++ b/src/research/armors/armor_digit/gcloud/gather_performances.py
@@ -5,11 +5,11 @@ from typing import List
from polystar.models.roco_object import ArmorDigit
from polystar.utils.iterable_utils import flatten
+from research.armors.evaluation.metrics.f1 import F1Metric
+from research.armors.evaluation.performance import ClassificationPerformances
+from research.armors.evaluation.reporter import ImagePipelineEvaluationReporter
from research.common.constants import EVALUATION_DIR
from research.common.gcloud.gcloud_storage import GCStorages
-from research.robots.evaluation.metrics.f1 import F1Metric
-from research.robots.evaluation.performance import ClassificationPerformances
-from research.robots.evaluation.reporter import ImagePipelineEvaluationReporter
def load_performances(performances_paths: List[Path]) -> ClassificationPerformances:
diff --git a/src/research/robots/armor_digit/gcloud/hptuning_config.yaml b/src/research/armors/armor_digit/gcloud/hptuning_config.yaml
similarity index 100%
rename from src/research/robots/armor_digit/gcloud/hptuning_config.yaml
rename to src/research/armors/armor_digit/gcloud/hptuning_config.yaml
diff --git a/src/research/robots/armor_digit/gcloud/train.py b/src/research/armors/armor_digit/gcloud/train.py
similarity index 73%
rename from src/research/robots/armor_digit/gcloud/train.py
rename to src/research/armors/armor_digit/gcloud/train.py
index fecfaa7..670b02d 100644
--- a/src/research/robots/armor_digit/gcloud/train.py
+++ b/src/research/armors/armor_digit/gcloud/train.py
@@ -1,11 +1,11 @@
import pickle
from os.path import join
+from research.armors.armor_digit.armor_digit_dataset import default_armor_digit_datasets
+from research.armors.armor_digit.pipeline import ArmorDigitPipeline
+from research.armors.evaluation.evaluator import ImageClassificationPipelineEvaluator
+from research.armors.evaluation.trainer import ImageClassificationPipelineTrainer
from research.common.gcloud.gcloud_storage import GCStorage
-from research.robots.armor_digit.armor_digit_dataset import default_armor_digit_datasets
-from research.robots.armor_digit.pipeline import ArmorDigitPipeline
-from research.robots.evaluation.evaluator import ImageClassificationPipelineEvaluator
-from research.robots.evaluation.trainer import ImageClassificationPipelineTrainer
def train_evaluate_digit_pipeline(pipeline: ArmorDigitPipeline, job_dir: str):
diff --git a/src/research/robots/armor_digit/gcloud/train_cnn.py b/src/research/armors/armor_digit/gcloud/train_cnn.py
similarity index 87%
rename from src/research/robots/armor_digit/gcloud/train_cnn.py
rename to src/research/armors/armor_digit/gcloud/train_cnn.py
index c9c7437..79b595e 100644
--- a/src/research/robots/armor_digit/gcloud/train_cnn.py
+++ b/src/research/armors/armor_digit/gcloud/train_cnn.py
@@ -2,8 +2,8 @@ import logging
import warnings
from argparse import ArgumentParser
-from research.robots.armor_digit.gcloud.train import train_evaluate_digit_pipeline
-from research.robots.armor_digit.pipeline import ArmorDigitKerasPipeline
+from research.armors.armor_digit.gcloud.train import train_evaluate_digit_pipeline
+from research.armors.armor_digit.pipeline import ArmorDigitKerasPipeline
if __name__ == "__main__":
logging.getLogger().setLevel("INFO")
diff --git a/src/research/robots/armor_digit/gcloud/train_vgg16.py b/src/research/armors/armor_digit/gcloud/train_vgg16.py
similarity index 88%
rename from src/research/robots/armor_digit/gcloud/train_vgg16.py
rename to src/research/armors/armor_digit/gcloud/train_vgg16.py
index b8cc89e..f31fb7f 100644
--- a/src/research/robots/armor_digit/gcloud/train_vgg16.py
+++ b/src/research/armors/armor_digit/gcloud/train_vgg16.py
@@ -4,8 +4,8 @@ from argparse import ArgumentParser
from tensorflow.python.keras.applications.vgg16 import VGG16
-from research.robots.armor_digit.gcloud.train import train_evaluate_digit_pipeline
-from research.robots.armor_digit.pipeline import ArmorDigitKerasPipeline
+from research.armors.armor_digit.gcloud.train import train_evaluate_digit_pipeline
+from research.armors.armor_digit.pipeline import ArmorDigitKerasPipeline
if __name__ == "__main__":
logging.getLogger().setLevel("INFO")
diff --git a/src/research/robots/armor_digit/gcloud/train_xception.py b/src/research/armors/armor_digit/gcloud/train_xception.py
similarity index 88%
rename from src/research/robots/armor_digit/gcloud/train_xception.py
rename to src/research/armors/armor_digit/gcloud/train_xception.py
index c3ce07b..72e7379 100644
--- a/src/research/robots/armor_digit/gcloud/train_xception.py
+++ b/src/research/armors/armor_digit/gcloud/train_xception.py
@@ -4,8 +4,8 @@ from argparse import ArgumentParser
from tensorflow.python.keras.applications.xception import Xception
-from research.robots.armor_digit.gcloud.train import train_evaluate_digit_pipeline
-from research.robots.armor_digit.pipeline import ArmorDigitKerasPipeline
+from research.armors.armor_digit.gcloud.train import train_evaluate_digit_pipeline
+from research.armors.armor_digit.pipeline import ArmorDigitKerasPipeline
if __name__ == "__main__":
logging.getLogger().setLevel("INFO")
diff --git a/src/research/robots/armor_digit/gcloud/trainer.sh b/src/research/armors/armor_digit/gcloud/trainer.sh
similarity index 100%
rename from src/research/robots/armor_digit/gcloud/trainer.sh
rename to src/research/armors/armor_digit/gcloud/trainer.sh
diff --git a/src/research/robots/armor_digit/pipeline.py b/src/research/armors/armor_digit/pipeline.py
similarity index 100%
rename from src/research/robots/armor_digit/pipeline.py
rename to src/research/armors/armor_digit/pipeline.py
diff --git a/src/research/robots/armor_digit/scripts/__init__.py b/src/research/armors/armor_digit/scripts/__init__.py
similarity index 100%
rename from src/research/robots/armor_digit/scripts/__init__.py
rename to src/research/armors/armor_digit/scripts/__init__.py
diff --git a/src/research/robots/armor_digit/scripts/benchmark.py b/src/research/armors/armor_digit/scripts/benchmark.py
similarity index 93%
rename from src/research/robots/armor_digit/scripts/benchmark.py
rename to src/research/armors/armor_digit/scripts/benchmark.py
index 92b32c4..c947048 100644
--- a/src/research/robots/armor_digit/scripts/benchmark.py
+++ b/src/research/armors/armor_digit/scripts/benchmark.py
@@ -4,9 +4,9 @@ from pathlib import Path
from polystar.pipeline.classification.random_model import RandomClassifier
from polystar.utils.serialization import pkl_load
+from research.armors.armor_digit.digit_benchmarker import make_default_digit_benchmarker
+from research.armors.armor_digit.pipeline import ArmorDigitKerasPipeline, ArmorDigitPipeline
from research.common.utils.experiment_dir import prompt_experiment_dir
-from research.robots.armor_digit.digit_benchmarker import make_default_digit_benchmarker
-from research.robots.armor_digit.pipeline import ArmorDigitKerasPipeline, ArmorDigitPipeline
if __name__ == "__main__":
logging.getLogger().setLevel("INFO")
diff --git a/src/research/robots/armor_digit/scripts/clean_datasets.py b/src/research/armors/armor_digit/scripts/clean_datasets.py
similarity index 94%
rename from src/research/robots/armor_digit/scripts/clean_datasets.py
rename to src/research/armors/armor_digit/scripts/clean_datasets.py
index a4ca2ce..0d2db96 100644
--- a/src/research/robots/armor_digit/scripts/clean_datasets.py
+++ b/src/research/armors/armor_digit/scripts/clean_datasets.py
@@ -1,6 +1,6 @@
+from research.armors.armor_digit.armor_digit_dataset import make_armor_digit_dataset_generator
from research.common.datasets.roco.zoo.roco_dataset_zoo import ROCODatasetsZoo
from research.dataset.cleaning.dataset_cleaner_app import DatasetCleanerApp
-from research.robots.armor_digit.armor_digit_dataset import make_armor_digit_dataset_generator
if __name__ == "__main__":
# _roco_dataset = ROCODatasetsZoo.TWITCH.T470149568
diff --git a/src/research/robots/armor_digit/scripts/evaluate.py b/src/research/armors/armor_digit/scripts/evaluate.py
similarity index 97%
rename from src/research/robots/armor_digit/scripts/evaluate.py
rename to src/research/armors/armor_digit/scripts/evaluate.py
index 5e46b24..62dc6f3 100644
--- a/src/research/robots/armor_digit/scripts/evaluate.py
+++ b/src/research/armors/armor_digit/scripts/evaluate.py
@@ -11,11 +11,11 @@ from polystar.models.roco_object import ArmorDigit
from polystar.pipeline.classification.classification_pipeline import ClassificationPipeline
from polystar.utils.iterable_utils import chunk
from polystar.utils.serialization import pkl_load
+from research.armors.armor_digit.armor_digit_dataset import make_armor_digit_dataset_generator
from research.common.constants import PIPELINES_DIR
from research.common.datasets.dataset import Dataset
from research.common.gcloud.gcloud_storage import GCStorages
from research.common.utils.logs import setup_dev_logs
-from research.robots.armor_digit.armor_digit_dataset import make_armor_digit_dataset_generator
def time_digit_pipeline(pipeline_path: Path):
diff --git a/src/research/robots/armor_digit/scripts/hyper_tune_cnn.py b/src/research/armors/armor_digit/scripts/hyper_tune_cnn.py
similarity index 84%
rename from src/research/robots/armor_digit/scripts/hyper_tune_cnn.py
rename to src/research/armors/armor_digit/scripts/hyper_tune_cnn.py
index 26ce661..680e2f7 100644
--- a/src/research/robots/armor_digit/scripts/hyper_tune_cnn.py
+++ b/src/research/armors/armor_digit/scripts/hyper_tune_cnn.py
@@ -4,10 +4,10 @@ from pathlib import Path
from optuna import Trial
+from research.armors.armor_digit.digit_benchmarker import make_default_digit_benchmarker
+from research.armors.armor_digit.pipeline import ArmorDigitKerasPipeline, ArmorDigitPipeline
+from research.armors.evaluation.hyper_tuner import HyperTuner
from research.common.utils.experiment_dir import make_experiment_dir
-from research.robots.armor_digit.digit_benchmarker import make_default_digit_benchmarker
-from research.robots.armor_digit.pipeline import ArmorDigitKerasPipeline, ArmorDigitPipeline
-from research.robots.evaluation.hyper_tuner import HyperTuner
def cnn_pipeline_factory(report_dir: Path, trial: Trial) -> ArmorDigitPipeline:
diff --git a/src/research/robots/armor_digit/scripts/hyper_tune_distiled_vgg16_into_cnn.py b/src/research/armors/armor_digit/scripts/hyper_tune_distiled_vgg16_into_cnn.py
similarity index 88%
rename from src/research/robots/armor_digit/scripts/hyper_tune_distiled_vgg16_into_cnn.py
rename to src/research/armors/armor_digit/scripts/hyper_tune_distiled_vgg16_into_cnn.py
index 9388f50..73ba8ca 100644
--- a/src/research/robots/armor_digit/scripts/hyper_tune_distiled_vgg16_into_cnn.py
+++ b/src/research/armors/armor_digit/scripts/hyper_tune_distiled_vgg16_into_cnn.py
@@ -5,10 +5,10 @@ from pathlib import Path
from optuna import Trial
from polystar.utils.serialization import pkl_load
+from research.armors.armor_digit.digit_benchmarker import make_default_digit_benchmarker
+from research.armors.armor_digit.pipeline import ArmorDigitKerasPipeline, ArmorDigitPipeline
+from research.armors.evaluation.hyper_tuner import HyperTuner
from research.common.utils.experiment_dir import make_experiment_dir
-from research.robots.armor_digit.digit_benchmarker import make_default_digit_benchmarker
-from research.robots.armor_digit.pipeline import ArmorDigitKerasPipeline, ArmorDigitPipeline
-from research.robots.evaluation.hyper_tuner import HyperTuner
class DistilledPipelineFactory:
diff --git a/src/research/robots/armor_digit/scripts/train_kd_cnn.py b/src/research/armors/armor_digit/scripts/train_kd_cnn.py
similarity index 87%
rename from src/research/robots/armor_digit/scripts/train_kd_cnn.py
rename to src/research/armors/armor_digit/scripts/train_kd_cnn.py
index 061e5d2..ae76f1b 100644
--- a/src/research/robots/armor_digit/scripts/train_kd_cnn.py
+++ b/src/research/armors/armor_digit/scripts/train_kd_cnn.py
@@ -1,9 +1,9 @@
from polystar.utils.serialization import pkl_load
from polystar.utils.time import create_time_id
+from research.armors.armor_digit.pipeline import ArmorDigitKerasPipeline
+from research.armors.armor_digit.training import train_report_and_upload_digit_pipeline
from research.common.constants import PIPELINES_DIR
from research.common.utils.logs import setup_dev_logs
-from research.robots.armor_digit.pipeline import ArmorDigitKerasPipeline
-from research.robots.armor_digit.training import train_report_and_upload_digit_pipeline
if __name__ == "__main__":
setup_dev_logs()
diff --git a/src/research/robots/armor_digit/scripts/train_vgg16.py b/src/research/armors/armor_digit/scripts/train_vgg16.py
similarity index 84%
rename from src/research/robots/armor_digit/scripts/train_vgg16.py
rename to src/research/armors/armor_digit/scripts/train_vgg16.py
index 0d8e075..52c71e3 100644
--- a/src/research/robots/armor_digit/scripts/train_vgg16.py
+++ b/src/research/armors/armor_digit/scripts/train_vgg16.py
@@ -1,10 +1,10 @@
from tensorflow.python.keras.applications.vgg16 import VGG16
from polystar.utils.time import create_time_id
+from research.armors.armor_digit.pipeline import ArmorDigitKerasPipeline
+from research.armors.armor_digit.training import train_report_and_upload_digit_pipeline
from research.common.constants import PIPELINES_DIR
from research.common.utils.logs import setup_dev_logs
-from research.robots.armor_digit.pipeline import ArmorDigitKerasPipeline
-from research.robots.armor_digit.training import train_report_and_upload_digit_pipeline
if __name__ == "__main__":
setup_dev_logs()
diff --git a/src/research/robots/armor_digit/training.py b/src/research/armors/armor_digit/training.py
similarity index 76%
rename from src/research/robots/armor_digit/training.py
rename to src/research/armors/armor_digit/training.py
index c14f5f4..c4a3183 100644
--- a/src/research/robots/armor_digit/training.py
+++ b/src/research/armors/armor_digit/training.py
@@ -1,9 +1,9 @@
import pickle
from pathlib import Path
+from research.armors.armor_digit.digit_benchmarker import make_default_digit_benchmarker
+from research.armors.armor_digit.pipeline import ArmorDigitPipeline
from research.common.gcloud.gcloud_storage import GCStorages
-from research.robots.armor_digit.digit_benchmarker import make_default_digit_benchmarker
-from research.robots.armor_digit.pipeline import ArmorDigitPipeline
def train_report_and_upload_digit_pipeline(pipeline: ArmorDigitPipeline, training_dir: Path):
diff --git a/src/research/robots/dataset/__init__.py b/src/research/armors/dataset/__init__.py
similarity index 100%
rename from src/research/robots/dataset/__init__.py
rename to src/research/armors/dataset/__init__.py
diff --git a/src/research/robots/dataset/armor_dataset_factory.py b/src/research/armors/dataset/armor_dataset_factory.py
similarity index 100%
rename from src/research/robots/dataset/armor_dataset_factory.py
rename to src/research/armors/dataset/armor_dataset_factory.py
diff --git a/src/research/robots/dataset/armor_value_dataset_cache.py b/src/research/armors/dataset/armor_value_dataset_cache.py
similarity index 95%
rename from src/research/robots/dataset/armor_value_dataset_cache.py
rename to src/research/armors/dataset/armor_value_dataset_cache.py
index 29774e2..51b0e92 100644
--- a/src/research/robots/dataset/armor_value_dataset_cache.py
+++ b/src/research/armors/dataset/armor_value_dataset_cache.py
@@ -9,12 +9,12 @@ from polystar.models.image import Image, save_image
from polystar.utils.misc import identity
from polystar.utils.time import create_time_id
from polystar.utils.tqdm import smart_tqdm
+from research.armors.dataset.armor_dataset_factory import ArmorDataset
+from research.armors.dataset.armor_value_target_factory import ArmorValueTargetFactory
from research.common.datasets.lazy_dataset import LazyDataset, TargetT
from research.common.datasets.roco.roco_dataset_builder import ROCODatasetBuilder
from research.common.datasets.transform_dataset import TransformDataset
from research.common.gcloud.gcloud_storage import GCStorages
-from research.robots.dataset.armor_dataset_factory import ArmorDataset
-from research.robots.dataset.armor_value_target_factory import ArmorValueTargetFactory
class ArmorValueDatasetCache(Generic[TargetT]):
diff --git a/src/research/robots/dataset/armor_value_dataset_generator.py b/src/research/armors/dataset/armor_value_dataset_generator.py
similarity index 96%
rename from src/research/robots/dataset/armor_value_dataset_generator.py
rename to src/research/armors/dataset/armor_value_dataset_generator.py
index faba255..8f9ed9d 100644
--- a/src/research/robots/dataset/armor_value_dataset_generator.py
+++ b/src/research/armors/dataset/armor_value_dataset_generator.py
@@ -5,14 +5,14 @@ from polystar.filters.exclude_filter import ExcludeFilter
from polystar.filters.filter_abc import FilterABC
from polystar.filters.pass_through_filter import PassThroughFilter
from polystar.models.image import FileImage
+from research.armors.dataset.armor_value_dataset_cache import ArmorValueDatasetCache
+from research.armors.dataset.armor_value_target_factory import ArmorValueTargetFactory
from research.common.datasets.dataset import Dataset
from research.common.datasets.image_file_dataset_builder import DirectoryDatasetBuilder
from research.common.datasets.lazy_dataset import TargetT
from research.common.datasets.roco.roco_dataset_builder import ROCODatasetBuilder
from research.common.datasets.roco.zoo.roco_dataset_zoo import ROCODatasetsZoo
from research.dataset.cleaning.dataset_changes import DatasetChanges
-from research.robots.dataset.armor_value_dataset_cache import ArmorValueDatasetCache
-from research.robots.dataset.armor_value_target_factory import ArmorValueTargetFactory
class ExcludeFilesFilter(ExcludeFilter[Path]):
diff --git a/src/research/robots/dataset/armor_value_target_factory.py b/src/research/armors/dataset/armor_value_target_factory.py
similarity index 100%
rename from src/research/robots/dataset/armor_value_target_factory.py
rename to src/research/armors/dataset/armor_value_target_factory.py
diff --git a/src/research/robots/demos/__init__.py b/src/research/armors/demos/__init__.py
similarity index 100%
rename from src/research/robots/demos/__init__.py
rename to src/research/armors/demos/__init__.py
diff --git a/src/research/robots/demos/demo_pipeline.py b/src/research/armors/demos/demo_pipeline.py
similarity index 100%
rename from src/research/robots/demos/demo_pipeline.py
rename to src/research/armors/demos/demo_pipeline.py
diff --git a/src/research/robots/demos/demo_pipeline_camera.py b/src/research/armors/demos/demo_pipeline_camera.py
similarity index 100%
rename from src/research/robots/demos/demo_pipeline_camera.py
rename to src/research/armors/demos/demo_pipeline_camera.py
diff --git a/src/research/robots/evaluation/__init__.py b/src/research/armors/evaluation/__init__.py
similarity index 100%
rename from src/research/robots/evaluation/__init__.py
rename to src/research/armors/evaluation/__init__.py
diff --git a/src/research/robots/evaluation/benchmarker.py b/src/research/armors/evaluation/benchmarker.py
similarity index 86%
rename from src/research/robots/evaluation/benchmarker.py
rename to src/research/armors/evaluation/benchmarker.py
index 33b5aa8..0f48c90 100644
--- a/src/research/robots/evaluation/benchmarker.py
+++ b/src/research/armors/evaluation/benchmarker.py
@@ -5,12 +5,12 @@ from pathlib import Path
from typing import List, Sequence
from polystar.pipeline.classification.classification_pipeline import ClassificationPipeline
+from research.armors.evaluation.evaluator import ImageClassificationPipelineEvaluator
+from research.armors.evaluation.metrics.f1 import F1Metric
+from research.armors.evaluation.performance import ClassificationPerformances
+from research.armors.evaluation.reporter import ImagePipelineEvaluationReporter
+from research.armors.evaluation.trainer import ImageClassificationPipelineTrainer
from research.common.datasets.image_dataset import FileImageDataset
-from research.robots.evaluation.evaluator import ImageClassificationPipelineEvaluator
-from research.robots.evaluation.metrics.f1 import F1Metric
-from research.robots.evaluation.performance import ClassificationPerformances
-from research.robots.evaluation.reporter import ImagePipelineEvaluationReporter
-from research.robots.evaluation.trainer import ImageClassificationPipelineTrainer
logger = logging.getLogger(__name__)
diff --git a/src/research/robots/evaluation/evaluator.py b/src/research/armors/evaluation/evaluator.py
similarity index 95%
rename from src/research/robots/evaluation/evaluator.py
rename to src/research/armors/evaluation/evaluator.py
index 83a96bd..6e879b6 100644
--- a/src/research/robots/evaluation/evaluator.py
+++ b/src/research/armors/evaluation/evaluator.py
@@ -7,14 +7,14 @@ import numpy as np
from polystar.models.image import file_images_to_images
from polystar.pipeline.classification.classification_pipeline import ClassificationPipeline
from polystar.utils.iterable_utils import flatten
-from research.common.datasets.image_dataset import FileImageDataset
-from research.common.datasets.lazy_dataset import TargetT
-from research.robots.evaluation.performance import (
+from research.armors.evaluation.performance import (
ClassificationPerformance,
ClassificationPerformances,
ContextualizedClassificationPerformance,
)
-from research.robots.evaluation.set import Set
+from research.armors.evaluation.set import Set
+from research.common.datasets.image_dataset import FileImageDataset
+from research.common.datasets.lazy_dataset import TargetT
class ImageClassificationPipelineEvaluator(Generic[TargetT]):
diff --git a/src/research/robots/evaluation/hyper_tuner.py b/src/research/armors/evaluation/hyper_tuner.py
similarity index 88%
rename from src/research/robots/evaluation/hyper_tuner.py
rename to src/research/armors/evaluation/hyper_tuner.py
index 6a320ea..43bd21b 100644
--- a/src/research/robots/evaluation/hyper_tuner.py
+++ b/src/research/armors/evaluation/hyper_tuner.py
@@ -5,9 +5,9 @@ from optuna import Trial, create_study
from polystar.pipeline.classification.classification_pipeline import ClassificationPipeline
from polystar.utils.serialization import pkl_dump
-from research.robots.evaluation.benchmarker import Benchmarker
-from research.robots.evaluation.metrics.accuracy import AccuracyMetric
-from research.robots.evaluation.metrics.metric_abc import MetricABC
+from research.armors.evaluation.benchmarker import Benchmarker
+from research.armors.evaluation.metrics.accuracy import AccuracyMetric
+from research.armors.evaluation.metrics.metric_abc import MetricABC
PipelineFactory = Callable[[Path, Trial], ClassificationPipeline]
diff --git a/src/research/robots/evaluation/metrics/__init__.py b/src/research/armors/evaluation/metrics/__init__.py
similarity index 100%
rename from src/research/robots/evaluation/metrics/__init__.py
rename to src/research/armors/evaluation/metrics/__init__.py
diff --git a/src/research/robots/evaluation/metrics/accuracy.py b/src/research/armors/evaluation/metrics/accuracy.py
similarity index 67%
rename from src/research/robots/evaluation/metrics/accuracy.py
rename to src/research/armors/evaluation/metrics/accuracy.py
index 60716f2..ce46adc 100644
--- a/src/research/robots/evaluation/metrics/accuracy.py
+++ b/src/research/armors/evaluation/metrics/accuracy.py
@@ -1,5 +1,5 @@
-from research.robots.evaluation.metrics.metric_abc import MetricABC
-from research.robots.evaluation.performance import ClassificationPerformance
+from research.armors.evaluation.metrics.metric_abc import MetricABC
+from research.armors.evaluation.performance import ClassificationPerformance
class AccuracyMetric(MetricABC):
diff --git a/src/research/robots/evaluation/metrics/f1.py b/src/research/armors/evaluation/metrics/f1.py
similarity index 83%
rename from src/research/robots/evaluation/metrics/f1.py
rename to src/research/armors/evaluation/metrics/f1.py
index 0730c42..6f228de 100644
--- a/src/research/robots/evaluation/metrics/f1.py
+++ b/src/research/armors/evaluation/metrics/f1.py
@@ -2,8 +2,8 @@ from enum import Enum, auto
from sklearn.metrics import f1_score
-from research.robots.evaluation.metrics.metric_abc import MetricABC
-from research.robots.evaluation.performance import ClassificationPerformance
+from research.armors.evaluation.metrics.metric_abc import MetricABC
+from research.armors.evaluation.performance import ClassificationPerformance
class F1Strategy(Enum):
diff --git a/src/research/robots/evaluation/metrics/metric_abc.py b/src/research/armors/evaluation/metrics/metric_abc.py
similarity index 82%
rename from src/research/robots/evaluation/metrics/metric_abc.py
rename to src/research/armors/evaluation/metrics/metric_abc.py
index f939585..b2d0957 100644
--- a/src/research/robots/evaluation/metrics/metric_abc.py
+++ b/src/research/armors/evaluation/metrics/metric_abc.py
@@ -1,6 +1,6 @@
from abc import ABC, abstractmethod
-from research.robots.evaluation.performance import ClassificationPerformance
+from research.armors.evaluation.performance import ClassificationPerformance
class MetricABC(ABC):
diff --git a/src/research/robots/evaluation/performance.py b/src/research/armors/evaluation/performance.py
similarity index 98%
rename from src/research/robots/evaluation/performance.py
rename to src/research/armors/evaluation/performance.py
index 736ba16..12c67ac 100644
--- a/src/research/robots/evaluation/performance.py
+++ b/src/research/armors/evaluation/performance.py
@@ -7,7 +7,7 @@ from memoized_property import memoized_property
from polystar.filters.filter_abc import FilterABC
from polystar.models.image import FileImage
from polystar.utils.iterable_utils import flatten, group_by
-from research.robots.evaluation.set import Set
+from research.armors.evaluation.set import Set
@dataclass
diff --git a/src/research/robots/evaluation/reporter.py b/src/research/armors/evaluation/reporter.py
similarity index 98%
rename from src/research/robots/evaluation/reporter.py
rename to src/research/armors/evaluation/reporter.py
index 7af8ac1..1c2bd6c 100644
--- a/src/research/robots/evaluation/reporter.py
+++ b/src/research/armors/evaluation/reporter.py
@@ -16,11 +16,11 @@ from sklearn.metrics import ConfusionMatrixDisplay, classification_report, confu
from polystar.pipeline.classification.classification_pipeline import EnumT
from polystar.utils.dataframe import Format, format_df_row, format_df_rows, make_formater
from polystar.utils.markdown import MarkdownFile
+from research.armors.evaluation.metrics.accuracy import AccuracyMetric
+from research.armors.evaluation.metrics.metric_abc import MetricABC
+from research.armors.evaluation.performance import ClassificationPerformance, ClassificationPerformances
+from research.armors.evaluation.set import Set
from research.common.constants import DSET_DIR
-from research.robots.evaluation.metrics.accuracy import AccuracyMetric
-from research.robots.evaluation.metrics.metric_abc import MetricABC
-from research.robots.evaluation.performance import ClassificationPerformance, ClassificationPerformances
-from research.robots.evaluation.set import Set
logger = logging.getLogger(__name__)
diff --git a/src/research/robots/evaluation/set.py b/src/research/armors/evaluation/set.py
similarity index 100%
rename from src/research/robots/evaluation/set.py
rename to src/research/armors/evaluation/set.py
diff --git a/src/research/robots/evaluation/trainer.py b/src/research/armors/evaluation/trainer.py
similarity index 100%
rename from src/research/robots/evaluation/trainer.py
rename to src/research/armors/evaluation/trainer.py
--
GitLab