Skip to content

Commit 718dd6a

Browse files
ahojnnesahojnnes
authored
Merge pull request #16 from colmap/update/25-06-25
Update
2 parents c91e5b2 + 78023fc commit 718dd6a

29 files changed

+743
-225
lines changed

‎_sources/index.rst.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,3 +119,4 @@ support (special credits to `Torsten Sattler <https://tsattler.github.io>`_).
119119
contribution
120120
license
121121
bibliography
122+
legacy

‎_sources/install.rst.txt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,7 @@ Dependencies from the default Ubuntu repositories::
9393
libcgal-dev \
9494
libceres-dev \
9595
libcurl4-openssl-dev \
96-
libopenblas-openmp-dev
97-
98-
Notice that compiling against OpenBLAS requires the OpenMP version
99-
under Debian/Ubuntu because of `this issue <https://github.com/facebookresearch/faiss/wiki/Troubleshooting#surprising-faiss-openmp-and-openblas-interaction>`__.
96+
libmkl-full-dev
10097

10198
To compile with **CUDA support**, also install Ubuntu's default CUDA package::
10299

@@ -115,7 +112,7 @@ Configure and compile COLMAP::
115112
cd colmap
116113
mkdir build
117114
cd build
118-
cmake .. -GNinja
115+
cmake .. -GNinja -DBLA_VENDOR=Intel10_64lp
119116
ninja
120117
sudo ninja install
121118

@@ -138,6 +135,11 @@ CUDA package and GCC, and you must compile against GCC 10::
138135
export CUDAHOSTCXX=/usr/bin/g++-10
139136
# ... and then run CMake against COLMAP's sources.
140137

138+
Notice that the `BLA_VENDOR=Intel10_64lp` option tells CMake to find Intel's MKL
139+
implementation of BLAS. If you decide to compile against OpenBLAS instead of
140+
MKL, you must install and select the OpenMP version under Debian/Ubuntu because
141+
of `this issue <https://github.com/facebookresearch/faiss/wiki/Troubleshooting#surprising-faiss-openmp-and-openblas-interaction>`__.
142+
141143
Mac
142144
---
143145

‎_sources/legacy.rst.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Legacy Documentations
2+
=====================
3+
4+
.. toctree::
5+
:maxdepth: 1
6+
7+
v3.11 (2024-11-28) <https://colmap.github.io/legacy/3.11/index.html>
8+
v3.10 (2024-07-23) <https://colmap.github.io/legacy/3.10/index.html>
9+
v3.9 (2024-01-06) <https://colmap.github.io/legacy/3.9/index.html>
10+
v3.8 (2023-01-31) <https://colmap.github.io/legacy/3.8/index.html>

