From 44165539bbb727d17db75d749dd9d0ccad79c05e Mon Sep 17 00:00:00 2001 From: Erol444 Date: Mon, 5 Feb 2024 11:18:23 +0200 Subject: [PATCH 1/4] Updated lib version, updated depthai-demo a bit so it doesn't throw warnings --- depthai_demo.py | 5 +++-- depthai_sdk/requirements.txt | 2 +- requirements.txt | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/depthai_demo.py b/depthai_demo.py index 691a89880..41a2a3d36 100755 --- a/depthai_demo.py +++ b/depthai_demo.py @@ -206,7 +206,8 @@ def setup(self, conf: ConfigManager): self._nnManager.countLabel(self._conf.getCountLabel(self._nnManager)) self._pm.setNnManager(self._nnManager) - self._device = dai.Device(self._pm.pipeline.getOpenVINOVersion(), self._deviceInfo, usb2Mode=self._conf.args.usbSpeed == "usb2") + maxUsbSpeed = dai.UsbSpeed.HIGH if self._conf.args.usbSpeed == "usb2" else dai.UsbSpeed.SUPER + self._device = dai.Device(self._pm.pipeline.getOpenVINOVersion(), self._deviceInfo, maxUsbSpeed) self._device.addLogCallback(self._logMonitorCallback) if sentryEnabled: try: @@ -288,7 +289,7 @@ def run(self): if self._conf.useCamera: cameras = self._device.getConnectedCameras() - if dai.CameraBoardSocket.LEFT in cameras and dai.CameraBoardSocket.RIGHT in cameras: + if dai.CameraBoardSocket.CAM_B in cameras and dai.CameraBoardSocket.CAM_C in cameras: self._pv.collectCalibData(self._device) self._updateCameraConfigs({ diff --git a/depthai_sdk/requirements.txt b/depthai_sdk/requirements.txt index 01580b840..a4b309dd8 100644 --- a/depthai_sdk/requirements.txt +++ b/depthai_sdk/requirements.txt @@ -4,7 +4,7 @@ opencv-contrib-python>4 blobconverter>=1.4.1 pytube>=12.1.0 --extra-index-url https://artifacts.luxonis.com/artifactory/luxonis-python-snapshot-local/ -depthai==2.22.0 +depthai==2.24.0 PyTurboJPEG==1.6.4 marshmallow==3.17.0 xmltodict diff --git a/requirements.txt b/requirements.txt index 59a73c082..5be95088c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,6 @@ depthai-sdk==1.9.4 --extra-index-url https://artifacts.luxonis.com/artifactory/luxonis-depthai-data-local/wheels/ pyqt5>5,<5.15.6 ; platform_machine != "armv6l" and platform_machine != "armv7l" and platform_machine != "aarch64" and platform_machine != "arm64" --extra-index-url https://artifacts.luxonis.com/artifactory/luxonis-python-snapshot-local/ -depthai==2.21.2.0 +depthai==2.24.0.0 Qt.py scipy \ No newline at end of file From 706ecc3f8a7290b5e2749afe706ebf259f0bd7c5 Mon Sep 17 00:00:00 2001 From: Erol444 Date: Mon, 5 Feb 2024 11:43:37 +0200 Subject: [PATCH 2/4] Try to fix windows tests --- .github/workflows/test_install_requirements.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_install_requirements.yml b/.github/workflows/test_install_requirements.yml index 56ba8e41f..45b1ace27 100644 --- a/.github/workflows/test_install_requirements.yml +++ b/.github/workflows/test_install_requirements.yml @@ -91,9 +91,18 @@ - name: Download chocolatey shell: pwsh run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - - name: Install dependencies + - name: Install cmake dependency shell: pwsh - run: choco install cmake git python --version 3.10 pycharm-community -y + run: choco install cmake -y + - name: Install git dependency + shell: pwsh + run: choco install git -y + - name: Install python dependency + shell: pwsh + run: choco install python --version 3.10 -y + - name: Install pycharm-community dependency + shell: pwsh + run: choco install pycharm-community -y - name: Install requrirements run: | python install_requirements.py From c50e2174443b271d3eb941b1896322e2c7295059 Mon Sep 17 00:00:00 2001 From: Erol444 Date: Mon, 5 Feb 2024 12:23:34 +0200 Subject: [PATCH 3/4] Force install python version for windows tests --- .github/workflows/test_install_requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_install_requirements.yml b/.github/workflows/test_install_requirements.yml index 45b1ace27..874deb3f0 100644 --- a/.github/workflows/test_install_requirements.yml +++ b/.github/workflows/test_install_requirements.yml @@ -99,7 +99,7 @@ run: choco install git -y - name: Install python dependency shell: pwsh - run: choco install python --version 3.10 -y + run: choco install python --version 3.10 --force -y - name: Install pycharm-community dependency shell: pwsh run: choco install pycharm-community -y From 6210b02a0aa3e51af11bc82744c140c79f48013a Mon Sep 17 00:00:00 2001 From: jakaskerl <53253318+jakaskerl@users.noreply.github.com> Date: Mon, 5 Feb 2024 19:27:19 +0100 Subject: [PATCH 4/4] Fixing windows tests - removed already installed packages: (https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md) --- .github/workflows/test_install_requirements.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/test_install_requirements.yml b/.github/workflows/test_install_requirements.yml index 874deb3f0..4dab13002 100644 --- a/.github/workflows/test_install_requirements.yml +++ b/.github/workflows/test_install_requirements.yml @@ -91,15 +91,6 @@ - name: Download chocolatey shell: pwsh run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - - name: Install cmake dependency - shell: pwsh - run: choco install cmake -y - - name: Install git dependency - shell: pwsh - run: choco install git -y - - name: Install python dependency - shell: pwsh - run: choco install python --version 3.10 --force -y - name: Install pycharm-community dependency shell: pwsh run: choco install pycharm-community -y