From b02c38af3898f2095897d16c995f8ebbb4b9db74 Mon Sep 17 00:00:00 2001 From: Richard-xx Date: Tue, 28 Nov 2023 10:04:17 +0800 Subject: [PATCH 1/5] Changes to support depthai in windows/android --- .github/workflows/depthai.yml | 26 +++++++++++++++++++++++++- depthai/cppbuild.sh | 27 +++++++++++++++++++++++++++ depthai/platform/pom.xml | 34 +++++++++++++++++++++++++++++++++- pom.xml | 5 +++++ 4 files changed, 90 insertions(+), 2 deletions(-) diff --git a/.github/workflows/depthai.yml b/.github/workflows/depthai.yml index 1b62311c8ae..d7d32aa5b3c 100644 --- a/.github/workflows/depthai.yml +++ b/.github/workflows/depthai.yml @@ -41,8 +41,32 @@ jobs: runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions + windows-x86_64: + runs-on: windows-2019 + steps: + - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions + android-arm: + runs-on: ubuntu-20.04 + container: centos:7 + steps: + - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + android-arm64: + runs-on: ubuntu-20.04 + container: centos:7 + steps: + - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + android-x86: + runs-on: ubuntu-20.04 + container: centos:7 + steps: + - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + android-x86_64: + runs-on: ubuntu-20.04 + container: centos:7 + steps: + - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions redeploy: - needs: [linux-armhf, linux-arm64, linux-x86, linux-x86_64, macosx-x86_64] + needs: [linux-armhf, linux-arm64, linux-x86, linux-x86_64, macosx-x86_64, windows-x86_64, android-arm, android-arm64, android-x86, android-x86_64] runs-on: ubuntu-20.04 steps: - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions diff --git a/depthai/cppbuild.sh b/depthai/cppbuild.sh index 3ddecb619f1..59f333d4fec 100755 --- a/depthai/cppbuild.sh +++ b/depthai/cppbuild.sh @@ -107,6 +107,33 @@ case $PLATFORM in make install/strip install_name_tool -change /usr/local/opt/libusb/lib/libusb-1.0.0.dylib @rpath/libusb-1.0.0.dylib ../lib/libdepthai-core.dylib ;; + windows-x86_64) + export CC="cl.exe" + export CXX="cl.exe" + sedinplace 's:BUILD_SHARED_LIBS=ON:BUILD_SHARED_LIBS=OFF:g' cmake/Hunter/config.cmake + "$CMAKE" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DDEPTHAI_ENABLE_BACKWARD=OFF -DBUILD_SHARED_LIBS=ON -DDEPTHAI_OPENCV_SUPPORT=ON . + "$CMAKE" --build . --config Release --target install -j $MAKEJ + ;; + android-arm) + sedinplace 's:BUILD_SHARED_LIBS=ON:BUILD_SHARED_LIBS=OFF:g' cmake/Hunter/config.cmake + "$CMAKE" -DCMAKE_TOOLCHAIN_FILE=${PLATFORM_ROOT}/build/cmake/android.toolchain.cmake -DOpenCV_DIR=$OPENCV_PATH/sdk/native/jni/abi-armeabi-v7a/ -DANDROID_ABI=armeabi-v7a -DANDROID_PLATFORM=24 -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DDEPTHAI_OPENCV_SUPPORT=ON . + "$CMAKE" --build . --config Release --target install/strip -j $MAKEJ + ;; + android-arm64) + sedinplace 's:BUILD_SHARED_LIBS=ON:BUILD_SHARED_LIBS=OFF:g' cmake/Hunter/config.cmake + "$CMAKE" -DCMAKE_TOOLCHAIN_FILE=${PLATFORM_ROOT}/build/cmake/android.toolchain.cmake -DOpenCV_DIR=$OPENCV_PATH/sdk/native/jni/abi-arm64-v8a/ -DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=24 -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DDEPTHAI_OPENCV_SUPPORT=ON . + "$CMAKE" --build . --config Release --target install/strip -j $MAKEJ + ;; + android-x86) + sedinplace 's:BUILD_SHARED_LIBS=ON:BUILD_SHARED_LIBS=OFF:g' cmake/Hunter/config.cmake + "$CMAKE" -DCMAKE_TOOLCHAIN_FILE=${PLATFORM_ROOT}/build/cmake/android.toolchain.cmake -DOpenCV_DIR=$OPENCV_PATH/sdk/native/jni/abi-x86/ -DANDROID_ABI=x86 -DANDROID_PLATFORM=24 -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DDEPTHAI_OPENCV_SUPPORT=ON . + "$CMAKE" --build . --config Release --target install/strip -j $MAKEJ + ;; + android-x86_64) + sedinplace 's:BUILD_SHARED_LIBS=ON:BUILD_SHARED_LIBS=OFF:g' cmake/Hunter/config.cmake + "$CMAKE" -DCMAKE_TOOLCHAIN_FILE=${PLATFORM_ROOT}/build/cmake/android.toolchain.cmake -DOpenCV_DIR=$OPENCV_PATH/sdk/native/jni/abi-x86_64/ -DANDROID_ABI=x86_64 -DANDROID_PLATFORM=24 -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DDEPTHAI_OPENCV_SUPPORT=ON . + "$CMAKE" --build . --config Release --target install/strip -j $MAKEJ + ;; *) echo "Error: Platform \"$PLATFORM\" is not supported" ;; diff --git a/depthai/platform/pom.xml b/depthai/platform/pom.xml index b03df5813ab..06747af5828 100644 --- a/depthai/platform/pom.xml +++ b/depthai/platform/pom.xml @@ -65,6 +65,36 @@ ${project.version} ${javacpp.platform.macosx-x86_64} + + ${project.groupId} + ${javacpp.moduleId} + ${project.version} + ${javacpp.platform.windows-x86_64} + + + ${project.groupId} + ${javacpp.moduleId} + ${project.version} + ${javacpp.platform.android-arm} + + + ${project.groupId} + ${javacpp.moduleId} + ${project.version} + ${javacpp.platform.android-arm64} + + + ${project.groupId} + ${javacpp.moduleId} + ${project.version} + ${javacpp.platform.android-x86} + + + ${project.groupId} + ${javacpp.moduleId} + ${project.version} + ${javacpp.platform.android-x86_64} + @@ -77,7 +107,7 @@ - ${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-armhf.jar ${javacpp.moduleId}-linux-arm64.jar ${javacpp.moduleId}-linux-x86.jar ${javacpp.moduleId}-linux-x86_64.jar ${javacpp.moduleId}-macosx-x86_64.jar + ${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-armhf.jar ${javacpp.moduleId}-linux-arm64.jar ${javacpp.moduleId}-linux-x86.jar ${javacpp.moduleId}-linux-x86_64.jar ${javacpp.moduleId}-macosx-x86_64.jar ${javacpp.moduleId}-windows-x86_64.jar @@ -127,6 +157,8 @@ requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64; + requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64; + // requires static org.bytedeco.${javacpp.moduleId}.android.arm64; } diff --git a/pom.xml b/pom.xml index d30031fece3..76ce9bd647e 100644 --- a/pom.xml +++ b/pom.xml @@ -781,6 +781,7 @@ tesseract tensorflow tensorflow-lite + depthai bullet cpu_features @@ -832,6 +833,7 @@ tesseract tensorflow tensorflow-lite + depthai bullet cpu_features @@ -883,6 +885,7 @@ tesseract tensorflow tensorflow-lite + depthai bullet cpu_features @@ -934,6 +937,7 @@ tesseract tensorflow tensorflow-lite + depthai bullet cpu_features @@ -1690,6 +1694,7 @@ tensorflow-lite tensorrt ale + depthai onnx onnxruntime tvm From 649952aa86ef745bcb0f269debbdb76b2bcad3a5 Mon Sep 17 00:00:00 2001 From: Richard-xx Date: Thu, 30 Nov 2023 08:42:32 +0800 Subject: [PATCH 2/5] Reinsert new entries in the same order as OpenCV --- .github/workflows/depthai.yml | 42 ++++++++--------- depthai/cppbuild.sh | 88 +++++++++++++++++------------------ depthai/platform/pom.xml | 5 +- 3 files changed, 69 insertions(+), 66 deletions(-) diff --git a/.github/workflows/depthai.yml b/.github/workflows/depthai.yml index d7d32aa5b3c..4f25ca513cb 100644 --- a/.github/workflows/depthai.yml +++ b/.github/workflows/depthai.yml @@ -17,6 +17,26 @@ env: CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }} jobs: + android-arm: + runs-on: ubuntu-20.04 + container: centos:7 + steps: + - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + android-arm64: + runs-on: ubuntu-20.04 + container: centos:7 + steps: + - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + android-x86: + runs-on: ubuntu-20.04 + container: centos:7 + steps: + - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + android-x86_64: + runs-on: ubuntu-20.04 + container: centos:7 + steps: + - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions linux-armhf: runs-on: ubuntu-20.04 container: ubuntu:bionic @@ -45,28 +65,8 @@ jobs: runs-on: windows-2019 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions - android-arm: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions - android-arm64: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions - android-x86: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions - android-x86_64: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions redeploy: - needs: [linux-armhf, linux-arm64, linux-x86, linux-x86_64, macosx-x86_64, windows-x86_64, android-arm, android-arm64, android-x86, android-x86_64] + needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-x86, linux-x86_64, macosx-x86_64, windows-x86_64] runs-on: ubuntu-20.04 steps: - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions diff --git a/depthai/cppbuild.sh b/depthai/cppbuild.sh index 59f333d4fec..f9957dd8040 100755 --- a/depthai/cppbuild.sh +++ b/depthai/cppbuild.sh @@ -41,61 +41,81 @@ fi export OpenCV_DIR="$OPENCV_PATH/lib/cmake/opencv4" case $PLATFORM in - linux-armhf) + android-arm) + sedinplace 's:BUILD_SHARED_LIBS=ON:BUILD_SHARED_LIBS=OFF:g' cmake/Hunter/config.cmake + "$CMAKE" -DCMAKE_TOOLCHAIN_FILE=${PLATFORM_ROOT}/build/cmake/android.toolchain.cmake -DOpenCV_DIR=$OPENCV_PATH/sdk/native/jni/abi-armeabi-v7a/ -DANDROID_ABI=armeabi-v7a -DANDROID_PLATFORM=24 -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DDEPTHAI_OPENCV_SUPPORT=ON . + "$CMAKE" --build . --config Release --target install/strip -j $MAKEJ + ;; + android-arm64) + sedinplace 's:BUILD_SHARED_LIBS=ON:BUILD_SHARED_LIBS=OFF:g' cmake/Hunter/config.cmake + "$CMAKE" -DCMAKE_TOOLCHAIN_FILE=${PLATFORM_ROOT}/build/cmake/android.toolchain.cmake -DOpenCV_DIR=$OPENCV_PATH/sdk/native/jni/abi-arm64-v8a/ -DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=24 -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DDEPTHAI_OPENCV_SUPPORT=ON . + "$CMAKE" --build . --config Release --target install/strip -j $MAKEJ + ;; + android-x86) + sedinplace 's:BUILD_SHARED_LIBS=ON:BUILD_SHARED_LIBS=OFF:g' cmake/Hunter/config.cmake + "$CMAKE" -DCMAKE_TOOLCHAIN_FILE=${PLATFORM_ROOT}/build/cmake/android.toolchain.cmake -DOpenCV_DIR=$OPENCV_PATH/sdk/native/jni/abi-x86/ -DANDROID_ABI=x86 -DANDROID_PLATFORM=24 -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DDEPTHAI_OPENCV_SUPPORT=ON . + "$CMAKE" --build . --config Release --target install/strip -j $MAKEJ + ;; + android-x86_64) + sedinplace 's:BUILD_SHARED_LIBS=ON:BUILD_SHARED_LIBS=OFF:g' cmake/Hunter/config.cmake + "$CMAKE" -DCMAKE_TOOLCHAIN_FILE=${PLATFORM_ROOT}/build/cmake/android.toolchain.cmake -DOpenCV_DIR=$OPENCV_PATH/sdk/native/jni/abi-x86_64/ -DANDROID_ABI=x86_64 -DANDROID_PLATFORM=24 -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DDEPTHAI_OPENCV_SUPPORT=ON . + "$CMAKE" --build . --config Release --target install/strip -j $MAKEJ + ;; + linux-x86) cd ../libusb-$LIBUSB_VERSION - CC=arm-linux-gnueabihf-gcc CXX=arm-linux-gnueabihf-g++ ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=arm-linux-gnueabihf --disable-udev + CC="gcc -m32" CXX="g++ -m32" ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=i686-linux --disable-udev make -j $MAKEJ make install cd ../depthai-core-v$DEPTHAI_VERSION - echo 'set(CMAKE_C_COMPILER "arm-linux-gnueabihf-gcc")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_C_FLAGS "-std=gnu99")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_CXX_COMPILER "arm-linux-gnueabihf-g++")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_CXX_FLAGS "-std=c++14")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_C_COMPILER "gcc")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_C_FLAGS "-m32 -std=gnu99")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_CXX_COMPILER "g++")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_CXX_FLAGS "-m32 -std=c++14")' >> cmake/toolchain/pic.cmake sedinplace "/ XLink/a CMAKE_ARGS LIBUSB_INCLUDE_DIR=$INSTALL_PATH/include/libusb-1.0/ LIBUSB_LIBRARY=$INSTALL_PATH/lib/libusb-1.0.a" cmake/Hunter/config.cmake "$CMAKE" -DCMAKE_TOOLCHAIN_FILE=$PWD/cmake/toolchain/pic.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DDEPTHAI_ENABLE_BACKWARD=OFF -DBUILD_SHARED_LIBS=ON -DDEPTHAI_OPENCV_SUPPORT=ON . make -j $MAKEJ make install/strip ;; - linux-arm64) + linux-x86_64) cd ../libusb-$LIBUSB_VERSION - CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=aarch64-linux-gnu --disable-udev + CC="gcc -m64" CXX="g++ -m64" ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=x86_64-linux --disable-udev make -j $MAKEJ make install cd ../depthai-core-v$DEPTHAI_VERSION - echo 'set(CMAKE_C_COMPILER "aarch64-linux-gnu-gcc")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_C_FLAGS "-std=gnu99")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_CXX_COMPILER "aarch64-linux-gnu-g++")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_CXX_FLAGS "-std=c++14")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_C_COMPILER "gcc")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_C_FLAGS "-m64 -std=gnu99")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_CXX_COMPILER "g++")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_CXX_FLAGS "-m64 -std=c++14")' >> cmake/toolchain/pic.cmake sedinplace "/ XLink/a CMAKE_ARGS LIBUSB_INCLUDE_DIR=$INSTALL_PATH/include/libusb-1.0/ LIBUSB_LIBRARY=$INSTALL_PATH/lib/libusb-1.0.a" cmake/Hunter/config.cmake "$CMAKE" -DCMAKE_TOOLCHAIN_FILE=$PWD/cmake/toolchain/pic.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DDEPTHAI_ENABLE_BACKWARD=OFF -DBUILD_SHARED_LIBS=ON -DDEPTHAI_OPENCV_SUPPORT=ON . make -j $MAKEJ make install/strip ;; - linux-x86) + linux-armhf) cd ../libusb-$LIBUSB_VERSION - CC="gcc -m32" CXX="g++ -m32" ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=i686-linux --disable-udev + CC=arm-linux-gnueabihf-gcc CXX=arm-linux-gnueabihf-g++ ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=arm-linux-gnueabihf --disable-udev make -j $MAKEJ make install cd ../depthai-core-v$DEPTHAI_VERSION - echo 'set(CMAKE_C_COMPILER "gcc")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_C_FLAGS "-m32 -std=gnu99")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_CXX_COMPILER "g++")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_CXX_FLAGS "-m32 -std=c++14")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_C_COMPILER "arm-linux-gnueabihf-gcc")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_C_FLAGS "-std=gnu99")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_CXX_COMPILER "arm-linux-gnueabihf-g++")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_CXX_FLAGS "-std=c++14")' >> cmake/toolchain/pic.cmake sedinplace "/ XLink/a CMAKE_ARGS LIBUSB_INCLUDE_DIR=$INSTALL_PATH/include/libusb-1.0/ LIBUSB_LIBRARY=$INSTALL_PATH/lib/libusb-1.0.a" cmake/Hunter/config.cmake "$CMAKE" -DCMAKE_TOOLCHAIN_FILE=$PWD/cmake/toolchain/pic.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DDEPTHAI_ENABLE_BACKWARD=OFF -DBUILD_SHARED_LIBS=ON -DDEPTHAI_OPENCV_SUPPORT=ON . make -j $MAKEJ make install/strip ;; - linux-x86_64) + linux-arm64) cd ../libusb-$LIBUSB_VERSION - CC="gcc -m64" CXX="g++ -m64" ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=x86_64-linux --disable-udev + CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=aarch64-linux-gnu --disable-udev make -j $MAKEJ make install cd ../depthai-core-v$DEPTHAI_VERSION - echo 'set(CMAKE_C_COMPILER "gcc")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_C_FLAGS "-m64 -std=gnu99")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_CXX_COMPILER "g++")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_CXX_FLAGS "-m64 -std=c++14")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_C_COMPILER "aarch64-linux-gnu-gcc")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_C_FLAGS "-std=gnu99")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_CXX_COMPILER "aarch64-linux-gnu-g++")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_CXX_FLAGS "-std=c++14")' >> cmake/toolchain/pic.cmake sedinplace "/ XLink/a CMAKE_ARGS LIBUSB_INCLUDE_DIR=$INSTALL_PATH/include/libusb-1.0/ LIBUSB_LIBRARY=$INSTALL_PATH/lib/libusb-1.0.a" cmake/Hunter/config.cmake "$CMAKE" -DCMAKE_TOOLCHAIN_FILE=$PWD/cmake/toolchain/pic.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DDEPTHAI_ENABLE_BACKWARD=OFF -DBUILD_SHARED_LIBS=ON -DDEPTHAI_OPENCV_SUPPORT=ON . make -j $MAKEJ @@ -114,26 +134,6 @@ case $PLATFORM in "$CMAKE" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DDEPTHAI_ENABLE_BACKWARD=OFF -DBUILD_SHARED_LIBS=ON -DDEPTHAI_OPENCV_SUPPORT=ON . "$CMAKE" --build . --config Release --target install -j $MAKEJ ;; - android-arm) - sedinplace 's:BUILD_SHARED_LIBS=ON:BUILD_SHARED_LIBS=OFF:g' cmake/Hunter/config.cmake - "$CMAKE" -DCMAKE_TOOLCHAIN_FILE=${PLATFORM_ROOT}/build/cmake/android.toolchain.cmake -DOpenCV_DIR=$OPENCV_PATH/sdk/native/jni/abi-armeabi-v7a/ -DANDROID_ABI=armeabi-v7a -DANDROID_PLATFORM=24 -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DDEPTHAI_OPENCV_SUPPORT=ON . - "$CMAKE" --build . --config Release --target install/strip -j $MAKEJ - ;; - android-arm64) - sedinplace 's:BUILD_SHARED_LIBS=ON:BUILD_SHARED_LIBS=OFF:g' cmake/Hunter/config.cmake - "$CMAKE" -DCMAKE_TOOLCHAIN_FILE=${PLATFORM_ROOT}/build/cmake/android.toolchain.cmake -DOpenCV_DIR=$OPENCV_PATH/sdk/native/jni/abi-arm64-v8a/ -DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=24 -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DDEPTHAI_OPENCV_SUPPORT=ON . - "$CMAKE" --build . --config Release --target install/strip -j $MAKEJ - ;; - android-x86) - sedinplace 's:BUILD_SHARED_LIBS=ON:BUILD_SHARED_LIBS=OFF:g' cmake/Hunter/config.cmake - "$CMAKE" -DCMAKE_TOOLCHAIN_FILE=${PLATFORM_ROOT}/build/cmake/android.toolchain.cmake -DOpenCV_DIR=$OPENCV_PATH/sdk/native/jni/abi-x86/ -DANDROID_ABI=x86 -DANDROID_PLATFORM=24 -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DDEPTHAI_OPENCV_SUPPORT=ON . - "$CMAKE" --build . --config Release --target install/strip -j $MAKEJ - ;; - android-x86_64) - sedinplace 's:BUILD_SHARED_LIBS=ON:BUILD_SHARED_LIBS=OFF:g' cmake/Hunter/config.cmake - "$CMAKE" -DCMAKE_TOOLCHAIN_FILE=${PLATFORM_ROOT}/build/cmake/android.toolchain.cmake -DOpenCV_DIR=$OPENCV_PATH/sdk/native/jni/abi-x86_64/ -DANDROID_ABI=x86_64 -DANDROID_PLATFORM=24 -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DDEPTHAI_OPENCV_SUPPORT=ON . - "$CMAKE" --build . --config Release --target install/strip -j $MAKEJ - ;; *) echo "Error: Platform \"$PLATFORM\" is not supported" ;; diff --git a/depthai/platform/pom.xml b/depthai/platform/pom.xml index 06747af5828..8481b7c2cbb 100644 --- a/depthai/platform/pom.xml +++ b/depthai/platform/pom.xml @@ -152,13 +152,16 @@ ${project.build.directory}/${project.artifactId}.jar module org.bytedeco.${javacpp.moduleId}.platform { +// requires static org.bytedeco.${javacpp.moduleId}.android.arm; +// requires static org.bytedeco.${javacpp.moduleId}.android.arm64; +// requires static org.bytedeco.${javacpp.moduleId}.android.x86; +// requires static org.bytedeco.${javacpp.moduleId}.android.x86_64; requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; requires static org.bytedeco.${javacpp.moduleId}.linux.arm64; requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64; requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64; - // requires static org.bytedeco.${javacpp.moduleId}.android.arm64; } From 9e3a515265b28e9209551b127a9462b7c7d6afed Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Sat, 2 Dec 2023 10:18:48 +0900 Subject: [PATCH 3/5] Update CHANGELOG.md and fix builds --- .github/workflows/depthai.yml | 47 +++++++++++------------ CHANGELOG.md | 1 + depthai/README.md | 6 +-- depthai/cppbuild.sh | 55 +++++++++++++++------------ depthai/platform/pom.xml | 71 +++++++++++++++++++---------------- depthai/pom.xml | 12 +++--- depthai/samples/pom.xml | 6 +-- pom.xml | 1 + 8 files changed, 106 insertions(+), 93 deletions(-) diff --git a/.github/workflows/depthai.yml b/.github/workflows/depthai.yml index 4f25ca513cb..b6f5a5c01ba 100644 --- a/.github/workflows/depthai.yml +++ b/.github/workflows/depthai.yml @@ -17,56 +17,53 @@ env: CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }} jobs: - android-arm: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# android-arm: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions android-arm64: runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions - android-x86: - runs-on: ubuntu-20.04 - container: centos:7 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# android-x86: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions android-x86_64: runs-on: ubuntu-20.04 - container: centos:7 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions - linux-armhf: - runs-on: ubuntu-20.04 - container: ubuntu:bionic - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions +# linux-armhf: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-arm64: runs-on: ubuntu-20.04 - container: ubuntu:bionic steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions - linux-x86: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# linux-x86: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions linux-x86_64: runs-on: ubuntu-20.04 - container: centos:7 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions +# windows-x86: +# runs-on: windows-2019 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions windows-x86_64: runs-on: windows-2019 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions redeploy: - needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-x86, linux-x86_64, macosx-x86_64, windows-x86_64] +# needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] + needs: [android-arm64, android-x86_64, linux-arm64, linux-x86_64, macosx-x86_64, windows-x86_64] runs-on: ubuntu-20.04 steps: - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ccd336cac3..30baf2987bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ + * Add Android and Windows builds to presets for DepthAI ([pull #1441](https://github.com/bytedeco/javacpp-presets/pull/1441)) * Add presets for SentencePiece 0.1.99 ([pull #1384](https://github.com/bytedeco/javacpp-presets/pull/1384)) * Refactor and improve presets for PyTorch ([pull #1360](https://github.com/bytedeco/javacpp-presets/pull/1360)) * Include `mkl_lapack.h` header file in presets for MKL ([issue #1388](https://github.com/bytedeco/javacpp-presets/issues/1388)) diff --git a/depthai/README.md b/depthai/README.md index 5ff386d5388..86b1f1a4764 100644 --- a/depthai/README.md +++ b/depthai/README.md @@ -38,7 +38,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic 4.0.0 org.bytedeco.depthai examples - 1.5.9 + 1.5.10-SNAPSHOT CameraPreviewExample @@ -46,12 +46,12 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco depthai-platform - 2.21.2-1.5.9 + 2.21.2-1.5.10-SNAPSHOT org.bytedeco opencv-platform - 4.7.0-1.5.9 + 4.8.1-1.5.10-SNAPSHOT diff --git a/depthai/cppbuild.sh b/depthai/cppbuild.sh index f9957dd8040..9c8ae969ab8 100755 --- a/depthai/cppbuild.sh +++ b/depthai/cppbuild.sh @@ -61,61 +61,61 @@ case $PLATFORM in "$CMAKE" -DCMAKE_TOOLCHAIN_FILE=${PLATFORM_ROOT}/build/cmake/android.toolchain.cmake -DOpenCV_DIR=$OPENCV_PATH/sdk/native/jni/abi-x86_64/ -DANDROID_ABI=x86_64 -DANDROID_PLATFORM=24 -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DDEPTHAI_OPENCV_SUPPORT=ON . "$CMAKE" --build . --config Release --target install/strip -j $MAKEJ ;; - linux-x86) + linux-armhf) cd ../libusb-$LIBUSB_VERSION - CC="gcc -m32" CXX="g++ -m32" ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=i686-linux --disable-udev + CC=arm-linux-gnueabihf-gcc CXX=arm-linux-gnueabihf-g++ ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=arm-linux-gnueabihf --disable-udev make -j $MAKEJ make install cd ../depthai-core-v$DEPTHAI_VERSION - echo 'set(CMAKE_C_COMPILER "gcc")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_C_FLAGS "-m32 -std=gnu99")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_CXX_COMPILER "g++")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_CXX_FLAGS "-m32 -std=c++14")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_C_COMPILER "arm-linux-gnueabihf-gcc")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_C_FLAGS "-std=gnu99")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_CXX_COMPILER "arm-linux-gnueabihf-g++")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_CXX_FLAGS "-std=c++14")' >> cmake/toolchain/pic.cmake sedinplace "/ XLink/a CMAKE_ARGS LIBUSB_INCLUDE_DIR=$INSTALL_PATH/include/libusb-1.0/ LIBUSB_LIBRARY=$INSTALL_PATH/lib/libusb-1.0.a" cmake/Hunter/config.cmake "$CMAKE" -DCMAKE_TOOLCHAIN_FILE=$PWD/cmake/toolchain/pic.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DDEPTHAI_ENABLE_BACKWARD=OFF -DBUILD_SHARED_LIBS=ON -DDEPTHAI_OPENCV_SUPPORT=ON . make -j $MAKEJ make install/strip ;; - linux-x86_64) + linux-arm64) cd ../libusb-$LIBUSB_VERSION - CC="gcc -m64" CXX="g++ -m64" ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=x86_64-linux --disable-udev + CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=aarch64-linux-gnu --disable-udev make -j $MAKEJ make install cd ../depthai-core-v$DEPTHAI_VERSION - echo 'set(CMAKE_C_COMPILER "gcc")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_C_FLAGS "-m64 -std=gnu99")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_CXX_COMPILER "g++")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_CXX_FLAGS "-m64 -std=c++14")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_C_COMPILER "aarch64-linux-gnu-gcc")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_C_FLAGS "-std=gnu99")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_CXX_COMPILER "aarch64-linux-gnu-g++")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_CXX_FLAGS "-std=c++14")' >> cmake/toolchain/pic.cmake sedinplace "/ XLink/a CMAKE_ARGS LIBUSB_INCLUDE_DIR=$INSTALL_PATH/include/libusb-1.0/ LIBUSB_LIBRARY=$INSTALL_PATH/lib/libusb-1.0.a" cmake/Hunter/config.cmake "$CMAKE" -DCMAKE_TOOLCHAIN_FILE=$PWD/cmake/toolchain/pic.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DDEPTHAI_ENABLE_BACKWARD=OFF -DBUILD_SHARED_LIBS=ON -DDEPTHAI_OPENCV_SUPPORT=ON . make -j $MAKEJ make install/strip ;; - linux-armhf) + linux-x86) cd ../libusb-$LIBUSB_VERSION - CC=arm-linux-gnueabihf-gcc CXX=arm-linux-gnueabihf-g++ ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=arm-linux-gnueabihf --disable-udev + CC="gcc -m32" CXX="g++ -m32" ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=i686-linux --disable-udev make -j $MAKEJ make install cd ../depthai-core-v$DEPTHAI_VERSION - echo 'set(CMAKE_C_COMPILER "arm-linux-gnueabihf-gcc")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_C_FLAGS "-std=gnu99")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_CXX_COMPILER "arm-linux-gnueabihf-g++")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_CXX_FLAGS "-std=c++14")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_C_COMPILER "gcc")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_C_FLAGS "-m32 -std=gnu99")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_CXX_COMPILER "g++")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_CXX_FLAGS "-m32 -std=c++14")' >> cmake/toolchain/pic.cmake sedinplace "/ XLink/a CMAKE_ARGS LIBUSB_INCLUDE_DIR=$INSTALL_PATH/include/libusb-1.0/ LIBUSB_LIBRARY=$INSTALL_PATH/lib/libusb-1.0.a" cmake/Hunter/config.cmake "$CMAKE" -DCMAKE_TOOLCHAIN_FILE=$PWD/cmake/toolchain/pic.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DDEPTHAI_ENABLE_BACKWARD=OFF -DBUILD_SHARED_LIBS=ON -DDEPTHAI_OPENCV_SUPPORT=ON . make -j $MAKEJ make install/strip ;; - linux-arm64) + linux-x86_64) cd ../libusb-$LIBUSB_VERSION - CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=aarch64-linux-gnu --disable-udev + CC="gcc -m64" CXX="g++ -m64" ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=x86_64-linux --disable-udev make -j $MAKEJ make install cd ../depthai-core-v$DEPTHAI_VERSION - echo 'set(CMAKE_C_COMPILER "aarch64-linux-gnu-gcc")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_C_FLAGS "-std=gnu99")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_CXX_COMPILER "aarch64-linux-gnu-g++")' >> cmake/toolchain/pic.cmake - echo 'set(CMAKE_CXX_FLAGS "-std=c++14")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_C_COMPILER "gcc")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_C_FLAGS "-m64 -std=gnu99")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_CXX_COMPILER "g++")' >> cmake/toolchain/pic.cmake + echo 'set(CMAKE_CXX_FLAGS "-m64 -std=c++14")' >> cmake/toolchain/pic.cmake sedinplace "/ XLink/a CMAKE_ARGS LIBUSB_INCLUDE_DIR=$INSTALL_PATH/include/libusb-1.0/ LIBUSB_LIBRARY=$INSTALL_PATH/lib/libusb-1.0.a" cmake/Hunter/config.cmake "$CMAKE" -DCMAKE_TOOLCHAIN_FILE=$PWD/cmake/toolchain/pic.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DDEPTHAI_ENABLE_BACKWARD=OFF -DBUILD_SHARED_LIBS=ON -DDEPTHAI_OPENCV_SUPPORT=ON . make -j $MAKEJ @@ -127,6 +127,13 @@ case $PLATFORM in make install/strip install_name_tool -change /usr/local/opt/libusb/lib/libusb-1.0.0.dylib @rpath/libusb-1.0.0.dylib ../lib/libdepthai-core.dylib ;; + windows-x86) + export CC="cl.exe" + export CXX="cl.exe" + sedinplace 's:BUILD_SHARED_LIBS=ON:BUILD_SHARED_LIBS=OFF:g' cmake/Hunter/config.cmake + "$CMAKE" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DDEPTHAI_ENABLE_BACKWARD=OFF -DBUILD_SHARED_LIBS=ON -DDEPTHAI_OPENCV_SUPPORT=ON . + "$CMAKE" --build . --config Release --target install -j $MAKEJ + ;; windows-x86_64) export CC="cl.exe" export CXX="cl.exe" diff --git a/depthai/platform/pom.xml b/depthai/platform/pom.xml index 8481b7c2cbb..7a056119a09 100644 --- a/depthai/platform/pom.xml +++ b/depthai/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ @@ -23,7 +23,7 @@ org.bytedeco opencv-platform - 4.7.0-${project.parent.version} + 4.8.1-${project.parent.version} org.bytedeco @@ -35,24 +35,48 @@ ${javacpp.moduleId} ${project.version} + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} - ${javacpp.platform.linux-armhf} + ${javacpp.platform.android-arm64} + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} - ${javacpp.platform.linux-arm64} + ${javacpp.platform.android-x86_64} + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} - ${javacpp.platform.linux-x86} + ${javacpp.platform.linux-arm64} + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -65,36 +89,18 @@ ${project.version} ${javacpp.platform.macosx-x86_64} + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.windows-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-arm} - - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-arm64} - - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-x86} - - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-x86_64} - @@ -107,7 +113,7 @@ - ${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-armhf.jar ${javacpp.moduleId}-linux-arm64.jar ${javacpp.moduleId}-linux-x86.jar ${javacpp.moduleId}-linux-x86_64.jar ${javacpp.moduleId}-macosx-x86_64.jar ${javacpp.moduleId}-windows-x86_64.jar + ${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-armhf.jar ${javacpp.moduleId}-linux-arm64.jar ${javacpp.moduleId}-linux-x86.jar ${javacpp.moduleId}-linux-x86_64.jar ${javacpp.moduleId}-macosx-x86_64.jar ${javacpp.moduleId}-windows-x86.jar ${javacpp.moduleId}-windows-x86_64.jar @@ -156,11 +162,12 @@ // requires static org.bytedeco.${javacpp.moduleId}.android.arm64; // requires static org.bytedeco.${javacpp.moduleId}.android.x86; // requires static org.bytedeco.${javacpp.moduleId}.android.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; +// requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; requires static org.bytedeco.${javacpp.moduleId}.linux.arm64; - requires static org.bytedeco.${javacpp.moduleId}.linux.x86; +// requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64; +// requires static org.bytedeco.${javacpp.moduleId}.windows.x86; requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64; } diff --git a/depthai/pom.xml b/depthai/pom.xml index 3ed0d87b11c..89910fe6eba 100644 --- a/depthai/pom.xml +++ b/depthai/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco @@ -18,7 +18,7 @@ org.bytedeco opencv - 4.7.0-${project.parent.version} + 4.8.1-${project.parent.version} true @@ -42,23 +42,23 @@ org.bytedeco openblas - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} org.bytedeco opencv - 4.7.0-${project.parent.version} + 4.8.1-${project.parent.version} org.bytedeco openblas - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} ${javacpp.platform} org.bytedeco opencv - 4.7.0-${project.parent.version} + 4.8.1-${project.parent.version} ${javacpp.platform} diff --git a/depthai/samples/pom.xml b/depthai/samples/pom.xml index 50b18e41e7c..5ac0da44f61 100644 --- a/depthai/samples/pom.xml +++ b/depthai/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.depthai examples - 1.5.9 + 1.5.10-SNAPSHOT CameraPreviewExample 1.7 @@ -12,12 +12,12 @@ org.bytedeco depthai-platform - 2.21.2-1.5.9 + 2.21.2-1.5.10-SNAPSHOT org.bytedeco opencv-platform - 4.7.0-1.5.9 + 4.8.1-1.5.10-SNAPSHOT diff --git a/pom.xml b/pom.xml index 76ce9bd647e..e2c38ce97d8 100644 --- a/pom.xml +++ b/pom.xml @@ -1614,6 +1614,7 @@ leptonica tesseract ale + depthai bullet liquidfun cpu_features From 371fdb733ad2da589ece4080c5ceed820b7b3690 Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Sat, 2 Dec 2023 10:21:09 +0900 Subject: [PATCH 4/5] Fix Linux builds --- .github/workflows/depthai.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/depthai.yml b/.github/workflows/depthai.yml index b6f5a5c01ba..bba34299332 100644 --- a/.github/workflows/depthai.yml +++ b/.github/workflows/depthai.yml @@ -20,19 +20,19 @@ jobs: # android-arm: # runs-on: ubuntu-20.04 # steps: -# - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions android-arm64: runs-on: ubuntu-20.04 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions # android-x86: # runs-on: ubuntu-20.04 # steps: -# - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions android-x86_64: runs-on: ubuntu-20.04 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions # linux-armhf: # runs-on: ubuntu-20.04 # steps: @@ -44,11 +44,11 @@ jobs: # linux-x86: # runs-on: ubuntu-20.04 # steps: -# - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-x86_64: runs-on: ubuntu-20.04 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: runs-on: macos-11 steps: From c66f8164fdeda952556816ca6d249873a01dbb73 Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Sat, 2 Dec 2023 10:47:32 +0900 Subject: [PATCH 5/5] Fix presets --- .../java/org/bytedeco/depthai/presets/depthai.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/depthai/src/main/java/org/bytedeco/depthai/presets/depthai.java b/depthai/src/main/java/org/bytedeco/depthai/presets/depthai.java index 62b7f0d92d7..a4d2c113489 100644 --- a/depthai/src/main/java/org/bytedeco/depthai/presets/depthai.java +++ b/depthai/src/main/java/org/bytedeco/depthai/presets/depthai.java @@ -44,7 +44,7 @@ inherit = opencv_imgproc.class, value = { @Platform( - value = {"linux-arm", "linux-x86", "macosx-x86"}, + value = {"android", "linux-arm", "linux-x86", "macosx-x86", "Windows-x86"}, compiler = "cpp14", define = {"SHARED_PTR_NAMESPACE std", "UNIQUE_PTR_NAMESPACE std", "XLINK_USE_MX_ID_NAME ON"}, include = { @@ -485,11 +485,11 @@ public void map(InfoMap infoMap) { .put(new Info("dai::DeviceBootloader::Version::toString", "dai::Version::toString", "dai::DeviceInfo::toString", "dai::Node::toString").javaText("public native @StdString String toString();")) - .put(new Info("std::function(std::shared_ptr)>").valueTypes("RawBufferCallback")) - .put(new Info("std::function").valueTypes("LogCallback")) + .put(new Info("std::function(dai::RawBuffer*)>").valueTypes("RawBufferCallback")) + .put(new Info("std::function").valueTypes("LogCallback")) .put(new Info("std::function").valueTypes("ProgressCallback")) - .put(new Info("std::function)>").valueTypes("NameMessageCallback")) - .put(new Info("std::function)>").valueTypes("MessageCallback")) + .put(new Info("std::function)>").valueTypes("NameMessageCallback")) + .put(new Info("std::function)>").valueTypes("MessageCallback")) .put(new Info("std::function").valueTypes("Callback")) ; }