Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor updates #450

Merged
merged 2 commits into from
Oct 9, 2024
Merged

Minor updates #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e738098
Add default values for Dockerfile ARGs
Purg Oct 9, 2024
1dbf63f
Minor system configuration file updates
Purg Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docker/workspace-build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Assumptions:
# - ROS_DISTRO is defined with the name of a distribution installed under /opt/ros/
#
ARG ROS_VERSION
ARG ROS_VERSION="foxy"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Help me recall: what are the reasons we cannot upgrade from foxy? mmdet was one; were there others?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was wondering if we should revisit this

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mmdet/mmpose specifically.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right. Noted, thanks.

FROM osrf/ros:${ROS_VERSION}-desktop AS base

SHELL ["/bin/bash", "-c"]
Expand Down Expand Up @@ -59,8 +59,8 @@ RUN --mount=type=cache,target=/root/nvidia,sharing=locked \
--no-verbose -c -O /root/nvidia/cuda_12.5.0_555.42.02_linux.run \
&& chmod +x /root/nvidia/cuda_12.5.0_555.42.02_linux.run \
&& /root/nvidia/cuda_12.5.0_555.42.02_linux.run --silent --toolkit
ENV PATH /usr/local/cuda-12.5/bin:$PATH
ENV LD_LIBRARY_PATH /usr/local/cuda-12.5/lib64:$LD_LIBRARY_PATH
ENV PATH=/usr/local/cuda-12.5/bin:${PATH}
ENV LD_LIBRARY_PATH=/usr/local/cuda-12.5/lib64:${LD_LIBRARY_PATH}

# Install ZED SDK and dependencies.
# We are skipping the python installation here as the pacakge version has been
Expand Down
1 change: 1 addition & 0 deletions tmux/demos/medical/Kitware-R18.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,3 +171,4 @@ windows:
-p interp_user_intent_topic:=UserIntentPredicted
-p system_text_response_topic:=SystemTextResponse
-p system_notification_topic:=ARUISystemNotifications
-p task_error_topic:=ARUISystemNotifications
6 changes: 3 additions & 3 deletions tmux/record/record_ros_bag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,14 @@ windows:
-p head_pose_topic:=HeadsetPoseData
-p pv_width:=1280
-p pv_height:=720
-p pv_framerate:=30
-p pv_framerate:=15
-p sm_freq:=5
-p rm_depth_AHAT:=disable
# Visualize Images being output from the headset
- rqt_pv_images: rqt -s rqt_image_view/ImageView
--args ${ROS_NAMESPACE}/PVFramesBGR
--ros-args -p _image_transport:=raw
--ros-args -p _image_transport:=raw

- record:
layout: even-vertical
root: ./ros_bags
Expand All @@ -92,4 +93,3 @@ windows:
${ROS_NAMESPACE}/EyeGazeData
${ROS_NAMESPACE}/HeadsetDepthPoseData
${ROS_NAMESPACE}/ShortThrowDepthMapImages

Loading