Skip to content

Commit a0fa92a

Browse files
committed
Merge 'origin/develop' into camera_controls_misc
2 parents a9d69ae + cbe0c76 commit a0fa92a

File tree

110 files changed

+3886
-416
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+3886
-416
lines changed

.github/workflows/main.yml

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ jobs:
4949
run: |
5050
python -m pip install --upgrade pip
5151
sudo apt install libusb-1.0-0-dev
52-
python -m pip install clang==14.0 --force-reinstall
5352
python -m pip install -r docs/requirements_mkdoc.txt
5453
- name: Configure project
5554
run: cmake -S . -B build -DDEPTHAI_PYTHON_FORCE_DOCSTRINGS=ON -DDEPTHAI_PYTHON_DOCSTRINGS_OUTPUT="$PWD/docstrings/depthai_python_docstring.hpp"
@@ -154,8 +153,13 @@ jobs:
154153
run: echo "BUILD_COMMIT_HASH=${{github.sha}}" >> $GITHUB_ENV
155154
- name: Building wheel
156155
run: python3 -m pip wheel . -w ./wheelhouse/ --verbose
157-
- name: Auditing wheel
158-
run: for whl in wheelhouse/*.whl; do auditwheel repair "$whl" --plat linux_armv7l -w wheelhouse/audited/; done
156+
- name: Auditing wheels and adding armv6l tag (Running on RPi, binaries compiled as armv6l)
157+
run: |
158+
python3 -m pip install -U wheel auditwheel
159+
for whl in wheelhouse/*.whl; do auditwheel repair "$whl" --plat linux_armv7l -w wheelhouse/preaudited/; done
160+
for whl in wheelhouse/preaudited/*.whl; do python3 -m wheel tags --platform-tag +linux_armv6l "$whl"; done
161+
mkdir -p wheelhouse/audited/
162+
for whl in wheelhouse/preaudited/*linux_armv6l*.whl; do cp "$whl" wheelhouse/audited/$(basename $whl); done
159163
- name: Archive wheel artifacts
160164
uses: actions/upload-artifact@v3
161165
with:
@@ -540,14 +544,33 @@ jobs:
540544
event-type: depthai-python-release
541545
client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
542546

543-
notify_hil_workflow_linux_x86_64:
544-
needs: [build-linux-x86_64]
547+
# notify_hil_workflow_linux_x86_64:
548+
# needs: [build-linux-x86_64]
549+
# runs-on: ubuntu-latest
550+
# steps:
551+
# - name: Repository Dispatch
552+
# uses: peter-evans/repository-dispatch@v2
553+
# with:
554+
# token: ${{ secrets.HIL_CORE_DISPATCH_TOKEN }}
555+
# repository: luxonis/depthai-core-hil-tests
556+
# event-type: python-hil-event
557+
# client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
558+
559+
notify_hil_workflow:
560+
needs: [build-linux-armhf, build-linux-x86_64]
545561
runs-on: ubuntu-latest
546562
steps:
547-
- name: Repository Dispatch
548-
uses: peter-evans/repository-dispatch@v2
549-
with:
550-
token: ${{ secrets.HIL_CORE_DISPATCH_TOKEN }}
551-
repository: luxonis/depthai-core-hil-tests
552-
event-type: python-hil-event
553-
client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
563+
- name: Dispatch an action and get the run ID
564+
uses: codex-/return-dispatch@v1
565+
id: return_dispatch
566+
with:
567+
token: ${{ secrets.HIL_CORE_DISPATCH_TOKEN }} # Note this is NOT GITHUB_TOKEN but a PAT
568+
ref: main # or refs/heads/target_branch
569+
repo: depthai-core-hil-tests
570+
owner: luxonis
571+
workflow: regression_test.yml
572+
workflow_inputs: '{"commit": "${{ github.ref }}", "parent_url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"}'
573+
workflow_timeout_seconds: 300 # was 120 Default: 300
574+
575+
- name: Release
576+
run: echo "https://github.com/luxonis/depthai-core-hil-tests/actions/runs/${{steps.return_dispatch.outputs.run_id}}" >> $GITHUB_STEP_SUMMARY

.readthedocs.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
version: 2
77

88
build:
9-
image: latest
9+
os: ubuntu-20.04
10+
tools:
11+
python: "3.8"
1012

1113
# Submodules
1214
submodules:
@@ -29,6 +31,5 @@ formats: []
2931

3032
# Optionally set the version of Python and requirements required to build your docs
3133
python:
32-
version: 3.8
3334
install:
3435
- requirements: docs/readthedocs/requirements.txt

CMakeLists.txt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,10 @@ pybind11_add_module(${TARGET_NAME}
127127
src/pipeline/node/AprilTagBindings.cpp
128128
src/pipeline/node/DetectionParserBindings.cpp
129129
src/pipeline/node/WarpBindings.cpp
130+
src/pipeline/node/UVCBindings.cpp
131+
src/pipeline/node/ToFBindings.cpp
132+
src/pipeline/node/SyncBindings.cpp
133+
src/pipeline/node/MessageDemuxBindings.cpp
130134

131135
src/pipeline/datatype/ADatatypeBindings.cpp
132136
src/pipeline/datatype/AprilTagConfigBindings.cpp
@@ -135,10 +139,13 @@ pybind11_add_module(${TARGET_NAME}
135139
src/pipeline/datatype/CameraControlBindings.cpp
136140
src/pipeline/datatype/EdgeDetectorConfigBindings.cpp
137141
src/pipeline/datatype/FeatureTrackerConfigBindings.cpp
142+
src/pipeline/datatype/ToFConfigBindings.cpp
138143
src/pipeline/datatype/ImageManipConfigBindings.cpp
139144
src/pipeline/datatype/ImgDetectionsBindings.cpp
140145
src/pipeline/datatype/ImgFrameBindings.cpp
146+
src/pipeline/datatype/EncodedFrameBindings.cpp
141147
src/pipeline/datatype/IMUDataBindings.cpp
148+
src/pipeline/datatype/MessageGroupBindings.cpp
142149
src/pipeline/datatype/NNDataBindings.cpp
143150
src/pipeline/datatype/SpatialImgDetectionsBindings.cpp
144151
src/pipeline/datatype/SpatialLocationCalculatorConfigBindings.cpp
@@ -159,8 +166,9 @@ if(WIN32)
159166
set(depthai_dll_libraries "$<TARGET_RUNTIME_DLLS:${TARGET_NAME}>")
160167
endif()
161168
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD COMMAND
162-
${CMAKE_COMMAND} -E copy ${depthai_dll_libraries} $<TARGET_FILE_DIR:${TARGET_NAME}>
169+
"$<$<BOOL:${depthai_dll_libraries}>:${CMAKE_COMMAND};-E;copy_if_different;${depthai_dll_libraries};$<TARGET_FILE_DIR:${TARGET_NAME}>>"
163170
COMMAND_EXPAND_LISTS
171+
VERBATIM
164172
)
165173

166174
# Disable "d" postfix, so python can import the library as is
@@ -169,8 +177,8 @@ endif()
169177

170178
# Add stubs (pyi) generation step after building bindings
171179
execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" "from mypy import api" RESULT_VARIABLE error OUTPUT_QUIET ERROR_QUIET)
172-
if(error)
173-
message(WARNING "Mypy not available - stubs won't be generated or checked")
180+
if(error OR CMAKE_CROSSCOMPILING)
181+
message(WARNING "Mypy not available or cross compiling - stubs won't be generated or checked")
174182
else()
175183
get_target_property(bindings_directory ${TARGET_NAME} LIBRARY_OUTPUT_DIRECTORY)
176184
if(NOT bindings_directory)

cmake/pybind11-mkdoc.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function(pybind11_mkdoc_setup_internal target output_path mkdoc_headers enforce)
2828

2929
# Execute module pybind11_mkdoc to check if present
3030
message(STATUS "Checking for pybind11_mkdoc")
31-
execute_process(COMMAND ${PYTHON_EXECUTABLE} -m ${PYBIND11_MKDOC_MODULE_NAME} RESULT_VARIABLE error OUTPUT_QUIET ERROR_QUIET)
31+
execute_process(COMMAND ${PYTHON_EXECUTABLE} -m ${PYBIND11_MKDOC_MODULE_NAME} --help RESULT_VARIABLE error OUTPUT_QUIET ERROR_QUIET)
3232
if(error)
3333
set(message "Checking for pybind11_mkdoc - not found, docstrings not available")
3434
if(NOT enforce)

depthai-core

Submodule depthai-core updated 97 files

docs/docker/dev.dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ENV CC clang-10
88
ENV CXX clang++-10
99
WORKDIR /app
1010
ADD docs/requirements.txt docs/requirements.txt
11+
ADD docs/requirements_mkdoc.txt docs/requirements_mkdoc.txt
1112
RUN python3 -m pip install -r docs/requirements.txt
1213
ADD . .
1314
CMD docs/docker/docker_run.sh

docs/requirements_mkdoc.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
git+https://github.com/luxonis/pybind11_mkdoc.git@59746f8d1645c9f00ebfb534186334d0154b5bd6
1+
git+https://github.com/luxonis/pybind11_mkdoc.git@da6c64251a0ebbc3ffc007477a0b9c9f20cac165
2+
libclang==16.0.6
27.8 KB
Loading
91.5 KB
Loading
8.49 MB
Loading

0 commit comments

Comments
 (0)