‎_static/documentation_options.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const DOCUMENTATION_OPTIONS = {
2-
VERSION: '3.12.0.dev0',
2+
VERSION: '3.12.0.dev | 1571fe00 (2025-06-25)',
33
LANGUAGE: 'en',
44
COLLAPSE_INDEX: false,
55
BUILDER: 'html',

‎bibliography.html‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
1-
2-
31
<!DOCTYPE html>
42
<html class="writer-html5" lang="en" data-content_root="./">
53
<head>
64
<meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
75

86
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
9-
<title>Bibliography &mdash; COLMAP 3.12.0.dev0 documentation</title>
7+
<title>Bibliography &mdash; COLMAP 3.12.0.dev | 1571fe00 (2025-06-25) documentation</title>
108
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=fa44fd50" />
11-
<link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=e59714d7" />
9+
<link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
1210
<link rel="stylesheet" type="text/css" href="_static/custom.css?v=4eec7147" />
1311

1412

15-
<script src="_static/jquery.js?v=5d32c60e"></script>
16-
<script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
17-
<script src="_static/documentation_options.js?v=3a07dcc1"></script>
18-
<script src="_static/doctools.js?v=9a2dae69"></script>
19-
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
13+
<!--[if lt IE 9]>
14+
<script src="_static/js/html5shiv.min.js"></script>
15+
<![endif]-->
16+
17+
<script src="_static/jquery.js?v=5d32c60e"></script>
18+
<script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
19+
<script src="_static/documentation_options.js?v=5c1fd480"></script>
20+
<script src="_static/doctools.js?v=9a2dae69"></script>
21+
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
2022
<script src="_static/js/theme.js"></script>
2123
<link rel="index" title="Index" href="genindex.html" />
2224
<link rel="search" title="Search" href="search.html" />
25+
<link rel="next" title="Legacy Documentations" href="legacy.html" />
2326
<link rel="prev" title="License" href="license.html" />
2427
</head>
2528

@@ -34,6 +37,9 @@
3437
<a href="index.html" class="icon icon-home">
3538
COLMAP
3639
</a>
40+
<div class="version">
41+
3.12.0.dev | 1571fe00 (2025-06-25)
42+
</div>
3743
<div role="search">
3844
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">
3945
<input type="text" name="q" placeholder="Search docs" aria-label="Search docs" />
@@ -59,6 +65,7 @@
5965
<li class="toctree-l1"><a class="reference internal" href="contribution.html">Contribution</a></li>
6066
<li class="toctree-l1"><a class="reference internal" href="license.html">License</a></li>
6167
<li class="toctree-l1 current"><a class="current reference internal" href="#">Bibliography</a></li>
68+
<li class="toctree-l1"><a class="reference internal" href="legacy.html">Legacy Documentations</a></li>
6269
</ul>
6370

6471
</div>
@@ -155,6 +162,7 @@ <h1>Bibliography<a class="headerlink" href="#bibliography" title="Link to this h
155162
</div>
156163
<footer><div class="rst-footer-buttons" role="navigation" aria-label="Footer">
157164
<a href="license.html" class="btn btn-neutral float-left" title="License" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left" aria-hidden="true"></span> Previous</a>
165+
<a href="legacy.html" class="btn btn-neutral float-right" title="Legacy Documentations" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right" aria-hidden="true"></span></a>
158166
</div>
159167

160168
<hr/>

‎cameras.html‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
2-
31
<!DOCTYPE html>
42
<html class="writer-html5" lang="en" data-content_root="./">
53
<head>
64
<meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
75

86
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
9-
<title>Camera Models &mdash; COLMAP 3.12.0.dev0 documentation</title>
7+
<title>Camera Models &mdash; COLMAP 3.12.0.dev | 1571fe00 (2025-06-25) documentation</title>
108
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=fa44fd50" />
11-
<link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=e59714d7" />
9+
<link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
1210
<link rel="stylesheet" type="text/css" href="_static/custom.css?v=4eec7147" />
1311

1412

15-
<script src="_static/jquery.js?v=5d32c60e"></script>
16-
<script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
17-
<script src="_static/documentation_options.js?v=3a07dcc1"></script>
18-
<script src="_static/doctools.js?v=9a2dae69"></script>
19-
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
13+
<!--[if lt IE 9]>
14+
<script src="_static/js/html5shiv.min.js"></script>
15+
<![endif]-->
16+
17+
<script src="_static/jquery.js?v=5d32c60e"></script>
18+
<script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
19+
<script src="_static/documentation_options.js?v=5c1fd480"></script>
20+
<script src="_static/doctools.js?v=9a2dae69"></script>
21+
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
2022
<script src="_static/js/theme.js"></script>
2123
<link rel="index" title="Index" href="genindex.html" />
2224
<link rel="search" title="Search" href="search.html" />
@@ -35,6 +37,9 @@
3537
<a href="index.html" class="icon icon-home">
3638
COLMAP
3739
</a>
40+
<div class="version">
41+
3.12.0.dev | 1571fe00 (2025-06-25)
42+
</div>
3843
<div role="search">
3944
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">
4045
<input type="text" name="q" placeholder="Search docs" aria-label="Search docs" />
@@ -60,6 +65,7 @@
6065
<li class="toctree-l1"><a class="reference internal" href="contribution.html">Contribution</a></li>
6166
<li class="toctree-l1"><a class="reference internal" href="license.html">License</a></li>
6267
<li class="toctree-l1"><a class="reference internal" href="bibliography.html">Bibliography</a></li>
68+
<li class="toctree-l1"><a class="reference internal" href="legacy.html">Legacy Documentations</a></li>
6369
</ul>
6470

6571
</div>

‎changelog.html‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
2-
31
<!DOCTYPE html>
42
<html class="writer-html5" lang="en" data-content_root="./">
53
<head>
64
<meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
75

86
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
9-
<title>Changelog &mdash; COLMAP 3.12.0.dev0 documentation</title>
7+
<title>Changelog &mdash; COLMAP 3.12.0.dev | 1571fe00 (2025-06-25) documentation</title>
108
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=fa44fd50" />
11-
<link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=e59714d7" />
9+
<link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
1210
<link rel="stylesheet" type="text/css" href="_static/custom.css?v=4eec7147" />
1311

1412

15-
<script src="_static/jquery.js?v=5d32c60e"></script>
16-
<script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
17-
<script src="_static/documentation_options.js?v=3a07dcc1"></script>
18-
<script src="_static/doctools.js?v=9a2dae69"></script>
19-
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
13+
<!--[if lt IE 9]>
14+
<script src="_static/js/html5shiv.min.js"></script>
15+
<![endif]-->
16+
17+
<script src="_static/jquery.js?v=5d32c60e"></script>
18+
<script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
19+
<script src="_static/documentation_options.js?v=5c1fd480"></script>
20+
<script src="_static/doctools.js?v=9a2dae69"></script>
21+
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
2022
<script src="_static/js/theme.js"></script>
2123
<link rel="index" title="Index" href="genindex.html" />
2224
<link rel="search" title="Search" href="search.html" />
@@ -35,6 +37,9 @@
3537
<a href="index.html" class="icon icon-home">
3638
COLMAP
3739
</a>
40+
<div class="version">
41+
3.12.0.dev | 1571fe00 (2025-06-25)
42+
</div>
3843
<div role="search">
3944
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">
4045
<input type="text" name="q" placeholder="Search docs" aria-label="Search docs" />
@@ -89,6 +94,7 @@
8994
<li class="toctree-l1"><a class="reference internal" href="contribution.html">Contribution</a></li>
9095
<li class="toctree-l1"><a class="reference internal" href="license.html">License</a></li>
9196
<li class="toctree-l1"><a class="reference internal" href="bibliography.html">Bibliography</a></li>
97+
<li class="toctree-l1"><a class="reference internal" href="legacy.html">Legacy Documentations</a></li>
9298
</ul>
9399

94100
</div>

‎cli.html‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
2-
31
<!DOCTYPE html>
42
<html class="writer-html5" lang="en" data-content_root="./">
53
<head>
64
<meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
75

86
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
9-
<title>Command-line Interface &mdash; COLMAP 3.12.0.dev0 documentation</title>
7+
<title>Command-line Interface &mdash; COLMAP 3.12.0.dev | 1571fe00 (2025-06-25) documentation</title>
108
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=fa44fd50" />
11-
<link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=e59714d7" />
9+
<link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
1210
<link rel="stylesheet" type="text/css" href="_static/custom.css?v=4eec7147" />
1311

1412

15-
<script src="_static/jquery.js?v=5d32c60e"></script>
16-
<script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
17-
<script src="_static/documentation_options.js?v=3a07dcc1"></script>
18-
<script src="_static/doctools.js?v=9a2dae69"></script>
19-
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
13+
<!--[if lt IE 9]>
14+
<script src="_static/js/html5shiv.min.js"></script>
15+
<![endif]-->
16+
17+
<script src="_static/jquery.js?v=5d32c60e"></script>
18+
<script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
19+
<script src="_static/documentation_options.js?v=5c1fd480"></script>
20+
<script src="_static/doctools.js?v=9a2dae69"></script>
21+
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
2022
<script src="_static/js/theme.js"></script>
2123
<link rel="index" title="Index" href="genindex.html" />
2224
<link rel="search" title="Search" href="search.html" />
@@ -35,6 +37,9 @@
3537
<a href="index.html" class="icon icon-home">
3638
COLMAP
3739
</a>
40+
<div class="version">
41+
3.12.0.dev | 1571fe00 (2025-06-25)
42+
</div>
3843
<div role="search">
3944
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">
4045
<input type="text" name="q" placeholder="Search docs" aria-label="Search docs" />
@@ -66,6 +71,7 @@
6671
<li class="toctree-l1"><a class="reference internal" href="contribution.html">Contribution</a></li>
6772
<li class="toctree-l1"><a class="reference internal" href="license.html">License</a></li>
6873
<li class="toctree-l1"><a class="reference internal" href="bibliography.html">Bibliography</a></li>
74+
<li class="toctree-l1"><a class="reference internal" href="legacy.html">Legacy Documentations</a></li>
6975
</ul>
7076

7177
</div>

‎concepts.html‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
2-
31
<!DOCTYPE html>
42
<html class="writer-html5" lang="en" data-content_root="./">
53
<head>
64
<meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
75

86
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
9-
<title>Key Concepts &mdash; COLMAP 3.12.0.dev0 documentation</title>
7+
<title>Key Concepts &mdash; COLMAP 3.12.0.dev | 1571fe00 (2025-06-25) documentation</title>
108
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=fa44fd50" />
11-
<link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=e59714d7" />
9+
<link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
1210
<link rel="stylesheet" type="text/css" href="_static/custom.css?v=4eec7147" />
1311

1412

15-
<script src="_static/jquery.js?v=5d32c60e"></script>
16-
<script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
17-
<script src="_static/documentation_options.js?v=3a07dcc1"></script>
18-
<script src="_static/doctools.js?v=9a2dae69"></script>
19-
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
13+
<!--[if lt IE 9]>
14+
<script src="_static/js/html5shiv.min.js"></script>
15+
<![endif]-->
16+
17+
<script src="_static/jquery.js?v=5d32c60e"></script>
18+
<script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
19+
<script src="_static/documentation_options.js?v=5c1fd480"></script>
20+
<script src="_static/doctools.js?v=9a2dae69"></script>
21+
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
2022
<script src="_static/js/theme.js"></script>
2123
<link rel="index" title="Index" href="genindex.html" />
2224
<link rel="search" title="Search" href="search.html" />
@@ -35,6 +37,9 @@
3537
<a href="index.html" class="icon icon-home">
3638
COLMAP
3739
</a>
40+
<div class="version">
41+
3.12.0.dev | 1571fe00 (2025-06-25)
42+
</div>
3843
<div role="search">
3944
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">
4045
<input type="text" name="q" placeholder="Search docs" aria-label="Search docs" />
@@ -65,6 +70,7 @@
6570
<li class="toctree-l1"><a class="reference internal" href="contribution.html">Contribution</a></li>
6671
<li class="toctree-l1"><a class="reference internal" href="license.html">License</a></li>
6772
<li class="toctree-l1"><a class="reference internal" href="bibliography.html">Bibliography</a></li>
73+
<li class="toctree-l1"><a class="reference internal" href="legacy.html">Legacy Documentations</a></li>
6874
</ul>
6975

7076
</div>

‎contribution.html‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
2-
31
<!DOCTYPE html>
42
<html class="writer-html5" lang="en" data-content_root="./">
53
<head>
64
<meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
75

86
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
9-
<title>Contribution &mdash; COLMAP 3.12.0.dev0 documentation</title>
7+
<title>Contribution &mdash; COLMAP 3.12.0.dev | 1571fe00 (2025-06-25) documentation</title>
108
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=fa44fd50" />
11-
<link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=e59714d7" />
9+
<link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
1210
<link rel="stylesheet" type="text/css" href="_static/custom.css?v=4eec7147" />
1311

1412

15-
<script src="_static/jquery.js?v=5d32c60e"></script>
16-
<script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
17-
<script src="_static/documentation_options.js?v=3a07dcc1"></script>
18-
<script src="_static/doctools.js?v=9a2dae69"></script>
19-
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
13+
<!--[if lt IE 9]>
14+
<script src="_static/js/html5shiv.min.js"></script>
15+
<![endif]-->
16+
17+
<script src="_static/jquery.js?v=5d32c60e"></script>
18+
<script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
19+
<script src="_static/documentation_options.js?v=5c1fd480"></script>
20+
<script src="_static/doctools.js?v=9a2dae69"></script>
21+
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
2022
<script src="_static/js/theme.js"></script>
2123
<link rel="index" title="Index" href="genindex.html" />
2224
<link rel="search" title="Search" href="search.html" />
@@ -35,6 +37,9 @@
3537
<a href="index.html" class="icon icon-home">
3638
COLMAP
3739
</a>
40+
<div class="version">
41+
3.12.0.dev | 1571fe00 (2025-06-25)
42+
</div>
3843
<div role="search">
3944
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">
4045
<input type="text" name="q" placeholder="Search docs" aria-label="Search docs" />
@@ -60,6 +65,7 @@
6065
<li class="toctree-l1 current"><a class="current reference internal" href="#">Contribution</a></li>
6166
<li class="toctree-l1"><a class="reference internal" href="license.html">License</a></li>
6267
<li class="toctree-l1"><a class="reference internal" href="bibliography.html">Bibliography</a></li>
68+
<li class="toctree-l1"><a class="reference internal" href="legacy.html">Legacy Documentations</a></li>
6369
</ul>
6470

6571
</div>

0 commit comments

Comments
 (0)