Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into fix
Browse files Browse the repository at this point in the history
  • Loading branch information
EtaLoop committed Oct 22, 2024
2 parents 2e5d279 + c23e81e commit b9f4174
Show file tree
Hide file tree
Showing 783 changed files with 59,158 additions and 47,741 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/cargo_machete.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Cargo Machete

on:
push:
branches:
- "main"
pull_request:
types: [opened, synchronize]

jobs:
cargo-machete:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Machete
uses: bnjbvr/cargo-machete@main
14 changes: 4 additions & 10 deletions .github/workflows/contrib_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,15 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
- uses: prefix-dev/[email protected]
with:
python-version: "3.8"

- name: Install Python dependencies
shell: bash
run: |
pip install --upgrade pip
pip install -r rerun_py/requirements-doc.txt
pixi-version: v0.25.0
environments: py-docs

- name: Build via mkdocs
shell: bash
run: |
mkdocs build --strict -f rerun_py/mkdocs.yml
pixi run -e py-docs mkdocs build --strict -f rerun_py/mkdocs.yml
no-codegen-changes:
name: Check if running codegen would produce any changes
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/contrib_rerun_py.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ jobs:
# this stops `re_web_viewer_server/build.rs` from running
RERUN_IS_PUBLISHING: true
run: |
cargo build \
pixi run cargo build \
--locked \
-p rerun-cli \
--no-default-features \
--features native_viewer,web_viewer \
--features release \
--release \
--target x86_64-unknown-linux-gnu
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ jobs:
with:
mode: minimum
count: 1
labels: "📊 analytics, 🟦 blueprint, 🪳 bug, 🌊 C++ API, CLI, codegen/idl, 🧑‍💻 dev experience, dependencies, 📖 documentation, 💬 discussion, examples, exclude from changelog, 🪵 Log-API, 📉 performance, 🐍 Python API, ⛃ re_datastore, 🔍 re_query, 📺 re_viewer, 🔺 re_renderer, 🚜 refactor, ⛴ release, 🦀 Rust API, 🔨 testing, ui, 🕸️ web"
labels: "📊 analytics, 🟦 blueprint, 🪳 bug, 🌊 C++ API, CLI, codegen/idl, 🧑‍💻 dev experience, dependencies, 📖 documentation, 💬 discussion, examples, exclude from changelog, 🪵 Log & send APIs, 📉 performance, 🐍 Python API, ⛃ re_datastore, 🔍 re_query, 📺 re_viewer, 🔺 re_renderer, 🚜 refactor, ⛴ release, 🦀 Rust API, 🔨 testing, ui, 🕸️ web"
6 changes: 3 additions & 3 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ on:
workflow_dispatch:
schedule:
# https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
# 12:15 UTC, every day
- cron: "15 12 * * *"
# 3am UTC, so 4am-5am CET and evening in east time, basically after everyone's day.
- cron: "15 3 * * *"

defaults:
run:
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.76.0
toolchain: 1.79.0

- run: cargo build -p rerun

Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/on_push_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ jobs:
- uses: prefix-dev/[email protected]
with:
pixi-version: v0.25.0
environments: py-docs

- name: Install rerun-sdk
run: |
Expand All @@ -72,11 +73,6 @@ jobs:
# because it is not actually going to run
RUSTFLAGS: "-Awarnings --cfg disable_web_viewer_server"
run: |
# Install latest release version of the Rerun SDK
# We don't actually want to build it, because then we'd be installing the dev version.
pixi run pip install -r rerun_py/requirements-doc.txt
pixi run pip install rerun-sdk==${{ needs.get-version.outputs.version }}
pixi run search-index build \
landing \
--url "https://edge.meilisearch.com" \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ jobs:
secrets: inherit

publish-rerun_c:
name: "Build and Publish rerun_c"
name: "Build and Publish C/C++ SDKs"
needs: [version]
uses: ./.github/workflows/reusable_publish_rerun_c.yml
with:
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/reusable_bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,13 @@ jobs:
save-data-file: false
auto-push: false

- uses: prefix-dev/[email protected]
with:
pixi-version: v0.25.0

