Skip to content

Commit

Permalink
Fixed a bunch of missing renames (rerun-io#2448)
Browse files Browse the repository at this point in the history
### What

This PR fixes a bunch of places where renames from rerun-io#2416 weren't
applied.

⚠️ It touches various build-related places, ~~due to the renaming of
`colmap_fiat.rrd` into `structure_from_motion_fiat.rrd`~~, which is
included in the SDK demo feature.

Edit: `colmap_fiat.rrd` shouldn't be renamed, it corresponds to an
actual Google dataset called `colmap_fiat`.

### Checklist
* [x] I have read and agree to [Contributor
Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and
the [Code of
Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md)
* [ ] ~~I've included a screenshot or gif (if applicable)~~ 

<!-- This line will get updated when the PR build summary job finishes.
-->
PR Build Summary: https://build.rerun.io/pr/2448

<!-- pr-link-docs:start -->
Docs preview: https://rerun.io/preview/98e0eca/docs
Examples preview: https://rerun.io/preview/98e0eca/examples
<!-- pr-link-docs:end -->
  • Loading branch information
abey79 authored Jun 15, 2023
1 parent 2514b72 commit ad77e2d
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/reusable_build_and_test_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -278,9 +278,9 @@ jobs:
id: dataset
uses: actions/cache@v3
with:
path: examples/python/colmap/dataset/
path: examples/python/structure_from_motion/dataset/
# TODO(jleibs): Derive this key from the invocation below
key: colmap-dataset-colmap-fiat-v1
key: structure-from-motion-dataset-structure-from-motion-fiat-v1

- name: Generate Embedded RRD file
if: needs.set-config.outputs.RUN_TESTS == 'true'
Expand Down
2 changes: 1 addition & 1 deletion crates/rerun-cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ Run `rerun --help` for more.

### Running a web viewer
```sh
rerun --web-viewer ../nyud.rrd
rerun --web-viewer path/to/file.rrd
```
2 changes: 1 addition & 1 deletion crates/rerun/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,5 @@ Run `rerun --help` for more.
The web viewer is an experimental feature, but you can try it out with:
```sh
rerun --web-viewer ../nyud.rrd
rerun --web-viewer path/to/file.rrd
```
4 changes: 2 additions & 2 deletions docs/content/getting-started/viewer-walkthrough.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ If you have already followed the Python Quickstart you may have used `rerun_demo

This time, we will pass an additional flag:
```bash
$ python -m rerun_demo --colmap
$ python -m rerun_demo --structure-from-motion
```

*Note: If this is your first time launching Rerun you will see a notification about the Rerun anonymous data usage
Expand All @@ -46,7 +46,7 @@ like.*

In your terminal you should see an output along the lines of:
```
2023-02-13T05:16:06.835424Z INFO rerun::run: Loading "/home/rerun/venv/lib/python3.10/site-packages/rerun_sdk/rerun_demo/colmap.rrd"…
2023-02-13T05:16:06.835424Z INFO rerun::run: Loading "/home/rerun/venv/lib/python3.10/site-packages/rerun_sdk/rerun_demo/colmap_fiat.rrd"…
```

And a window that looks like this will appear:
Expand Down
3 changes: 2 additions & 1 deletion examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ The important part is that each example has a `README.md` file. This file contai
```
---
title: Text Logging
python: https://github.com/rerun-io/rerun/tree/latest/examples/python/tracking_hf_opencv/main.py
python: https://github.com/rerun-io/rerun/tree/latest/examples/python/detect_and_track_objects/main.py
tags: [2D, huggingface, object-detection, object-tracking, opencv]
---
...
Expand Down
4 changes: 2 additions & 2 deletions examples/python/live_camera_edge_detection/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
And then connect using:
```
python examples/python/opencv_canny/main.py --connect
python examples/python/live_camera_edge_detection/main.py --connect
```
"""
Expand Down Expand Up @@ -89,7 +89,7 @@ def main() -> None:
And then connect using:
```
python examples/python/opencv_canny/main.py --connect
python examples/python/live_camera_edge_detection/main.py --connect
```
################################################################################
"""
Expand Down
2 changes: 1 addition & 1 deletion examples/python/signed_distance_fields/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
Run:
```sh
# assuming your virtual env is up
examples/python/deep_sdf/main.py
examples/python/signed_distance_fields/main.py
```
"""
from __future__ import annotations
Expand Down
10 changes: 5 additions & 5 deletions rerun_py/rerun_sdk/rerun_demo/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def run_cube(args: argparse.Namespace):
rr.script_teardown(args)


def run_colmap(args):
def run_structure_from_motion(args):
from rerun import bindings, unregister_shutdown # type: ignore[attr-defined]

serve_opts = []
Expand Down Expand Up @@ -67,7 +67,7 @@ def main() -> None:
)

group.add_argument(
"--colmap",
"--structure-from-motion",
action="store_true",
help="Run the COLMAP data demo",
)
Expand All @@ -76,14 +76,14 @@ def main() -> None:

args = parser.parse_args()

if not any([args.cube, args.colmap]):
if not any([args.cube, args.structure_from_motion]):
args.cube = True

if args.cube:
run_cube(args)

elif args.colmap:
run_colmap(args)
elif args.structure_from_motion:
run_structure_from_motion(args)


if __name__ == "__main__":
Expand Down
2 changes: 1 addition & 1 deletion scripts/demo_assets/static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
></script>

<script>
window.location.href = "examples/colmap";
window.location.href = "examples/structure_from_motion";
</script>
</body>
</html>
Expand Down

0 comments on commit ad77e2d

Please sign in to comment.