Upgrade on HDR brackets estimation

alicevision · Oct 1, 2024 · f6b0387 · f6b0387
1 parent b7c7a6b
commit f6b0387
Show file tree

Hide file tree

Showing 5 changed files with 457 additions and 132 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -102,9 +102,9 @@ jobs:
           meshroom_avBranch=$(git ls-remote --heads https://github.com/alicevision/Meshroom.git $GITHUB_HEAD_REF | cut -f 1)
           if [ $meshroom_avBranch != "" ]; then git checkout $meshroom_avBranch; echo "Use Meshroom/$GITHUB_HEAD_REF"; fi
           export MESHROOM_INSTALL_DIR=$PWD
-          export PYTHONPATH=$PWD:${PYTHONPATH}
+          export PYTHONPATH=$PWD:${ALICEVISION_ROOT}:${PYTHONPATH}
           export PATH=$PATH:${ALICEVISION_ROOT}/bin
-          export LD_LIBRARY_PATH=${ALICEVISION_ROOT}/lib64:${DEPS_INSTALL_DIR}/lib64:${DEPS_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}
+          export LD_LIBRARY_PATH=${ALICEVISION_ROOT}/lib:${ALICEVISION_ROOT}/lib64:${DEPS_INSTALL_DIR}/lib64:${DEPS_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}
           mkdir ./outputData
           cd bin/
           python3 --version
@@ -121,7 +121,8 @@ jobs:
           cd SfM_quality_evaluation/
           # checkout a specific commit to ensure repeatability
           git checkout 36e3bf2d05c64d1726cb4a0e770923794f203f98
-          export LD_LIBRARY_PATH=${ALICEVISION_ROOT}/lib64:${DEPS_INSTALL_DIR}/lib64:${DEPS_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}
+          export PYTHONPATH=${ALICEVISION_ROOT}:${PYTHONPATH}
+          export LD_LIBRARY_PATH=${ALICEVISION_ROOT}/lib:${ALICEVISION_ROOT}/lib64:${DEPS_INSTALL_DIR}/lib64:${DEPS_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}
           echo "ldd aliceVision_cameraInit"
           ldd ${ALICEVISION_ROOT}/bin/aliceVision_cameraInit
           python --version

diff --git a/src/aliceVision/hdr/Brackets.i b/src/aliceVision/hdr/Brackets.i
@@ -4,8 +4,19 @@
 // v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+
 %include <aliceVision/hdr/brackets.hpp>
 
 %{
 #include <aliceVision/hdr/brackets.hpp>
-%}
+
+using namespace aliceVision;
+using namespace aliceVision::hdr;
+%}
+
+
+%include "std_vector.i"
+
+%template(vectorli) std::vector<aliceVision::hdr::LuminanceInfo>;
+%template(vvectori) std::vector<std::vector<aliceVision::IndexT>>;
+
diff --git a/src/aliceVision/hdr/Hdr.i b/src/aliceVision/hdr/Hdr.i
@@ -6,4 +6,6 @@
 
 %module (module="pyalicevision") hdr
 
-%include <aliceVision/hdr/Brackets.i>
+%include <aliceVision/global.i>
+%include <aliceVision/hdr/Brackets.i>
+