Skip to content

Commit

Permalink
Merge pull request #339 from luxonis/develop
Browse files Browse the repository at this point in the history
Release 1.0.0.0
  • Loading branch information
SzabolcsGergely authored Feb 26, 2021
2 parents e6f7df0 + 13ccae3 commit 39852dc
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,5 @@ log_system_information.json
*.img
.aux_wheels
*.whl

*.orig
5 changes: 4 additions & 1 deletion depthai_demo.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -272,6 +274,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, :, :]
Expand Down
4 changes: 2 additions & 2 deletions install_requirements.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@ def save_response_content(response, destination):
subprocess.check_call([*pip_install, str(wheel_dest)])

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.")
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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==0.4.1.1; 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==0.4.1.1+91ba9cbf941592371a7246887a491f0c82632e9d
# depthai==1.0.0.0+719e825e580e2be386b756950e3cc55a4dadcaba
4 changes: 2 additions & 2 deletions tests/tests_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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)

Expand Down

0 comments on commit 39852dc

Please sign in to comment.