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

feat: use pipefunc.helpers.collect_kwargs #30

Merged
merged 1 commit into from
Dec 31, 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
19 changes: 7 additions & 12 deletions config/_templates/dataset/yaak.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,17 @@ inputs:
cache_dir: /tmp/rbyte-cache
functions:
- _target_: pipefunc.PipeFunc
scope: meta
output_name: data
scope: yaak_metadata
output_name: output
cache: true
func:
_target_: hydra.utils.get_method
path: rbyte.io.build_yaak_metadata_dataframe

- _target_: pipefunc.PipeFunc
scope: mcap
bound:
path: ${data_dir}/(@=input_id@)/ai.mcap
output_name: data
output_name: mcap
func:
_target_: rbyte.io.McapDataFrameBuilder
decoder_factories: [rbyte.utils._mcap.ProtobufDecoderFactory]
Expand All @@ -61,14 +60,10 @@ inputs:

- _target_: pipefunc.PipeFunc
func:
_target_: hydra.utils.get_method
path: rbyte.utils.make_dict
bound:
k0: meta
k1: mcap
_target_: pipefunc.helpers.collect_kwargs
parameters: [meta, mcap]
renames:
v0: meta.data
v1: mcap.data
meta: yaak_metadata.output
output_name: data

- _target_: pipefunc.PipeFunc
Expand Down Expand Up @@ -137,7 +132,7 @@ inputs:
length: 6

kwargs:
meta:
yaak_metadata:
path: ${data_dir}/(@=input_id@)/metadata.log
fields:
rbyte.io.yaak.proto.sensor_pb2.ImageMetadata:
Expand Down
18 changes: 5 additions & 13 deletions config/_templates/dataset/zod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ inputs:
- _target_: pipefunc.PipeFunc
bound:
path: "${data_dir}/sequences/000002_short/camera_front_blur/000002_romeo_{timestamp:%Y-%m-%dT%H:%M:%S.%f}Z.jpg"
output_name: camera_front_blur_data
output_name: camera_front_blur
func:
_target_: rbyte.io.PathDataFrameBuilder
fields:
Expand All @@ -43,7 +43,7 @@ inputs:
- _target_: pipefunc.PipeFunc
bound:
path: "${data_dir}/sequences/000002_short/lidar_velodyne/000002_romeo_{timestamp:%Y-%m-%dT%H:%M:%S.%f}Z.npy"
output_name: lidar_velodyne_data
output_name: lidar_velodyne
func:
_target_: rbyte.io.PathDataFrameBuilder
fields:
Expand Down Expand Up @@ -74,18 +74,10 @@ inputs:
speed/meters_per_second/value:

- _target_: pipefunc.PipeFunc
bound:
k0: camera_front_blur
k1: lidar_velodyne
k2: vehicle_data
renames:
v0: camera_front_blur_data
v1: lidar_velodyne_data
v2: vehicle_data
output_name: data
func:
_target_: hydra.utils.get_method
path: rbyte.utils.make_dict
_target_: pipefunc.helpers.collect_kwargs
parameters: [camera_front_blur, lidar_velodyne, vehicle_data]
output_name: data

- _target_: pipefunc.PipeFunc
renames:
Expand Down
11 changes: 5 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[project]
name = "rbyte"
version = "0.10.1"
version = "0.10.2"
description = "Multimodal PyTorch dataset library"
authors = [{ name = "Evgenii Gorchakov", email = "[email protected]" }]
maintainers = [{ name = "Evgenii Gorchakov", email = "[email protected]" }]
dependencies = [
"tensordict>=0.6.2",
"torch",
"numpy",
"polars>=1.16.0",
"polars>=1.18.0",
"pydantic>=2.10.2",
"more-itertools>=10.5.0",
"hydra-core>=1.3.2",
Expand All @@ -17,9 +17,8 @@ dependencies = [
"diskcache>=5.6.3",
"parse>=1.20.2",
"structlog>=24.4.0",
"xxhash>=3.5.0",
"tqdm>=4.66.5",
"pipefunc>=0.41.0",
"pipefunc>=0.46.0",
]
readme = "README.md"
requires-python = ">=3.12,<3.13"
Expand All @@ -39,7 +38,7 @@ repo = "https://github.com/yaak-ai/rbyte"

[project.optional-dependencies]
build = ["hatchling>=1.25.0", "grpcio-tools>=1.62.0", "protoletariat==3.2.19"]
visualize = ["rerun-sdk[notebook]>=0.20.2"]
visualize = ["rerun-sdk[notebook]>=0.21.0"]
mcap = [
"mcap>=1.2.1",
"mcap-ros2-support>=0.5.5",
Expand All @@ -53,7 +52,7 @@ video = [
"video-reader-rs>=0.2.1",
]
hdf5 = ["h5py>=3.12.1"]
rrd = ["rerun-sdk>=0.20.2", "pyarrow-stubs"]
rrd = ["rerun-sdk>=0.21.0", "pyarrow-stubs"]

[project.scripts]
rbyte-visualize = 'rbyte.scripts.visualize:main'
Expand Down
2 changes: 1 addition & 1 deletion src/rbyte/io/yaak/idl-repo
3 changes: 0 additions & 3 deletions src/rbyte/utils/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
from ._pipefunc import make_dict

__all__ = ["make_dict"]
33 changes: 0 additions & 33 deletions src/rbyte/utils/_pipefunc.py

This file was deleted.

2 changes: 1 addition & 1 deletion src/rbyte/viz/loggers/rerun_logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,6 @@ def log(self, batch_idx: int, batch: Batch) -> None:
rr.send_columns(
entity_path=entity_path,
times=times,
components=components, # pyright: ignore[reportArgumentType]
components=components,
strict=True,
)
Loading