Matrix Strategy for Tests

.github/workflows/modelconverter_test.yaml

@@ -13,17 +13,27 @@ permissions:
   packages: read
 
 env:
-  DOCKERFILE: docker/${{ inputs.package }}/Dockerfile
-  TAG: luxonis/modelconverter-${{ inputs.package }}:latest
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  AWS_S3_ENDPOINT_URL: ${{ secrets.AWS_S3_ENDPOINT_URL }}
+  PACKAGE: ${{ inputs.package }}
 
 jobs:
   tests:
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-13]
+
+    runs-on: ${{ matrix.os }}
 
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
 
+    - name: Set up Docker
+      uses: crazy-max/ghaction-setup-docker@v3
+
     - name: Login to GitHub Container Registry
       uses: docker/login-action@v3
       with:
@@ -47,12 +57,12 @@ jobs:
         credentials_json: ${{ secrets.GCP_CREDENTIALS }}
         token_format: access_token
 
-    - name: Run Tests
-      env:
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        AWS_S3_ENDPOINT_URL: ${{ secrets.AWS_S3_ENDPOINT_URL }}
-        PACKAGE: ${{ inputs.package }}
+    - name: Run Tests (Ubuntu)
+      if: ${{ matrix.os == 'ubuntu-latest' }}
       run: |
         pytest -s --verbose "tests/test_packages/test_$PACKAGE.py"
 
+    - name: Run Tests (Windows)
+      if: ${{ matrix.os == 'windows-latest' }}
+      run: |
+        pytest -s --verbose "tests/test_packages/test_${{env.PACKAGE}}.py"

modelconverter/packages/rvc4/benchmark.py

@@ -51,8 +51,10 @@ def _adb_run(self, args, **kwargs) -> Tuple[int, str, str]:
                 f"stdout:\n{stdout}\n"
                 f"stderr:\n{stderr}\n"
             )
-        return result.returncode, stdout.decode("utf-8"), stderr.decode(
-            "utf-8"
+        return (
+            result.returncode,
+            stdout.decode(errors="ignore"),
+            stderr.decode(errors="ignore"),
         )
 
     def shell(self, cmd: str) -> Tuple[int, str, str]:

modelconverter/utils/subprocess.py

@@ -54,12 +54,12 @@ def subprocess_run(
     if not silent:
         log_message(info_string)
     if result.stderr:
-        string = result.stderr.decode("utf-8")
+        string = result.stderr.decode(errors="ignore")
         if not silent:
             log_message(f"[ STDERR ]:\n{string}")
         info_string += f"\n[ STDERR ]:\n{string}"
     if result.stdout:
-        string = result.stdout.decode("utf-8")
+        string = result.stdout.decode(errors="ignore")
         if not silent:
             log_message(f"[ STDOUT ]:\n{string}")
         info_string += f"\n[ STDOUT ]:\n{string}"