From ba090c1b44afaba861febb8c2a62806591db3cfc Mon Sep 17 00:00:00 2001 From: Tomoya Okazaki <64631098+tmyok@users.noreply.github.com> Date: Mon, 17 Jun 2024 18:22:38 +0900 Subject: [PATCH] custom colmap (#47) --- Dockerfile | 59 +++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/Dockerfile b/Dockerfile index f4bdf04..3ea521f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -ARG cuda_version=11.8.0 +ARG cuda_version=12.1.1 ARG cudnn_version=8 -ARG ubuntu=20.04 +ARG ubuntu=22.04 FROM nvcr.io/nvidia/cuda:${cuda_version}-cudnn${cudnn_version}-devel-ubuntu${ubuntu} LABEL maintainer "Tomoya Okazaki" @@ -11,34 +11,39 @@ ENV LANG=C.UTF-8 ENV PIP_DEFAULT_TIMEOUT=100 ENV TORCH_CUDA_ARCH_LIST="8.0 8.6+PTX" -# https://colmap.github.io/install.html - RUN apt -y update && apt -y upgrade && \ apt -y install --no-install-recommends \ - git \ - cmake \ - ninja-build \ build-essential \ + cmake \ + git \ graphviz \ graphviz-dev \ - libboost-program-options-dev \ libboost-filesystem-dev \ libboost-graph-dev \ + libboost-program-options-dev \ libboost-system-dev \ + libceres-dev \ + libcgal-dev \ libeigen3-dev \ libflann-dev \ libfreeimage-dev \ - libmetis-dev \ + libgl1-mesa-dev \ + libglew-dev \ + libglib2.0-0 \ libgoogle-glog-dev \ libgtest-dev \ - libsqlite3-dev \ - libglew-dev \ - qtbase5-dev \ + libmetis-dev \ libqt5opengl5-dev \ - libcgal-dev \ - libceres-dev \ + libsqlite3-dev \ + libsm6 \ + libx11-dev \ + libxext6 \ + libxrender1 \ + ninja-build \ python3-dev \ python3-pip \ + qtbase5-dev \ + vim \ wget \ zip \ unzip && \ @@ -47,40 +52,33 @@ RUN apt -y update && apt -y upgrade && \ RUN python3 -m pip install --upgrade pip && \ python3 -m pip install --no-cache-dir \ - setuptools==69.5.1 \ + setuptools==70.0.0 \ wheel==0.43.0 && \ python3 -m pip install --no-cache-dir \ - torch==2.0.1+cu118 \ - torchvision==0.15.2+cu118 \ - --index-url https://download.pytorch.org/whl/cu118 && \ + torch==2.3.0+cu121 \ + torchvision==0.18.0+cu121 \ + --index-url https://download.pytorch.org/whl/cu121 && \ python3 -m pip cache purge RUN python3 -m pip install --upgrade pip && \ python3 -m pip install --no-cache-dir \ - check_orientation==0.0.5 \ - cmake==3.29.3 \ + cmake==3.29.5.1 \ einops==0.8.0 \ h5py==3.11.0 \ - kneed==0.8.5 \ kornia==0.7.2 \ kornia-moons==0.2.9 \ kornia-rs==0.1.3 \ - mmcv-full==1.7.2 \ - mmsegmentation==0.30.0 \ - opencv-python==4.9.0.80 \ - pandas==2.0.3 \ - pygraphviz==1.11 \ - scipy==1.10.1 \ - scikit-learn==1.3.2 \ + opencv-python==4.10.0.82 \ timm==1.0.3 \ tqdm==4.66.4 \ - transformers==4.40.1 \ - yacs==0.1.8 && \ + transformers==4.41.2 && \ python3 -m pip cache purge # pycolmap WORKDIR /home RUN git clone https://github.com/colmap/colmap.git +WORKDIR /home/colmap/ +RUN git checkout dcfd14b300868c7eb1b360ebbca0dc21acd641b6 WORKDIR /home/colmap/build # https://github.com/colmap/colmap/issues/1822 @@ -95,6 +93,7 @@ RUN python3 -m pip install . WORKDIR /home RUN git clone https://github.com/cvg/LightGlue.git WORKDIR /home/LightGlue +RUN git checkout edb2b838efb2ecfe3f88097c5fad9887d95aedad RUN python3 -m pip install -e . WORKDIR /home/work \ No newline at end of file