Skip to content

Commit 650d4d1

Browse files
committed
[docker] Remove installation of mrSegmentation from Dockerfiles
The installation of plugins will be handled separately, and not directly in Meshroom's images.
1 parent 71597c4 commit 650d4d1

File tree

2 files changed

+0
-36
lines changed

2 files changed

+0
-36
lines changed

docker/Dockerfile_rocky

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,24 +53,6 @@ RUN make "-j$(nproc)" && \
5353
${MESHROOM_BUNDLE}/aliceVision/share/man/ \
5454
aliceVision/share/pkgconfig
5555

56-
# Download mrSegmentation and the models, install the requirements and set all the variables
57-
WORKDIR ${MESHROOM_BUNDLE}
58-
RUN git clone https://github.com/meshroomHub/mrSegmentation.git mrSegmentation
59-
RUN python -m pip install --upgrade setuptools
60-
RUN python -m pip install -r mrSegmentation/requirements.txt
61-
RUN rm mrSegmentation/requirements.txt mrSegmentation/setup.py
62-
ENV MESHROOM_NODES_PATH="${MESHROOM_BUNDLE}/mrSegmentation/meshroom/nodes"
63-
ENV PYTHONPATH="${PYTHONPATH}:${MESHROOM_BUNDLE}/mrSegmentation"
64-
65-
RUN git clone https://gitlab.com/alicevision/imagepromptnnmodels.git imagePromptNNModels
66-
RUN rm imagePromptNNModels/.gitattributes
67-
ENV RDS_RECOGNITION_MODEL_PATH="${MESHROOM_BUNDLE}/imagePromptNNModels/models/ram_plus_swin_large_14m.pth"
68-
ENV RDS_DETECTION_CONFIG_PATH="${MESHROOM_BUNDLE}/imagePromptNNModels/models/models/GroundingDINO_SwinT_OGC.py"
69-
ENV RDS_DETECTION_MODEL_PATH="${MESHROOM_BUNDLE}/imagePromptNNModels/models/groundingdino_swint_ogc.pth"
70-
ENV RDS_SEGMENTATION_MODEL_PATH="${MESHROOM_BUNDLE}/imagePromptNNModels/models/sam_vit_h_4b8939.pth"
71-
ENV RDS_TOKENIZER_PATH="${MESHROOM_BUNDLE}/imagePromptNNModels/models/tokenizer"
72-
ENV TRANSFORMERS_OFFLINE="TRUE"
73-
7456
# Enable SSH X11 forwarding, needed when the Docker image
7557
# is run on a remote machine
7658
RUN dnf install -y openssh openssh-clients openssh-server xorg-x11-xauth

docker/Dockerfile_ubuntu

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,24 +51,6 @@ RUN make "-j$(nproc)" && \
5151
${MESHROOM_BUNDLE}/aliceVision/share/man/ \
5252
aliceVision/share/pkgconfig
5353

54-
# Download mrSegmentation and the models, install the requirements and set all the variables
55-
WORKDIR ${MESHROOM_BUNDLE}
56-
RUN git clone https://github.com/meshroomHub/mrSegmentation.git mrSegmentation
57-
RUN python -m pip install --upgrade setuptools
58-
RUN python -m pip install -r mrSegmentation/requirements.txt
59-
RUN rm mrSegmentation/requirements.txt mrSegmentation/setup.py
60-
ENV MESHROOM_NODES_PATH="${MESHROOM_BUNDLE}/mrSegmentation/meshroom/nodes"
61-
ENV PYTHONPATH="${PYTHONPATH}:${MESHROOM_BUNDLE}/mrSegmentation"
62-
63-
RUN git clone https://gitlab.com/alicevision/imagepromptnnmodels.git imagePromptNNModels
64-
RUN rm imagePromptNNModels/.gitattributes
65-
ENV RDS_RECOGNITION_MODEL_PATH="${MESHROOM_BUNDLE}/imagePromptNNModels/models/ram_plus_swin_large_14m.pth"
66-
ENV RDS_DETECTION_CONFIG_PATH="${MESHROOM_BUNDLE}/imagePromptNNModels/models/models/GroundingDINO_SwinT_OGC.py"
67-
ENV RDS_DETECTION_MODEL_PATH="${MESHROOM_BUNDLE}/imagePromptNNModels/models/groundingdino_swint_ogc.pth"
68-
ENV RDS_SEGMENTATION_MODEL_PATH="${MESHROOM_BUNDLE}/imagePromptNNModels/models/sam_vit_h_4b8939.pth"
69-
ENV RDS_TOKENIZER_PATH="${MESHROOM_BUNDLE}/imagePromptNNModels/models/tokenizer"
70-
ENV TRANSFORMERS_OFFLINE="TRUE"
71-
7254
# Enable SSH X11 forwarding, needed when the Docker image
7355
# is run on a remote machine
7456
RUN apt install ssh xauth && \

0 commit comments

Comments
 (0)