Skip to content

Commit 4b6f3a1

Browse files
themarpethemarpe
committed
Merge branch 'develop' into gen2_scripting
2 parents 8c9d95e + ca39051 commit 4b6f3a1

File tree

147 files changed

+5949
-841
lines changed

Some content is hidden

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

147 files changed

+5949
-841
lines changed

‎.github/workflows/main.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,31 +26,31 @@ jobs:
2626

2727
# Job which builds docstrings for the rest of the wheel builds
2828
build-docstrings:
29-
runs-on: macos-latest
29+
runs-on: ubuntu-latest
3030
steps:
3131
- name: Cache .hunter folder
3232
uses: actions/cache@v2
3333
with:
3434
path: ~/.hunter
35-
key: hunter-macos-latest
35+
key: hunter-ubuntu-latest
3636
- name: List .hunter cache directory
3737
run: ls -a -l ~/.hunter/_Base/ || true
3838
- uses: actions/checkout@v2
3939
with:
4040
submodules: 'recursive'
4141
- name: Set up Python
4242
uses: actions/setup-python@v2
43-
with:
43+
with:
4444
python-version: 3.8
4545
- name: Install dependencies
4646
run: |
4747
python -m pip install --upgrade pip
48-
brew install libusb
49-
python -m pip install git+git://github.com/luxonis/pybind11_mkdoc.git@master
48+
sudo apt install libusb-1.0-0-dev
49+
python -m pip install -r docs/requirements_mkdoc.txt
5050
- name: Configure project
5151
run: cmake -S . -B build -DDEPTHAI_PYTHON_FORCE_DOCSTRINGS=ON -DDEPTHAI_PYTHON_DOCSTRINGS_OUTPUT="$PWD/docstrings/depthai_python_docstring.hpp"
5252
- name: Build target 'pybind11_mkdoc'
53-
run: cmake --build build --target pybind11_mkdoc --parallel
53+
run: cmake --build build --target pybind11_mkdoc --parallel 8
5454
- name: Upload docstring artifacts
5555
uses: actions/upload-artifact@v2
5656
with:
@@ -62,7 +62,7 @@ jobs:
6262
build-linux-armhf:
6363
needs: build-docstrings
6464
runs-on: luxonis-armhf
65-
container:
65+
container:
6666
image: registry.gitlab.com/luxonis/depthai-crosscompile/debian-buster
6767
# Mount local hunter cache directory, instead of transfering to Github and back
6868
volumes:
@@ -73,7 +73,7 @@ jobs:
7373
- uses: actions/checkout@v2
7474
with:
7575
submodules: 'recursive'
76-
76+
7777
- uses: actions/download-artifact@v2
7878
with:
7979
name: 'docstrings'
@@ -129,7 +129,7 @@ jobs:
129129

130130
- name: Set up Python ${{ matrix.python-version }}
131131
uses: actions/setup-python@v2
132-
with:
132+
with:
133133
python-version: ${{ matrix.python-version }}
134134
architecture: ${{ matrix.python-architecture }}
135135
- name: Append build hash if not a tagged commit
@@ -182,7 +182,7 @@ jobs:
182182