- name: Render benchmark result
if: github.ref == 'refs/heads/main'
run: |
pip install --break-system-package google-cloud-storage==2.9.0
scripts/ci/render_bench.py crates \
pixi run python scripts/ci/render_bench.py crates \
--after $(date -d"30 days ago" +%Y-%m-%d) \
--output "gs://rerun-builds/graphs"
4 changes: 2 additions & 2 deletions .github/workflows/reusable_build_and_upload_rerun_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,11 @@ jobs:
# this stops `re_web_viewer_server/build.rs` from running
RERUN_IS_PUBLISHING: true
run: |
cargo build \
pixi run cargo build \
--locked \
-p rerun-cli \
--no-default-features \
--features native_viewer,web_viewer \
--features release \
--release \
--target ${{ needs.set-config.outputs.TARGET }}
Expand Down
16 changes: 4 additions & 12 deletions .github/workflows/reusable_checks_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,12 @@ jobs:
with:
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref || '' }}

- name: Set up Python
uses: actions/setup-python@v4
- uses: prefix-dev/[email protected]
with:
python-version: "3.8"
cache: "pip"
cache-dependency-path: "rerun_py/requirements-doc.txt"

- name: Install Python dependencies
shell: bash
run: |
pip install --upgrade pip
pip install -r rerun_py/requirements-doc.txt
pixi-version: v0.25.0
environments: py-docs

- name: Build via mkdocs
shell: bash
run: |
mkdocs build --strict -f rerun_py/mkdocs.yml
pixi run -e py-docs mkdocs build --strict -f rerun_py/mkdocs.yml
9 changes: 7 additions & 2 deletions .github/workflows/reusable_checks_rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,5 +100,10 @@ jobs:
workload_identity_provider: ${{ secrets.GOOGLE_WORKLOAD_IDENTITY_PROVIDER }}
service_account: ${{ secrets.GOOGLE_SERVICE_ACCOUNT }}

- name: cargo test --all-targets --all-features
run: cargo test --all-targets --all-features
# Building with `--all-features` requires extra build tools like `nasm`.
- uses: prefix-dev/[email protected]
with:
pixi-version: v0.25.0

- name: pixi run cargo test --all-targets --all-features
run: pixi run cargo test --all-targets --all-features
24 changes: 10 additions & 14 deletions .github/workflows/reusable_deploy_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,10 @@ jobs:
fetch-depth: 0 # Don't do a shallow clone
ref: ${{ inputs.RELEASE_COMMIT || (github.event_name == 'pull_request' && github.event.pull_request.head.ref || '') }}

- name: Set up Python
uses: actions/setup-python@v4
- uses: prefix-dev/[email protected]
with:
python-version: "3.11"
cache: "pip"
cache-dependency-path: "rerun_py/requirements-doc.txt"

- name: Install Python dependencies
shell: bash
run: |
pip install --upgrade pip
pip install -r rerun_py/requirements-doc.txt
pixi-version: v0.25.0
environments: py-docs

- name: Set up git author
run: |
Expand All @@ -99,7 +91,7 @@ jobs:
if: ${{ inputs.UPDATE_LATEST }}
run: |
git fetch
mike deploy -F rerun_py/mkdocs.yml --rebase -b gh-pages --prefix docs/python -u ${{inputs.PY_DOCS_VERSION_NAME}} stable
pixi run -e py-docs mike deploy -F rerun_py/mkdocs.yml --rebase -b gh-pages --prefix docs/python -u ${{inputs.PY_DOCS_VERSION_NAME}} stable
git checkout gh-pages
git checkout --orphan gh-pages-orphan
git commit -m "Update docs for ${GITHUB_SHA}"
Expand All @@ -112,7 +104,7 @@ jobs:
if: ${{ ! inputs.UPDATE_LATEST }}
run: |
git fetch
mike deploy -F rerun_py/mkdocs.yml --rebase -b gh-pages --prefix docs/python ${{inputs.PY_DOCS_VERSION_NAME}}
pixi run -e py-docs mike deploy -F rerun_py/mkdocs.yml --rebase -b gh-pages --prefix docs/python ${{inputs.PY_DOCS_VERSION_NAME}}
git checkout gh-pages
git checkout --orphan gh-pages-orphan
git commit -m "Update docs for ${GITHUB_SHA}"
Expand Down Expand Up @@ -151,11 +143,15 @@ jobs:
workload_identity_provider: ${{ secrets.GOOGLE_WORKLOAD_IDENTITY_PROVIDER }}
service_account: ${{ secrets.GOOGLE_SERVICE_ACCOUNT }}

- uses: prefix-dev/[email protected]
with:
pixi-version: v0.25.0

- name: Delete existing /target/doc
run: rm -rf ./target/doc

