Merge pull request #34 from saaresearch/develop

New version
aimclub · Jun 26, 2024 · aa7e54e · aa7e54e
2 parents d217aa5 + 95cb385
commit aa7e54e
Show file tree

Hide file tree

Showing 639 changed files with 3,487 additions and 10,436 deletions.
diff --git a/.github/workflows/ml-test.yaml b/.github/workflows/ml-test.yaml
@@ -26,4 +26,4 @@ jobs:
         mkdir WaRP/Warp-D/valid
         cp -r WaRP/Warp-D/test/* WaRP/Warp-D/valid/        
     - name: Ml predictions
-      run: python ODRS/ml_utils/ml_model_optimizer.py
+      run: python src/ML/run_recommender.py
diff --git a/.github/workflows/model-test.yaml b/.github/workflows/model-test.yaml
@@ -27,4 +27,4 @@ jobs:
         cp -r WaRP/Warp-D/test/* WaRP/Warp-D/valid/
     - name: AI training
       run: |
-        python ODRS/train_utils/custom_train_all.py
+        python src/DL/train_detectors.py
diff --git a/.github/workflows/pep8-test.yaml b/.github/workflows/pep8-test.yaml
@@ -21,4 +21,4 @@ jobs:
         pip install flake8
     - name: Run PEP8 test
       run: |
-        flake8 --max-line-length=130 --exclude=ODRS/train_utils/train_model/models/*,ODRS/ml_utils/*,ODRS/train_utils/custom_train_all.py,ODRS/train_utils/train_model/scripts/yolov7_train.py,tests/*,docs/*,ODRS/utils/dataset_info.py .
+        flake8 --max-line-length=180 --exclude=tests/*,src/DL/*,src/ML/*,docs/*,src/data_processing/* .
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,4 @@
 _pycache_/
-yolov7/
-yolov5/
-ultralytics/
-wandb/
 .idea/
 
 
diff --git a/ODRS/api/ODRS.py b/ODRS/api/ODRS.py
diff --git a/ODRS/data_utils/.DS_Store b/ODRS/data_utils/.DS_Store
diff --git a/ODRS/data_utils/__pycache__/__init__.cpython-38.pyc b/ODRS/data_utils/__pycache__/__init__.cpython-38.pyc
diff --git a/ODRS/data_utils/__pycache__/create_config.cpython-38.pyc b/ODRS/data_utils/__pycache__/create_config.cpython-38.pyc
diff --git a/ODRS/data_utils/__pycache__/prepare_ssd.cpython-38.pyc b/ODRS/data_utils/__pycache__/prepare_ssd.cpython-38.pyc
diff --git a/ODRS/data_utils/__pycache__/split_dataset.cpython-38.pyc b/ODRS/data_utils/__pycache__/split_dataset.cpython-38.pyc
diff --git a/ODRS/data_utils/create_config.py b/ODRS/data_utils/create_config.py
diff --git a/ODRS/data_utils/resize_image.py b/ODRS/data_utils/resize_image.py
diff --git a/ODRS/ml_utils/ml_model_optimizer.py b/ODRS/ml_utils/ml_model_optimizer.py
diff --git a/ODRS/train_utils/.DS_Store b/ODRS/train_utils/.DS_Store
diff --git a/ODRS/train_utils/train_model/.DS_Store b/ODRS/train_utils/train_model/.DS_Store
diff --git a/ODRS/train_utils/train_model/models/.DS_Store b/ODRS/train_utils/train_model/models/.DS_Store
diff --git a/...in_model/models/fastercnn-pytorch-training-pipeline/example_test_data/README.md b/...in_model/models/fastercnn-pytorch-training-pipeline/example_test_data/README.md
diff --git a/..._model/models/fastercnn-pytorch-training-pipeline/example_test_data/image_1.jpg b/..._model/models/fastercnn-pytorch-training-pipeline/example_test_data/image_1.jpg
diff --git a/..._model/models/fastercnn-pytorch-training-pipeline/example_test_data/image_2.jpg b/..._model/models/fastercnn-pytorch-training-pipeline/example_test_data/image_2.jpg
diff --git a/...tils/train_model/models/fastercnn-pytorch-training-pipeline/example_test_data/video_1.mp4 b/...tils/train_model/models/fastercnn-pytorch-training-pipeline/example_test_data/video_1.mp4