git: d3dbf085b445 - main - misc/openmvg: Update 1.6 -> 2.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Sun, 14 Nov 2021 18:46:23 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d3dbf085b44517ebac8143ae5632667f19881bc6

commit d3dbf085b44517ebac8143ae5632667f19881bc6
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2021-11-14 18:45:25 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2021-11-14 18:46:14 +0000

    misc/openmvg: Update 1.6 -> 2.0
    
    Reported by:    portscout
---
 misc/openmvg/Makefile                              |  55 ++-
 misc/openmvg/distinfo                              |  12 +-
 misc/openmvg/files/patch-CMakeLists.txt            |  27 +-
 ...atch-dependencies_osi__clp_Clp_src_ClpModel.cpp |  11 -
 ...ndencies_osi__clp_Clp_src_OsiClp_CMakeLists.txt |   9 -
 ...i__clp_Clp_src_OsiClp_OsiClpSolverInterface.cpp |  11 -
 ...endencies_osi__clp_CoinUtils_src_CMakeLists.txt |   9 -
 ...ependencies_osi__clp_Osi_src_Osi_CMakeLists.txt |   9 -
 .../files/patch-software_SfM_CMakeLists.txt        |  12 +
 ...arty_ceres-solver_internal_ceres_CMakeLists.txt |  11 -
 .../patch-third__party_cxsparse_CMakeLists.txt     |  11 -
 .../patch-third__party_easyexif_CMakeLists.txt     |   5 +-
 .../files/patch-third__party_fast_CMakeLists.txt   |   4 +-
 misc/openmvg/pkg-plist                             | 490 ++++++++-------------
 14 files changed, 236 insertions(+), 440 deletions(-)

diff --git a/misc/openmvg/Makefile b/misc/openmvg/Makefile
index 70d591c1c8c4..1058f26a8b66 100644
--- a/misc/openmvg/Makefile
+++ b/misc/openmvg/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	openmvg
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.6
-PORTREVISION=	2
+DISTVERSION=	2.0
 CATEGORIES=	misc science
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -13,29 +12,57 @@ LICENSE_FILE=	${WRKSRC}/../LICENSE
 ONLY_FOR_ARCHS=	amd64 i386 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	need to figure out which TARGET_ARCHITECTURE values correspond to other architectures, plus "generic" is broken
 
-HPP_DEPENDS=	cereal>0:devel/cereal
-BUILD_DEPENDS=	${HPP_DEPENDS}
-LIB_DEPENDS=	libflann_cpp.so:math/flann \
+#HPP_DEPENDS=	cereal>0:devel/cereal # external cereal is currently broken, see https://github.com/openMVG/openMVG/issues/1963
+#BUILD_DEPENDS=	${HPP_DEPENDS}
+LIB_DEPENDS=	libamd.so:math/suitesparse-amd \
+		libblas.so:math/blas \
+		libcamd.so:math/suitesparse-camd \
+		libCbc.so:math/cbc \
+		libccolamd.so:math/suitesparse-ccolamd \
+		libceres.so:math/ceres-solver \
+		libCgl.so:math/cgl \
+		libcholmod.so:math/suitesparse-cholmod \
+		libClp.so:math/clp \
+		libcoinasl.so:math/asl \
+		libCoinUtils.so:math/coinutils \
+		libcolamd.so:math/suitesparse-colamd \
+		libcoinmumps.so:math/ipopt \
+		libcxsparse.so:math/suitesparse-cxsparse \
+		libemon.so:math/lemon \
+		libflann_cpp.so:math/flann \
+		libgflags.so:devel/gflags \
+		libglog.so:devel/glog \
+		libglpk.so:math/glpk \
+		libgmp.so:math/gmp \
+		libjbig.so:graphics/jbigkit \
+		libmetis.so:math/metis \
+		libnauty.so:math/nauty \
 		libopenblas.so:math/openblas \
+		libOsi.so:math/osi \
 		libpng.so:graphics/png \
-		libtiff.so:graphics/tiff
+		libspqr.so:math/suitesparse-spqr \
+		libsuitesparseconfig.so:math/suitesparse-config \
+		libtiff.so:graphics/tiff \
+		libunwind.so:devel/libunwind
 LIB_DEPENDS+=	liblz4.so:archivers/liblz4 # workaround for https://github.com/openMVG/openMVG/issues/1798
-RUN_DEPENDS=	${HPP_DEPENDS}
+#RUN_DEPENDS=	${HPP_DEPENDS}
 
 USES=		cmake compiler:c++11-lang eigen:3 jpeg qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	openMVG
 GH_PROJECT=	openMVG
-GH_TUPLE=	openMVG-thirdparty:osi_clp:a25a980:osi/dependencies/osi_clp
+GH_TUPLE=	openMVG-thirdparty:cereal:ac168fe:cereal/dependencies/cereal
 WRKSRC_SUBDIR=	src
 USE_QT=		core gui opengl svg widgets buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
-CONFLICTS_BUILD=	Clp CoinMP # libopenMVG_lemon.so: undefined reference to ClpSimplex::setRowLower(int, double)
-
-CMAKE_ARGS=	-DCEREAL_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
-		-DEIGEN_INCLUDE_DIR_HINTS=${LOCALBASE}/include/eigen3 \
-		-DFLANN_INCLUDE_DIR_HINTS=${LOCALBASE}/include
+CMAKE_ARGS=	-DEIGEN_INCLUDE_DIR_HINTS=${LOCALBASE}/include/eigen3 \
+		-DFLANN_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
+		-DLEMON_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
+		-DOSI_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
+		-DCOINUTILS_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
+		-DCLP_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
+		-DCERES_DIR_HINTS=${LOCALBASE}/include
 CMAKE_ON=	OpenMVG_BUILD_SHARED
 CMAKE_OFF=	OpenMVG_BUILD_TESTS OpenMVG_BUILD_EXAMPLES
 
@@ -62,6 +89,6 @@ MEROM_CMAKE_ON=			-DTARGET_ARCHITECTURE=merom
 NEHALEM_CMAKE_ON=		-DTARGET_ARCHITECTURE=nehalem
 
 post-install:
-	cd ${STAGEDIR}${PREFIX}/include/openMVG_dependencies && ${RMDIR} cereal
+	@${RM} -r ${STAGEDIR}${PREFIX}/include/openMVG_dependencies/osi_clp
 
 .include <bsd.port.mk>
