diff --git a/.github/workflows/docker-hub.yml b/.github/workflows/docker-hub.yml index e37415970..fa0d6b1dd 100644 --- a/.github/workflows/docker-hub.yml +++ b/.github/workflows/docker-hub.yml @@ -13,12 +13,10 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, [Linux, ARM], ubuntu-24.04-arm] + os: [ubuntu-latest, ubuntu-24.04-arm] include: - os: ubuntu-latest arch: amd64 - - os: [Linux, ARM] - arch: armv7 - os: ubuntu-24.04-arm arch: armv8 steps: @@ -77,7 +75,6 @@ jobs: docker manifest create \ luxonis/depthai-library:${{ github.sha}} \ --amend luxonis/depthai-library:${{ github.sha }}-amd64 \ - --amend luxonis/depthai-library:${{ github.sha }}-armv7 \ --amend luxonis/depthai-library:${{ github.sha }}-armv8 # Push docker manifest push luxonis/depthai-library:${{ github.sha }} @@ -88,7 +85,6 @@ jobs: docker manifest create \ luxonis/depthai-library:${{ steps.vars.outputs.short_ref }} \ --amend luxonis/depthai-library:${{ steps.vars.outputs.short_ref }}-amd64 \ - --amend luxonis/depthai-library:${{ steps.vars.outputs.short_ref }}-armv7 \ --amend luxonis/depthai-library:${{ steps.vars.outputs.short_ref }}-armv8 # Push docker manifest push luxonis/depthai-library:${{ steps.vars.outputs.short_ref }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2634f4323..ffc4429a2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,13 +29,13 @@ jobs: # Job which builds docstrings for the rest of the wheel builds build-docstrings: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Cache .hunter folder uses: actions/cache@v4 with: path: ~/.hunter - key: hunter-ubuntu-latest + key: hunter-ubuntu-24.04 - name: List .hunter cache directory run: ls -a -l ~/.hunter/_Base/ || true - uses: actions/checkout@v4 @@ -67,13 +67,13 @@ jobs: needs: build-docstrings strategy: matrix: - os: [ubuntu-latest, windows-2022, macos-14] + os: [ubuntu-24.04, windows-2022, macos-15] runs-on: ${{ matrix.os }} steps: - name: Print home directory run: echo Home directory inside container $HOME - name: Setup cmake - if: matrix.os == 'macos-14' + if: matrix.os == 'macos-15' uses: jwlawson/actions-setup-cmake@v1.13 with: cmake-version: '3.29.x' @@ -107,16 +107,22 @@ jobs: python-version: "3.10" - name: Install dependencies (Ubuntu) - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-24.04' run: | python -m pip install --upgrade pip sudo apt install libusb-1.0-0-dev - name: Install dependencies (MacOS) - if: matrix.os == 'macos-14' + if: matrix.os == 'macos-15' run: | python -m pip install --upgrade pip brew install libusb + brew uninstall --ignore-dependencies libpsl || true + # -Dfdopen=fdopen: zlib 1.2.11 defines fdopen() as a macro on macOS, which breaks the macOS 15 SDK. + # -isysroot must come first: Hunter passes all C flags to OpenSSL Configure as one argument, + # and an argument that starts with -D is used only to compile, so the dylib links lose the SDK + # (ld: library 'System' not found). + echo "CFLAGS=-isysroot $(xcrun --sdk macosx --show-sdk-path) -Dfdopen=fdopen" >> $GITHUB_ENV - name: Install pytest run: | @@ -131,48 +137,6 @@ jobs: cmake --build build --target pytest --config Release - # This job builds wheels for armhf arch (RPi) - build-linux-armhf: - needs: build-docstrings - strategy: - matrix: - include: - - rpi-os: rpi-bullseye - auditwheel-plat: manylinux_2_31_armv7l - - rpi-os: rpi-bookworm - auditwheel-plat: linux_armv7l - runs-on: ${{ matrix.rpi-os }} - steps: - - name: Print home directory - run: echo Home directory inside container $HOME - - uses: actions/checkout@v4 - with: - submodules: 'recursive' - - - uses: actions/download-artifact@v4 - 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: 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 wheel - run: CMAKE_ARGS='-DDEPTHAI_ENABLE_CURL=OFF' python3 -m pip wheel . -w ./wheelhouse/ --verbose - - name: Auditing wheels and adding armv6l tag (Running on RPi, binaries compiled as armv6l) - run: | - # python3 -m pip install -U wheel auditwheel # Called once when setting up the runner - for whl in wheelhouse/*.whl; do auditwheel repair "$whl" --plat ${{ matrix.auditwheel-plat }} -w wheelhouse/preaudited/; done - for whl in wheelhouse/preaudited/*.whl; do python3 -m wheel tags --platform-tag +linux_armv6l "$whl"; done - mkdir -p wheelhouse/audited/ - for whl in wheelhouse/preaudited/*linux_armv6l*.whl; do cp "$whl" wheelhouse/audited/$(basename $whl); done - - name: Archive wheel artifacts - uses: actions/upload-artifact@v4 - with: - name: audited-wheels-${{ matrix.rpi-os }} - path: wheelhouse/audited/ # This job builds wheels for Windows x86_64 arch build-windows-x86_64: needs: build-docstrings @@ -233,7 +197,7 @@ jobs: strategy: matrix: python-version: [3.9, '3.10', '3.11', '3.12', '3.13', '3.14'] - os: [macos-14] # macos-14 is arm64 (macos-15-intel could be added later, once compilation on clang that on that image is fixed)) + os: [macos-15] # macos-15 is arm64 (macos-15-intel could be added later, once compilation on clang that on that image is fixed)) runs-on: ${{ matrix.os }} steps: - name: Cache .hunter folder @@ -268,9 +232,13 @@ jobs: run: | python -m pip install --upgrade pip brew install libusb + brew uninstall --ignore-dependencies libpsl || true python -m pip install delocate wheel - name: Set macos deployment target - run: echo "MACOSX_DEPLOYMENT_TARGET=10.9" >> $GITHUB_ENV + run: | + echo "MACOSX_DEPLOYMENT_TARGET=10.9" >> $GITHUB_ENV + # See the pytest job: -isysroot must come before -Dfdopen=fdopen (Hunter OpenSSL link). + echo "CFLAGS=-isysroot $(xcrun --sdk macosx --show-sdk-path) -Dfdopen=fdopen" >> $GITHUB_ENV - name: Building wheels run: python -m pip wheel . -w ./wheelhouse/ --verbose - name: Auditing wheels @@ -283,7 +251,7 @@ jobs: # This job builds wheels for x86_64 arch build-linux-x86_64: needs: build-docstrings - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 container: image: quay.io/pypa/manylinux_2_28_x86_64:2025.11.10-2 env: @@ -388,8 +356,8 @@ jobs: path: wheelhouse/audited/ upload-wheels-to-ak: if: (github.event_name == 'workflow_dispatch' || github.event_name == 'push') && !startsWith(github.ref, 'refs/tags/v') - needs: [build-linux-armhf, build-windows-x86_64, build-macos, build-linux-x86_64, build-linux-arm64] - runs-on: ubuntu-latest + needs: [build-windows-x86_64, build-macos, build-linux-x86_64, build-linux-arm64] + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 with: @@ -407,8 +375,8 @@ jobs: release: if: startsWith(github.ref, 'refs/tags/v') - needs: [pytest, build-linux-armhf, build-windows-x86_64, build-macos, build-linux-x86_64, build-linux-arm64] - runs-on: ubuntu-latest + needs: [pytest, build-windows-x86_64, build-macos, build-linux-x86_64, build-linux-arm64] + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 @@ -444,7 +412,7 @@ jobs: deploy: if: startsWith(github.ref, 'refs/tags/v') needs: [release] - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 with: @@ -471,7 +439,7 @@ jobs: # notify_hil_workflow_linux_x86_64: # needs: [build-linux-x86_64] - # runs-on: ubuntu-latest + # runs-on: ubuntu-24.04 # steps: # - name: Repository Dispatch # uses: peter-evans/repository-dispatch@v2 @@ -482,8 +450,8 @@ jobs: # client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}' notify_hil_workflow: - needs: [build-linux-armhf, build-linux-x86_64] - runs-on: ubuntu-latest + needs: [build-linux-x86_64] + runs-on: ubuntu-24.04 steps: - name: Dispatch an action and get the run ID uses: codex-/return-dispatch@v1 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 2257bb8d2..000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,14 +0,0 @@ -variables: - GIT_SUBMODULE_STRATEGY: recursive - -build:armhf: - tags: - - luxonis-armhf - image: registry.gitlab.com/luxonis/depthai-crosscompile/debian-buster - stage: build - script: - - python3 -m pip wheel . -w wheelhouse/ - - for whl in wheelhouse/*.whl; do auditwheel repair "$whl" --plat "linux_armv7l" -w wheelhouse/audited/; done - artifacts: - paths: - - wheelhouse/audited/ \ No newline at end of file diff --git a/README.md b/README.md index 1d4dd7953..397e57386 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,8 @@ Documentation is available over at [Luxonis DepthAI API](https://docs.luxonis.co ## Installation +Automated ARM32 (ARMv6/ARMv7) builds have been discontinued for DepthAI v2. Prebuilt ARM wheels and Docker images are provided for ARM64. + Prebuilt wheels are available in [Luxonis repository](https://artifacts.luxonis.com/artifactory/luxonis-python-snapshot-local/) Make sure pip is upgraded ``` diff --git a/ci/Dockerfile b/ci/Dockerfile index d2556a699..7a6cf1aa0 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -1,6 +1,6 @@ -FROM python:3.9-bullseye +FROM python:3.11-bookworm -RUN apt-get update && apt-get install -y wget build-essential cmake pkg-config libjpeg-dev libtiff5-dev libavcodec-dev libavformat-dev libswscale-dev libv4l-dev libxvidcore-dev libx264-dev libgtk2.0-dev libgtk-3-dev libatlas-base-dev gfortran git libopencv-dev +RUN apt-get update && apt-get install -y wget build-essential cmake pkg-config libjpeg-dev libtiff-dev libavcodec-dev libavformat-dev libswscale-dev libv4l-dev libxvidcore-dev libx264-dev libgtk2.0-dev libgtk-3-dev libatlas-base-dev gfortran git libopencv-dev ADD ci/docker_dependencies.sh . RUN ./docker_dependencies.sh @@ -15,4 +15,4 @@ RUN cmake -S /depthai-python/depthai-core -B /build -D CMAKE_BUILD_TYPE=Release RUN cmake --build /build --parallel 4 --config Relase --target install # Install Python library -RUN cd /depthai-python && python3 -m pip install . \ No newline at end of file +RUN cd /depthai-python && python3 -m pip install . diff --git a/ci/docker_dependencies.sh b/ci/docker_dependencies.sh index d3cbfc291..0b7cb68df 100755 --- a/ci/docker_dependencies.sh +++ b/ci/docker_dependencies.sh @@ -17,12 +17,12 @@ readonly ubuntu_pkgs=( libavcodec-dev libavformat-dev libswscale-dev - libtbb2 + libtbb12 libtbb-dev libjpeg-dev libpng-dev libtiff-dev - libdc1394-22-dev + libdc1394-dev # https://stackoverflow.com/questions/55313610 ffmpeg libsm6 @@ -37,7 +37,7 @@ readonly ubuntu_arm_pkgs=( libhdf5-dev libatlas-base-dev # https://github.com/EdjeElectronics/TensorFlow-Object-Detection-on-the-Raspberry-Pi/issues/18#issuecomment-433953426 - libilmbase-dev + libimath-dev libopenexr-dev libgstreamer1.0-dev ) diff --git a/depthai-core b/depthai-core index 586df2e96..b68e5b0a5 160000 --- a/depthai-core +++ b/depthai-core @@ -1 +1 @@ -Subproject commit 586df2e96c72a7bb9cbf48c29fbd63b24709f901 +Subproject commit b68e5b0a5ecd29a79739a028d1e7cb6635c88f2b