183183
- name: Set up Python ${{ matrix.python-version }}
184184
uses: actions/setup-python@v2
185-
with:
185+
with:
186186
python-version: ${{ matrix.python-version }}
187187
- name: Append build hash if not a tagged commit
188188
if: startsWith(github.ref, 'refs/tags/v') != true
@@ -197,7 +197,7 @@ jobs:
197197
- name: Building wheels
198198
run: python -m pip wheel . -w ./wheelhouse/ --verbose
199199
- name: Auditing wheels
200-
run: ci/repair-whl-macos.sh `pwd`/wheelhouse/* `pwd`/wheelhouse/audited
200+
run: ci/repair-whl-macos.sh `pwd`/wheelhouse/* `pwd`/wheelhouse/audited
201201
- name: Archive wheel artifacts
202202
uses: actions/upload-artifact@v2
203203
with:
@@ -247,7 +247,7 @@ jobs:
247247
- name: Build and install depthai-core
248248
run: |
249249
cmake -S depthai-core/ -B build_core -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=$PWD/cmake/toolchain/pic.cmake
250-
cmake --build build_core --target install --parallel
250+
cmake --build build_core --target install --parallel 8
251251
echo "DEPTHAI_INSTALLATION_DIR=$PWD/build_core/install/" >> $GITHUB_ENV
252252
253253
- name: Append build hash if not a tagged commit
@@ -309,7 +309,7 @@ jobs:
309309
- name: Build and install depthai-core
310310
run: |
311311
cmake -S depthai-core/ -B build_core -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=$PWD/cmake/toolchain/pic.cmake
312-
cmake --build build_core --target install --parallel
312+
cmake --build build_core --target install --parallel 8
313313
echo "DEPTHAI_INSTALLATION_DIR=$PWD/build_core/install/" >> $GITHUB_ENV
314314
315315
- name: Append build hash if not a tagged commit
@@ -336,12 +336,12 @@ jobs:
336336
if: startsWith(github.ref, 'refs/tags/v')
337337
needs: [build-linux-armhf, build-windows-x86_64, build-macos-x86_64, build-linux-x86_64, build-linux-arm64]
338338
runs-on: ubuntu-latest
339-
339+
340340
steps:
341341
- uses: actions/checkout@v2
342342
with:
343343
submodules: 'recursive'
344-
344+
345345
- name: Get tag version
346346
id: tag
347347
uses: battila7/get-version-action@v2

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ _builds/
2525

2626
#git
2727
*.orig
28+
*_REMOTE_*
29+
*_LOCAL_*
30+
*_BACKUP_*
31+
*_BASE_*
2832

2933
#ci
3034
wheelhouse/

‎.readthedocs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ submodules:
1818
sphinx:
1919
builder: dirhtml
2020
configuration: docs/source/conf.py
21+
fail_on_warning: true
2122

2223
# Build documentation with MkDocs
2324
#mkdocs:

‎CMakeLists.txt‎

Lines changed: 60 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,18 @@ endif()
3131
set(TARGET_NAME depthai)
3232
project(depthai VERSION "0") # revision of bindings [depthai-core].[rev]
3333

34+
# Set default build type depending on context
35+
set(default_build_type "Release")
36+
if(EXISTS "${CMAKE_SOURCE_DIR}/.git" AND NOT DEFINED ENV{CI})
37+
set(default_build_type "Debug")
38+
endif()
39+
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
40+
message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
41+
set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE STRING "Choose the type of build." FORCE)
42+
# Set the possible values of build type for cmake-gui
43+
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
44+
endif()
45+
3446
# Add module paths
3547
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/")
3648
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/depthai-core/cmake")
@@ -63,13 +75,13 @@ endif()
6375
hunter_add_package(pybind11)
6476

6577
# Disable LTO if MINGW compiler
66-
if(MINGW)
78+
if(MINGW)
6779
set(PYBIND11_LTO_CXX_FLAGS "" CACHE STRING "" FORCE)
6880
endif()
6981
find_package(pybind11 CONFIG REQUIRED)
7082

7183
# Add files for python module
72-
pybind11_add_module(${TARGET_NAME}
84+
pybind11_add_module(${TARGET_NAME}
7385
src/py_bindings.cpp
7486
src/XLinkConnectionBindings.cpp
7587
src/DeviceBindings.cpp
@@ -92,8 +104,8 @@ endif()
92104

93105
if(DEPTHAI_PYTHON_DOCSTRINGS_OUTPUT)
94106
# If output is specified set both input and output to same the path
95-
set(docstring_input_path ${DEPTHAI_PYTHON_DOCSTRINGS_OUTPUT})
96-
set(docstring_output_path ${DEPTHAI_PYTHON_DOCSTRINGS_OUTPUT})
107+
set(docstring_input_path ${DEPTHAI_PYTHON_DOCSTRINGS_OUTPUT})
108+
set(docstring_output_path ${DEPTHAI_PYTHON_DOCSTRINGS_OUTPUT})
97109
else()
98110
# If input docstrings explicitly specified, use those and disable building
99111
if(DEPTHAI_PYTHON_DOCSTRINGS_INPUT)
@@ -102,11 +114,11 @@ else()
102114
set(DEPTHAI_PYTHON_BUILD_DOCSTRINGS OFF CACHE BOOL "Generate docstrings from header files if module 'pybind11_mkdoc' available" FORCE)
103115
else()
104116
# Otherwise set default location as input
105-
set(docstring_input_path ${DEFAULT_DOCSTRINGS_OUTPUT})
117+
set(docstring_input_path ${DEFAULT_DOCSTRINGS_OUTPUT})
106118
endif()
107119

108120
# Set default output location
109-
set(docstring_output_path ${DEFAULT_DOCSTRINGS_OUTPUT})
121+
set(docstring_output_path ${DEFAULT_DOCSTRINGS_OUTPUT})
110122
endif()
111123

112124
if(DEPTHAI_PYTHON_BUILD_DOCSTRINGS)
@@ -118,11 +130,14 @@ configure_file(cmake/docstring.hpp.in ${DOCSTRINGS_INCLUDE_PLACEHOLDER_PATH})
118130
# Add target to generate docstrings
119131
if (DEPTHAI_PYTHON_BUILD_DOCSTRINGS)
120132
include(pybind11-mkdoc)
121-
133+
122134
# Check if pybind11_mkdoc available and create target
123135
target_pybind11_mkdoc_setup(${docstring_output_path} depthai::core ${DEPTHAI_PYTHON_FORCE_DOCSTRINGS})
124-
125-
if(NOT TARGET pybind11_mkdoc)
136+
137+
if(TARGET pybind11_mkdoc)
138+
# Add dependency to mkdoc target (makes sure that mkdoc is executed, and docstrings available)
139+
add_dependencies(${TARGET_NAME} pybind11_mkdoc)
140+
else()
126141
# Generate default docstrings to OUTPUT path
127142
configure_file(cmake/default_docstring.hpp.in ${docstring_output_path} COPYONLY)
128143
endif()
@@ -135,17 +150,39 @@ endif()
135150
target_include_directories(${TARGET_NAME} PRIVATE src ${DOCSTRINGS_INCLUDE_PLACEHOLDER_DIR})
136151

137152
# Link with libraries
138-
target_link_libraries(${TARGET_NAME}
139-
PUBLIC
153+
target_link_libraries(${TARGET_NAME}
154+
PUBLIC
140155
# pybind11
141156
pybind11::pybind11
142157
depthai::core # Use non-opencv target as we use opencv-python in bindings
143158
hedley
144159
)
145160

146-
# Add default commit hash ('dev') if not build by CI
147-
if(NOT DEFINED ENV{CI} AND NOT DEPTHAI_PYTHON_COMMIT_HASH)
148-
set(DEPTHAI_PYTHON_COMMIT_HASH "dev")
161+
# Find Git
162+
find_package(Git)
163+
164+
# Add build information (commit, date)
165+
set(BUILD_COMMIT "dev")
166+
if(GIT_FOUND)
167+
execute_process(
168+
COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
169+
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
170+
OUTPUT_VARIABLE BUILD_COMMIT
171+
ERROR_QUIET
172+
OUTPUT_STRIP_TRAILING_WHITESPACE
173+
)
174+
execute_process(
175+
COMMAND ${GIT_EXECUTABLE} show -s --format=%ci ${BUILD_COMMIT}
176+
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
177+
OUTPUT_VARIABLE BUILD_COMMIT_DATETIME
178+
ERROR_QUIET
179+
OUTPUT_STRIP_TRAILING_WHITESPACE
180+
)
181+
endif()
182+
183+
# Add local commit hash (or 'dev' if unable to retrieve) if not build by CI
184+
if(NOT DEFINED ENV{CI} AND NOT DEPTHAI_PYTHON_COMMIT_HASH)
185+
set(DEPTHAI_PYTHON_COMMIT_HASH ${BUILD_COMMIT})
149186
endif()
150187

151188
# Get version to use
@@ -159,8 +196,15 @@ execute_process(COMMAND ${PYTHON_EXECUTABLE} "-c" "${version_command}"
159196
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
160197
)
161198

162-
# Add version definition
163-
target_compile_definitions(${TARGET_NAME} PRIVATE DEPTHAI_PYTHON_VERSION="${DEPTHAI_PYTHON_VERSION}")
199+
200+
string(TIMESTAMP BUILD_DATETIME "%Y-%m-%d %H:%M:%S +0000" UTC)
201+
target_compile_definitions(${TARGET_NAME}
202+
PRIVATE
203+
DEPTHAI_PYTHON_VERSION="${DEPTHAI_PYTHON_VERSION}"
204+
DEPTHAI_PYTHON_COMMIT_HASH="${BUILD_COMMIT}"
205+
DEPTHAI_PYTHON_COMMIT_DATETIME="${BUILD_COMMIT_DATETIME}"
206+
DEPTHAI_PYTHON_BUILD_DATETIME="${BUILD_DATETIME}"
207+
)
164208

165209
# Set compiler features (c++14), and disables extensions
166210
set_property(TARGET ${TARGET_NAME} PROPERTY CXX_STANDARD 14)

0 commit comments

Comments
 (0)