Merge branch 'develop' into dev/fix-misc-memory-issues

Author: servantftransperfect

.github/workflows/build-linux.yml

@@ -18,6 +18,17 @@ jobs:
     steps:
       - uses: actions/checkout@v1
 
+      - name: Setup ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          # Isolate writes per ref (branch/PR) to reduce cross-PR cache contamination.
+          key: ccache-${{ runner.os }}-rocky9-cuda12.1.1-${{ github.ref_name }}-${{ hashFiles('CMakeLists.txt', 'src/CMakeLists.txt', 'vcpkg.json', 'vcpkg-configuration.json', '.github/workflows/build-linux.yml') }}
+          restore-keys: |
+            ccache-${{ runner.os }}-rocky9-cuda12.1.1-${{ github.ref_name }}-
+            ccache-${{ runner.os }}-rocky9-cuda12.1.1-develop-
+            ccache-${{ runner.os }}-
+          max-size: "1000M"
+
       - name: Prepare File Tree
         run: |
           mkdir ./build
@@ -29,6 +40,9 @@ jobs:
         working-directory: ./build
         run: |
           cmake .. \
+           -G Ninja \
+           -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
            -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
            -DBUILD_SHARED_LIBS=ON \
            -DCMAKE_PREFIX_PATH="${DEPS_INSTALL_DIR}" \
@@ -52,26 +66,26 @@ jobs:
       - name: Build
         working-directory: ./build
         run: |
-          make -j$(nproc)
+          cmake --build . -j$(nproc)
 
       - name: Install
         working-directory: ./build
         run: |
-          make install
+          cmake --install .
 
       - name: Unit Tests
         working-directory: ./build
         run: |
           export LD_LIBRARY_PATH=${ALICEVISION_ROOT}/lib:${ALICEVISION_ROOT}/lib64:${DEPS_INSTALL_DIR}/lib64:${DEPS_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}
-          make test
+          cmake --build . --target test
 
       - name: Build As Third Party
         working-directory: ./build_as_3rdparty
         run: |
           cmake ../src/software/utils/aliceVisionAs3rdParty \
            -DBUILD_SHARED_LIBS:BOOL=ON \
            -DCMAKE_PREFIX_PATH:PATH="$PWD/../../AV_install;${DEPS_INSTALL_DIR}"
-          make -j$(nproc)
+          cmake --build . -j$(nproc)
 
       - name: Functional Tests - PanoramaFisheyeHdr Pipeline
         working-directory: ./functional_tests

.github/workflows/build-sonarqube.yml

