diff --git a/classification/yolo-second-run/cfg/yolov7.yaml b/classification/detector/cfg/yolov7.yaml similarity index 100% rename from classification/yolo-second-run/cfg/yolov7.yaml rename to classification/detector/cfg/yolov7.yaml diff --git a/classification/yolo-second-run/detect.py b/classification/detector/detect.py similarity index 100% rename from classification/yolo-second-run/detect.py rename to classification/detector/detect.py diff --git a/classification/yolo-second-run/export.py b/classification/detector/export.py similarity index 100% rename from classification/yolo-second-run/export.py rename to classification/detector/export.py diff --git a/classification/yolo-second-run/hyp/hyp.scratch.custom.yaml b/classification/detector/hyp/hyp.scratch.custom.yaml similarity index 100% rename from classification/yolo-second-run/hyp/hyp.scratch.custom.yaml rename to classification/detector/hyp/hyp.scratch.custom.yaml diff --git a/classification/yolo-second-run/models/__init__.py b/classification/detector/models/__init__.py similarity index 100% rename from classification/yolo-second-run/models/__init__.py rename to classification/detector/models/__init__.py diff --git a/classification/yolo-second-run/models/common.py b/classification/detector/models/common.py similarity index 100% rename from classification/yolo-second-run/models/common.py rename to classification/detector/models/common.py diff --git a/classification/yolo-second-run/models/experimental.py b/classification/detector/models/experimental.py similarity index 100% rename from classification/yolo-second-run/models/experimental.py rename to classification/detector/models/experimental.py diff --git a/classification/yolo-second-run/models/yolo.py b/classification/detector/models/yolo.py similarity index 100% rename from classification/yolo-second-run/models/yolo.py rename to classification/detector/models/yolo.py diff --git a/classification/yolo-second-run/requirements.txt b/classification/detector/requirements.txt similarity index 100% rename from classification/yolo-second-run/requirements.txt rename to classification/detector/requirements.txt diff --git a/classification/yolo-second-run/runs/test/exp/F1_curve.png b/classification/detector/runs/test/exp/F1_curve.png similarity index 100% rename from classification/yolo-second-run/runs/test/exp/F1_curve.png rename to classification/detector/runs/test/exp/F1_curve.png diff --git a/classification/yolo-second-run/runs/test/exp/PR_curve.png b/classification/detector/runs/test/exp/PR_curve.png similarity index 100% rename from classification/yolo-second-run/runs/test/exp/PR_curve.png rename to classification/detector/runs/test/exp/PR_curve.png diff --git a/classification/yolo-second-run/runs/test/exp/P_curve.png b/classification/detector/runs/test/exp/P_curve.png similarity index 100% rename from classification/yolo-second-run/runs/test/exp/P_curve.png rename to classification/detector/runs/test/exp/P_curve.png diff --git a/classification/yolo-second-run/runs/test/exp/R_curve.png b/classification/detector/runs/test/exp/R_curve.png similarity index 100% rename from classification/yolo-second-run/runs/test/exp/R_curve.png rename to classification/detector/runs/test/exp/R_curve.png diff --git a/classification/yolo-second-run/runs/test/exp/confusion_matrix.png b/classification/detector/runs/test/exp/confusion_matrix.png similarity index 100% rename from classification/yolo-second-run/runs/test/exp/confusion_matrix.png rename to classification/detector/runs/test/exp/confusion_matrix.png diff --git a/classification/yolo-second-run/runs/test/exp/test_batch0_labels.jpg b/classification/detector/runs/test/exp/test_batch0_labels.jpg similarity index 100% rename from classification/yolo-second-run/runs/test/exp/test_batch0_labels.jpg rename to classification/detector/runs/test/exp/test_batch0_labels.jpg diff --git a/classification/yolo-second-run/runs/test/exp/test_batch0_pred.jpg b/classification/detector/runs/test/exp/test_batch0_pred.jpg similarity index 100% rename from classification/yolo-second-run/runs/test/exp/test_batch0_pred.jpg rename to classification/detector/runs/test/exp/test_batch0_pred.jpg diff --git a/classification/yolo-second-run/runs/test/exp/test_batch1_labels.jpg b/classification/detector/runs/test/exp/test_batch1_labels.jpg similarity index 100% rename from classification/yolo-second-run/runs/test/exp/test_batch1_labels.jpg rename to classification/detector/runs/test/exp/test_batch1_labels.jpg diff --git a/classification/yolo-second-run/runs/test/exp/test_batch1_pred.jpg b/classification/detector/runs/test/exp/test_batch1_pred.jpg similarity index 100% rename from classification/yolo-second-run/runs/test/exp/test_batch1_pred.jpg rename to classification/detector/runs/test/exp/test_batch1_pred.jpg diff --git a/classification/yolo-second-run/runs/test/exp/test_batch2_labels.jpg b/classification/detector/runs/test/exp/test_batch2_labels.jpg similarity index 100% rename from classification/yolo-second-run/runs/test/exp/test_batch2_labels.jpg rename to classification/detector/runs/test/exp/test_batch2_labels.jpg diff --git a/classification/yolo-second-run/runs/test/exp/test_batch2_pred.jpg b/classification/detector/runs/test/exp/test_batch2_pred.jpg similarity index 100% rename from classification/yolo-second-run/runs/test/exp/test_batch2_pred.jpg rename to classification/detector/runs/test/exp/test_batch2_pred.jpg diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/F1_curve.png b/classification/detector/runs/train/yolov7-custom7/F1_curve.png similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/F1_curve.png rename to classification/detector/runs/train/yolov7-custom7/F1_curve.png diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/PR_curve.png b/classification/detector/runs/train/yolov7-custom7/PR_curve.png similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/PR_curve.png rename to classification/detector/runs/train/yolov7-custom7/PR_curve.png diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/P_curve.png b/classification/detector/runs/train/yolov7-custom7/P_curve.png similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/P_curve.png rename to classification/detector/runs/train/yolov7-custom7/P_curve.png diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/R_curve.png b/classification/detector/runs/train/yolov7-custom7/R_curve.png similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/R_curve.png rename to classification/detector/runs/train/yolov7-custom7/R_curve.png diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/confusion_matrix.png b/classification/detector/runs/train/yolov7-custom7/confusion_matrix.png similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/confusion_matrix.png rename to classification/detector/runs/train/yolov7-custom7/confusion_matrix.png diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/events.out.tfevents.1672427617.dl1.144257.0 b/classification/detector/runs/train/yolov7-custom7/events.out.tfevents.1672427617.dl1.144257.0 similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/events.out.tfevents.1672427617.dl1.144257.0 rename to classification/detector/runs/train/yolov7-custom7/events.out.tfevents.1672427617.dl1.144257.0 diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/events.out.tfevents.1672429081.dl1.183081.0 b/classification/detector/runs/train/yolov7-custom7/events.out.tfevents.1672429081.dl1.183081.0 similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/events.out.tfevents.1672429081.dl1.183081.0 rename to classification/detector/runs/train/yolov7-custom7/events.out.tfevents.1672429081.dl1.183081.0 diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/hyp.yaml b/classification/detector/runs/train/yolov7-custom7/hyp.yaml similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/hyp.yaml rename to classification/detector/runs/train/yolov7-custom7/hyp.yaml diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/opt.yaml b/classification/detector/runs/train/yolov7-custom7/opt.yaml similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/opt.yaml rename to classification/detector/runs/train/yolov7-custom7/opt.yaml diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/results.png b/classification/detector/runs/train/yolov7-custom7/results.png similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/results.png rename to classification/detector/runs/train/yolov7-custom7/results.png diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/results.txt b/classification/detector/runs/train/yolov7-custom7/results.txt similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/results.txt rename to classification/detector/runs/train/yolov7-custom7/results.txt diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/test_batch0_labels.jpg b/classification/detector/runs/train/yolov7-custom7/test_batch0_labels.jpg similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/test_batch0_labels.jpg rename to classification/detector/runs/train/yolov7-custom7/test_batch0_labels.jpg diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/test_batch0_pred.jpg b/classification/detector/runs/train/yolov7-custom7/test_batch0_pred.jpg similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/test_batch0_pred.jpg rename to classification/detector/runs/train/yolov7-custom7/test_batch0_pred.jpg diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/test_batch1_labels.jpg b/classification/detector/runs/train/yolov7-custom7/test_batch1_labels.jpg similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/test_batch1_labels.jpg rename to classification/detector/runs/train/yolov7-custom7/test_batch1_labels.jpg diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/test_batch1_pred.jpg b/classification/detector/runs/train/yolov7-custom7/test_batch1_pred.jpg similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/test_batch1_pred.jpg rename to classification/detector/runs/train/yolov7-custom7/test_batch1_pred.jpg diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/test_batch2_labels.jpg b/classification/detector/runs/train/yolov7-custom7/test_batch2_labels.jpg similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/test_batch2_labels.jpg rename to classification/detector/runs/train/yolov7-custom7/test_batch2_labels.jpg diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/test_batch2_pred.jpg b/classification/detector/runs/train/yolov7-custom7/test_batch2_pred.jpg similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/test_batch2_pred.jpg rename to classification/detector/runs/train/yolov7-custom7/test_batch2_pred.jpg diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/train_batch0.jpg b/classification/detector/runs/train/yolov7-custom7/train_batch0.jpg similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/train_batch0.jpg rename to classification/detector/runs/train/yolov7-custom7/train_batch0.jpg diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/train_batch1.jpg b/classification/detector/runs/train/yolov7-custom7/train_batch1.jpg similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/train_batch1.jpg rename to classification/detector/runs/train/yolov7-custom7/train_batch1.jpg diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/train_batch2.jpg b/classification/detector/runs/train/yolov7-custom7/train_batch2.jpg similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/train_batch2.jpg rename to classification/detector/runs/train/yolov7-custom7/train_batch2.jpg diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/train_batch3.jpg b/classification/detector/runs/train/yolov7-custom7/train_batch3.jpg similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/train_batch3.jpg rename to classification/detector/runs/train/yolov7-custom7/train_batch3.jpg diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/train_batch4.jpg b/classification/detector/runs/train/yolov7-custom7/train_batch4.jpg similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/train_batch4.jpg rename to classification/detector/runs/train/yolov7-custom7/train_batch4.jpg diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/train_batch5.jpg b/classification/detector/runs/train/yolov7-custom7/train_batch5.jpg similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/train_batch5.jpg rename to classification/detector/runs/train/yolov7-custom7/train_batch5.jpg diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/train_batch6.jpg b/classification/detector/runs/train/yolov7-custom7/train_batch6.jpg similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/train_batch6.jpg rename to classification/detector/runs/train/yolov7-custom7/train_batch6.jpg diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/train_batch7.jpg b/classification/detector/runs/train/yolov7-custom7/train_batch7.jpg similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/train_batch7.jpg rename to classification/detector/runs/train/yolov7-custom7/train_batch7.jpg diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/train_batch8.jpg b/classification/detector/runs/train/yolov7-custom7/train_batch8.jpg similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/train_batch8.jpg rename to classification/detector/runs/train/yolov7-custom7/train_batch8.jpg diff --git a/classification/yolo-second-run/runs/train/yolov7-custom7/train_batch9.jpg b/classification/detector/runs/train/yolov7-custom7/train_batch9.jpg similarity index 100% rename from classification/yolo-second-run/runs/train/yolov7-custom7/train_batch9.jpg rename to classification/detector/runs/train/yolov7-custom7/train_batch9.jpg diff --git a/classification/yolo-second-run/test.py b/classification/detector/test.py similarity index 100% rename from classification/yolo-second-run/test.py rename to classification/detector/test.py diff --git a/classification/yolo-second-run/train.py b/classification/detector/train.py similarity index 100% rename from classification/yolo-second-run/train.py rename to classification/detector/train.py diff --git a/classification/yolo-second-run/train_aux.py b/classification/detector/train_aux.py similarity index 100% rename from classification/yolo-second-run/train_aux.py rename to classification/detector/train_aux.py diff --git a/classification/yolo-second-run/utils/__init__.py b/classification/detector/utils/__init__.py similarity index 100% rename from classification/yolo-second-run/utils/__init__.py rename to classification/detector/utils/__init__.py diff --git a/classification/yolo-second-run/utils/activations.py b/classification/detector/utils/activations.py similarity index 100% rename from classification/yolo-second-run/utils/activations.py rename to classification/detector/utils/activations.py diff --git a/classification/yolo-second-run/utils/add_nms.py b/classification/detector/utils/add_nms.py similarity index 100% rename from classification/yolo-second-run/utils/add_nms.py rename to classification/detector/utils/add_nms.py diff --git a/classification/yolo-second-run/utils/autoanchor.py b/classification/detector/utils/autoanchor.py similarity index 100% rename from classification/yolo-second-run/utils/autoanchor.py rename to classification/detector/utils/autoanchor.py diff --git a/classification/yolo-second-run/utils/aws/__init__.py b/classification/detector/utils/aws/__init__.py similarity index 100% rename from classification/yolo-second-run/utils/aws/__init__.py rename to classification/detector/utils/aws/__init__.py diff --git a/classification/yolo-second-run/utils/aws/mime.sh b/classification/detector/utils/aws/mime.sh similarity index 100% rename from classification/yolo-second-run/utils/aws/mime.sh rename to classification/detector/utils/aws/mime.sh diff --git a/classification/yolo-second-run/utils/aws/resume.py b/classification/detector/utils/aws/resume.py similarity index 100% rename from classification/yolo-second-run/utils/aws/resume.py rename to classification/detector/utils/aws/resume.py diff --git a/classification/yolo-second-run/utils/aws/userdata.sh b/classification/detector/utils/aws/userdata.sh similarity index 100% rename from classification/yolo-second-run/utils/aws/userdata.sh rename to classification/detector/utils/aws/userdata.sh diff --git a/classification/yolo-second-run/utils/datasets.py b/classification/detector/utils/datasets.py similarity index 100% rename from classification/yolo-second-run/utils/datasets.py rename to classification/detector/utils/datasets.py diff --git a/classification/yolo-second-run/utils/general.py b/classification/detector/utils/general.py similarity index 100% rename from classification/yolo-second-run/utils/general.py rename to classification/detector/utils/general.py diff --git a/classification/yolo-second-run/utils/google_app_engine/Dockerfile b/classification/detector/utils/google_app_engine/Dockerfile similarity index 100% rename from classification/yolo-second-run/utils/google_app_engine/Dockerfile rename to classification/detector/utils/google_app_engine/Dockerfile diff --git a/classification/yolo-second-run/utils/google_app_engine/additional_requirements.txt b/classification/detector/utils/google_app_engine/additional_requirements.txt similarity index 100% rename from classification/yolo-second-run/utils/google_app_engine/additional_requirements.txt rename to classification/detector/utils/google_app_engine/additional_requirements.txt diff --git a/classification/yolo-second-run/utils/google_app_engine/app.yaml b/classification/detector/utils/google_app_engine/app.yaml similarity index 100% rename from classification/yolo-second-run/utils/google_app_engine/app.yaml rename to classification/detector/utils/google_app_engine/app.yaml diff --git a/classification/yolo-second-run/utils/google_utils.py b/classification/detector/utils/google_utils.py similarity index 100% rename from classification/yolo-second-run/utils/google_utils.py rename to classification/detector/utils/google_utils.py diff --git a/classification/yolo-second-run/utils/loss.py b/classification/detector/utils/loss.py similarity index 100% rename from classification/yolo-second-run/utils/loss.py rename to classification/detector/utils/loss.py diff --git a/classification/yolo-second-run/utils/metrics.py b/classification/detector/utils/metrics.py similarity index 100% rename from classification/yolo-second-run/utils/metrics.py rename to classification/detector/utils/metrics.py diff --git a/classification/yolo-second-run/utils/plots.py b/classification/detector/utils/plots.py similarity index 100% rename from classification/yolo-second-run/utils/plots.py rename to classification/detector/utils/plots.py diff --git a/classification/yolo-second-run/utils/torch_utils.py b/classification/detector/utils/torch_utils.py similarity index 100% rename from classification/yolo-second-run/utils/torch_utils.py rename to classification/detector/utils/torch_utils.py diff --git a/classification/yolo-second-run/utils/wandb_logging/__init__.py b/classification/detector/utils/wandb_logging/__init__.py similarity index 100% rename from classification/yolo-second-run/utils/wandb_logging/__init__.py rename to classification/detector/utils/wandb_logging/__init__.py diff --git a/classification/yolo-second-run/utils/wandb_logging/log_dataset.py b/classification/detector/utils/wandb_logging/log_dataset.py similarity index 100% rename from classification/yolo-second-run/utils/wandb_logging/log_dataset.py rename to classification/detector/utils/wandb_logging/log_dataset.py diff --git a/classification/yolo-second-run/utils/wandb_logging/wandb_utils.py b/classification/detector/utils/wandb_logging/wandb_utils.py similarity index 100% rename from classification/yolo-second-run/utils/wandb_logging/wandb_utils.py rename to classification/detector/utils/wandb_logging/wandb_utils.py diff --git a/classification/evaluation/eval-test-yolo.ipynb b/classification/evaluation/eval-test-yolo.ipynb index 90fe55b..5b6bd87 100644 --- a/classification/evaluation/eval-test-yolo.ipynb +++ b/classification/evaluation/eval-test-yolo.ipynb @@ -178,17 +178,17 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 17, "id": "0b86639e", "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "['2023.02.28.10.28.50', 'dataset', 'dataset-small', 'yolo', 'yolo_test']" + "['dataset', 'dataset-small', 'yolo', 'yolo_test']" ] }, - "execution_count": 2, + "execution_count": 17, "metadata": {}, "output_type": "execute_result" } @@ -304,7 +304,7 @@ { "cell_type": "code", "execution_count": 5, - "id": "04de8608", + "id": "0c8a3151", "metadata": {}, "outputs": [], "source": [ @@ -318,7 +318,7 @@ }, { "cell_type": "markdown", - "id": "78144a0a", + "id": "5baf367a", "metadata": {}, "source": [ "The code for the LaTeX table of the classification report can be printed by first converting the results to a pandas DataFrame and then calling the `to_latex()` method of the DataFrame. This code can then be inserted into the LaTeX document." @@ -358,7 +358,7 @@ { "cell_type": "code", "execution_count": 14, - "id": "5cbf690d", + "id": "a6e0e146", "metadata": {}, "outputs": [ {