From cf5e1bcf7f091cc5a4cbdf8578e34abec6f1560d Mon Sep 17 00:00:00 2001 From: SeptimiuVana Date: Tue, 28 Jan 2025 11:13:55 +0200 Subject: [PATCH 1/7] azure-pipelines.yml: add ubuntu 24 build Signed-off-by: SeptimiuVana --- azure-pipelines.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 247b46cdb..23a7d65d9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -34,6 +34,9 @@ jobs: ubuntu_22_04_x86_64: imageName: 'ubuntu-22.04' + ubuntu_24_04_x86_64: + imageName: 'ubuntu-24.04' + ubuntu_22_04_x86_64_offline: imageName: 'ubuntu-22.04' EXTRA_CMAKE_FLAGS: "-DWITH_OFFLINE=on" From cf0669096fddbda92dffbf3d14346be378c04779 Mon Sep 17 00:00:00 2001 From: SeptimiuVana Date: Tue, 28 Jan 2025 11:35:09 +0200 Subject: [PATCH 2/7] ci/azure: remove duplicated deps install Signed-off-by: SeptimiuVana --- azure-pipelines.yml | 24 ++++++++++++------------ ci/azure/deps.sh | 8 ++++---- ci/azure/lib.sh | 18 +++++++++--------- ci/azure/run_build.sh | 2 +- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 23a7d65d9..cf1cb5ecc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -128,18 +128,18 @@ jobs: - task: UsePythonVersion@0 inputs: versionSpec: '3.9' - - task: Cache@2 - inputs: - key: deps_windows | "$(imageName)" - restoreKeys: deps_windows | "$(imageName)" - path: $(Agent.BuildDirectory)/s/deps_installed - cacheHitVar: CACHE_RESTORED - - task: PowerShell@2 - inputs: - targetType: 'filePath' - filePath: ./ci/azure/windows-build/install_deps.ps1 - condition: eq(variables.CACHE_RESTORED, 'false') - displayName: "Install Dependencies" + # - task: Cache@2 + # inputs: + # key: deps_windows | "$(imageName)" + # restoreKeys: deps_windows | "$(imageName)" + # path: $(Agent.BuildDirectory)/s/deps_installed + # cacheHitVar: CACHE_RESTORED + # - task: PowerShell@2 + # inputs: + # targetType: 'filePath' + # filePath: ./ci/azure/windows-build/install_deps.ps1 + # condition: eq(variables.CACHE_RESTORED, 'false') + # displayName: "Install Dependencies" - task: PowerShell@2 inputs: targetType: 'filePath' diff --git a/ci/azure/deps.sh b/ci/azure/deps.sh index d1387346e..836448c31 100755 --- a/ci/azure/deps.sh +++ b/ci/azure/deps.sh @@ -12,10 +12,10 @@ deps_default() { pushd ${BUILD_DIR} get_deps_source_code "${DEPS_DIR}" - build_and_install_glog "${DEPS_DIR}/glog" "${DEPS_DIR}/installed/glog" - build_and_install_protobuf "${DEPS_DIR}/protobuf" "${DEPS_DIR}/installed/protobuf" - build_and_install_websockets "${DEPS_DIR}/libwebsockets" "${DEPS_DIR}/installed/websockets" - build_and_install_opencv "${DEPS_DIR}/opencv-${OPENCV}" "${DEPS_DIR}/installed/opencv" + # build_and_install_glog "${DEPS_DIR}/glog" "${DEPS_DIR}/installed/glog" + # build_and_install_protobuf "${DEPS_DIR}/protobuf" "${DEPS_DIR}/installed/protobuf" + # build_and_install_websockets "${DEPS_DIR}/libwebsockets" "${DEPS_DIR}/installed/websockets" + # build_and_install_opencv "${DEPS_DIR}/opencv-${OPENCV}" "${DEPS_DIR}/installed/opencv" if [[ ${CMAKE_OPTIONS} == *"WITH_OPEN3D=on"* ]]; then build_and_install_open3d "${DEPS_DIR}/Open3D" "${DEPS_DIR}/installed/Open3D" diff --git a/ci/azure/lib.sh b/ci/azure/lib.sh index 46f336585..c63829762 100755 --- a/ci/azure/lib.sh +++ b/ci/azure/lib.sh @@ -279,17 +279,17 @@ get_deps_source_code() { export OPENCV="3.4.1" fi - [ -d "glog" ] || { - git clone --branch v0.6.0 --depth 1 https://github.com/google/glog - } + # [ -d "glog" ] || { + # git clone --branch v0.6.0 --depth 1 https://github.com/google/glog + # } - [ -d "protobuf" ] || { - git clone --branch v3.9.0 --depth 1 https://github.com/protocolbuffers/protobuf - } + # [ -d "protobuf" ] || { + # git clone --branch v3.9.0 --depth 1 https://github.com/protocolbuffers/protobuf + # } - [ -d "libwebsockets" ] || { - git clone --branch v3.1-stable --depth 1 https://github.com/warmcat/libwebsockets - } + # [ -d "libwebsockets" ] || { + # git clone --branch v3.1-stable --depth 1 https://github.com/warmcat/libwebsockets + # } [ -d "opencv-${OPENCV}" ] || { curl -sL https://github.com/Itseez/opencv/archive/${OPENCV}.zip > opencv.zip diff --git a/ci/azure/run_build.sh b/ci/azure/run_build.sh index c9d57bbf1..7acf9d5b6 100755 --- a/ci/azure/run_build.sh +++ b/ci/azure/run_build.sh @@ -10,7 +10,7 @@ build_default() { # setup more deps # TODO cache this sudo apt-get update - sudo apt-get install -y build-essential libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev libgl1-mesa-dev libglfw3-dev + sudo apt-get install -y build-essential libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev libgl1-mesa-dev libglfw3-dev libopencv-dev sudo sh -c 'echo "${DEPS_DIR}/installed/opencv/lib" > /etc/ld.so.conf.d/opencv.conf' sudo ldconfig From 5fd8777754bc508b529f8bf3339c6acef1d2009b Mon Sep 17 00:00:00 2001 From: Andre Straker Date: Tue, 28 Jan 2025 10:11:08 -0500 Subject: [PATCH 3/7] Updated build instructions specifically for installation of the Python dev libraries. --- doc/itof/linux_build_instructions.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/itof/linux_build_instructions.md b/doc/itof/linux_build_instructions.md index 39fcf55c6..5c3396e96 100644 --- a/doc/itof/linux_build_instructions.md +++ b/doc/itof/linux_build_instructions.md @@ -16,12 +16,17 @@ #### Installing the pre-requisites ```console sudo apt update -sudo apt install cmake g++ python3.8-dev \ +sudo apt install cmake g++ \ libopencv-contrib-dev libopencv-dev \ libgl1-mesa-dev libglfw3-dev \ doxygen graphviz ``` +For Linux builds install the necessary version of Python dev libraries. For example for Ubuntu 24.04 with Python 3.12 as the default Python: +```console +sudo apt install python3.12-dev +``` + ### Building the SDK with Example Please note, ensure you are using the intended branch. From 9134517427921a2c4dd0d6acd90d20166888a785 Mon Sep 17 00:00:00 2001 From: Andre Straker Date: Tue, 28 Jan 2025 10:13:02 -0500 Subject: [PATCH 4/7] Update for Ubuntu 24.04 build. --- libaditof | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libaditof b/libaditof index 100b30c56..5942dde1a 160000 --- a/libaditof +++ b/libaditof @@ -1 +1 @@ -Subproject commit 100b30c56568cc5e6d83d1b61869a07b65e70050 +Subproject commit 5942dde1aa9e5d097f8488245b40f2ea98bf7f68 From 7db24e63d9179c53114e0792608b2f0fd7dbf046 Mon Sep 17 00:00:00 2001 From: andrestraker <42846714+andrestraker@users.noreply.github.com> Date: Wed, 29 Jan 2025 12:45:38 -0500 Subject: [PATCH 5/7] Updates after builds tested across OSes. --- libaditof | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libaditof b/libaditof index 5942dde1a..e4861222c 160000 --- a/libaditof +++ b/libaditof @@ -1 +1 @@ -Subproject commit 5942dde1aa9e5d097f8488245b40f2ea98bf7f68 +Subproject commit e4861222caa14f6c8df54c45408d615aba5b6bdf From f5e8ef181e863559a7604d7804b83145498c6640 Mon Sep 17 00:00:00 2001 From: SeptimiuVana Date: Wed, 5 Feb 2025 16:15:47 +0200 Subject: [PATCH 6/7] libaditof: update commits Signed-off-by: SeptimiuVana --- libaditof | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libaditof b/libaditof index e4861222c..9e563ce50 160000 --- a/libaditof +++ b/libaditof @@ -1 +1 @@ -Subproject commit e4861222caa14f6c8df54c45408d615aba5b6bdf +Subproject commit 9e563ce50ed33833feb68e93ee3bc077bc5b8bbe From bc2a815ffc1195c82bba62cd64e32e62b7185114 Mon Sep 17 00:00:00 2001 From: SeptimiuVana Date: Wed, 5 Feb 2025 16:20:45 +0200 Subject: [PATCH 7/7] azure-pipelines.yml: change dockers Signed-off-by: SeptimiuVana --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cf1cb5ecc..4e4e67c7f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -44,13 +44,13 @@ jobs: #IMX ubuntu_20_04_imx: imageName: 'ubuntu-20.04' - DOCKER: "septimiuvana/tof-imx8-docker" + DOCKER: "septimiuvana/arm64-ubuntu" EXTRA_CMAKE_FLAGS: "-DNXP=1" #NVIDIA ubuntu_20_04_nvidia: imageName: 'ubuntu-20.04' - DOCKER: "adismartcamtest/tof_nvidia:4.0" + DOCKER: "septimiuvana/arm64-ubuntu" EXTRA_CMAKE_FLAGS: "-DNVIDIA=1" #code quality, TO DO: once entire code is formatted enable clang-format