@@ -0,0 +1,84 @@
+name: Build Linux
+
+on:
+  workflow_call:
+
+jobs:
+  build-linux:
+    runs-on: ubuntu-latest
+    container:
+      image: "alicevision/alicevision-deps:2026.03.30-rocky9-cuda12.1.1"
+    env:
+      DEPS_INSTALL_DIR: /opt/AliceVision_install
+      BUILD_TYPE: Release
+      CTEST_OUTPUT_ON_FAILURE: 1
+      ALICEVISION_ROOT: ${{ github.workspace }}/../AV_install
+      ALICEVISION_SENSOR_DB: ${{ github.workspace }}/../AV_install/share/aliceVision/cameraSensors.db
+      ALICEVISION_LENS_PROFILE_INFO: ""
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Setup ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          # Isolate writes per ref (branch/PR) to reduce cross-PR cache contamination.
+          key: ccache-${{ runner.os }}-sonarqube-${{ github.ref_name }}-${{ hashFiles('CMakeLists.txt', 'src/CMakeLists.txt', 'vcpkg.json', 'vcpkg-configuration.json', '.github/workflows/build-linux.yml') }}
+          restore-keys: |
+            ccache-${{ runner.os }}-sonarqube-${{ github.ref_name }}-
+            ccache-${{ runner.os }}-sonarqube-develop-
+            ccache-${{ runner.os }}-
+          max-size: "1000M"
+
+      - name: Install Build Wrapper
+        uses: SonarSource/sonarqube-scan-action/install-build-wrapper@v7.1
+
+      - name: Prepare File Tree
+        run: |
+          mkdir ./build
+          mkdir ../AV_install
+          mkdir -p ${{ github.workspace }}/bw-output
+          mkdir -p ${{ github.workspace }}/analysisCache
+
+      - name: Cache SonarCloud CFamily (incremental analysis)
+        uses: actions/cache@v4
+        with:
+          path: /root/.sonar/cache
+          key: ${{ runner.os }}-cfamily-${{ hashFiles('src/**/*.cpp', 'src/**/*.hpp', '**/CMakeLists.txt') }}
+          restore-keys: ${{ runner.os }}-cfamily-
+
+      - name: Configure CMake
+        working-directory: ./build
+        run: |
+          cmake .. \
+           -G Ninja \
+           -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+           -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
+           -DBUILD_SHARED_LIBS=ON \
+           -DCMAKE_PREFIX_PATH="${DEPS_INSTALL_DIR}" \
+           -DCMAKE_INSTALL_PREFIX="${ALICEVISION_ROOT}" \
+           -DTARGET_ARCHITECTURE=core \
+           -DALICEVISION_BUILD_TESTS=OFF \
+           -DALICEVISION_BUILD_SWIG_BINDING=OFF \
+           -DALICEVISION_USE_OPENCV=ON \
+           -DALICEVISION_USE_CUDA=OFF \
+           -DALICEVISION_USE_CCTAG=OFF \
+           -DALICEVISION_USE_POPSIFT=OFF \
+           -DALICEVISION_USE_ALEMBIC=ON \
+           -DALICEVISION_USE_USD=ON \
+           -DOpenCV_DIR="${DEPS_INSTALL_DIR}/share/OpenCV" \
+           -DCeres_DIR="${DEPS_INSTALL_DIR}/share/Ceres" \
+           -DAlembic_DIR="${DEPS_INSTALL_DIR}/lib/cmake/Alembic" 
+
+      - name: Build
+        working-directory: ./build
+        run: |
+          build-wrapper-linux-x86-64 --out-dir ${{ github.workspace }}/bw-output cmake --build . -j$(nproc)
+        
+      - name: SonarQube Scan
+        uses: SonarSource/sonarqube-scan-action@v7.1
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        with:
+          args: >
+            --define sonar.cfamily.compile-commands=${{ github.workspace }}/bw-output/compile_commands.json

.github/workflows/continuous-integration.yml

@@ -26,3 +26,7 @@ jobs:
   build-windows:
     uses: ./.github/workflows/build-windows.yml
     secrets: inherit
+
+  build-sonarqube:
+    uses: ./.github/workflows/build-sonarqube.yml
+    secrets: inherit

CMakeLists.txt

@@ -1,13 +1,31 @@
 cmake_minimum_required(VERSION 3.30)
 project(aliceVision LANGUAGES C CXX)
 
+include(CMakeDependentOption)
+
+# Initialize CMAKE_OSX_ARCHITECTURES, if not specified on the command line.
+if(APPLE AND NOT CMAKE_OSX_ARCHITECTURES)
+    message(STATUS "Host processor: ${CMAKE_HOST_SYSTEM_PROCESSOR}")
+    if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
+        set(CMAKE_OSX_ARCHITECTURES "arm64")
+    elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
+        set(CMAKE_OSX_ARCHITECTURES "x86_64")
+    else()
+        message(FATAL_ERROR "CMAKE_HOST_SYSTEM_PROCESSOR was neither arm64 nor x86_64 on an Apple platform and CMAKE_OSX_ARCHITECTURES was not specified!")
+    endif()
+endif()
+
 option(ALICEVISION_BUILD_DEPENDENCIES "Build all AliceVision dependencies" OFF)