diff --git a/misc/openmvg/distinfo b/misc/openmvg/distinfo
index 9ed67c48b874..0ac3ff64ba0d 100644
--- a/misc/openmvg/distinfo
+++ b/misc/openmvg/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1610945557
-SHA256 (openMVG-openMVG-v1.6_GH0.tar.gz) = 11b7f632a773f8c06fe7e30caeebc8ac124049cd5dd947eaadc8c7bf0a294d64
-SIZE (openMVG-openMVG-v1.6_GH0.tar.gz) = 14752743
-SHA256 (openMVG-thirdparty-cereal-ac168fe78ac499be0a745bf4a3253a9660572f8d_GH0.tar.gz) = 97e571da6be41eeba060ba257f74bdb329e043c078df7429f2f87ecdfeeb3db3
-SIZE (openMVG-thirdparty-cereal-ac168fe78ac499be0a745bf4a3253a9660572f8d_GH0.tar.gz) = 375037
-SHA256 (openMVG-thirdparty-osi_clp-a25a980_GH0.tar.gz) = 749c742b7eb6d346d34ef02872c7a02bdbef6759bdd48b9542dffb91bf82d0d7
-SIZE (openMVG-thirdparty-osi_clp-a25a980_GH0.tar.gz) = 2575191
+TIMESTAMP = 1636913713
+SHA256 (openMVG-openMVG-v2.0_GH0.tar.gz) = 950da7d6fc370cc99ad29092fd3b46196f782af2f905e475a7262ceb96170618
+SIZE (openMVG-openMVG-v2.0_GH0.tar.gz) = 15129786
+SHA256 (openMVG-thirdparty-cereal-ac168fe_GH0.tar.gz) = 99290309c96f65eca82883224fc19d08271d086328e97a657758deaea1110014
+SIZE (openMVG-thirdparty-cereal-ac168fe_GH0.tar.gz) = 374597
diff --git a/misc/openmvg/files/patch-CMakeLists.txt b/misc/openmvg/files/patch-CMakeLists.txt
index f245cd9e440c..970e92633172 100644
--- a/misc/openmvg/files/patch-CMakeLists.txt
+++ b/misc/openmvg/files/patch-CMakeLists.txt
@@ -1,20 +1,6 @@
---- CMakeLists.txt.orig	2020-05-13 05:15:56 UTC
+--- CMakeLists.txt.orig	2021-10-20 20:39:31 UTC
 +++ CMakeLists.txt
-@@ -88,11 +88,13 @@ endif()
- # ==============================================================================
- # Check that submodule have been initialized and updated
- # ==============================================================================
-+if (FALSE)
- if (NOT EXISTS ${PROJECT_SOURCE_DIR}/dependencies/cereal/include)
-   message(FATAL_ERROR
-     "\n submodule(s) are missing, please update your repository:\n"
-     "  > git submodule update -i\n")
- endif()
-+endif()
- 
- # ==============================================================================
- # Additional cmake find modules
-@@ -103,8 +105,8 @@ include(OptimizeForArchitecture)
+@@ -113,8 +115,8 @@ include(OptimizeForArchitecture)
  OptimizeForArchitecture()
  
  if (UNIX AND NOT OpenMVG_BUILD_COVERAGE)
@@ -25,12 +11,3 @@
  endif ()
  
  # ==============================================================================
