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

Fix streaming #65

Merged
merged 15 commits into from
Aug 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 8 additions & 5 deletions .github/workflows/openpilot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
arch: ${{ fromJson(
((github.repository == 'commaai/plotjuggler') &&
((github.event_name != 'pull_request') ||
(github.event.pull_request.head.repo.full_name == 'commaai/plotjuggler'))) && '["x86_64", "aarch64"]' || '["x86_64"]' ) }}
(github.event.pull_request.head.repo.full_name == 'commaai/plotjuggler'))) && '["x86_64", "aarch64"]' || '["x86_64"]' ) }}
runs-on: ${{ (matrix.arch == 'aarch64') && 'buildjet-4vcpu-ubuntu-2204-arm' || 'ubuntu-20.04' }}
steps:
- uses: actions/checkout@v2
with:
submodules: true
submodules: recursive
- name: build
run: ./build.sh
- name: zip plugins
Expand All @@ -42,18 +42,21 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
submodules: true
submodules: recursive
- uses: actions/setup-python@v2
with:
python-version: '3.11.x'
- name: setup dependencies
run: |
brew install cmake bzip2 capnp qt@5 zeromq protobuf@3 gnu-tar
sudo pip3 install --no-cache-dir -r 3rdparty/opendbc_repo/requirements.txt
brew install cmake bzip2 capnp qt@5 zeromq protobuf@3 gnu-tar portaudio
curl -LsSf https://astral.sh/uv/install.sh | sh
uv venv
uv pip install 3rdparty/openpilot 3rdparty/openpilot/opendbc_repo
- name: build
run: |
export PYTHONPATH=$PWD/3rdparty
# force usage of protobuf@3 instead of protobuf
source .venv/bin/activate
mkdir -p build && cd build && cmake -DCMAKE_PREFIX_PATH="$(brew --prefix)/opt/protobuf@3" .. && make -j8
- name: zip plugins
run: eval "$ZIP"
Expand Down
9 changes: 3 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "3rdparty/cereal"]
path = 3rdparty/cereal
url = ../../commaai/cereal.git
[submodule "3rdparty/opendbc"]
path = 3rdparty/opendbc_repo
url = ../../commaai/opendbc.git
[submodule "3rdparty/openpilot"]
path = 3rdparty/openpilot
url = https://github.com/commaai/openpilot
1 change: 0 additions & 1 deletion 3rdparty/cereal
Submodule cereal deleted from 8ae5c5
1 change: 1 addition & 0 deletions 3rdparty/cereal
1 change: 1 addition & 0 deletions 3rdparty/common
1 change: 1 addition & 0 deletions 3rdparty/msgq
2 changes: 1 addition & 1 deletion 3rdparty/opendbc
1 change: 0 additions & 1 deletion 3rdparty/opendbc_repo
Submodule opendbc_repo deleted from a40652
1 change: 1 addition & 0 deletions 3rdparty/openpilot
Submodule openpilot added at 756d64
21 changes: 10 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,16 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libsqlite3-dev \
clang \
ocl-icd-opencl-dev \
opencl-headers
opencl-headers \
portaudio19-dev

RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
ENV PATH="/root/.pyenv/bin:/root/.pyenv/shims:${PATH}"
RUN pyenv install 3.11.4 && \
pyenv global 3.11.4 && \
pyenv rehash
RUN curl -LsSf https://astral.sh/uv/install.sh | sh
ENV PATH="/root/.cargo/bin:${PATH}"
RUN uv venv --python 3.11.4
RUN uv pip install pkgconfig jinja2 Cython

RUN pip3 install pkgconfig jinja2

# installs scons, pycapnp, cython, etc.
ENV PYTHONPATH /tmp/plotjuggler/3rdparty
COPY 3rdparty/opendbc_repo/requirements.txt /tmp/
RUN pip3 install Cython && pip3 install --no-cache-dir -r /tmp/requirements.txt
COPY 3rdparty/openpilot/opendbc_repo/pyproject.toml /tmp/opendbc_repo/pyproject.toml
COPY 3rdparty/openpilot/pyproject.toml /tmp/openpilot/pyproject.toml
RUN uv pip install --no-cache-dir /tmp/opendbc_repo
RUN uv pip install --no-cache-dir /tmp/openpilot
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ docker run \
--rm \
--volume $PWD:/tmp/plotjuggler \
--workdir /tmp/plotjuggler plotjuggler:latest \
/bin/bash -c "mkdir -p build && cd build && cmake .. && make -j$(nproc)"
/bin/bash -c "source /.venv/bin/activate && mkdir -p build && cd build && cmake .. && make -j$(nproc)"
19 changes: 12 additions & 7 deletions cmake/FindCereal.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,13 @@ else (Cereal_LIBRARIES AND Cereal_INCLUDE_DIRS)

# build cereal before we search for required Cereal plugin libs below
execute_process(
COMMAND scons -j8 --minimal
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/cereal
COMMAND scons -j8 --minimal -u
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/openpilot/cereal
)

execute_process(
COMMAND scons -j8 --minimal -u
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/openpilot/msgq
)

find_path(Cereal_INCLUDE_DIRS
Expand All @@ -29,14 +34,14 @@ else (Cereal_LIBRARIES AND Cereal_INCLUDE_DIRS)
NAMES
cereal
PATHS
${CMAKE_SOURCE_DIR}/3rdparty/cereal
${CMAKE_SOURCE_DIR}/3rdparty/openpilot/cereal
)

find_library(Cereal_LIBRARY_MESSAGING
find_library(Cereal_LIBRARY_MSGQ
NAMES
messaging
msgq
PATHS
${CMAKE_SOURCE_DIR}/3rdparty/cereal
${CMAKE_SOURCE_DIR}/3rdparty/openpilot/msgq_repo
)

find_library(Cereal_LIBRARY_ZMQ
Expand All @@ -47,7 +52,7 @@ else (Cereal_LIBRARIES AND Cereal_INCLUDE_DIRS)
set(Cereal_LIBRARIES
${Cereal_LIBRARIES}
${Cereal_LIBRARY_CEREAL}
${Cereal_LIBRARY_MESSAGING}
${Cereal_LIBRARY_MSGQ}
${Cereal_LIBRARY_ZMQ}
)

Expand Down
Loading