Skip to content

Commit 6271afb

Browse files
committed
Update to latest colmap and use L1 solver + union-find from colmap
1 parent 0edb1b8 commit 6271afb

20 files changed

+126
-764
lines changed

.github/workflows/ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
if: matrix.config.checkCodeFormat
101101
run: |
102102
set +x -euo pipefail
103-
python -m pip install clang-format==19.1.0
103+
python -m pip install clang-format==20.1.5
104104
./scripts/format/c++.sh
105105
git diff --name-only
106106
git diff --exit-code || (echo "Code formatting failed" && exit 1)

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
/data
33
/.vscode
44
/compile_commands.json
5+
.cache

cmake/FindDependencies.cmake

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
22

3-
find_package(Eigen3 3.4 REQUIRED)
4-
find_package(CHOLMOD QUIET)
5-
if(NOT TARGET SuiteSparse::CHOLMOD)
6-
find_package(SuiteSparse COMPONENTS CHOLMOD REQUIRED)
7-
endif()
3+
find_package(Eigen3 REQUIRED)
84
find_package(Ceres REQUIRED COMPONENTS SuiteSparse)
95
find_package(Boost REQUIRED)
106
find_package(OpenMP REQUIRED COMPONENTS C CXX)
@@ -24,36 +20,6 @@ if(TESTS_ENABLED)
2420
find_package(GTest REQUIRED)
2521
endif()
2622

27-
include(FetchContent)
28-
FetchContent_Declare(PoseLib
29-
GIT_REPOSITORY https://github.com/PoseLib/PoseLib.git
30-
GIT_TAG 7e9f5f53372e43f89655040d4dfc4a00e5ace11c # 2.0.5
31-
EXCLUDE_FROM_ALL
32-
SYSTEM
33-
)
34-
message(STATUS "Configuring PoseLib...")
35-
if (FETCH_POSELIB)
36-
FetchContent_MakeAvailable(PoseLib)
37-
else()
38-
find_package(PoseLib REQUIRED)
39-
endif()
40-
message(STATUS "Configuring PoseLib... done")
41-
42-
FetchContent_Declare(COLMAP
43-
GIT_REPOSITORY https://github.com/colmap/colmap.git
44-
GIT_TAG c5f9cefc87e5dd596b638e4cee0ff543c7d14755 # Oct 23 2025
45-
EXCLUDE_FROM_ALL
46-
)
47-
message(STATUS "Configuring COLMAP...")
48-
set(UNINSTALL_ENABLED OFF CACHE INTERNAL "")
49-
set(GUI_ENABLED OFF CACHE INTERNAL "")
50-
if (FETCH_COLMAP)
51-
FetchContent_MakeAvailable(COLMAP)
52-
else()
53-
find_package(COLMAP REQUIRED)
54-
endif()
55-
message(STATUS "Configuring COLMAP... done")
56-
5723
set(CUDA_MIN_VERSION "7.0")
5824
if(CUDA_ENABLED)
5925
if(CMAKE_VERSION VERSION_LESS 3.17)

0 commit comments

Comments
 (0)