-@@ -260,7 +262,7 @@ endif()
- # - external by default if CERES_DIR_HINTS or find_package found a valid Ceres
- # - internal if ceres not found (ceres-solver+cxsparse+miniglog)
- # ==============================================================================
--find_package(Ceres QUIET HINTS ${CERES_DIR_HINTS})
-+#find_package(Ceres QUIET HINTS ${CERES_DIR_HINTS}) # external ceres can't work because it requires fortran
- if (NOT Ceres_FOUND)
-   set(OpenMVG_USE_INTERNAL_CERES ON)
-   set(CERES_INCLUDE_DIRS
diff --git a/misc/openmvg/files/patch-dependencies_osi__clp_Clp_src_ClpModel.cpp b/misc/openmvg/files/patch-dependencies_osi__clp_Clp_src_ClpModel.cpp
deleted file mode 100644
index 3a78db140b40..000000000000
--- a/misc/openmvg/files/patch-dependencies_osi__clp_Clp_src_ClpModel.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- dependencies/osi_clp/Clp/src/ClpModel.cpp.orig	2018-04-10 05:06:37 UTC
-+++ dependencies/osi_clp/Clp/src/ClpModel.cpp
-@@ -3845,7 +3845,7 @@ ClpModel::writeMps(const char *filename,
-      writer.setMpsData(*(matrix_->getPackedMatrix()), COIN_DBL_MAX,
-                        getColLower(), getColUpper(),
-                        objective,
--                       reinterpret_cast<const char*> (NULL) /*integrality*/,
-+                       static_cast<const char*> (NULL) /*integrality*/,
-                        getRowLower(), getRowUpper(),
-                        columnNames, rowNames);
-      // Pass in array saying if each variable integer
diff --git a/misc/openmvg/files/patch-dependencies_osi__clp_Clp_src_OsiClp_CMakeLists.txt b/misc/openmvg/files/patch-dependencies_osi__clp_Clp_src_OsiClp_CMakeLists.txt
deleted file mode 100644
index 2605a27bb898..000000000000
--- a/misc/openmvg/files/patch-dependencies_osi__clp_Clp_src_OsiClp_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- dependencies/osi_clp/Clp/src/OsiClp/CMakeLists.txt.orig	2018-08-26 19:29:00 UTC
-+++ dependencies/osi_clp/Clp/src/OsiClp/CMakeLists.txt
-@@ -9,5 +9,5 @@ file(
- 	OSI_SRCS
- 	*.cpp
- )
--ADD_LIBRARY(lib_OsiClpSolver ${OSI_HEADERS} ${OSI_SRCS})
-+ADD_LIBRARY(lib_OsiClpSolver SHARED ${OSI_HEADERS} ${OSI_SRCS})
- INSTALL(TARGETS lib_OsiClpSolver DESTINATION lib EXPORT openMVG-targets)
diff --git a/misc/openmvg/files/patch-dependencies_osi__clp_Clp_src_OsiClp_OsiClpSolverInterface.cpp b/misc/openmvg/files/patch-dependencies_osi__clp_Clp_src_OsiClp_OsiClpSolverInterface.cpp
deleted file mode 100644
index 2ebfbd9bac7e..000000000000
--- a/misc/openmvg/files/patch-dependencies_osi__clp_Clp_src_OsiClp_OsiClpSolverInterface.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- dependencies/osi_clp/Clp/src/OsiClp/OsiClpSolverInterface.cpp.orig	2018-04-10 05:08:11 UTC
-+++ dependencies/osi_clp/Clp/src/OsiClp/OsiClpSolverInterface.cpp
-@@ -1449,7 +1449,7 @@ OsiClpSolverInterface::setupForRepeatedU
-   if (stopPrinting) {
-     CoinMessages * messagesPointer = modelPtr_->messagesPointer();
-     // won't even build messages
--    messagesPointer->setDetailMessages(100,10000,reinterpret_cast<int *> (NULL));
-+    messagesPointer->setDetailMessages(100,10000,static_cast<int *> (NULL));
-   }
- #endif
- }
diff --git a/misc/openmvg/files/patch-dependencies_osi__clp_CoinUtils_src_CMakeLists.txt b/misc/openmvg/files/patch-dependencies_osi__clp_CoinUtils_src_CMakeLists.txt
deleted file mode 100644
index bb71d0d88ccc..000000000000
--- a/misc/openmvg/files/patch-dependencies_osi__clp_CoinUtils_src_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- dependencies/osi_clp/CoinUtils/src/CMakeLists.txt.orig	2018-08-26 19:29:34 UTC
-+++ dependencies/osi_clp/CoinUtils/src/CMakeLists.txt
-@@ -12,5 +12,5 @@ file(
- )
- 
- 
--ADD_LIBRARY(lib_CoinUtils ${COINUTILS_HEADER} ${COINUTILS_CPP})
-+ADD_LIBRARY(lib_CoinUtils SHARED ${COINUTILS_HEADER} ${COINUTILS_CPP})
- INSTALL(TARGETS lib_CoinUtils DESTINATION lib EXPORT openMVG-targets)
diff --git a/misc/openmvg/files/patch-dependencies_osi__clp_Osi_src_Osi_CMakeLists.txt b/misc/openmvg/files/patch-dependencies_osi__clp_Osi_src_Osi_CMakeLists.txt
deleted file mode 100644
index 215a6433a8a7..000000000000
--- a/misc/openmvg/files/patch-dependencies_osi__clp_Osi_src_Osi_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- dependencies/osi_clp/Osi/src/Osi/CMakeLists.txt.orig	2018-08-26 19:31:00 UTC
-+++ dependencies/osi_clp/Osi/src/Osi/CMakeLists.txt
-@@ -10,5 +10,5 @@ file(
- 	*.cpp
- )
- 
--ADD_LIBRARY(lib_Osi ${OSI_OSI_HEADER} ${OSI_OSI_CPP})
-+ADD_LIBRARY(lib_Osi SHARED ${OSI_OSI_HEADER} ${OSI_OSI_CPP})
- INSTALL(TARGETS lib_Osi DESTINATION lib EXPORT openMVG-targets)
diff --git a/misc/openmvg/files/patch-software_SfM_CMakeLists.txt b/misc/openmvg/files/patch-software_SfM_CMakeLists.txt
new file mode 100644
index 000000000000..c73e826d2457
--- /dev/null
+++ b/misc/openmvg/files/patch-software_SfM_CMakeLists.txt
@@ -0,0 +1,12 @@
+- workaround for https://github.com/openMVG/openMVG/issues/1962
+
+--- software/SfM/CMakeLists.txt.orig	2021-11-14 08:42:39 UTC
++++ software/SfM/CMakeLists.txt
+@@ -200,6 +200,7 @@ target_link_libraries(openMVG_main_ComputeStructureFro
+     openMVG_system
+     openMVG_features
+     openMVG_sfm
++    ceres
+     ${STLPLUS_LIBRARY}
+ )
+ 
diff --git a/misc/openmvg/files/patch-third__party_ceres-solver_internal_ceres_CMakeLists.txt b/misc/openmvg/files/patch-third__party_ceres-solver_internal_ceres_CMakeLists.txt
deleted file mode 100644
index 4c1652e1c7c2..000000000000
--- a/misc/openmvg/files/patch-third__party_ceres-solver_internal_ceres_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/ceres-solver/internal/ceres/CMakeLists.txt.orig	2018-08-26 19:32:38 UTC
-+++ third_party/ceres-solver/internal/ceres/CMakeLists.txt
-@@ -196,7 +196,7 @@ if (MINIGLOG)
-   list(APPEND CERES_LIBRARY_SOURCE miniglog/glog/logging.cc)
- endif (MINIGLOG)
- 
--add_library(openMVG_ceres STATIC ${CERES_LIBRARY_SOURCE})
-+add_library(openMVG_ceres SHARED ${CERES_LIBRARY_SOURCE})
- set_target_properties(openMVG_ceres PROPERTIES
-   VERSION ${CERES_VERSION}
-   SOVERSION ${CERES_VERSION_MAJOR})
diff --git a/misc/openmvg/files/patch-third__party_cxsparse_CMakeLists.txt b/misc/openmvg/files/patch-third__party_cxsparse_CMakeLists.txt
deleted file mode 100644
index 654ea56cf276..000000000000
--- a/misc/openmvg/files/patch-third__party_cxsparse_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/cxsparse/CMakeLists.txt.orig	2018-08-26 19:12:57 UTC
-+++ third_party/cxsparse/CMakeLists.txt
-@@ -6,7 +6,7 @@ project(CXSparse C)
- file(GLOB CXSparse_SRCS "Source/*.c")
- set_source_files_properties(${CXSparse_SRCS} PROPERTIES LANGUAGE C)
- 
--add_library(openMVG_cxsparse STATIC ${CXSparse_SRCS})
-+add_library(openMVG_cxsparse SHARED ${CXSparse_SRCS})
- target_compile_definitions(openMVG_cxsparse PUBLIC NCOMPLEX)
- target_include_directories(openMVG_cxsparse PRIVATE ./ ./Include)
- if(UNIX)
diff --git a/misc/openmvg/files/patch-third__party_easyexif_CMakeLists.txt b/misc/openmvg/files/patch-third__party_easyexif_CMakeLists.txt
index b2fd8714daff..c0ed07731804 100644
--- a/misc/openmvg/files/patch-third__party_easyexif_CMakeLists.txt
+++ b/misc/openmvg/files/patch-third__party_easyexif_CMakeLists.txt
@@ -1,7 +1,6 @@
---- third_party/easyexif/CMakeLists.txt.orig	2018-08-26 19:13:28 UTC
+--- third_party/easyexif/CMakeLists.txt.orig	2021-10-20 20:39:31 UTC
 +++ third_party/easyexif/CMakeLists.txt
-@@ -1,6 +1,6 @@
- project (openMVG_easyexif CXX)
+@@ -1,5 +1,5 @@
  
 -add_library(openMVG_easyexif STATIC exif.h exif.cpp)
 +add_library(openMVG_easyexif SHARED exif.h exif.cpp)
diff --git a/misc/openmvg/files/patch-third__party_fast_CMakeLists.txt b/misc/openmvg/files/patch-third__party_fast_CMakeLists.txt
index c5d2ba1f40e9..4048cb7ce6c1 100644
--- a/misc/openmvg/files/patch-third__party_fast_CMakeLists.txt
+++ b/misc/openmvg/files/patch-third__party_fast_CMakeLists.txt
@@ -1,7 +1,7 @@
---- third_party/fast/CMakeLists.txt.orig	2018-08-26 19:17:28 UTC
+--- third_party/fast/CMakeLists.txt.orig	2021-10-20 20:39:31 UTC
 +++ third_party/fast/CMakeLists.txt
 @@ -1,7 +1,7 @@
- project(openMVG_fast)
+ 
  file(GLOB_RECURSE C_FILES ${CMAKE_CURRENT_SOURCE_DIR} *.c)
  set_source_files_properties(${C_FILES} PROPERTIES LANGUAGE CXX)
 -add_library(openMVG_fast STATIC ${C_FILES})
diff --git a/misc/openmvg/pkg-plist b/misc/openmvg/pkg-plist
index 27ea40b041f3..e36db44d1596 100644
--- a/misc/openmvg/pkg-plist
+++ b/misc/openmvg/pkg-plist
@@ -11,12 +11,12 @@ bin/openMVG_main_ConvertSfM_DataFormat
 bin/openMVG_main_ExportCameraFrustums
 bin/openMVG_main_ExportUndistortedImages
 bin/openMVG_main_FrustumFiltering
-bin/openMVG_main_GlobalSfM
-bin/openMVG_main_IncrementalSfM
-bin/openMVG_main_IncrementalSfM2
+bin/openMVG_main_GeometricFilter
 bin/openMVG_main_ListMatchingPairs
 bin/openMVG_main_MatchesToTracks
+bin/openMVG_main_PairGenerator
 bin/openMVG_main_PointsFiltering
+bin/openMVG_main_SfM
 bin/openMVG_main_SfMInit_ImageListing
 bin/openMVG_main_SfMInit_ImageListingFromKnownPoses
 bin/openMVG_main_SfM_Localization
@@ -87,6 +87,7 @@ include/openMVG/features/mser/mser_region.hpp
 include/openMVG/features/regions.hpp
 include/openMVG/features/regions_factory.hpp
 include/openMVG/features/regions_factory_io.hpp
+include/openMVG/features/regions_scale_sort.hpp
 include/openMVG/features/scalar_regions.hpp
 include/openMVG/features/sift/SIFT_Anatomy_Image_Describer.hpp
 include/openMVG/features/sift/SIFT_Anatomy_Image_Describer_io.hpp
@@ -157,8 +158,9 @@ include/openMVG/matching/matcher_type.hpp
 include/openMVG/matching/matching_filters.hpp
 include/openMVG/matching/matching_interface.hpp
 include/openMVG/matching/metric.hpp
-include/openMVG/matching/metric_avx2.hpp
 include/openMVG/matching/metric_hamming.hpp
+include/openMVG/matching/metric_hnsw.hpp
+include/openMVG/matching/metric_simd.hpp
 include/openMVG/matching/pairwiseAdjacencyDisplay.hpp
 include/openMVG/matching/regions_matcher.hpp
 include/openMVG/matching/svg_matches.hpp
@@ -173,6 +175,9 @@ include/openMVG/matching_image_collection/H_ACRobust.hpp
 include/openMVG/matching_image_collection/Matcher.hpp
 include/openMVG/matching_image_collection/Matcher_Regions.hpp
 include/openMVG/matching_image_collection/Pair_Builder.hpp
+include/openMVG/matching_image_collection/Retrieval_Helpers.hpp
+include/openMVG/matching_image_collection/Vlad.hpp
+include/openMVG/matching_image_collection/VladBase.hpp
 include/openMVG/multiview/conditioning.hpp
 include/openMVG/multiview/essential.hpp
 include/openMVG/multiview/motion_from_essential.hpp
@@ -242,6 +247,7 @@ include/openMVG/sfm/pipelines/sequential/sequential_SfM2.hpp
 include/openMVG/sfm/pipelines/sfm_engine.hpp
 include/openMVG/sfm/pipelines/sfm_features_provider.hpp
 include/openMVG/sfm/pipelines/sfm_matches_provider.hpp
+include/openMVG/sfm/pipelines/sfm_preemptive_regions_provider.hpp
 include/openMVG/sfm/pipelines/sfm_regions_provider.hpp
 include/openMVG/sfm/pipelines/sfm_regions_provider_cache.hpp
 include/openMVG/sfm/pipelines/sfm_robust_model_estimation.hpp
@@ -273,6 +279,8 @@ include/openMVG/sfm/sfm_view.hpp
 include/openMVG/sfm/sfm_view_io.hpp
 include/openMVG/sfm/sfm_view_priors.hpp
 include/openMVG/sfm/sfm_view_priors_io.hpp
+include/openMVG/spherical/cubic_image_sampler.hpp
+include/openMVG/spherical/image_resampling.hpp
 include/openMVG/stl/dynamic_bitset.hpp
 include/openMVG/stl/hash.hpp
 include/openMVG/stl/indexed_sort.hpp
@@ -280,6 +288,9 @@ include/openMVG/stl/split.hpp
 include/openMVG/stl/stl.hpp
 include/openMVG/stl/stlMap.hpp
 include/openMVG/system/cpu_instruction_set.hpp
+include/openMVG/system/logger.hpp
+include/openMVG/system/loggerprogress.hpp
+include/openMVG/system/progressinterface.hpp
 include/openMVG/system/timer.hpp
 include/openMVG/third_party/cmdLine/cmdLine.h
 include/openMVG/third_party/histogram/histogram.hpp
@@ -290,110 +301,6 @@ include/openMVG/third_party/hnswlib/space_ip.h
 include/openMVG/third_party/hnswlib/space_l2.h
 include/openMVG/third_party/hnswlib/visited_list_pool.h
 include/openMVG/third_party/htmlDoc/htmlDoc.hpp
-include/openMVG/third_party/lemon/config.h
-include/openMVG/third_party/lemon/lemon/adaptors.h
-include/openMVG/third_party/lemon/lemon/arg_parser.h
-include/openMVG/third_party/lemon/lemon/assert.h
-include/openMVG/third_party/lemon/lemon/bellman_ford.h
-include/openMVG/third_party/lemon/lemon/bfs.h
-include/openMVG/third_party/lemon/lemon/bin_heap.h
-include/openMVG/third_party/lemon/lemon/binomial_heap.h
-include/openMVG/third_party/lemon/lemon/bits/alteration_notifier.h
-include/openMVG/third_party/lemon/lemon/bits/array_map.h
-include/openMVG/third_party/lemon/lemon/bits/bezier.h
-include/openMVG/third_party/lemon/lemon/bits/default_map.h
-include/openMVG/third_party/lemon/lemon/bits/edge_set_extender.h
-include/openMVG/third_party/lemon/lemon/bits/enable_if.h
-include/openMVG/third_party/lemon/lemon/bits/graph_adaptor_extender.h
-include/openMVG/third_party/lemon/lemon/bits/graph_extender.h
-include/openMVG/third_party/lemon/lemon/bits/lock.h
-include/openMVG/third_party/lemon/lemon/bits/map_extender.h
-include/openMVG/third_party/lemon/lemon/bits/path_dump.h
-include/openMVG/third_party/lemon/lemon/bits/solver_bits.h
-include/openMVG/third_party/lemon/lemon/bits/traits.h
-include/openMVG/third_party/lemon/lemon/bits/variant.h
-include/openMVG/third_party/lemon/lemon/bits/vector_map.h
-include/openMVG/third_party/lemon/lemon/bits/windows.h
-include/openMVG/third_party/lemon/lemon/bucket_heap.h
-include/openMVG/third_party/lemon/lemon/capacity_scaling.h
-include/openMVG/third_party/lemon/lemon/cbc.h
-include/openMVG/third_party/lemon/lemon/christofides_tsp.h
-include/openMVG/third_party/lemon/lemon/circulation.h
-include/openMVG/third_party/lemon/lemon/clp.h
-include/openMVG/third_party/lemon/lemon/color.h
-include/openMVG/third_party/lemon/lemon/concept_check.h
-include/openMVG/third_party/lemon/lemon/concepts/bpgraph.h
-include/openMVG/third_party/lemon/lemon/concepts/digraph.h
-include/openMVG/third_party/lemon/lemon/concepts/graph.h
-include/openMVG/third_party/lemon/lemon/concepts/graph_components.h
-include/openMVG/third_party/lemon/lemon/concepts/heap.h
-include/openMVG/third_party/lemon/lemon/concepts/maps.h
-include/openMVG/third_party/lemon/lemon/concepts/path.h
-include/openMVG/third_party/lemon/lemon/connectivity.h
-include/openMVG/third_party/lemon/lemon/core.h
-include/openMVG/third_party/lemon/lemon/cost_scaling.h
-include/openMVG/third_party/lemon/lemon/counter.h
-include/openMVG/third_party/lemon/lemon/cplex.h
-include/openMVG/third_party/lemon/lemon/cycle_canceling.h
-include/openMVG/third_party/lemon/lemon/dfs.h
-include/openMVG/third_party/lemon/lemon/dheap.h
-include/openMVG/third_party/lemon/lemon/dijkstra.h
-include/openMVG/third_party/lemon/lemon/dim2.h
-include/openMVG/third_party/lemon/lemon/dimacs.h
-include/openMVG/third_party/lemon/lemon/edge_set.h
-include/openMVG/third_party/lemon/lemon/edmonds_karp.h
-include/openMVG/third_party/lemon/lemon/elevator.h
-include/openMVG/third_party/lemon/lemon/error.h
-include/openMVG/third_party/lemon/lemon/euler.h
-include/openMVG/third_party/lemon/lemon/fib_heap.h
-include/openMVG/third_party/lemon/lemon/fractional_matching.h
-include/openMVG/third_party/lemon/lemon/full_graph.h
-include/openMVG/third_party/lemon/lemon/glpk.h
-include/openMVG/third_party/lemon/lemon/gomory_hu.h
-include/openMVG/third_party/lemon/lemon/graph_to_eps.h
-include/openMVG/third_party/lemon/lemon/greedy_tsp.h
-include/openMVG/third_party/lemon/lemon/grid_graph.h
-include/openMVG/third_party/lemon/lemon/grosso_locatelli_pullan_mc.h
-include/openMVG/third_party/lemon/lemon/hao_orlin.h
-include/openMVG/third_party/lemon/lemon/hartmann_orlin_mmc.h
-include/openMVG/third_party/lemon/lemon/howard_mmc.h
-include/openMVG/third_party/lemon/lemon/hypercube_graph.h
-include/openMVG/third_party/lemon/lemon/insertion_tsp.h
-include/openMVG/third_party/lemon/lemon/karp_mmc.h
-include/openMVG/third_party/lemon/lemon/kruskal.h
-include/openMVG/third_party/lemon/lemon/lgf_reader.h
-include/openMVG/third_party/lemon/lemon/lgf_writer.h
-include/openMVG/third_party/lemon/lemon/list_graph.h
-include/openMVG/third_party/lemon/lemon/lp.h
-include/openMVG/third_party/lemon/lemon/lp_base.h
-include/openMVG/third_party/lemon/lemon/lp_skeleton.h
-include/openMVG/third_party/lemon/lemon/maps.h
-include/openMVG/third_party/lemon/lemon/matching.h
-include/openMVG/third_party/lemon/lemon/math.h
-include/openMVG/third_party/lemon/lemon/max_cardinality_search.h
-include/openMVG/third_party/lemon/lemon/min_cost_arborescence.h
-include/openMVG/third_party/lemon/lemon/nagamochi_ibaraki.h
-include/openMVG/third_party/lemon/lemon/nauty_reader.h
-include/openMVG/third_party/lemon/lemon/nearest_neighbor_tsp.h
-include/openMVG/third_party/lemon/lemon/network_simplex.h
-include/openMVG/third_party/lemon/lemon/opt2_tsp.h
-include/openMVG/third_party/lemon/lemon/pairing_heap.h
-include/openMVG/third_party/lemon/lemon/path.h
-include/openMVG/third_party/lemon/lemon/planarity.h
-include/openMVG/third_party/lemon/lemon/preflow.h
-include/openMVG/third_party/lemon/lemon/quad_heap.h
-include/openMVG/third_party/lemon/lemon/radix_heap.h
-include/openMVG/third_party/lemon/lemon/radix_sort.h
-include/openMVG/third_party/lemon/lemon/random.h
-include/openMVG/third_party/lemon/lemon/smart_graph.h
-include/openMVG/third_party/lemon/lemon/soplex.h
-include/openMVG/third_party/lemon/lemon/static_graph.h
-include/openMVG/third_party/lemon/lemon/suurballe.h
-include/openMVG/third_party/lemon/lemon/time_measure.h
-include/openMVG/third_party/lemon/lemon/tolerance.h
-include/openMVG/third_party/lemon/lemon/unionfind.h
-include/openMVG/third_party/progress/progress.hpp
-include/openMVG/third_party/progress/progress_display.hpp
 include/openMVG/third_party/stlplus3/filesystemSimplified/file_system.hpp
 include/openMVG/third_party/stlplus3/filesystemSimplified/portability_fixes.hpp
 include/openMVG/third_party/stlplus3/filesystemSimplified/wildcard.hpp
@@ -403,6 +310,135 @@ include/openMVG/tracks/tracks.hpp
 include/openMVG/tracks/union_find.hpp
 include/openMVG/types.hpp
 include/openMVG/version.hpp
+include/openMVG_dependencies/cereal/include/cereal/access.hpp
+include/openMVG_dependencies/cereal/include/cereal/archives/adapters.hpp
+include/openMVG_dependencies/cereal/include/cereal/archives/binary.hpp
+include/openMVG_dependencies/cereal/include/cereal/archives/json.hpp
+include/openMVG_dependencies/cereal/include/cereal/archives/portable_binary.hpp
+include/openMVG_dependencies/cereal/include/cereal/archives/xml.hpp
+include/openMVG_dependencies/cereal/include/cereal/cereal.hpp
+include/openMVG_dependencies/cereal/include/cereal/details/helpers.hpp
+include/openMVG_dependencies/cereal/include/cereal/details/polymorphic_impl.hpp
+include/openMVG_dependencies/cereal/include/cereal/details/polymorphic_impl_fwd.hpp
+include/openMVG_dependencies/cereal/include/cereal/details/static_object.hpp
+include/openMVG_dependencies/cereal/include/cereal/details/traits.hpp
+include/openMVG_dependencies/cereal/include/cereal/details/util.hpp
+include/openMVG_dependencies/cereal/include/cereal/external/base64.hpp
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/allocators.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/cursorstreamwrapper.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/document.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/encodedstream.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/encodings.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/error/en.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/error/error.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/filereadstream.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/filewritestream.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/fwd.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/biginteger.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/diyfp.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/dtoa.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/ieee754.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/itoa.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/meta.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/pow10.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/regex.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/stack.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/strfunc.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/strtod.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/swap.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/istreamwrapper.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/memorybuffer.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/memorystream.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/msinttypes/inttypes.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/msinttypes/stdint.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/ostreamwrapper.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/pointer.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/prettywriter.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/rapidjson.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/reader.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/schema.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/stream.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/stringbuffer.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/writer.h
+include/openMVG_dependencies/cereal/include/cereal/external/rapidxml/rapidxml.hpp
+include/openMVG_dependencies/cereal/include/cereal/external/rapidxml/rapidxml_iterators.hpp
+include/openMVG_dependencies/cereal/include/cereal/external/rapidxml/rapidxml_print.hpp
+include/openMVG_dependencies/cereal/include/cereal/external/rapidxml/rapidxml_utils.hpp
+include/openMVG_dependencies/cereal/include/cereal/macros.hpp
+include/openMVG_dependencies/cereal/include/cereal/specialize.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/array.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/atomic.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/base_class.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/bitset.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/boost_variant.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/chrono.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/common.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/complex.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/concepts/pair_associative_container.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/deque.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/forward_list.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/functional.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/list.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/map.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/memory.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/optional.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/polymorphic.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/queue.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/set.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/stack.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/string.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/tuple.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/unordered_map.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/unordered_set.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/utility.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/valarray.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/variant.hpp
+include/openMVG_dependencies/cereal/include/cereal/types/vector.hpp
+include/openMVG_dependencies/cereal/include/cereal/version.hpp
+include/openMVG_dependencies/cereal/sandbox/sandbox_shared_lib/base.hpp
+include/openMVG_dependencies/cereal/sandbox/sandbox_shared_lib/derived.hpp
+include/openMVG_dependencies/cereal/unittests/array.hpp
+include/openMVG_dependencies/cereal/unittests/atomic.hpp
+include/openMVG_dependencies/cereal/unittests/basic_string.hpp
+include/openMVG_dependencies/cereal/unittests/bitset.hpp
+include/openMVG_dependencies/cereal/unittests/boost/boost_variant.hpp
+include/openMVG_dependencies/cereal/unittests/chrono.hpp
+include/openMVG_dependencies/cereal/unittests/common.hpp
+include/openMVG_dependencies/cereal/unittests/complex.hpp
+include/openMVG_dependencies/cereal/unittests/cpp17/optional.hpp
+include/openMVG_dependencies/cereal/unittests/cpp17/variant.hpp
+include/openMVG_dependencies/cereal/unittests/defer.hpp
+include/openMVG_dependencies/cereal/unittests/deque.hpp
+include/openMVG_dependencies/cereal/unittests/doctest.h
+include/openMVG_dependencies/cereal/unittests/forward_list.hpp
+include/openMVG_dependencies/cereal/unittests/list.hpp
+include/openMVG_dependencies/cereal/unittests/load_construct.hpp
+include/openMVG_dependencies/cereal/unittests/map.hpp
+include/openMVG_dependencies/cereal/unittests/memory.hpp
+include/openMVG_dependencies/cereal/unittests/memory_cycles.hpp
+include/openMVG_dependencies/cereal/unittests/multimap.hpp
+include/openMVG_dependencies/cereal/unittests/multiset.hpp
+include/openMVG_dependencies/cereal/unittests/pair.hpp
+include/openMVG_dependencies/cereal/unittests/pod.hpp
+include/openMVG_dependencies/cereal/unittests/polymorphic.hpp
+include/openMVG_dependencies/cereal/unittests/portable_binary_archive.hpp
+include/openMVG_dependencies/cereal/unittests/priority_queue.hpp
+include/openMVG_dependencies/cereal/unittests/queue.hpp
+include/openMVG_dependencies/cereal/unittests/set.hpp
+include/openMVG_dependencies/cereal/unittests/stack.hpp
+include/openMVG_dependencies/cereal/unittests/structs.hpp
+include/openMVG_dependencies/cereal/unittests/structs_minimal.hpp
+include/openMVG_dependencies/cereal/unittests/structs_specialized.hpp
+include/openMVG_dependencies/cereal/unittests/tuple.hpp
+include/openMVG_dependencies/cereal/unittests/unordered_loads.hpp
+include/openMVG_dependencies/cereal/unittests/unordered_map.hpp
+include/openMVG_dependencies/cereal/unittests/unordered_multimap.hpp
+include/openMVG_dependencies/cereal/unittests/unordered_multiset.hpp
+include/openMVG_dependencies/cereal/unittests/unordered_set.hpp
+include/openMVG_dependencies/cereal/unittests/user_data_adapters.hpp
+include/openMVG_dependencies/cereal/unittests/valarray.hpp
+include/openMVG_dependencies/cereal/unittests/vector.hpp
+include/openMVG_dependencies/cereal/unittests/versioning.hpp
 include/openMVG_dependencies/nonFree/sift/SIFT_describer.hpp
 include/openMVG_dependencies/nonFree/sift/SIFT_describer_io.hpp
 include/openMVG_dependencies/nonFree/sift/vl/generic.h
@@ -414,227 +450,49 @@ include/openMVG_dependencies/nonFree/sift/vl/mathop_sse2.h
 include/openMVG_dependencies/nonFree/sift/vl/mser.h
 include/openMVG_dependencies/nonFree/sift/vl/random.h
 include/openMVG_dependencies/nonFree/sift/vl/sift.h
-include/openMVG_dependencies/osi_clp/Clp/examples/myPdco.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/AbcCommon.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/AbcDualRowDantzig.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/AbcDualRowPivot.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/AbcDualRowSteepest.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/AbcMatrix.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/AbcNonLinearCost.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/AbcPrimalColumnDantzig.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/AbcPrimalColumnPivot.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/AbcPrimalColumnSteepest.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/AbcSimplex.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/AbcSimplexDual.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/AbcSimplexFactorization.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/AbcSimplexPrimal.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/AbcWarmStart.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/CbcOrClpParam.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpCholeskyBase.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpCholeskyDense.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpCholeskyMumps.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpCholeskyTaucs.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpCholeskyUfl.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpCholeskyWssmp.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpCholeskyWssmpKKT.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpConfig.h
-include/openMVG_dependencies/osi_clp/Clp/src/ClpConstraint.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpConstraintLinear.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpConstraintQuadratic.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpDualRowDantzig.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpDualRowPivot.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpDualRowSteepest.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpDummyMatrix.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpDynamicExampleMatrix.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpDynamicMatrix.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpEventHandler.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpFactorization.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpGubDynamicMatrix.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpGubMatrix.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpHelperFunctions.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpInterior.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpLinearObjective.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpLsqr.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpMatrixBase.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpMessage.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpModel.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpNetworkBasis.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpNetworkMatrix.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpNode.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpNonLinearCost.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpObjective.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpPackedMatrix.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpParameters.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpPdco.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpPdcoBase.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpPlusMinusOneMatrix.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpPredictorCorrector.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpPresolve.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpPrimalColumnDantzig.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpPrimalColumnPivot.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpPrimalColumnSteepest.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpPrimalQuadraticDantzig.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpQuadraticObjective.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpSimplex.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpSimplexDual.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpSimplexNonlinear.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpSimplexOther.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpSimplexPrimal.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/ClpSolve.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/Clp_C_Interface.h
-include/openMVG_dependencies/osi_clp/Clp/src/CoinAbcBaseFactorization.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/CoinAbcCommon.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/CoinAbcCommonFactorization.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/CoinAbcDenseFactorization.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/CoinAbcFactorization.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/CoinAbcHelperFunctions.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/Idiot.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/MyEventHandler.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/MyMessageHandler.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/OsiClp/OsiClpSolverInterface.hpp
-include/openMVG_dependencies/osi_clp/Clp/src/config_clp_default.h
-include/openMVG_dependencies/osi_clp/Clp/src/config_default.h
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinAlloc.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinBuild.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinDenseFactorization.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinDenseVector.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinDistance.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinError.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinFactorization.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinFileIO.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinFinite.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinFloatEqual.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinHelperFunctions.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinIndexedVector.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinLpIO.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinMessage.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinMessageHandler.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinModel.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinModelUseful.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinMpsIO.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinOslC.h
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinOslFactorization.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinPackedMatrix.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinPackedVector.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinPackedVectorBase.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinParam.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinPragma.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinPresolveDoubleton.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinPresolveDual.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinPresolveDupcol.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinPresolveEmpty.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinPresolveFixed.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinPresolveForcing.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinPresolveImpliedFree.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinPresolveIsolated.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinPresolveMatrix.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinPresolveMonitor.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinPresolvePsdebug.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinPresolveSingleton.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinPresolveSubst.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinPresolveTighten.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinPresolveTripleton.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinPresolveUseless.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinPresolveZeros.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinRational.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinSearchTree.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinShallowPackedVector.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinSignal.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinSimpFactorization.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinSmartPtr.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinSnapshot.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinSort.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinStructuredModel.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinTime.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinTypes.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinUtility.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinUtilsConfig.h
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinWarmStart.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinWarmStartBasis.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinWarmStartDual.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinWarmStartPrimalDual.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/CoinWarmStartVector.hpp
-include/openMVG_dependencies/osi_clp/CoinUtils/src/Coin_C_defines.h
-include/openMVG_dependencies/osi_clp/CoinUtils/src/config_coinutils_default.h
-include/openMVG_dependencies/osi_clp/CoinUtils/src/config_default.h
-include/openMVG_dependencies/osi_clp/Osi/examples/opbdp_solve.hpp
-include/openMVG_dependencies/osi_clp/Osi/src/Osi/OsiAuxInfo.hpp
-include/openMVG_dependencies/osi_clp/Osi/src/Osi/OsiBranchingObject.hpp
-include/openMVG_dependencies/osi_clp/Osi/src/Osi/OsiChooseVariable.hpp
-include/openMVG_dependencies/osi_clp/Osi/src/Osi/OsiColCut.hpp
-include/openMVG_dependencies/osi_clp/Osi/src/Osi/OsiCollections.hpp
-include/openMVG_dependencies/osi_clp/Osi/src/Osi/OsiConfig.h
-include/openMVG_dependencies/osi_clp/Osi/src/Osi/OsiCut.hpp
-include/openMVG_dependencies/osi_clp/Osi/src/Osi/OsiCuts.hpp
-include/openMVG_dependencies/osi_clp/Osi/src/Osi/OsiPresolve.hpp
-include/openMVG_dependencies/osi_clp/Osi/src/Osi/OsiRowCut.hpp
-include/openMVG_dependencies/osi_clp/Osi/src/Osi/OsiRowCutDebugger.hpp
-include/openMVG_dependencies/osi_clp/Osi/src/Osi/OsiSolverBranch.hpp
-include/openMVG_dependencies/osi_clp/Osi/src/Osi/OsiSolverInterface.hpp
-include/openMVG_dependencies/osi_clp/Osi/src/Osi/OsiSolverParameters.hpp
-include/openMVG_dependencies/osi_clp/Osi/src/Osi/config_default.h
-include/openMVG_dependencies/osi_clp/Osi/src/Osi/config_osi_default.h
-include/openMVG_dependencies/osi_clp/Osi/src/OsiCommonTest/OsiUnitTests.hpp
-include/openMVG_dependencies/osi_clp/Osi/src/OsiCpx/OsiCpxSolverInterface.hpp
-include/openMVG_dependencies/osi_clp/Osi/src/OsiGlpk/OsiGlpkSolverInterface.hpp
-include/openMVG_dependencies/osi_clp/Osi/src/OsiGrb/OsiGrbSolverInterface.hpp
-include/openMVG_dependencies/osi_clp/Osi/src/OsiMsk/OsiMskSolverInterface.hpp
-include/openMVG_dependencies/osi_clp/Osi/src/OsiSpx/OsiSpxSolverInterface.hpp
-include/openMVG_dependencies/osi_clp/Osi/src/OsiXpr/OsiXprSolverInterface.hpp
-include/openMVG_dependencies/osi_clp/Osi/test/OsiTestSolver.hpp
-include/openMVG_dependencies/osi_clp/Osi/test/OsiTestSolverInterface.hpp
-lib/liblib_CoinUtils.so
-lib/liblib_Osi.so
-lib/liblib_OsiClpSolver.so
-lib/liblib_clp.a
-lib/libopenMVG_ceres.so
-lib/libopenMVG_ceres.so.1
-lib/libopenMVG_ceres.so.1.13.0
-lib/libopenMVG_cxsparse.so
 lib/libopenMVG_easyexif.so
 lib/libopenMVG_exif.so
 lib/libopenMVG_fast.so
 lib/libopenMVG_features.so
-lib/libopenMVG_features.so.1
-lib/libopenMVG_features.so.1.6
+lib/libopenMVG_features.so.2
+lib/libopenMVG_features.so.2.0
 lib/libopenMVG_geometry.so
-lib/libopenMVG_geometry.so.1
-lib/libopenMVG_geometry.so.1.6
+lib/libopenMVG_geometry.so.2
+lib/libopenMVG_geometry.so.2.0
 lib/libopenMVG_image.so
-lib/libopenMVG_image.so.1
-lib/libopenMVG_image.so.1.6
+lib/libopenMVG_image.so.2
+lib/libopenMVG_image.so.2.0
 lib/libopenMVG_kvld.so
-lib/libopenMVG_kvld.so.1
-lib/libopenMVG_kvld.so.1.6
+lib/libopenMVG_kvld.so.2
+lib/libopenMVG_kvld.so.2.0
 lib/libopenMVG_lInftyComputerVision.so
-lib/libopenMVG_lInftyComputerVision.so.1
-lib/libopenMVG_lInftyComputerVision.so.1.6
-lib/libopenMVG_lemon.so
+lib/libopenMVG_lInftyComputerVision.so.2
+lib/libopenMVG_lInftyComputerVision.so.2.0
 lib/libopenMVG_linearProgramming.so
-lib/libopenMVG_linearProgramming.so.1
-lib/libopenMVG_linearProgramming.so.1.6
+lib/libopenMVG_linearProgramming.so.2
+lib/libopenMVG_linearProgramming.so.2.0
 lib/libopenMVG_matching.so
-lib/libopenMVG_matching.so.1
-lib/libopenMVG_matching.so.1.6
+lib/libopenMVG_matching.so.2
+lib/libopenMVG_matching.so.2.0
 lib/libopenMVG_matching_image_collection.so
-lib/libopenMVG_matching_image_collection.so.1
-lib/libopenMVG_matching_image_collection.so.1.6
+lib/libopenMVG_matching_image_collection.so.2
+lib/libopenMVG_matching_image_collection.so.2.0
 lib/libopenMVG_multiview.so
-lib/libopenMVG_multiview.so.1
-lib/libopenMVG_multiview.so.1.6
+lib/libopenMVG_multiview.so.2
+lib/libopenMVG_multiview.so.2.0
 lib/libopenMVG_numeric.so
-lib/libopenMVG_numeric.so.1
-lib/libopenMVG_numeric.so.1.6
+lib/libopenMVG_numeric.so.2
+lib/libopenMVG_numeric.so.2.0
 lib/libopenMVG_robust_estimation.so
-lib/libopenMVG_robust_estimation.so.1
-lib/libopenMVG_robust_estimation.so.1.6
+lib/libopenMVG_robust_estimation.so.2
+lib/libopenMVG_robust_estimation.so.2.0
 lib/libopenMVG_sfm.so
-lib/libopenMVG_sfm.so.1
-lib/libopenMVG_sfm.so.1.6
+lib/libopenMVG_sfm.so.2
+lib/libopenMVG_sfm.so.2.0
 lib/libopenMVG_stlplus.so
 lib/libopenMVG_system.so
-lib/libopenMVG_system.so.1
-lib/libopenMVG_system.so.1.6
+lib/libopenMVG_system.so.2
+lib/libopenMVG_system.so.2.0
 lib/libvlsift.so
 lib/openMVG-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/openMVG-targets.cmake
@@ -660,10 +518,6 @@ share/openMVG/webgl/common/trackball.js
 share/openMVG/webgl/common/vector.js
 @dir include/openMVG/exif/image_data
 @dir include/openMVG/image/image_test
+@dir include/openMVG_dependencies/cereal/doc
+@dir include/openMVG_dependencies/cereal/scripts
 @dir include/openMVG_dependencies/glfw
-@dir include/openMVG_dependencies/osi_clp/Clp/doc/Howto
-@dir include/openMVG_dependencies/osi_clp/Clp/doxydoc
-@dir include/openMVG_dependencies/osi_clp/Clp/test
-@dir include/openMVG_dependencies/osi_clp/CoinUtils/doxydoc
-@dir include/openMVG_dependencies/osi_clp/CoinUtils/test
-@dir include/openMVG_dependencies/osi_clp/Osi/doxydoc