Merge pull request #1980 from alicevision/dev/removeOpengv

servantftransperfect · web-flow · commit f12de1075989 · 2025-09-18T09:01:01.000+02:00
Remove opengv from dependencies
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -57,7 +57,6 @@ jobs:
            -DALICEVISION_USE_POPSIFT=ON \
            -DALICEVISION_USE_ALEMBIC=ON \
            -DOpenCV_DIR="${DEPS_INSTALL_DIR}/share/OpenCV" \
-           -DALICEVISION_USE_OPENGV=ON \
            -DCeres_DIR="${DEPS_INSTALL_DIR}/share/Ceres" \
            -DAlembic_DIR="${DEPS_INSTALL_DIR}/lib/cmake/Alembic" \
            -DSWIG_DIR="${DEPS_INSTALL_DIR}/share/swig/4.3.0" \
@@ -252,7 +251,6 @@ jobs:
                              -DALICEVISION_USE_CCTAG=OFF
                              -DALICEVISION_USE_POPSIFT=OFF
                              -DALICEVISION_USE_ALEMBIC=ON
-                             -DALICEVISION_USE_OPENGV=OFF
                              -DALICEVISION_BUILD_PHOTOMETRICSTEREO=OFF
                              -DALICEVISION_BUILD_SEGMENTATION=OFF
                              -DALICEVISION_BUILD_SWIG_BINDING=ON
