Merge branch 'jmorat' into main

# Conflicts: # Dockerfile
naver · Feb 16, 2022 · e0e4573 · e0e4573
2 parents 9957488 + 92d1e6d
commit e0e4573
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 31 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -16,11 +16,10 @@ RUN mkdir -p ${SOURCE_PREFIX}
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
     git \
-    wget\
-    curl \
-    python3.6 python3-pip \
+    wget curl \
+    unzip openssh-client libssl-dev \
+    python3.6 python3-pip python3-dev \
     pandoc asciidoctor \
-    cmake \
     build-essential \
     libboost-all-dev \
     libsuitesparse-dev \
@@ -44,9 +43,15 @@ RUN apt-get update \
 ########################################################################################################################
 # PYTHON-PIP ###########################################################################################################
 # make sure pip 3 is >= 20.0 to enable use-feature=2020-resolver
-RUN python3 -m pip install --upgrade pip
-RUN python3 -m pip install --upgrade setuptools wheel twine
+RUN     python3 -m pip install --upgrade pip
+RUN     python3 -m pip install --upgrade setuptools wheel twine
 
+# force upgrade of cmake (more than apt get)
+## CMAKE version 3.23.0-rc1
+WORKDIR ${SOURCE_PREFIX}
+RUN     wget https://github.com/Kitware/CMake/releases/download/v3.23.0-rc1/cmake-3.23.0-rc1.tar.gz && \
+        tar -xf cmake-3.23.0-rc1.tar.gz
+RUN     cd cmake-3.23.0-rc1 && ./bootstrap && make install
 
 ########################################################################################################################
 # COLMAP ###############################################################################################################
@@ -78,9 +83,8 @@ RUN     cmake \
 
 # colmap
 WORKDIR ${SOURCE_PREFIX}
-RUN     git clone -b dev https://github.com/colmap/colmap.git 
+RUN     git clone -b 3.7 https://github.com/colmap/colmap.git
 WORKDIR ${SOURCE_PREFIX}/colmap
-RUN     git checkout 06a230fe9bea71170583dcd4e7acc14aac4ef2fb
 RUN     mkdir -p build
 WORKDIR ${SOURCE_PREFIX}/colmap/build
 RUN     cmake \
@@ -90,41 +94,42 @@ RUN     cmake \
         make ${MAKE_OPTIONS} && make install && make clean
 
 ######### POSELIB ##############################################################
-# force upgrade of cmake
-RUN     apt-get -y remove cmake
-RUN     python3 -m pip install cmake --upgrade
-
 WORKDIR ${SOURCE_PREFIX}
-RUN     git clone --recursive https://github.com/vlarsson/PoseLib.git
-RUN     mkdir -p ./PoseLib/_build
-RUN     cd  ./PoseLib/_build && \
+RUN     git clone --recursive -n https://github.com/vlarsson/PoseLib.git
+WORKDIR ${SOURCE_PREFIX}/PoseLib
+RUN     git checkout 67dc757c619a320ae3cf4a4ffd4e4b7fc5daa692 && \
+        git submodule update --recursive # version required by PYRANSACLIB
+RUN     mkdir -p ${SOURCE_PREFIX}/PoseLib/_build
+RUN     cd ${SOURCE_PREFIX}/PoseLib/_build && \
         cmake -DCMAKE_INSTALL_PREFIX=../_install .. && \
-        cmake --build . --target install -j 8 &&\
+        cmake --build . --target install -j 8 && \
         cmake --build . --target clean
 
-########################################################################################################################
-# install kapture from pip.
-RUN      python3 -m pip install kapture
-
-# install kapture-localization
-ADD      . ${SOURCE_PREFIX}/kapture-localization
-WORKDIR  ${SOURCE_PREFIX}/kapture-localization
-RUN      python3 -m pip install "torch==1.4.0" "torchvision==0.5.0" "scikit_learn==0.20.2"
-RUN      python3 -m pip install -r requirements.txt --use-feature=2020-resolver
-RUN      python3 setup.py install
-
 ######### PYCOLMAP #############################################################
 WORKDIR ${SOURCE_PREFIX}
-RUN     git clone --recursive https://github.com/colmap/pycolmap.git
+RUN     git clone --recursive -b v0.1.0 https://github.com/colmap/pycolmap.git
 WORKDIR ${SOURCE_PREFIX}/pycolmap
 RUN     python3 -m pip install ./
 
 ######### PYRANSACLIB ##########################################################
 WORKDIR ${SOURCE_PREFIX}
-RUN     git clone --recursive https://github.com/tsattler/RansacLib.git
+RUN     git clone --recursive -n https://github.com/tsattler/RansacLib.git
 WORKDIR ${SOURCE_PREFIX}/RansacLib
+RUN     git checkout 8b5a8b062711ee9cc57bc73907fbe0ae769d5113 && \
+        git submodule update --recursive
 RUN     sed -i '4i set(CMAKE_CXX_STANDARD 17)' CMakeLists.txt
-RUN     CMAKE_PREFIX_PATH=${SOURCE_PREFIX}/PoseLib/_install/lib/cmake/PoseLib python3 -m pip install ./
+RUN     CMAKE_PREFIX_PATH=${SOURCE_PREFIX}/PoseLib/_install/lib/cmake/PoseLib  python3 -m pip install ./
+
+#########################################################################################################################
+# install kapture from pip.
+RUN      python3 -m pip install kapture
+
+# install kapture-localization
+ADD      . ${SOURCE_PREFIX}/kapture-localization
+WORKDIR  ${SOURCE_PREFIX}/kapture-localization
+RUN      python3 -m pip install "torch==1.4.0" "torchvision==0.5.0" "scikit_learn==0.20.2"
+RUN      python3 -m pip install -r requirements.txt
+RUN      python3 setup.py install
 
 ### FINALIZE ###################################################################
 # save space: purge apt-get

diff --git a/pipeline/examples/run_aachen-v11.sh b/pipeline/examples/run_aachen-v11.sh
@@ -1,4 +1,4 @@
-# Run this script in docker,
+  # Run this script in docker,
 # but first pull the most recent version.
 
 # docker pull kapture/kapture-localization