Skip to content

Commit 80e0ebb

Browse files
committed
Temporarily disable macvo
1 parent 8e2febb commit 80e0ebb

2 files changed

Lines changed: 33 additions & 33 deletions

File tree

robot/docker/Dockerfile.robot

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -165,39 +165,40 @@ RUN if [ "$REAL_ROBOT" = "true" ]; then \
165165
echo "REAL_ROBOT is false"; \
166166
fi
167167

168-
# Downloading model weights for MACVO
169-
WORKDIR /model_weights
170-
RUN wget -r "https://github.com/MAC-VO/MAC-VO/releases/download/model/MACVO_FrontendCov.pth" && \
171-
wget -r "https://github.com/MAC-VO/MAC-VO/releases/download/model/MACVO_posenet.pkl" && \
172-
wget -r "https://github.com/castacks/MAC-VO-ROS2/releases/download/dsta-efficient-v0/dsta_efficient.ckpt" && \
173-
mv /model_weights/github.com/MAC-VO/MAC-VO/releases/download/model/MACVO_FrontendCov.pth /model_weights/MACVO_FrontendCov.pth && \
174-
mv /model_weights/github.com/MAC-VO/MAC-VO/releases/download/model/MACVO_posenet.pkl /model_weights/MACVO_posenet.pkl && \
175-
mv /model_weights/github.com/castacks/MAC-VO-ROS2/releases/download/dsta-efficient-v0/dsta_efficient.ckpt /model_weights/dsta_efficient.ckpt && \
176-
rm -rf /model_weights/github.com
177-
178168
# Install colcon, seems to be getting removed
179169
RUN pip install -U colcon-common-extensions
180170

181-
# Fixes for MACVO Integration
182-
RUN pip install huggingface_hub
183-
RUN pip uninstall matplotlib -y
184-
185-
# Temporary fix for UFM
186-
WORKDIR /model_weights
187-
RUN wget -r "https://github.com/castacks/MAC-VO-ROS2/releases/download/dsta-efficient-v0/UFM_Env2.zip" && \
188-
apt update && apt install -y unzip && \
189-
mv /model_weights/github.com/castacks/MAC-VO-ROS2/releases/download/dsta-efficient-v0/UFM_Env2.zip /model_weights/UFM_Env2.zip && \
190-
unzip UFM_Env2.zip && \
191-
rm UFM_Env2.zip
192-
193-
WORKDIR /model_weights/UFM
194-
RUN pip install -e .
195-
196-
WORKDIR /model_weights/UFM/UniCeption
197-
RUN pip install -e .
198-
199-
WORKDIR /model_weights/UFM/benchmarks
200-
RUN pip install -e .
171+
# # Downloading model weights for MACVO
172+
# WORKDIR /model_weights
173+
# RUN wget -r "https://github.com/MAC-VO/MAC-VO/releases/download/model/MACVO_FrontendCov.pth" && \
174+
# wget -r "https://github.com/MAC-VO/MAC-VO/releases/download/model/MACVO_posenet.pkl" && \
175+
# wget -r "https://github.com/castacks/MAC-VO-ROS2/releases/download/dsta-efficient-v0/dsta_efficient.ckpt" && \
176+
# mv /model_weights/github.com/MAC-VO/MAC-VO/releases/download/model/MACVO_FrontendCov.pth /model_weights/MACVO_FrontendCov.pth && \
177+
# mv /model_weights/github.com/MAC-VO/MAC-VO/releases/download/model/MACVO_posenet.pkl /model_weights/MACVO_posenet.pkl && \
178+
# mv /model_weights/github.com/castacks/MAC-VO-ROS2/releases/download/dsta-efficient-v0/dsta_efficient.ckpt /model_weights/dsta_efficient.ckpt && \
179+
# rm -rf /model_weights/github.com
180+
181+
182+
# # Fixes for MACVO Integration
183+
# RUN pip install huggingface_hub
184+
# RUN pip uninstall matplotlib -y
185+
186+
# # Temporary fix for UFM
187+
# WORKDIR /model_weights
188+
# RUN wget -r "https://github.com/castacks/MAC-VO-ROS2/releases/download/dsta-efficient-v0/UFM_Env2.zip" && \
189+
# apt update && apt install -y unzip && \
190+
# mv /model_weights/github.com/castacks/MAC-VO-ROS2/releases/download/dsta-efficient-v0/UFM_Env2.zip /model_weights/UFM_Env2.zip && \
191+
# unzip UFM_Env2.zip && \
192+
# rm UFM_Env2.zip
193+
194+
# WORKDIR /model_weights/UFM
195+
# RUN pip install -e .
196+
197+
# WORKDIR /model_weights/UFM/UniCeption
198+
# RUN pip install -e .
199+
200+
# WORKDIR /model_weights/UFM/benchmarks
201+
# RUN pip install -e .
201202

202203
# TMux config
203204
RUN git clone https://github.com/tmux-plugins/tpm /home/robot/.tmux/plugins/tpm

robot/ros_ws/src/autonomy/2_perception/perception_bringup/launch/perception.launch.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,15 @@
1111
name="static_transform_publisher"
1212
args="--x 0 --y 0 --z 0 --yaw 1.5708 --pitch -1.5708 --roll 3.14159 --frame-id CameraLeft --child-frame-id macvo_ned" />
1313

14-
<node pkg="macvo" exec="macvo" namespace="macvo">
14+
<!-- <node pkg="macvo" exec="macvo" namespace="macvo">
1515
<param name="camera_config" value="$(find-pkg-share macvo)/config/model_config.yaml" />
16-
<!-- override -->
1716
<param from="$(find-pkg-share macvo)/config/interface_config.yaml" />
1817
<remap from="left/image_rect"
1918
to="/$(env ROBOT_NAME)/sensors/front_stereo/left/image_rect" />
2019
<remap from="right/image_rect"
2120
to="/$(env ROBOT_NAME)/sensors/front_stereo/right/image_rect" />
2221
<remap from="sensors/get_camera_params"
2322
to="/$(env ROBOT_NAME)/sensors/get_camera_params" />
24-
</node>
23+
</node> -->
2524

2625
</launch>

0 commit comments

Comments
 (0)