Initial commit for removing super-gradients dependencies and allowing… (#287)

… general exported Onnx Object detections models to be used. Still
figuring out how to build unit test.

---------

Co-authored-by: EC2 Default User <[email protected]>
Co-authored-by: Alan Bertl <[email protected]>
Co-authored-by: qued <[email protected]>

Author: 3 people

.github/workflows/ci.yml

@@ -20,6 +20,7 @@ jobs:
         path: |
           .venv
         key: ${{ runner.os }}-${{ env.PYTHON_VERSION }}-${{ hashFiles('requirements/*.txt') }}
+        lookup-only: true
     - name: Set up Python ${{ env.PYTHON_VERSION }}
       uses: actions/setup-python@v4
       with:
@@ -88,11 +89,18 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get -y install poppler-utils tesseract-ocr
+    - name: Configure AWS credentials
+      uses: aws-actions/configure-aws-credentials@v4
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
     - name: Test
       env:
         UNSTRUCTURED_HF_TOKEN: ${{ secrets.HF_TOKEN }}
       run: |
         source .venv/bin/activate
+        aws s3 cp s3://utic-dev-models/ci_test_model/test_ci_model.onnx test_unstructured_inference/models/
         CI=true make test
         make check-coverage
 

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.7.14
+
+* enhancement: Remove Super-Gradients Dependency and Allow General Onnx Models Instead
+
 ## 0.7.13
 
 * refactor: add a class `ElementType` for the element type constants and use the constants to replace element type strings

MANIFEST.in

@@ -1,2 +1 @@
 include requirements/base.in
-include requirements/sg.in

Makefile

@@ -19,10 +19,10 @@ install-base: install-base-pip-packages
 
 ## install:                 installs all test, dev, and experimental requirements
 .PHONY: install
-install: install-base-pip-packages install-dev install-sg install-detectron2
+install: install-base-pip-packages install-dev install-detectron2
 
 .PHONY: install-ci
-install-ci: install-base-pip-packages install-test install-sg install-paddleocr
+install-ci: install-base-pip-packages install-test install-paddleocr
 
 .PHONY: install-base-pip-packages
 install-base-pip-packages:
@@ -46,10 +46,6 @@ install-test: install-base
 install-dev: install-test
 	pip install -r requirements/dev.txt
 
-.PHONY: install-sg
-install-sg: install-base
-	pip install -r requirements/sg.txt
-
 ## pip-compile:             compiles all base/dev/test requirements
 .PHONY: pip-compile
 pip-compile:
@@ -60,8 +56,6 @@ pip-compile:
 	sed 's/^detectron2 @/# detectron2 @/g' requirements/base.txt
 	pip-compile --upgrade requirements/test.in
 	pip-compile --upgrade requirements/dev.in
-	pip-compile --upgrade requirements/sg.in
-
 
 #################
 # Test and Lint #

requirements/base.txt

@@ -10,34 +10,34 @@ certifi==2023.7.22
     # via requests
 cffi==1.16.0
     # via cryptography
-charset-normalizer==3.3.0
+charset-normalizer==3.3.2
     # via
     #   pdfminer-six
     #   requests
 coloredlogs==15.0.1
     # via onnxruntime
 contourpy==1.1.1
     # via matplotlib
-cryptography==41.0.4
+cryptography==41.0.5
     # via pdfminer-six
 cycler==0.12.1
     # via matplotlib
 effdet==0.4.1
     # via layoutparser
-filelock==3.12.4
+filelock==3.13.1
     # via
     #   huggingface-hub
     #   torch
     #   transformers
 flatbuffers==23.5.26
     # via onnxruntime
-fonttools==4.43.1
+fonttools==4.44.3
     # via matplotlib
-fsspec==2023.9.2
+fsspec==2023.10.0
     # via
     #   huggingface-hub
     #   torch
-huggingface-hub==0.17.3
+huggingface-hub==0.19.4
     # via
     #   -r requirements/base.in
     #   timm
@@ -47,7 +47,7 @@ humanfriendly==10.0
     # via coloredlogs
 idna==3.4
     # via requests
-importlib-resources==6.1.0
+importlib-resources==6.1.1
     # via matplotlib
 iopath==0.1.10
     # via layoutparser
@@ -65,9 +65,8 @@ mpmath==1.3.0
     # via sympy
 networkx==3.1
     # via torch
-numpy==1.23.0
+numpy==1.24.4
     # via
-    #   -c requirements/constraints.in
     #   contourpy
     #   layoutparser
     #   matplotlib
@@ -81,7 +80,7 @@ numpy==1.23.0
     #   transformers
 omegaconf==2.3.0
     # via effdet
-onnx==1.14.1
+onnx==1.15.0
     # via -r requirements/base.in
 onnxruntime==1.15.1
     # via -r requirements/base.in
@@ -102,9 +101,9 @@ pdf2image==1.16.3
     # via layoutparser
 pdfminer-six==20221105
     # via pdfplumber
-pdfplumber==0.10.2
+pdfplumber==0.10.3
     # via layoutparser
-pillow==10.0.1
+pillow==10.1.0
     # via
     #   layoutparser
     #   matplotlib
@@ -114,7 +113,7 @@ pillow==10.0.1
     #   torchvision
 portalocker==2.8.2
     # via iopath
-protobuf==4.24.4
+protobuf==4.25.1
     # via
     #   onnx
     #   onnxruntime
@@ -124,7 +123,7 @@ pycparser==2.21
     # via cffi
 pyparsing==3.1.1
     # via matplotlib
-pypdfium2==4.21.0
+pypdfium2==4.24.0
     # via pdfplumber
 pytesseract==0.3.10
     # via layoutparser
@@ -143,7 +142,7 @@ pyyaml==6.0.1
     #   omegaconf
     #   timm
     #   transformers
-rapidfuzz==3.4.0
+rapidfuzz==3.5.2
     # via -r requirements/base.in
 regex==2023.10.3
     # via transformers
@@ -164,17 +163,17 @@ sympy==1.12
     # via
     #   onnxruntime
     #   torch
-timm==0.9.7
+timm==0.9.10
     # via effdet
-tokenizers==0.14.1
+tokenizers==0.15.0
     # via transformers
-torch==2.1.0
+torch==2.1.1
     # via
     #   effdet
     #   layoutparser
     #   timm
     #   torchvision
-torchvision==0.16.0
+torchvision==0.16.1
     # via
     #   effdet
     #   layoutparser
@@ -184,17 +183,16 @@ tqdm==4.66.1
     #   huggingface-hub
     #   iopath
     #   transformers
-transformers==4.34.0
+transformers==4.35.2
     # via -r requirements/base.in
 typing-extensions==4.8.0
     # via
     #   huggingface-hub
     #   iopath
-    #   onnx
     #   torch
 tzdata==2023.3
     # via pandas
-urllib3==2.0.6
+urllib3==2.1.0
     # via requests
 zipp==3.17.0
     # via importlib-resources

requirements/constraints.in

@@ -1 +0,0 @@
-numpy<=1.23