From 287dd339ed65b9a087475d833b1c3a59ae3c7338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Fri, 26 Jul 2024 07:19:57 +0000 Subject: [PATCH 1/4] Updates for pycolmap --- pycolmap/README.md | 12 ++++++------ pycolmap/custom_incremental_mapping.py | 3 --- pycolmap/pyproject.toml | 8 +++----- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/pycolmap/README.md b/pycolmap/README.md index 004150be61..4a102e667f 100644 --- a/pycolmap/README.md +++ b/pycolmap/README.md @@ -1,14 +1,12 @@ # Python bindings for COLMAP -PyCOLMAP exposes to Python most capabilities of -[COLMAP](https://colmap.github.io/) for Structure-from-Motion and -Multiview-stereo, such as reconstruction pipelines & objects and geometric -estimators. +PyCOLMAP exposes to Python most capabilities of the +[COLMAP](https://colmap.github.io/) Structure-from-Motion (SfM) and Multi-View +Stereo (MVS) pipeline. ## Installation -Pre-built wheels for Python 3.8/3.9/3.10 on Linux, macOS 10/11/12 (both Intel -and Apple Silicon), and Windows can be installed using pip: +Pre-built wheels for Linux, macOS, and Windows can be installed using pip: ```bash pip install pycolmap ``` @@ -25,10 +23,12 @@ not built with CUDA support, which requires building from source. 3. Build PyCOLMAP: - On Linux and macOS: ```bash +cd pycolmap python -m pip install . ``` - On Windows, after installing COLMAP [via VCPKG](https://colmap.github.io/install.html#id3), run in powershell: ```powershell +cd pycolmap python -m pip install . ` --cmake.define.CMAKE_TOOLCHAIN_FILE="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" ` --cmake.define.VCPKG_TARGET_TRIPLET="x64-windows" diff --git a/pycolmap/custom_incremental_mapping.py b/pycolmap/custom_incremental_mapping.py index a6bc582b96..dfed526789 100644 --- a/pycolmap/custom_incremental_mapping.py +++ b/pycolmap/custom_incremental_mapping.py @@ -2,10 +2,7 @@ Python reimplementation of the C++ incremental mapper with equivalent logic. """ -import shutil import time -import urllib.request -import zipfile from pathlib import Path import enlighten diff --git a/pycolmap/pyproject.toml b/pycolmap/pyproject.toml index ba4fd7f391..7a8fda812c 100644 --- a/pycolmap/pyproject.toml +++ b/pycolmap/pyproject.toml @@ -2,19 +2,19 @@ requires = ["scikit-build-core>=0.3.3", "pybind11==2.12.0"] build-backend = "scikit_build_core.build" - [project] name = "pycolmap" version = "3.11-dev" -description="COLMAP bindings" +description = "COLMAP bindings" readme = "README.md" authors = [ + { name = "Johannes Schönberger", email = "jsch@demuc.de" }, { name = "Mihai Dusmanu", email = "mihai.dusmanu@gmail.com" }, { name = "Paul-Edouard Sarlin", email = "psarlin@ethz.ch" }, { name = "Philipp Lindenberger", email = "plindenbe@ethz.ch" }, ] license = {text = "BSD-3-Clause"} -urls = {Repository = "https://github.com/colmap/pycolmap"} +urls = {Repository = "https://github.com/colmap/colmap"} requires-python = ">=3.7" dependencies = ["numpy"] classifiers = [ @@ -22,11 +22,9 @@ classifiers = [ "Programming Language :: Python :: 3 :: Only", ] - [tool.scikit-build] wheel.expand-macos-universal-tags = true - [tool.cibuildwheel] build = "cp3{8,9,10,11,12}-{macosx,manylinux,win}*" archs = ["auto64"] From 5e0ae02c2dfdd2d466c36aed2ce28f208d3fddaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Fri, 26 Jul 2024 09:45:49 +0200 Subject: [PATCH 2/4] d --- pycolmap/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pycolmap/pyproject.toml b/pycolmap/pyproject.toml index 7a8fda812c..3b66987665 100644 --- a/pycolmap/pyproject.toml +++ b/pycolmap/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build" [project] name = "pycolmap" -version = "3.11-dev" +version = "3.11.dev0" description = "COLMAP bindings" readme = "README.md" authors = [ From 6e8fdc435252932b2520150c7e2899bb5f473059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Fri, 26 Jul 2024 10:05:01 +0200 Subject: [PATCH 3/4] d --- pycolmap/pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pycolmap/pyproject.toml b/pycolmap/pyproject.toml index 3b66987665..7765bb66da 100644 --- a/pycolmap/pyproject.toml +++ b/pycolmap/pyproject.toml @@ -4,6 +4,9 @@ build-backend = "scikit_build_core.build" [project] name = "pycolmap" +# WARNING: This version must follow the MAJOR.MINOR.PATCH format. If only +# MAJOR.MINOR is used, cibuildwheel will add a .dev0 patch version, which +# results in releasing a pre-release version on PyPI. version = "3.11.dev0" description = "COLMAP bindings" readme = "README.md" From 1378411e951e36bb6949965a654320fb8d6b76b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Fri, 26 Jul 2024 11:06:27 +0200 Subject: [PATCH 4/4] Add Shaohui --- pycolmap/pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pycolmap/pyproject.toml b/pycolmap/pyproject.toml index 7765bb66da..b2142eb19e 100644 --- a/pycolmap/pyproject.toml +++ b/pycolmap/pyproject.toml @@ -14,6 +14,7 @@ authors = [ { name = "Johannes Schönberger", email = "jsch@demuc.de" }, { name = "Mihai Dusmanu", email = "mihai.dusmanu@gmail.com" }, { name = "Paul-Edouard Sarlin", email = "psarlin@ethz.ch" }, + { name = "Shaohui Liu", email = "b1ueber2y@gmail.com" }, { name = "Philipp Lindenberger", email = "plindenbe@ethz.ch" }, ] license = {text = "BSD-3-Clause"}