diff --git a/COPYING.md b/COPYING.md
@@ -125,11 +125,6 @@ This program is based on works distributed under the terms of another license(s)
     Copyright (c) 2002, Industrial Light & Magic, a division of Lucas Digital Ltd. LLC  
     Distributed under the [BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
 
-*   __OpenGV__ (optional)  
-    [https://laurentkneip.github.io/opengv](https://laurentkneip.github.io/opengv)  
-    Copyright (c) 2013 Laurent Kneip, The Australian National University ANU. All rights reserved  
-    Distributed under the [BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
-
 *   __OpenImageIO__  
     [https://openimageio.org](https://openimageio.org)  
     Copyright 2008-2016 Larry Gritz et al.  
diff --git a/INSTALL.md b/INSTALL.md
@@ -43,7 +43,6 @@ Other optional libraries can enable specific features (check "CMake Options" for
 * Magma (required for UncertaintyTE)
 * Mosek >= 6 (linear programming)
 * OpenCV >= 3.4.11 (feature extraction, calibration module, video IO), >= 4.5 for colorchecker (mcc)
-* OpenGV (rig calibration and localization)
 * OpenMP (enable multi-threading)
 * PCL (Point Cloud Library) >= 1.12.1 for the registration module
 * PopSift (feature extraction on GPU)
@@ -208,11 +207,6 @@ At the end of the cmake process, a report shows for each library which version (
   Build with AprilTag markers support.  
   `-Dapriltag_DIR:PATH=/path/to/apriltag/install/share/apriltag/cmake` (where apriltagConfig.cmake can be found)
 
-* `ALICEVISION_USE_OPENGV` (default `AUTO`)  
-  Enable use of OpenGV algorithms. Build with openGV for multi-cameras localization.  
-  `-DOPENGV_DIR:PATH=/path/to/opengv/install/` (where the `include` and `lib` folders can be found)  
-  We recommend: `git clone https://github.com/alicevision/opengv.git --branch=cmake_fix_install`
-
 * `ALICEVISION_USE_ALEMBIC` (default `AUTO`)  
   Build with Alembic file format support (required version >= 1.7).  
   `-DAlembic_DIR:PATH=/path/to/alembic/install/lib/cmake/Alembic/` (where AlembicConfig.cmake can be found)  
diff --git a/docker/Dockerfile_rocky b/docker/Dockerfile_rocky
@@ -54,7 +54,6 @@ RUN cmake -DCMAKE_BUILD_TYPE=Release \
         -DMINIGLOG:BOOL=ON \
         -DALICEVISION_USE_CCTAG:BOOL=OFF \
         -DALICEVISION_USE_OPENCV:BOOL=ON \
-        -DALICEVISION_USE_OPENGV:BOOL=ON \
         -DALICEVISION_USE_POPSIFT:BOOL=ON \
         -DALICEVISION_USE_CUDA:BOOL=ON \
         -DALICEVISION_USE_ONNX_GPU:BOOL=OFF \
diff --git a/docker/Dockerfile_rocky_deps b/docker/Dockerfile_rocky_deps
@@ -101,7 +101,6 @@ RUN test -e /usr/local/cuda/lib64/libcublas.so || ln -s /usr/lib/x86_64-linux-gn
 # RUN make -j ${CPU_CORES} turbojpeg
 # RUN make -j ${CPU_CORES} assimp
 # RUN make -j ${CPU_CORES} geogram
-# RUN make -j ${CPU_CORES} opengv
 # RUN make -j ${CPU_CORES} lapack
 # RUN make -j ${CPU_CORES} suitesparse
 # RUN make -j ${CPU_CORES} ceres
diff --git a/docker/Dockerfile_ubuntu b/docker/Dockerfile_ubuntu
@@ -53,7 +53,6 @@ RUN export CPU_CORES=`${AV_DEV}/docker/check-cpu.sh`; \
         -DMINIGLOG:BOOL=ON \
         -DALICEVISION_USE_CCTAG:BOOL=ON \
         -DALICEVISION_USE_OPENCV:BOOL=ON \
-        -DALICEVISION_USE_OPENGV:BOOL=ON \
         -DALICEVISION_USE_POPSIFT:BOOL=ON \
         -DALICEVISION_USE_CUDA:BOOL=ON \
         -DALICEVISION_USE_ONNX_GPU:BOOL=OFF \
diff --git a/docker/Dockerfile_ubuntu_deps b/docker/Dockerfile_ubuntu_deps
@@ -109,7 +109,6 @@ RUN test -e /usr/local/cuda/lib64/libcublas.so || ln -s /usr/lib/x86_64-linux-gn
 # RUN make -j ${CPU_CORES} assimp
 # RUN make -j ${CPU_CORES} geogram
 # RUN make -j ${CPU_CORES} eigen
-# RUN make -j ${CPU_CORES} opengv
 # RUN make -j ${CPU_CORES} suitesparse
 # RUN make -j ${CPU_CORES} ceres
 # RUN make -j ${CPU_CORES} tiff
@@ -123,7 +122,6 @@ RUN test -e /usr/local/cuda/lib64/libcublas.so || ln -s /usr/lib/x86_64-linux-gn
 # RUN make -j ${CPU_CORES} SWIG
 # RUN make -j ${CPU_CORES} E57Format
 # RUN make -j ${CPU_CORES} LEMON
-# RUN make -j ${CPU_CORES} opengv
 # RUN make -j ${CPU_CORES} OpenMesh
 # RUN make -j ${CPU_CORES} flann
 # RUN make -j ${CPU_CORES} clp
diff --git a/docker/fetch.sh b/docker/fetch.sh
@@ -57,7 +57,6 @@ cmake -P "external/src/gmp-stamp/download-gmp.cmake"
 cmake -P "external/src/lapack-stamp/download-lapack.cmake"
 cmake -P "external/src/mpfr-stamp/download-mpfr.cmake"
 cmake -P "external/src/openexr-stamp/download-openexr.cmake"
-# cmake -P "external/src/opengv-stamp/download-opengv.cmake"
 cmake -P "external/src/openimageio-stamp/download-openimageio.cmake"
 # cmake -P "external/src/pcl-stamp/download-pcl.cmake"
 cmake -P "external/src/png-stamp/download-png.cmake"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -63,7 +63,6 @@ trilean_option(ALICEVISION_USE_OPENMP "Enable OpenMP parallelization" ON)
 trilean_option(ALICEVISION_USE_CCTAG "Enable CCTAG markers" AUTO)
 trilean_option(ALICEVISION_USE_APRILTAG "Enable AprilTag markers" AUTO)
 trilean_option(ALICEVISION_USE_POPSIFT "Enable GPU SIFT implementation" AUTO)
-trilean_option(ALICEVISION_USE_OPENGV "Enable use of OpenGV algorithms" AUTO)
 trilean_option(ALICEVISION_USE_ALEMBIC "Enable Alembic I/O" AUTO)
 trilean_option(ALICEVISION_USE_UNCERTAINTYTE "Enable Uncertainty computation" AUTO)
 trilean_option(ALICEVISION_USE_ONNX "Enable ONNX Runtime" AUTO)
@@ -592,26 +591,6 @@ if (NOT ALICEVISION_USE_USD STREQUAL "OFF")
     endif()
 endif()
 
-# ==============================================================================
-# OpenGV
-# ==============================================================================
-# - optional, it allows to use the generic camera PnP algorithms for rig localization
-# ==============================================================================
-set(ALICEVISION_HAVE_OPENGV 0)
-
-if (ALICEVISION_BUILD_SFM)
-    if (NOT ALICEVISION_USE_OPENGV STREQUAL "OFF")
-        find_package(opengv 1.0 CONFIG)
-        if (opengv_FOUND)
-            set(ALICEVISION_HAVE_OPENGV 1)
-            message(STATUS "OpenGV ${opengv_VERSION} found.")
-        elseif (ALICEVISION_USE_OPENGV STREQUAL "ON")
-            message(SEND_ERROR "Failed to find OpenGV.")
-        endif()
-    endif()
-
-endif()
-
 # ==============================================================================
 # UncertaintyTE
 # ==============================================================================
@@ -982,7 +961,6 @@ message("** Use OpenCV SIFT features: " ${ALICEVISION_HAVE_OCVSIFT})
 message("** Use PopSift feature extractor: " ${ALICEVISION_HAVE_POPSIFT})
 message("** Use CCTAG markers: " ${ALICEVISION_HAVE_CCTAG})
 message("** Use AprilTag markers: " ${ALICEVISION_HAVE_APRILTAG})
-message("** Use OpenGV for rig localization: " ${ALICEVISION_HAVE_OPENGV})
 message("** Use ONNX: " ${ALICEVISION_HAVE_ONNX})
 message("** Use ONNX with CUDA: " ${ALICEVISION_HAVE_ONNX_GPU})
 message("\n")
diff --git a/src/cmake/AliceVisionConfig.cmake.in b/src/cmake/AliceVisionConfig.cmake.in
@@ -35,7 +35,6 @@
 # ALICEVISION_HAVE_POPSIFT -  TRUE if the library is built with PopSift support
 # ALICEVISION_HAVE_OPENCV  -  TRUE if the library is built with OpenCV support
 # ALICEVISION_HAVE_OPENMP  -  TRUE if the library is built with openMP support
-# ALICEVISION_HAVE_OPENGV  -  TRUE if the library is built with openGV support
 # ALICEVISION_HAVE_ALEMBIC -  TRUE if the library is built with Alembic support
 #
 ################################################################################
@@ -73,13 +72,6 @@ if(ALICEVISION_HAVE_POPSIFT)
   find_dependency(PopSift 1.0.0)
 endif()
 
-# whether it is built with OpenGV
-set(ALICEVISION_HAVE_OPENGV @ALICEVISION_HAVE_OPENGV@)
-
-if(ALICEVISION_HAVE_OPENGV)
-  find_dependency(opengv 1.0)
-endif()
-
 # whether it is built with OpenCV
 set(ALICEVISION_HAVE_OPENCV @ALICEVISION_HAVE_OPENCV@)
 
@@ -112,7 +104,6 @@ if(ALICEVISION_BUILD_MVS)
 endif()
 
 # propagate other building options
-set(ALICEVISION_HAVE_OPENGV @ALICEVISION_HAVE_OPENGV@)
 set(ALICEVISION_HAVE_ALEMBIC @ALICEVISION_HAVE_ALEMBIC@)
 
 if(ALICEVISION_HAVE_ALEMBIC)
diff --git a/src/cmake/Dependencies.cmake b/src/cmake/Dependencies.cmake
@@ -16,7 +16,6 @@ option(AV_BUILD_LIBRAW "Enable building an embedded libraw" ON)
 option(AV_BUILD_POPSIFT "Enable building an embedded PopSift" ON)
 option(AV_BUILD_CCTAG "Enable building an embedded CCTag" ON)
 option(AV_BUILD_APRILTAG "Enable building an embedded AprilTag" ON)
-option(AV_BUILD_OPENGV "Enable building an embedded OpenGV" ON)
 option(AV_BUILD_OPENCV "Enable building an embedded OpenCV" ON)
 option(AV_BUILD_ONNXRUNTIME "Enable building an embedded ONNX runtime" ON)
 option(AV_BUILD_LAPACK "Enable building an embedded Lapack" ON)
@@ -62,7 +61,6 @@ message(STATUS "AV_BUILD_LIBRAW: ${AV_BUILD_LIBRAW}")
 message(STATUS "AV_BUILD_CCTAG: ${AV_BUILD_CCTAG}")
 message(STATUS "AV_BUILD_APRILTAG: ${AV_BUILD_APRILTAG}")
 message(STATUS "AV_BUILD_POPSIFT: ${AV_BUILD_POPSIFT}")
-message(STATUS "AV_BUILD_OPENGV: ${AV_BUILD_OPENGV}")
 message(STATUS "AV_BUILD_OPENCV: ${AV_BUILD_OPENCV}")
 message(STATUS "AV_BUILD_ONNXRUNTIME: ${AV_BUILD_ONNXRUNTIME}")
 if(APPLE)
@@ -403,34 +401,6 @@ if (AV_BUILD_ONNXRUNTIME)
     )
 endif()
 
-if(AV_BUILD_OPENGV)
-    set(OPENGV_TARGET opengv)
-
-    ExternalProject_Add(${OPENGV_TARGET}
-        # Official repository
-        # GIT_REPOSITORY https://github.com/laurentkneip/opengv.git
-        # Our fork, with a fix:
-        GIT_REPOSITORY https://github.com/alicevision/opengv.git
-        # Use a custom commit with a fix to override the cxx standard from cmake command line
-        GIT_TAG 65f7edccf5044d445d305580f79c50c2efcbd438
-        PREFIX ${BUILD_DIR}
-        BUILD_IN_SOURCE 0
-        BUILD_ALWAYS 0
-        UPDATE_COMMAND ""
-        SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/opengv
-        BINARY_DIR ${BUILD_DIR}/opengv_build
-        INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
-        CONFIGURE_COMMAND 
-            ${CMAKE_COMMAND} 
-            ${CMAKE_CORE_BUILD_FLAGS}
-            ${EIGEN_CMAKE_FLAGS}
-            -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-            <SOURCE_DIR>
-        BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL}
-        DEPENDS ${EIGEN_TARGET}
-    )
-    set(OPENGV_CMAKE_FLAGS -DOPENGV_DIR=${CMAKE_INSTALL_PREFIX})
-endif()
 
 if(AV_BUILD_OPENEXR)
     # Add OpenEXR
@@ -1443,7 +1413,6 @@ set(AV_DEPS
     ${TBB_TARGET}
     ${EIGEN_TARGET}
     ${ONNXRUNTIME_TARGET}
-    ${OPENGV_TARGET}
     ${OPENCV_TARGET}
     ${LAPACK_TARGET}
     ${SUITESPARSE_TARGET}
@@ -1490,7 +1459,6 @@ if(AV_BUILD_ALICEVISION)
         -DALICEVISION_USE_CCTAG=${AV_BUILD_CCTAG}
         -DALICEVISION_USE_APRILTAG=${AV_BUILD_APRILTAG}
         -DALICEVISION_USE_OPENCV=${AV_BUILD_OPENCV}
-        -DALICEVISION_USE_OPENGV=${AV_BUILD_OPENGV}
         -DALICEVISION_USE_POPSIFT=${AV_BUILD_POPSIFT}
         -DALICEVISION_USE_CUDA=${AV_USE_CUDA}
         -DALICEVISION_BUILD_SWIG_BINDING=${AV_USE_SWIG}
@@ -1508,7 +1476,6 @@ if(AV_BUILD_ALICEVISION)
         ${CERES_CMAKE_FLAGS}
         ${CUDA_CMAKE_FLAGS}
         ${POPSIFT_CMAKE_FLAGS}
-        ${OPENGV_CMAKE_FLAGS}
         ${OPENCV_CMAKE_FLAGS}
         ${CCTAG_CMAKE_FLAGS}
         ${APRILTAG_CMAKE_FLAGS}
diff --git a/src/cmake/config.hpp.in b/src/cmake/config.hpp.in
@@ -21,8 +21,6 @@
 
 #define ALICEVISION_HAVE_POPSIFT() @ALICEVISION_HAVE_POPSIFT@
 
-#define ALICEVISION_HAVE_OPENGV() @ALICEVISION_HAVE_OPENGV@
-
 #define ALICEVISION_HAVE_CUDA() @ALICEVISION_HAVE_CUDA@
 
 #define ALICEVISION_HAVE_ONNX() @ALICEVISION_HAVE_ONNX@
