Merge branch 'develop' into develop_keypoint_orientation_sfm

.gitattributes

@@ -0,0 +1,3 @@
+# GitHub syntax highlighting
+pixi.lock linguist-language=YAML
+

.github/workflows/compile_and_run_test.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [main, master, develop]
+    branches: [main, master, develop, develop_keypoint_orientation_sfm]
   pull_request:
-    branches: [main, master, develop]
+    branches: [main, master, develop, develop_keypoint_orientation_sfm]
 
  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -33,22 +33,22 @@ jobs:
           -DOpenMVG_BUILD_TESTS=ON \
           -DOpenMVG_BUILD_EXAMPLES=ON \
           -DOpenMVG_BUILD_SOFTWARES=ON \
-          -DSCHUR_SPECIALIZATIONS=OFF \
-          -DTARGET_ARCHITECTURE=core
+          -DSCHUR_SPECIALIZATIONS=OFF
         shell: bash
 
       - name: Build
         working-directory: ./build
         run: |
            if [ "$RUNNER_OS" == "Windows" ]; then
-              cmake --build . --config Release
+              cmake --build . --config Release --parallel 4
            else
-              cmake --build . -- -j$(nproc)
+              cmake --build . -j$(getconf _NPROCESSORS_ONLN)
            fi
         shell: bash
 
 
       - name: Unit Tests
         working-directory: ./build
         run: |
-          ctest -j$(nproc) --build-config Release
+          ctest -j$(getconf _NPROCESSORS_ONLN) --build-config Release
+        shell: bash

.github/workflows/compile_and_run_test_external_deps.yml

@@ -69,11 +69,12 @@ jobs:
       - name: Build
         working-directory: ./build
         run: |
-              cmake --build . -- -j$(nproc)
+              cmake --build . -j$(nproc)
         shell: bash
 
 
       - name: Unit Tests
         working-directory: ./build
         run: |
           ctest -j$(nproc) --build-config Release
+        shell: bash

.gitignore

@@ -13,3 +13,4 @@ build*
 *.out
 docs/openmvg.pdf
 tags
+.pixi

BUILD.md

@@ -44,6 +44,7 @@ Checking out the project and build it
 - [Compiling on MacOS](#macos)
 - [Compiling using VCPKG](#vcpkg)
 - [Using Docker](#docker)
+- [Using Pixi](#pixi)
 
 Getting the project
 --------------------
@@ -202,6 +203,30 @@ root@de138d2f6223:/# ls /
 ...   dataset/  ...
 ```
 
+Using Pixi
+------------
+<a name="pixi"></a>
+
+[Pixi](https://pixi.sh/) enables you to have a contained environment to compile and run openMVG in a local folder for Linux and Mac platforms.
+
+Install pixi and compile openMVG
+```shell
+$ git clone --recursive https://github.com/openMVG/openMVG.git
+$ cd openMVG
+$ curl -fsSL https://pixi.sh/install.sh | bash
+$ pixi run build
+```
+
+Then running openMVG is as easy as running the pixi shell (here an example for Linux):
+```shell
+$ pixi shell
+# Running one of the python script
+$ python3 ./build/software/SfM/tutorial_demo.py
+# Running one of OpenMVG binary
+$ ./build/Linux-x86_64-Release/openMVG_main_SfMInit_ImageListing
+```
+
+
 Using OpenCV sample
 --------------------
 

Dockerfile

@@ -18,8 +18,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata;
   liblemon-dev \
   libpng-dev \
   libtiff-dev \
-  git \
-  python3-minimal; \
+  python3; \
   apt-get autoclean && apt-get clean
 
 # Clone the openvMVG repo

dist/snap/snapcraft.yaml

@@ -1,7 +1,7 @@
 # This recipe is known to work under Ubuntu 16.04 (yet, the generated .snap
 # file will work on any Linux distribution having snap installed).
 name: openmvg
-version: '2.0-0'
+version: '2.1-0'
 summary: OpenMVG (open Multiple View Geometry)
 description: |
   OpenMVG (Multiple View Geometry) "open Multiple View Geometry" is a library
@@ -123,7 +123,7 @@ parts:
   openmvg:
     plugin: cmake
     source: https://github.com/openMVG/openMVG.git
-    source-tag: v2.0
+    source-tag: v2.1
     build-packages:
       - build-essential
       - libpng12-dev

docs/sphinx/rst/bibliography.rst

@@ -114,6 +114,9 @@ Bibliography
 .. [Lee_BMVC19] **Triangulation: Why Optimize?**
    S.H. Lee, J. Civera. BMVC 2019.
 
+.. [Ding] **Revisiting the P3P Problem.**
+   Y Ding, J Yang, V Larsson, C Olsson, K Åström. CVPR 2023.
+
 .. [Ceres] **Ceres Solver.**
     Sameer Agarwal and Keir Mierle and Others, http://ceres-solver.org
 

docs/sphinx/rst/conf.py

@@ -56,16 +56,16 @@
 
 # General information about the project.
 project = u'openMVG'
-copyright = u'2013-2021, OpenMVG authors'
+copyright = u'2013-2023, OpenMVG authors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '2.0'
+version = '2.1'
 # The full version, including alpha/beta/rc tags.
-release = '2.0'
+release = '2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -280,7 +280,7 @@
 epub_title = u'openMVG'
 epub_author = u'openMVG authors'
 epub_publisher = u'Pierre MOULON & al.'
-epub_copyright = u'2013-2021, openMVG authors'
+epub_copyright = u'2013-2023, openMVG authors'
 
 # The basename for the epub file. It defaults to the project name.
 #epub_basename = u'openMVG'

docs/sphinx/rst/openMVG/multiview/multiview.rst

@@ -125,8 +125,9 @@ openMVG provides 4 different solvers for this problem:
 
 * 6pt Direct Linear Transform [HZ]_,
 * 3pt with intrinsic P3P [Ke]_,  
-* 3pt with intrinsic P3P [Kneip]_.
+* 3pt with intrinsic P3P [Kneip]_,
 * 3pt with intrinsic P3P [Nordberg]_,
+* 3pt with intrinsic P3P [Ding]_.
 
 Kernel concept
 ---------------------

pixi.toml

@@ -0,0 +1,24 @@
+[project]
+name = "openMVG"
+version = "0.1.0"
+description = "openMVG 'open Multiple View Geometry' library. Basis for 3D computer vision and Structure from Motion."
+authors = ["OpenMVG Team<[email protected]>"]
+channels = ["conda-forge"]
+platforms = ["linux-64", "osx-arm64", "osx-64"]
+repository = "https://github.com/openMVG/openMVG"
+
+[tasks]
+clean = { cmd = "rm -rf build " }
+print-env = { cmd = "echo $PATH" }
+configure = "cmake -B build -S ./src -DOpenMVG_BUILD_TESTS:BOOL=ON"
+build = { cmd = "cmake --build build -j 4", depends_on = ["configure"] }
+test = { cmd = "cd build; ctest -j", depends_on = ["build"] }
+
+[dependencies]
+ceres-solver = "2.2.0.*"
+libjpeg-turbo = "3.0.0.*"
+cmake = "3.28.1.*"
+cxx-compiler = "1.7.0.*"
+libpng = "1.6.39.*"
+zlib = "1.2.13.*"
+libtiff = "4.6.0.*"