Merge remote-tracking branch 'origin/v4.0' into v4.0

.github/workflows/nn-ci-cpu-testing.yml

@@ -25,8 +25,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-18.04 ]
-        python-version: [ 3.7, 3.8, 3.9 ]
+        os: [ ubuntu-latest ]
+        python-version: [ 3.9 3.10 3.11 ]
 
     # Timeout: https://stackoverflow.com/a/59076067/4521646
     timeout-minutes: 120
@@ -76,59 +76,26 @@ jobs:
 
     - name: Tests workflow
       run: |
-
-        # test train examples ocr
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/train/ocr/by.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/train/ocr/eu.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/train/ocr/ge.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/train/ocr/kg.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/train/ocr/kz.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/train/ocr/ua.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/train/ocr/ua-1995.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/train/ocr/su.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/train/ocr/ru.ipynb
-
-        # test train examples classification
-        #jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/train/classification/options-base-count_lines-train.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/train/classification/options-base-train.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/train/classification/options-custom-train.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/train/classification/options-train.ipynb
-
-        # test train examples object detection
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/train/object_detection/yolov5-train.ipynb
-
         # test python inference examples
-        python examples/py/inference/get-started-demo.py
-        python examples/py/inference/get-started-tiny-demo.py
-        python examples/py/inference/number-plate-filling-demo.py
-        python examples/py/inference/number-plate-recognition-multiline-demo.py
+        python tutorials/py/inference/get-started-demo.py
+        python tutorials/py/inference/get-started-tiny-demo.py
+        python tutorials/py/inference/number-plate-filling-demo.py
 
         # test jupyter inference examples
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/inference/custom-options-model-demo.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/inference/get-started-demo.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/inference/get-started-tiny-demo.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/inference/number-plate-bbox-filling.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/inference/number-plate-keypoints-filling.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/inference/number-plate-recognition-multiline-demo.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/inference/get-started-demo-ocr-custom.ipynb
+        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html tutorials/ju/inference/custom-options-model-demo.ipynb
+        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html tutorials/ju/inference/get-started-demo.ipynb
+        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html tutorials/ju/inference/get-started-tiny-demo.ipynb
+        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html tutorials/ju/inference/number-plate-filling.ipynb
+        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html tutorials/ju/inference/get-started-demo-ocr-custom.ipynb
 
         # test python benchmarks examples
-        python examples/py/benchmark/accuracy-test.py
-        python examples/py/benchmark/runtime-test.py
+        python tutorials/py/benchmark/accuracy-test.py
+        python tutorials/py/benchmark/runtime-test.py
 
         # test jupyter benchmarks examples
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/benchmark/accuracy-test.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/benchmark/accuracy-test-custom.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/benchmark/accuracy-test-multiline.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/benchmark/runtime-test.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/benchmark/runtime-test-multiline.ipynb
-
-        # test jupyter dataset tools examples
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/dataset_tools/analyze_via_dataset.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/dataset_tools/auto_number_grab.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/dataset_tools/check_ocr_model.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/dataset_tools/option_checker.ipynb
-        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html examples/ju/dataset_tools/ocr_dataset_format_checker.ipynb
+        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html tutorials/ju/benchmark/accuracy-test.ipynb
+        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html tutorials/ju/benchmark/accuracy-test-custom.ipynb
+        jupyter nbconvert --ExecutePreprocessor.timeout=6000 --execute --to html tutorials/ju/benchmark/runtime-test.ipynb
 
         # test image loaders
         python3 nomeroff_net/image_loaders/base.py
@@ -140,9 +107,6 @@ jobs:
         # test nnmodels
         python3 -m nomeroff_net.nnmodels.numberplate_classification_model -f nomeroff_net/nnmodels/numberplate_classification_model.py
         python3 -m nomeroff_net.nnmodels.numberplate_options_model -f nomeroff_net/nnmodels/numberplate_options_model.py
-        python3 -m nomeroff_net.nnmodels.fraud_numberpate_model -f nomeroff_net/nnmodels/fraud_numberpate_options.py
-        python3 -m nomeroff_net.nnmodels.numberplate_inverse_model -f nomeroff_net/nnmodels/numberplate_inverse_model.py
-        python3 -m nomeroff_net.nnmodels.numberplate_orientation_model -f nomeroff_net/nnmodels/numberplate_orientation_model.py
         python3 -m nomeroff_net.nnmodels.ocr_model -f nomeroff_net/nnmodels/ocr_model.py
 
         # test tools

README.md

@@ -172,11 +172,16 @@ This gives you the opportunity to get **99% accuracy**on photos that are uploade
 
 <img src="https://nomeroff.net.ua/images/nn/ocr_example.png" alt="Nomeroff-Net OCR Example"/>
 
+
 ## Contributing
 Contributions to this repository are welcome. Examples of things you can contribute:
   * Training on other datasets.
   * Accuracy Improvements.
 
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=ria-com/nomeroff-net&type=Date)](https://star-history.com/#ria-com/nomeroff-net&Date)
+
 ## Credits
   * Dmytro Probachay &lt;[email protected]&gt;
   * Oleg Cherniy &lt;[email protected]&gt;