Merge branch 'develop' into main

Author: themarpe

.github/workflows/main.yml

@@ -31,8 +31,10 @@ jobs:
       - name: Cache .hunter folder
         uses: actions/cache@v2
         with:
-          path: ~/.hunter/
-          key: hunter-clang
+          path: ~/.hunter
+          key: hunter-macos-latest
+      - name: List .hunter cache directory
+        run: ls -a -l ~/.hunter/_Base/ || true
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
@@ -83,14 +85,22 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/v') != true
         run: echo "BUILD_COMMIT_HASH=${{github.sha}}" >> $GITHUB_ENV
       - name: Building wheel
-        run: python3 -m pip wheel . -w ./wheelhouse/
+        run: python3 -m pip wheel . -w ./wheelhouse/ --verbose
       - name: Auditing wheel
         run: for whl in wheelhouse/*.whl; do auditwheel repair "$whl" --plat linux_armv7l -w wheelhouse/audited/; done
       - name: Archive wheel artifacts
         uses: actions/upload-artifact@v2
         with:
           name: audited-wheels
           path: wheelhouse/audited/
+      - name: Deploy wheels to artifactory (if not a release)
+        if: startsWith(github.ref, 'refs/tags/v') != true
+        run: bash ./ci/upload-artifactory.sh
+        env:
+          ARTIFACTORY_URL: ${{ secrets.ARTIFACTORY_URL }}
+          ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
+          ARTIFACTORY_PASS: ${{ secrets.ARTIFACTORY_PASS }}
+
 
   # This job builds wheels for Windows x86_64 arch
   build-windows-x86_64:
@@ -104,7 +114,7 @@ jobs:
       - name: Cache .hunter folder
         uses: actions/cache@v2
         with:
-          path: ~/.hunter/
+          path: C:/.hunter
           key: hunter-msvc
       - uses: actions/checkout@v2
         with:
@@ -129,12 +139,19 @@ jobs:
         run: |
           python -m pip install --upgrade pip
       - name: Building wheels
-        run: python -m pip wheel . -w ./wheelhouse/
+        run: python -m pip wheel . -w ./wheelhouse/audited/ --verbose
       - name: Archive wheel artifacts
         uses: actions/upload-artifact@v2
         with:
           name: audited-wheels
-          path: wheelhouse/
+          path: wheelhouse/audited/
+      - name: Deploy wheels to artifactory (if not a release)
+        if: startsWith(github.ref, 'refs/tags/v') != true
+        run: bash ./ci/upload-artifactory.sh
+        env:
+          ARTIFACTORY_URL: ${{ secrets.ARTIFACTORY_URL }}
+          ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
+          ARTIFACTORY_PASS: ${{ secrets.ARTIFACTORY_PASS }}
 
   # This job builds wheels for macOS x86_64 arch
   build-macos-x86_64:
@@ -147,8 +164,11 @@ jobs:
       - name: Cache .hunter folder
         uses: actions/cache@v2
         with:
-          path: ~/.hunter/
-          key: hunter-clang
+          path: ~/.hunter
+          key: hunter-macos-latest
+      - name: List .hunter cache directory
+        run: ls -a -l ~/.hunter/_Base/ || true
+
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
@@ -175,14 +195,21 @@ jobs:
       - name: Set macos deployment target
         run: echo "MACOSX_DEPLOYMENT_TARGET=10.9" >> $GITHUB_ENV
       - name: Building wheels
-        run: python -m pip wheel . -w ./wheelhouse/
+        run: python -m pip wheel . -w ./wheelhouse/ --verbose
       - name: Auditing wheels
         run: ci/repair-whl-macos.sh `pwd`/wheelhouse/* `pwd`/wheelhouse/audited      
       - name: Archive wheel artifacts
         uses: actions/upload-artifact@v2
         with:
           name: audited-wheels
           path: wheelhouse/audited/
+      - name: Deploy wheels to artifactory (if not a release)
+        if: startsWith(github.ref, 'refs/tags/v') != true
+        run: bash ./ci/upload-artifactory.sh
+        env:
+          ARTIFACTORY_URL: ${{ secrets.ARTIFACTORY_URL }}
+          ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
+          ARTIFACTORY_PASS: ${{ secrets.ARTIFACTORY_PASS }}
 
   # This job builds wheels for x86_64 arch
   build-linux-x86_64:
@@ -196,7 +223,7 @@ jobs:
       - name: Cache .hunter folder
         uses: actions/cache@v2
         with:
-          path: ~/.hunter/
+          path: ~/.hunter
           key: hunter-x86_64
       - uses: actions/checkout@v2
         with:
@@ -217,69 +244,97 @@ jobs:
       - name: Specify docstring to use while building the wheel
         run: echo "DEPTHAI_PYTHON_DOCSTRINGS_INPUT=$PWD/docstrings/depthai_python_docstring.hpp" >> $GITHUB_ENV
 
+      - name: Build and install depthai-core
+        run: |
+          cmake -S depthai-core/ -B build_core -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=$PWD/cmake/toolchain/pic.cmake
+          cmake --build build_core --parallel --target install
+          echo "DEPTHAI_INSTALLATION_DIR=$PWD/build_core/install/" >> $GITHUB_ENV
+
       - name: Append build hash if not a tagged commit
         if: startsWith(github.ref, 'refs/tags/v') != true
         run: echo "BUILD_COMMIT_HASH=${{github.sha}}" >> $GITHUB_ENV
-      - name: Building a source distribution
+
+      - name: Building source distribution
         run: |
           /opt/python/cp38-cp38/bin/python3.8 setup.py sdist --formats=gztar
           mv dist/* wheelhouse/audited/
-      - name: Building wheels
-        run: for PYBIN in /opt/python/cp3*/bin; do "${PYBIN}/pip" wheel . -w ./wheelhouse/; done
-      - name: Auditing wheels
+      - name: Build wheels
+        run: for PYBIN in /opt/python/cp3*/bin; do "${PYBIN}/pip" wheel . -w ./wheelhouse/ --verbose; done
+      - name: Audit wheels
         run: for whl in wheelhouse/*.whl; do auditwheel repair "$whl" --plat $PLAT -w wheelhouse/audited/; done
       - name: Archive wheel artifacts
         uses: actions/upload-artifact@v2
         with:
           name: audited-wheels
           path: wheelhouse/audited/
+      - name: Deploy wheels to artifactory (if not a release)
+        if: startsWith(github.ref, 'refs/tags/v') != true
+        run: bash ./ci/upload-artifactory.sh
+        env:
+          ARTIFACTORY_URL: ${{ secrets.ARTIFACTORY_URL }}
+          ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
+          ARTIFACTORY_PASS: ${{ secrets.ARTIFACTORY_PASS }}
 
-
-  # # Run tests
-  # tests:
-  #   runs-on: luxonis-arm-tests
-  #   needs: [build-linux-armhf, build-windows-x86_64, build-macos-x86_64, build-linux-x86_64]
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #       with:
-  #         submodules: 'recursive'
-  #     - uses: actions/download-artifact@v2
-  #       with:
-  #         name: audited-wheels
-  #         path: wheels/depthai/
-  #     - name: List files
-  #       run: ls -lah
-  #     - name: install DepthAI
-  #       run: python3.7 -m pip install depthai --no-index --find-links file://`pwd`/wheels/depthai/
-  #     - name: Run tests
-  #       run: python3.7 tests/test.py
-
-  # Deploy to artifactory
-  deploy-artifacts:
-    if: startsWith(github.ref, 'refs/tags/v') != true
-    runs-on: ubuntu-latest
-    needs: [build-linux-armhf, build-windows-x86_64, build-macos-x86_64, build-linux-x86_64]
+  # This job builds wheels for ARM64 arch
+  build-linux-arm64:
+    needs: build-docstrings
+    runs-on: [self-hosted, linux, ARM64]
+    container:
+      image: quay.io/pypa/manylinux2014_aarch64
+      env:
+        PLAT: manylinux2014_aarch64
+      # Mount local hunter cache directory, instead of transfering to Github and back
+      volumes:
+        - /.hunter:/github/home/.hunter
     steps:
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
+      - name: Installing libusb1-devel dependency
+        run: yum install -y --disableplugin=fastestmirror libusb1-devel
+      - name: Installing cmake dependency
+        run: |
+          /opt/python/cp38-cp38/bin/python3.8 -m pip install cmake
+          ln -s /opt/python/cp38-cp38/bin/cmake /bin/
+      - name: Create folder structure
+        run: mkdir -p wheelhouse/audited/
+
       - uses: actions/download-artifact@v2
+        with:
+          name: 'docstrings'
+          path: docstrings
+      - name: Specify docstring to use while building the wheel
+        run: echo "DEPTHAI_PYTHON_DOCSTRINGS_INPUT=$PWD/docstrings/depthai_python_docstring.hpp" >> $GITHUB_ENV
+
+      - name: Build and install depthai-core
+        run: |
+          cmake -S depthai-core/ -B build_core -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=$PWD/cmake/toolchain/pic.cmake
+          cmake --build build_core --parallel --target install
+          echo "DEPTHAI_INSTALLATION_DIR=$PWD/build_core/install/" >> $GITHUB_ENV
+
+      - name: Append build hash if not a tagged commit
+        if: startsWith(github.ref, 'refs/tags/v') != true
+        run: echo "BUILD_COMMIT_HASH=${{github.sha}}" >> $GITHUB_ENV
+      - name: Building wheels
+        run: for PYBIN in /opt/python/cp3*/bin; do "${PYBIN}/pip" wheel . -w ./wheelhouse/ --verbose; done
+      - name: Auditing wheels
+        run: for whl in wheelhouse/*.whl; do auditwheel repair "$whl" --plat $PLAT -w wheelhouse/audited/; done
+      - name: Archive wheel artifacts
+        uses: actions/upload-artifact@v2
         with:
           name: audited-wheels
           path: wheelhouse/audited/
-      - name: List files
-        run: ls -lah wheelhouse/audited/
-      - name: Run deploy to artifacts
+      - name: Deploy wheels to artifactory (if not a release)
+        if: startsWith(github.ref, 'refs/tags/v') != true
         run: bash ./ci/upload-artifactory.sh
         env:
           ARTIFACTORY_URL: ${{ secrets.ARTIFACTORY_URL }}
           ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
           ARTIFACTORY_PASS: ${{ secrets.ARTIFACTORY_PASS }}
 
-
   release:
     if: startsWith(github.ref, 'refs/tags/v')
-    needs: [build-linux-armhf, build-windows-x86_64, build-macos-x86_64, build-linux-x86_64]
+    needs: [build-linux-armhf, build-windows-x86_64, build-macos-x86_64, build-linux-x86_64, build-linux-arm64]
     runs-on: ubuntu-latest
 
     steps:
@@ -301,7 +356,7 @@ jobs:
     # Create GitHub release
     - uses: actions/create-release@master
       id: createRelease
-      name: Create ${{ steps.releaseNote.outputs.version }} depthai-core release
+      name: Create ${{ steps.tag.outputs.version-without-v }} depthai-core release
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -337,5 +392,3 @@ jobs:
           PYPI_SERVER: ${{ secrets.PYPI_SERVER }}
           PYPI_USER: ${{ secrets.PYPI_USER }}
           PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-
-

CMakeLists.txt

@@ -29,7 +29,7 @@ endif()
 
 # Pybindings project
 set(TARGET_NAME depthai)
-project(depthai VERSION "1") # revision of bindings [depthai-core].[rev]
+project(depthai VERSION "0") # revision of bindings [depthai-core].[rev]
 
 # Add module paths
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/")
@@ -41,6 +41,7 @@ set(DOCSTRINGS_INCLUDE_PLACEHOLDER_PATH ${DOCSTRINGS_INCLUDE_PLACEHOLDER_DIR}/do
 set(DOCSTRINGS_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/generated/include/depthai_python_docstring.hpp)
 
 # First specify options
+option(DEPTHAI_PYTHON_USE_FIND_PACKAGE "Use find_package for depthai-core" OFF)
 option(DEPTHAI_PYTHON_ENABLE_TESTS "Enable tests" OFF)
 option(DEPTHAI_PYTHON_ENABLE_EXAMPLES "Enable examples" OFF)
 option(DEPTHAI_PYTHON_BUILD_DOCS "Build documentation - see docs/requirements.txt for needed dependencies" OFF)
@@ -54,8 +55,13 @@ endif()
 # Add external dependencies
 add_subdirectory(external)
 
-# Add depthai-cpp dependency
-add_subdirectory(depthai-core)
+# Add depthai-core dependency
+if(DEPTHAI_PYTHON_USE_FIND_PACKAGE)
+    find_package(depthai CONFIG REQUIRED)
+else()
+    add_subdirectory(depthai-core)
+endif()
+
 
 # Add pybind11 dependency
 #add_subdirectory(pybind11-2.5.0)
@@ -88,8 +94,10 @@ configure_file(cmake/docstring.hpp.in ${DOCSTRINGS_INCLUDE_PLACEHOLDER_PATH})
 # Add target to generate docstrings
 if (DEPTHAI_PYTHON_BUILD_DOCSTRINGS)
     include(pybind11-mkdoc)
+    
     # Check if pybind11_mkdoc available and create target
-    target_pybind11_mkdoc_setup(${DEPTHAI_PYTHON_DOCSTRINGS_OUTPUT} depthai-core ${DEPTHAI_PYTHON_FORCE_DOCSTRINGS})
+    target_pybind11_mkdoc_setup(${DEPTHAI_PYTHON_DOCSTRINGS_OUTPUT} depthai::core ${DEPTHAI_PYTHON_FORCE_DOCSTRINGS})
+    
     if(NOT TARGET pybind11_mkdoc)
         # Generate default docstrings to OUTPUT path
         configure_file(cmake/default_docstring.hpp.in ${DEPTHAI_PYTHON_DOCSTRINGS_OUTPUT} COPYONLY)
@@ -111,24 +119,24 @@ target_link_libraries(${TARGET_NAME}
         hedley
 )
 
-# Version consists of: (depthai-core).(bindings revision)[+bindings hash]
-set(DEPTHAI_PYTHON_VERSION "${DEPTHAI_VERSION}.${PROJECT_VERSION}")
-
 # Add default commit hash ('dev') if not build by CI
 if(NOT DEFINED ENV{CI} AND NOT DEPTHAI_PYTHON_COMMIT_HASH)   
-    set(DEPTHAI_PYTHON_COMMIT_HASH dev)
+    set(DEPTHAI_PYTHON_COMMIT_HASH "dev")
 endif()
 
-# Append build info to version
+# Get version to use
+set(version_command "import find_version as v; print(v.get_package_version())")
 if(DEPTHAI_PYTHON_COMMIT_HASH)
-    set(DEPTHAI_PYTHON_VERSION "${DEPTHAI_PYTHON_VERSION}+${DEPTHAI_PYTHON_COMMIT_HASH}")    
+    set(version_command "import find_version as v; print(v.get_package_dev_version('${DEPTHAI_PYTHON_COMMIT_HASH}'))")
 endif()
+execute_process(COMMAND ${PYTHON_EXECUTABLE} "-c" "${version_command}"
+    OUTPUT_VARIABLE DEPTHAI_PYTHON_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+)
 
 # Add version definition
 target_compile_definitions(${TARGET_NAME} PRIVATE DEPTHAI_PYTHON_VERSION="${DEPTHAI_PYTHON_VERSION}")
-target_compile_definitions(${TARGET_NAME} PRIVATE DEPTHAI_PYTHON_BINDINGS_REVISION="${PROJECT_VERSION}")
-target_compile_definitions(${TARGET_NAME} PRIVATE DEPTHAI_VERSION="${DEPTHAI_VERSION}")
-target_compile_definitions(${TARGET_NAME} PRIVATE DEPTHAI_PYTHON_COMMIT_HASH="${DEPTHAI_PYTHON_COMMIT_HASH}")
 
 # Set compiler features (c++14), and disables extensions
 set_property(TARGET ${TARGET_NAME} PROPERTY CXX_STANDARD 14)

README.md

@@ -83,6 +83,16 @@ To build a wheel, execute the following
 python3 -m pip wheel . -w wheelhouse
 ```
 
+## Running tests
+
+To run the tests build the library with the following options
+```
+mkdir build_tests && cd build_tests
+cmake .. -D DEPTHAI_PYTHON_ENABLE_TESTS=ON -D DEPTHAI_PYTHON_ENABLE_EXAMPLES=ON -D DEPTHAI_PYTHON_TEST_EXAMPLES=ON
+cmake --build . --parallel
+ctest
+```
+
 
 ## Tested platforms
 

cmake/pybind11-mkdoc.cmake

@@ -5,6 +5,12 @@ include(target-public-headers)
 # target_pybind11_mkdoc_setup([path/to/output/docstring.hpp] [Library for which to generate: target-name] [Enforce pybind11_mkdoc existing ON/OFF])
 function(target_pybind11_mkdoc_setup output_file target enforce)
 
+    # Get unaliased target if alias target passed in
+    get_target_property(original_target ${target} ALIASED_TARGET)
+    if(original_target)
+        set(target ${original_target})
+    endif()
+
     # gets target public headers
     get_target_public_headers(${target} header_files)
 
@@ -51,9 +57,9 @@ function(pybind11_mkdoc_setup_internal target output_path mkdoc_headers enforce)
             -w 80
             -o "${output_path}"
             # List of include directories
-            "-I$<JOIN:$<TARGET_PROPERTY:${target},INCLUDE_DIRECTORIES>,;-I>"
+            "-I$<JOIN:$<TARGET_PROPERTY:${target},INTERFACE_INCLUDE_DIRECTORIES>,;-I>"
             # List of compiler definitions
-            "-D$<JOIN:$<TARGET_PROPERTY:${target},COMPILE_DEFINITIONS>,;-D>"
+            "-D$<JOIN:$<TARGET_PROPERTY:${target},INTERFACE_COMPILE_DEFINITIONS>,;-D>"
             # List of headers for which to generate docstrings
             "${mkdoc_headers}"
             # Redirect stderr to not spam output