+option(ALICEVISION_USE_RPATH "Add RPATH on software with relative paths to libraries" ON)
 option(AV_BUILD_ALICEVISION "Enable building of AliceVision" ON)
 option(AV_EIGEN_MEMORY_ALIGNMENT "Enable Eigen memory alignment" ON)
 option(ALICEVISION_BUILD_TESTS "Build AliceVision tests" OFF)
-option(AV_USE_CUDA "Enable CUDA" ON)
-option(AV_USE_OPENMP "Enable OpenMP" $<$<CXX_COMPILER_ID:"AppleClang">,OFF,ON>) # disable by default for AppleClang
+option(AV_USE_OPENMP "Enable OpenMP" ON) # AppleClang now supports OpenMP, if installed as an external dependency (Homebrew, MacPorts, ...)
+cmake_dependent_option(AV_USE_CUDA  "Enable CUDA support" ON  "NOT APPLE" OFF)
 option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+if(APPLE AND BUILD_SHARED_LIBS)
+    option(BUILD_APPLE_FRAMEWORKS "Create Frameworks instead of plain dynamic libraries on macOS" ON)
+endif()
 option(ALICEVISION_INSTALL_MESHROOM_PLUGIN "Install AliceVision's plugin for Meshroom" ON)
 
 # Global policy section
@@ -17,6 +35,12 @@ if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type for AliceVision" FORCE)
 endif()
 
+# Currently no universal binaries are supported. Fail early.
+# FIXME: Enable universal builds by adapting dependency building accordingly.
+if(APPLE AND CMAKE_OSX_ARCHITECTURES MATCHES "arm64" AND CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
+    message(FATAL_ERROR "Building universal binaries is currently not supported. Please set 'CMAKE_OSX_ARCHITECTURES' to either arm64 (Apple Silicon) or x86_64 (Intel)!")
+endif()
+
 # set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type for AliceVision")
 set(DEPS_CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type for all external libraries (only used if ALICEVISION_BUILD_DEPENDENCIES=ON)")
 string(TOLOWER ${DEPS_CMAKE_BUILD_TYPE} DEPS_CMAKE_BUILD_TYPE_LOWERCASE)
@@ -78,10 +102,10 @@ else()
     add_subdirectory(src)
 
     install(
-        FILES 
-            LICENSE-MPL2.md 
-            LICENSE-MIT-libmv.md 
-            COPYING.md 
+        FILES
+            LICENSE-MPL2.md
+            LICENSE-MIT-libmv.md
+            COPYING.md
             CONTRIBUTORS.md
         DESTINATION ${CMAKE_INSTALL_DATADIR}/aliceVision
     )

INSTALL.md

@@ -1,9 +1,11 @@
 # AliceVision
 
+For specific build instructions for macOS see [INSTALL_macOS.md](./INSTALL_macOS.md).
+
 ## Build instructions
 
 Required tools:
-* CMake >= 3.11
+* CMake >= 3.30
 * Git
 * C/C++ compiler (gcc or Visual Studio or clang) with C++17 support (i.e. gcc >= 7, clang >= 5, msvc >= 19.15, cuda >= 11.0).
 
@@ -357,25 +359,6 @@ make test
   * Change the target to Release.
   * Compile the libraries and binaries samples.
 
-
-### Mac OSX compilation
-
-```bash
-git clone --recursive https://github.com/alicevision/AliceVision.git
-mkdir build && cd build
-cmake -DCMAKE_BUILD_TYPE=Release -G "Xcode" ../AliceVision
-```
-
-If you want to enable the build of the unit tests:
-```bash
-cmake -DCMAKE_BUILD_TYPE=Release \
-      -DALICEVISION_BUILD_TESTS=ON \
-      -G "Xcode" \
-      ../AliceVision
-xcodebuild -configuration Release
-```
-
-
 ## Using AliceVision as a third party library dependency in CMake
 
 AliceVision can be used as a third party library once it has been installed.