Add python 3.11 to test-check.yaml

.github/workflows/test-check.yaml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8, 3.9, '3.10']
+        python-version: [3.8, 3.9, '3.11']
         os: [ubuntu-20.04]
     runs-on: ${{ matrix.os }}
     steps:
@@ -52,7 +52,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8, 3.9, '3.10']
+        python-version: [3.8, 3.9, '3.11']
         os: [ubuntu-20.04]
     runs-on: ${{ matrix.os }}
     steps:
@@ -97,6 +97,6 @@ jobs:
       - name: "Clean sparsezoo directory"
         run: rm -r sparsezoo/
       - name: ⚙️ Install dependencies
-        run: pip install .[dev,server,image_classification,transformers,haystack]
+        run: pip install .[dev,haystack]
       - name: Run integrations tests
         run: make test_integrations

setup.py

@@ -130,12 +130,8 @@ def _parse_requirements_file(file_path):
     "onnxruntime>=1.7.0",
 ]
 _torch_deps = ["torch>=1.7.0,<=2.0"]
-_image_classification_deps = [
-    "torchvision>=0.3.0,<0.14",
-    "opencv-python<=4.6.0.66",
-]
-_yolo_integration_deps = [
-    "torchvision>=0.3.0,<=0.15.1",
+_computer_vision_deps = [
+    "torchvision>=0.3.0,<0.16",
     "opencv-python<=4.6.0.66",
 ]
 _openpifpaf_integration_deps = [
@@ -144,7 +140,7 @@ def _parse_requirements_file(file_path):
     "pycocotools >=2.0.6",
     "scipy==1.10.1",
 ]
-_yolov8_integration_deps = _yolo_integration_deps + ["ultralytics==8.0.124"]
+_yolov8_integration_deps = _computer_vision_deps + ["ultralytics==8.0.124"]
 _transformers_integration_deps = [
     "transformers<4.35",
     "datasets<=2.14.6",
@@ -166,7 +162,7 @@ def _parse_requirements_file(file_path):
 _haystack_integration_deps = _parse_requirements_file(_haystack_requirements_file_path)
 _clip_deps = [
     "open_clip_torch==2.20.0",
-    "scipy<1.9.2,>=1.8",
+    "scipy<1.10,>=1.8",
     "transformers<4.35",
 ]
 
@@ -267,9 +263,9 @@ def _setup_extras() -> Dict:
         "dev": _dev_deps,
         "server": _server_deps,
         "onnxruntime": _onnxruntime_deps,
-        "image_classification": _image_classification_deps,
-        "yolo": _yolo_integration_deps,
-        "yolov5": _yolo_integration_deps,
+        "image_classification": _computer_vision_deps,
+        "yolo": _computer_vision_deps,
+        "yolov5": _computer_vision_deps,
         "haystack": _haystack_integration_deps,
         "openpifpaf": _openpifpaf_integration_deps,
         "yolov8": _yolov8_integration_deps,

src/deepsparse/transformers/haystack/haystack_reqs.txt

@@ -16,7 +16,7 @@
 # deepsparse/transformers/haystack/__init__.py
 
 importlib-metadata
-torch==1.12.1
+torch>=1.12.1
 requests
 pydantic
 nltk
@@ -60,7 +60,7 @@ pillow
 pdf2image==1.14.0
 onnxruntime
 onnxruntime_tools
-ray>=1.9.1,<2
+ray
 aiorwlock>=1.3.0,<2
 grpcio==1.43.0
 beir

tests/deepsparse/loggers/metric_functions/predefined/test_predefined.py

@@ -159,8 +159,10 @@ def test_group_name(mock_engine, group_name, pipeline_name, inputs, optional_ind
 
     with open(expected_logs, "r") as f:
         expected_logs = f.read().splitlines()
-    for log, expected_log in zip(data_logging_logs, expected_logs):
-        assert log == expected_log
+    expected_logs = set(expected_logs)
+
+    for data_logging_log in data_logging_logs:
+        assert data_logging_log in expected_logs, f"Unexpected log: {data_logging_log}"
 
 
 yaml_config = """