From 79b5351dae1147ddd99920d8012905543e9fec56 Mon Sep 17 00:00:00 2001 From: Matthew Altenburg Date: Mon, 25 Jan 2021 13:58:47 +1100 Subject: [PATCH 1/7] Allow user to increase window size with mouse drag --- depthai_demo.py | 1 + 1 file changed, 1 insertion(+) diff --git a/depthai_demo.py b/depthai_demo.py index 1478b7107..0ab6701d3 100755 --- a/depthai_demo.py +++ b/depthai_demo.py @@ -272,6 +272,7 @@ def keypress_handler(self, key, stream_names): camera = meta.getCameraName() window_name = 'previewout-' + camera + cv2.namedWindow(window_name, cv2.WINDOW_NORMAL) # the format of previewout image is CHW (Chanel, Height, Width), but OpenCV needs HWC, so we # change shape (3, 300, 300) -> (300, 300, 3) data0 = packetData[0, :, :] From 823a67fc36ffb378c899f62cbb77aa02c59603e5 Mon Sep 17 00:00:00 2001 From: alex-luxonis Date: Wed, 3 Feb 2021 16:16:33 +0200 Subject: [PATCH 2/7] Update depthai: FW fix for -fusb2, USB descriptor was improperly set up, causing enumeration failure on Windows --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index d44a39de7..21c3ff681 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ opencv-python==4.5.1.48 requests==2.24.0 argcomplete==1.12.1 pyyaml==5.3.1 -depthai==0.4.1.1 +# depthai==0.4.1.1 -# --extra-index-url https://artifacts.luxonis.com/artifactory/luxonis-python-snapshot-local/ -# depthai==0.4.1.1+91ba9cbf941592371a7246887a491f0c82632e9d +--extra-index-url https://artifacts.luxonis.com/artifactory/luxonis-python-snapshot-local/ +depthai==0.4.1.1+d94e1b8e3a457dc2645d8ea9813057b569bbdd3a From cbdba8f40242e9ff3f54004d4f85c9d7c554cf01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pi=C5=82atowski?= Date: Tue, 23 Feb 2021 13:51:55 +0100 Subject: [PATCH 3/7] limit CNNs tested in run_tests.py --- tests/tests_runner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/tests_runner.py b/tests/tests_runner.py index 232c4c0c7..e0ca9cc80 100644 --- a/tests/tests_runner.py +++ b/tests/tests_runner.py @@ -3,6 +3,7 @@ from pathlib import Path from consts.resource_paths import nn_resource_path from depthai_helpers.cli_utils import PrintColors +from depthai_helpers.arg_manager import _CNN_choices import sys parser = argparse.ArgumentParser() @@ -61,8 +62,7 @@ def print_summary(self): runner.test_streams("disparity_color") runner.test_streams("object_tracker") - cnnlist = os.listdir(nn_resource_path) - for cnn in cnnlist: + for cnn in _CNN_choices: if os.path.isdir(nn_resource_path + cnn): runner.test_cnn(cnn) From 9ba3d967eccc1bca55c134364d20b7d4aa0977ad Mon Sep 17 00:00:00 2001 From: SzabolcsGergely Date: Sat, 27 Feb 2021 01:08:25 +0200 Subject: [PATCH 4/7] Do not print error if optional dependencies failed to install --- install_requirements.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install_requirements.py b/install_requirements.py index 5e281876a..b2438abbb 100755 --- a/install_requirements.py +++ b/install_requirements.py @@ -16,6 +16,6 @@ subprocess.check_call([*pip_call, "uninstall", "depthai", "--yes"]) subprocess.check_call([*pip_install, "-r", "requirements.txt"]) try: - subprocess.check_call([*pip_install, "-r", "requirements-optional.txt"]) + subprocess.check_call([*pip_install, "-r", "requirements-optional.txt"], stderr=subprocess.DEVNULL) except subprocess.CalledProcessError as ex: - print(f"Optional dependencies were not installed (exit code {ex.returncode})") + print(f"Optional dependencies were not installed. This is not an error.") From eb30ff227284c4d460bcb64acbb3d303c53b9809 Mon Sep 17 00:00:00 2001 From: SzabolcsGergely Date: Sat, 27 Feb 2021 01:08:41 +0200 Subject: [PATCH 5/7] Update lib to 1.0.0.0 --- requirements.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 21c3ff681..aadfcdac9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,5 @@ opencv-python==4.5.1.48 requests==2.24.0 argcomplete==1.12.1 pyyaml==5.3.1 -# depthai==0.4.1.1 ---extra-index-url https://artifacts.luxonis.com/artifactory/luxonis-python-snapshot-local/ -depthai==0.4.1.1+d94e1b8e3a457dc2645d8ea9813057b569bbdd3a +depthai==1.0.0.0 From 0f216369e7a2ea67551518fafcbb71403f79f02e Mon Sep 17 00:00:00 2001 From: SzabolcsGergely Date: Sat, 27 Feb 2021 01:14:46 +0200 Subject: [PATCH 6/7] Skip version check for pi zero and jetson --- .gitignore | 2 ++ depthai_demo.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index cc1c7801e..c4a884c69 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,5 @@ log_system_information.json *.img .aux_wheels *.whl + +*.orig \ No newline at end of file diff --git a/depthai_demo.py b/depthai_demo.py index 0ab6701d3..b41bf27d5 100755 --- a/depthai_demo.py +++ b/depthai_demo.py @@ -14,7 +14,9 @@ print('Using depthai module from: ', depthai.__file__) print('Depthai version installed: ', depthai.__version__) -check_depthai_version() +if platform.machine() not in ['armv6l', 'aarch64']: + check_depthai_version() + is_rpi = platform.machine().startswith('arm') or platform.machine().startswith('aarch64') global args, cnn_model2 From 13ccae3487b5c717d75c8d1295bc51b8c7e9440a Mon Sep 17 00:00:00 2001 From: SzabolcsGergely Date: Sat, 27 Feb 2021 01:33:12 +0200 Subject: [PATCH 7/7] Fix platform check for arm64 and armv6 in requirements --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0853014b1..06157a34c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ opencv-python==4.5.1.48; platform_machine != "aarch64" requests==2.24.0 argcomplete==1.12.1 pyyaml==5.3.1; platform_machine != "aarch64" -depthai==1.0.0.0; platform_machine != "armv6l" or platform_machine != "aarch64" +depthai==1.0.0.0; platform_machine != "armv6l" and platform_machine != "aarch64" # --extra-index-url https://artifacts.luxonis.com/artifactory/luxonis-python-snapshot-local/ # depthai==1.0.0.0+719e825e580e2be386b756950e3cc55a4dadcaba