Merge branch 'main' into easydiffrigid

Author: duburcqa

.github/workflows/production.yml

@@ -24,7 +24,7 @@ jobs:
       WANDB_API_KEY: ${{ secrets.WANDB_API_KEY }}
       HF_TOKEN: ${{ secrets.HF_TOKEN }}
       HF_HUB_DOWNLOAD_TIMEOUT: 60
-      GENESIS_IMAGE_VER: "1_3"
+      GENESIS_IMAGE_VER: "1_4"
       TIMEOUT_MINUTES: 180
       FORCE_COLOR: 1
       PY_COLORS: 1

examples/sensors/contact_force_go2.py

@@ -1,4 +1,5 @@
 import argparse
+import os
 
 from tqdm import tqdm
 
@@ -8,11 +9,11 @@
 
 def main():
     parser = argparse.ArgumentParser()
-    parser.add_argument("-dt", "--timestep", type=float, default=1e-2, help="Simulation time step")
+    parser.add_argument("-dt", "--timestep", type=float, default=0.01, help="Simulation time step")
     parser.add_argument("-v", "--vis", action="store_true", default=True, help="Show visualization GUI")
     parser.add_argument("-nv", "--no-vis", action="store_false", dest="vis", help="Disable visualization GUI")
     parser.add_argument("-c", "--cpu", action="store_true", help="Use CPU instead of GPU")
-    parser.add_argument("-t", "--seconds", type=float, default=2, help="Number of seconds to simulate")
+    parser.add_argument("-t", "--seconds", type=float, default=2.0, help="Number of seconds to simulate")
     parser.add_argument("-f", "--force", action="store_true", default=True, help="Use ContactForceSensor (xyz float)")
     parser.add_argument("-nf", "--no-force", action="store_false", dest="force", help="Use ContactSensor (boolean)")
 
@@ -23,19 +24,25 @@ def main():
 
     ########################## scene setup ##########################
     scene = gs.Scene(
-        sim_options=gs.options.SimOptions(dt=args.timestep),
+        sim_options=gs.options.SimOptions(
+            dt=args.timestep,
+        ),
         rigid_options=gs.options.RigidOptions(
-            use_gjk_collision=True,
             constraint_timeconst=max(0.01, 2 * args.timestep),
+            use_gjk_collision=True,
+        ),
+        vis_options=gs.options.VisOptions(
+            show_world_frame=True,
+        ),
+        profiling_options=gs.options.ProfilingOptions(
+            show_FPS=False,
         ),
-        vis_options=gs.options.VisOptions(show_world_frame=True),
-        profiling_options=gs.options.ProfilingOptions(show_FPS=False),
         show_viewer=args.vis,
     )
 
     scene.add_entity(gs.morphs.Plane())
 
-    foot_link_names = ["FR_foot", "FL_foot", "RR_foot", "RL_foot"]
+    foot_link_names = ("FR_foot", "FL_foot", "RR_foot", "RL_foot")
     go2 = scene.add_entity(
         gs.morphs.URDF(
             file="urdf/go2/urdf/go2.urdf",
@@ -79,7 +86,7 @@ def main():
     scene.build()
 
     try:
-        steps = int(args.seconds / args.timestep)
+        steps = int(args.seconds / args.timestep) if "PYTEST_VERSION" not in os.environ else 5
         for _ in tqdm(range(steps)):
             scene.step()
     except KeyboardInterrupt:

examples/sensors/imu_franka.py

@@ -1,4 +1,5 @@
 import argparse
+import os
 
 import numpy as np
 from tqdm import tqdm
@@ -21,14 +22,20 @@ def main():
 
     ########################## create a scene ##########################
     scene = gs.Scene(
-        sim_options=gs.options.SimOptions(dt=args.timestep),
-        vis_options=gs.options.VisOptions(show_world_frame=False),
+        sim_options=gs.options.SimOptions(
+            dt=args.timestep,
+        ),
+        vis_options=gs.options.VisOptions(
+            show_world_frame=False,
+        ),
         viewer_options=gs.options.ViewerOptions(
             camera_pos=(3.5, 0.0, 2.5),
             camera_lookat=(0.0, 0.0, 0.5),
             camera_fov=40,
         ),
-        profiling_options=gs.options.ProfilingOptions(show_FPS=False),
+        profiling_options=gs.options.ProfilingOptions(
+            show_FPS=False,
+        ),
         show_viewer=args.vis,
     )
 
@@ -40,6 +47,7 @@ def main():
     end_effector = franka.get_link("hand")
     motors_dof = (0, 1, 2, 3, 4, 5, 6)
 
+    ########################## record sensor data ##########################
     imu = scene.add_sensor(
         gs.sensors.IMU(
             entity_idx=franka.idx,
@@ -59,25 +67,38 @@ def main():
             draw_debug=True,
         )
     )
-    labels = {"lin_acc": ("acc_x", "acc_y", "acc_z"), "ang_vel": ("gyro_x", "gyro_y", "gyro_z")}
     if args.vis:
+        xyz = ("x", "y", "z")
+        labels = {"lin_acc": xyz, "true_lin_acc": xyz, "ang_vel": xyz, "true_ang_vel": xyz}
+
+        def data_func():
+            data = imu.read()
+            true_data = imu.read_ground_truth()
+            return {
+                "lin_acc": data.lin_acc,
+                "true_lin_acc": true_data.lin_acc,
+                "ang_vel": data.ang_vel,
+                "true_ang_vel": true_data.ang_vel,
+            }
+
         if IS_PYQTGRAPH_AVAILABLE:
-            imu.start_recording(gs.recorders.PyQtLinePlot(title="IMU Measured Data", labels=labels))
             scene.start_recording(
-                imu.read_ground_truth,
+                data_func,
                 gs.recorders.PyQtLinePlot(title="IMU Ground Truth Data", labels=labels),
             )
         elif IS_MATPLOTLIB_AVAILABLE:
             gs.logger.info("pyqtgraph not found, falling back to matplotlib.")
-            imu.start_recording(gs.recorders.MPLLinePlot(title="IMU Measured Data", labels=labels))
             scene.start_recording(
-                imu.read_ground_truth,
+                data_func,
                 gs.recorders.MPLLinePlot(title="IMU Ground Truth Data", labels=labels),
             )
         else:
             print("matplotlib or pyqtgraph not found, skipping real-time plotting.")
 
-    imu.start_recording(gs.recorders.NPZFile(filename="imu_data.npz"))
+    scene.start_recording(
+        data_func=lambda: imu.read()._asdict(),
+        rec_options=gs.recorders.NPZFile(filename="imu_data.npz"),
+    )
 
     ########################## build ##########################
     scene.build()
@@ -98,7 +119,7 @@ def main():
     rate = np.deg2rad(2.0)
 
     try:
-        steps = int(args.seconds / args.timestep)
+        steps = int(args.seconds / args.timestep) if "PYTEST_VERSION" not in os.environ else 5
         for i in tqdm(range(steps)):
             scene.step()