incomplete merge

This commit is contained in:
Michel Aractingi
2024-12-10 16:55:55 +01:00
parent 839dac9cd4
commit ceda66e2bc

View File

@@ -291,22 +291,14 @@ class LeRobotDatasetMetadata:
obj.root.mkdir(parents=True, exist_ok=False) obj.root.mkdir(parents=True, exist_ok=False)
if robot is not None: if robot is not None:
<<<<<<< HEAD
features = {**(features or {}), **get_features_from_robot(robot)} features = {**(features or {}), **get_features_from_robot(robot)}
=======
features = get_features_from_robot(robot, use_videos)
>>>>>>> main
robot_type = robot.robot_type robot_type = robot.robot_type
if not all(cam.fps == fps for cam in robot.cameras.values()): if not all(cam.fps == fps for cam in robot.cameras.values()):
logging.warning( logging.warning(
f"Some cameras in your {robot.robot_type} robot don't have an fps matching the fps of your dataset." f"Some cameras in your {robot.robot_type} robot don't have an fps matching the fps of your dataset."
"In this case, frames from lower fps cameras will be repeated to fill in the blanks." "In this case, frames from lower fps cameras will be repeated to fill in the blanks."
) )
<<<<<<< HEAD
elif robot_type is None or features is None: elif robot_type is None or features is None:
=======
elif features is None:
>>>>>>> main
raise ValueError( raise ValueError(
"Dataset features must either come from a Robot or explicitly passed upon creation." "Dataset features must either come from a Robot or explicitly passed upon creation."
) )