- name: cargo doc --document-private-items
run: cargo doc --document-private-items --no-deps --all-features --workspace --exclude rerun-cli
run: pixi run cargo doc --document-private-items --no-deps --all-features --workspace --exclude rerun-cli

- name: Set up git author
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_publish_rerun_c.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build and publish C++ SDK
name: Build and Publish C/C++ SDKs

on:
workflow_call:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/reusable_test_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,3 +224,6 @@ jobs:
# --no-py-build because rerun-sdk is already built and installed
# --no-asset-download because we already downloaded the assets
run: pixi run -e wheel-test-min RUST_LOG=debug python docs/snippets/compare_snippet_output.py --target ${{ needs.set-config.outputs.TARGET }} --no-py-build --no-cpp-build --no-asset-download

- name: Check the python library signatures
run: pixi run -e wheel-test-min python scripts/ci/python_check_signatures.py
7 changes: 5 additions & 2 deletions .github/workflows/reusable_track_size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,13 @@ jobs:
save-data-file: false
auto-push: false

- uses: prefix-dev/[email protected]
with:
pixi-version: v0.25.0

- name: Render benchmark result
if: github.ref == 'refs/heads/main'
run: |
python3 -m pip install --break-system-package google-cloud-storage==2.9.0
scripts/ci/render_bench.py sizes \
pixi run python scripts/ci/render_bench.py sizes \
--after $(date -d"180 days ago" +%Y-%m-%d) \
--output "gs://rerun-builds/graphs"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ _deps
# Python build artifacts:
__pycache__
*.pyc
*.pyd
*.so
**/.pytest_cache

Expand Down
30 changes: 16 additions & 14 deletions ARCHITECTURE.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,15 @@ Update instructions:

### Application-level store

| Crate | Description |
|----------------------|--------------------------------------------------------------------------|
| re_entity_db | In-memory storage of Rerun entities |
| re_query | Querying data in the re_chunk_store |
| re_dataframe | The Rerun public data APIs. |
| re_types | The built-in Rerun data types, component types, and archetypes. |
| re_types_blueprint | The core traits and types that power Rerun's Blueprint sub-system. |
| re_log_encoding | Helpers for encoding and transporting Rerun log messages |
| Crate | Description |
|-----------------------|--------------------------------------------------------------------------|
| re_entity_db | In-memory storage of Rerun entities |
| re_query | Querying data in the re_chunk_store |
| re_dataframe | The Rerun public data APIs. |
| re_remote_store_types | Rerun remote store gRPC API types |
| re_types | The built-in Rerun data types, component types, and archetypes. |
| re_types_blueprint | The core traits and types that power Rerun's Blueprint sub-system. |
| re_log_encoding | Helpers for encoding and transporting Rerun log messages |


### Low-level store
Expand All @@ -193,12 +194,13 @@ Update instructions:

### Build support

| Crate | Description |
|----------------------------|------------------------------------------------------------------|
| re_build_info | Information about the build. Use together with re_build_tools |
| re_build_tools | build.rs helpers for generating build info |
| re_types_builder | Generates code for Rerun's SDKs from flatbuffers definitions. |
| re_dev_tools | Various tools for Rerun development. Each tool has a subcommand. |
| Crate | Description |
|-------------------------------|------------------------------------------------------------------|
| re_build_info | Information about the build. Use together with re_build_tools |
| re_build_tools | build.rs helpers for generating build info |
| re_remote_store_types_builder | Generates code for Rerun remote store gRPC API |
| re_types_builder | Generates code for Rerun's SDKs from flatbuffers definitions. |
| re_dev_tools | Various tools for Rerun development. Each tool has a subcommand. |


### Utilities
Expand Down
4 changes: 2 additions & 2 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ cd rerun

Now install the `pixi` package manager: <https://github.com/prefix-dev/pixi?tab=readme-ov-file#installation>

Make sure `cargo --version` prints `1.76.0` once you are done.
Make sure `cargo --version` prints `1.79.0` once you are done.

If you are using an Apple-silicon Mac (M1, M2), make sure `rustc -vV` outputs `host: aarch64-apple-darwin`. If not, this should fix it:

```sh
rustup set default-host aarch64-apple-darwin && rustup install 1.76.0
rustup set default-host aarch64-apple-darwin && rustup install 1.79.0
```

## Building and running the Viewer
Expand Down
Loading

0 comments on commit b9f4174

Please sign in to comment.