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.

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

Lane detection ROS2 node #50

Merged
merged 34 commits into from
Jun 11, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
25ce097
Test base image build
leungjch Jan 28, 2024
5b93f75
Check devel image
leungjch Feb 1, 2024
60f693e
Add working node with new infra + space optimized runtime image
leungjch Feb 2, 2024
b8f6279
Merge branch 'main' into justin/lane-detection-new
leungjch Feb 2, 2024
4fd7e21
Revert watod-config and perception docker compose
leungjch Feb 3, 2024
5bdb733
Merge branch 'main' into justin/lane-detection-new
leungjch Feb 9, 2024
2de12d5
Delete unnecessary files
leungjch Feb 9, 2024
b173cb4
Delete unnecessary files
leungjch Feb 9, 2024
786d9e8
Delete unnecessary files
leungjch Feb 9, 2024
94ae1e2
Merge branch 'justin/lane-detection-new' of https://github.com/WATono…
leungjch Feb 9, 2024
e040f87
Add publishing lane detection message
leungjch Feb 12, 2024
cac12e7
Add launch and config files
leungjch Feb 13, 2024
508410d
Format
leungjch Feb 19, 2024
1187366
Merge branch 'main' into justin/lane-detection-new
Gongsta Feb 23, 2024
98b8ba2
Fix merge conflict
leungjch Mar 1, 2024
ae1b1d1
Merge branch 'justin/lane-detection-new' of github.com:WATonomous/wat…
Gongsta Mar 8, 2024
722d2e7
Merge branch 'main' into justin/lane-detection-new
Gongsta Mar 8, 2024
161d3d7
Clean up watod-config.sh
Gongsta Mar 8, 2024
8557648
Clean up
Gongsta Mar 8, 2024
c74a2c2
Merge branch 'main' into justin/lane-detection-new
Gongsta Mar 9, 2024
ffa6af5
clean up docker compose
Gongsta Mar 9, 2024
8589ac8
Fix formatting
Gongsta Mar 9, 2024
e634a99
Remove sample msgs
Gongsta Mar 10, 2024
df8715a
Fix lane detection header and save directory
Gongsta Mar 10, 2024
e123860
Add lane_detection_tensorrt submodule
leungjch Mar 11, 2024
7eb837d
Update docs for submodules
leungjch Mar 13, 2024
d25e2ad
Clean up
Gongsta Mar 14, 2024
8a286e3
Add .gitmodules
leungjch Mar 15, 2024
c1f0bf3
Merge branch 'justin/lane-detection-new' of https://github.com/WATono…
leungjch Mar 15, 2024
fbca3e1
Remove clone
leungjch Mar 15, 2024
2f02e85
Address PR comments
leungjch Mar 15, 2024
bbd26f1
Refactor node into hpp and cpp
leungjch Mar 15, 2024
1990ec1
Fix linting
leungjch Mar 15, 2024
8d22ca3
Merge branch 'main' into justin/lane-detection-new
leungjch Mar 22, 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
8 changes: 8 additions & 0 deletions .github/include/base_image_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,14 @@
"ros2": "humble"
}
},
{
"tag": "cuda12.2-humble-tensorrt-ubuntu22.04",
"external_image": "nvcr.io/nvidia/tensorrt:23.09-py3",
"injections": {
"ros2": "humble",
"opencv": "4.5.4"
}
},



Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/build_base_images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,24 @@ jobs:
GENERIC_IMAGE=${{ matrix.external_image }}
ROS_DISTRO=${{ matrix.injections.ros2 }}

- name: Inject OpenCV into Image
if: ${{ matrix.injections.opencv != '' }}
uses: docker/build-push-action@v5
with:
context: .
file: docker/base/inject_opencv.Dockerfile
push: true
tags: |
${{ steps.construct-registry-url.outputs.url }}_generic
cache-from: |
${{ steps.construct-registry-url.outputs.url }}_generic
cache-to: type=inline
builder: ${{ steps.buildx.outputs.name }}
target: wato_base
build-args: |
GENERIC_IMAGE=${{ matrix.external_image }}
OPENCV_VERSION=${{ matrix.injections.opencv }}

- name: Prepare Generic Image as Monorepo Base Image
uses: docker/build-push-action@v5
with:
Expand Down
8 changes: 8 additions & 0 deletions docker/base/inject_opencv.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ARG GENERIC_IMAGE

########################## Install ROS2 Core ##########################
FROM ${GENERIC_IMAGE} as wato_base

RUN apt-get update
RUN apt install -y libopencv-dev python3-opencv
RUN export OpenCV_DIR=/usr/lib/x86_64-linux-gnu/cmake/opencv4/OpenCVConfig.cmake
leungjch marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion docker/base/inject_ros2.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FROM ${GENERIC_IMAGE} as core

# setup timezone
RUN echo 'Etc/UTC' > /etc/timezone && \
ln -s /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
apt-get update && \
apt-get install -q -y --no-install-recommends tzdata && \
rm -rf /var/lib/apt/lists/*
Expand Down
Loading