Skip to content

Commit 08b500e

Browse files
committed
updated paths (#67)
1 parent 56b5fe9 commit 08b500e

File tree

11 files changed

+61
-56
lines changed

11 files changed

+61
-56
lines changed

README.md

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ This is a required step to generate robot masks.
122122

123123
```shell
124124
rr-sam2 \
125-
--path test/data/lbr_med7/zed2i \
125+
--path test/assets/lbr_med7/zed2i \
126126
--pattern "left_image_*.png" \
127127
--n-positive-samples 5 \
128128
--n-negative-samples 5 \
@@ -134,8 +134,8 @@ The Hydra robust ICP implements a point-to-plane ICP registration on a Lie algeb
134134

135135
```shell
136136
rr-hydra \
137-
--camera-info-file test/data/lbr_med7/zed2i/left_camera_info.yaml \
138-
--path test/data/lbr_med7/zed2i \
137+
--camera-info-file test/assets/lbr_med7/zed2i/left_camera_info.yaml \
138+
--path test/assets/lbr_med7/zed2i \
139139
--mask-pattern mask_sam2_left_image_*.png \
140140
--depth-pattern depth_*.npy \
141141
--joint-states-pattern joint_states_*.npy \
@@ -173,8 +173,8 @@ rr-cam-swarm \
173173
--target-reduction 0.95 \
174174
--scale 0.1 \
175175
--n-samples 1 \
176-
--camera-info-file test/data/lbr_med7/zed2i/left_camera_info.yaml \
177-
--path test/data/lbr_med7/zed2i \
176+
--camera-info-file test/assets/lbr_med7/zed2i/left_camera_info.yaml \
177+
--path test/assets/lbr_med7/zed2i \
178178
--image-pattern left_image_*.png \
179179
--joint-states-pattern joint_states_*.npy \
180180
--mask-pattern mask_sam2_left_image_*.png \
@@ -199,9 +199,9 @@ rr-mono-dr \
199199
--xacro-path urdf/med7/med7.xacro \
200200
--root-link-name lbr_link_0 \
201201
--end-link-name lbr_link_7 \
202-
--camera-info-file test/data/lbr_med7/zed2i/left_camera_info.yaml \
203-
--extrinsics-file test/data/lbr_med7/zed2i/HT_hydra_robust.npy \
204-
--path test/data/lbr_med7/zed2i \
202+
--camera-info-file test/assets/lbr_med7/zed2i/left_camera_info.yaml \
203+
--extrinsics-file test/assets/lbr_med7/zed2i/HT_hydra_robust.npy \
204+
--path test/assets/lbr_med7/zed2i \
205205
--image-pattern left_image_*.png \
206206
--joint-states-pattern joint_states_*.npy \
207207
--mask-pattern mask_sam2_left_image_*.png \
@@ -226,11 +226,11 @@ rr-stereo-dr \
226226
--xacro-path urdf/med7/med7.xacro \
227227
--root-link-name lbr_link_0 \
228228
--end-link-name lbr_link_7 \
229-
--left-camera-info-file test/data/lbr_med7/zed2i/left_camera_info.yaml \
230-
--right-camera-info-file test/data/lbr_med7/zed2i/right_camera_info.yaml \
231-
--left-extrinsics-file test/data/lbr_med7/zed2i/HT_hydra_robust.npy \
232-
--right-extrinsics-file test/data/lbr_med7/zed2i/HT_right_to_left.npy \
233-
--path test/data/lbr_med7/zed2i \
229+
--left-camera-info-file test/assets/lbr_med7/zed2i/left_camera_info.yaml \
230+
--right-camera-info-file test/assets/lbr_med7/zed2i/right_camera_info.yaml \
231+
--left-extrinsics-file test/assets/lbr_med7/zed2i/HT_hydra_robust.npy \
232+
--right-extrinsics-file test/assets/lbr_med7/zed2i/HT_right_to_left.npy \
233+
--path test/assets/lbr_med7/zed2i \
234234
--left-image-pattern left_image_*.png \
235235
--right-image-pattern right_image_*.png \
236236
--joint-states-pattern joint_states_*.npy \
@@ -256,13 +256,13 @@ rr-render \
256256
--xacro-path urdf/med7/med7.xacro \
257257
--root-link-name lbr_link_0 \
258258
--end-link-name lbr_link_7 \
259-
--camera-info-file test/data/lbr_med7/zed2i/left_camera_info.yaml \
260-
--extrinsics-file test/data/lbr_med7/zed2i/HT_left_dr.npy \
261-
--images-path test/data/lbr_med7/zed2i \
262-
--joint-states-path test/data/lbr_med7/zed2i \
259+
--camera-info-file test/assets/lbr_med7/zed2i/left_camera_info.yaml \
260+
--extrinsics-file test/assets/lbr_med7/zed2i/HT_left_dr.npy \
261+
--images-path test/assets/lbr_med7/zed2i \
262+
--joint-states-path test/assets/lbr_med7/zed2i \
263263
--image-pattern left_image_*.png \
264264
--joint-states-pattern joint_states_*.npy \
265-
--output-path test/data/lbr_med7/zed2i
265+
--output-path test/assets/lbr_med7/zed2i
266266
```
267267

268268
## Testing
@@ -273,8 +273,8 @@ To run Hydra robust ICP on provided `xarm` and `realsense` data, run
273273

274274
```shell
275275
rr-hydra \
276-
--camera-info-file test/data/xarm/realsense/camera_info.yaml \
277-
--path test/data/xarm/realsense \
276+
--camera-info-file test/assets/xarm/realsense/camera_info.yaml \
277+
--path test/assets/xarm/realsense \
278278
--mask-pattern mask_*.png \
279279
--depth-pattern depth_*.npy \
280280
--joint-states-pattern joint_state_*.npy \
@@ -297,13 +297,13 @@ rr-render \
297297
--xacro-path urdf/xarm_device.urdf.xacro \
298298
--root-link-name link_base \
299299
--end-link-name link7 \
300-
--camera-info-file test/data/xarm/realsense/camera_info.yaml \
301-
--extrinsics-file test/data/xarm/realsense/HT_hydra_robust.npy \
302-
--images-path test/data/xarm/realsense \
303-
--joint-states-path test/data/xarm/realsense \
300+
--camera-info-file test/assets/xarm/realsense/camera_info.yaml \
301+
--extrinsics-file test/assets/xarm/realsense/HT_hydra_robust.npy \
302+
--images-path test/assets/xarm/realsense \
303+
--joint-states-path test/assets/xarm/realsense \
304304
--image-pattern img_*.png \
305305
--joint-states-pattern joint_state_*.npy \
306-
--output-path test/data/xarm/realsense
306+
--output-path test/assets/xarm/realsense
307307
```
308308

309309
## Acknowledgements

test/differentiable/test_rendering.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class TestRendering:
2121
def __init__(
2222
self,
2323
device: str = "cuda" if torch.cuda.is_available() else "cpu",
24-
data_prefix: str = "test/data/lbr_med7",
24+
data_prefix: str = "test/assets/lbr_med7",
2525
recording_prefix: str = "zed2i/high_res",
2626
root_link_name: str = "lbr_link_0",
2727
end_link_name: str = "lbr_link_7",
@@ -401,7 +401,7 @@ def test_multi_camera_pose_rendering() -> None:
401401

402402
# load a sample mesh
403403
meshes = rrd.TorchMeshContainer(
404-
{"link_0": "test/data/lbr_med7/mesh/link_0.stl"},
404+
{"link_0": "test/assets/lbr_med7/mesh/link_0.stl"},
405405
batch_size=batch_size,
406406
device=device,
407407
)

test/differentiable/test_scene.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def __init__(
2222
root_link_name: str = "lbr_link_0",
2323
end_link_name: str = "lbr_link_7",
2424
camera_requires_grad: bool = False,
25-
data_prefix: str = "test/data/lbr_med7",
25+
data_prefix: str = "test/assets/lbr_med7",
2626
recording_prefix: str = "zed2i",
2727
) -> None:
2828
prefix = os.path.join(data_prefix, recording_prefix)
@@ -232,8 +232,8 @@ def test_single_camera_multiple_poses() -> None:
232232
camera_name = "camera"
233233
camera = {
234234
camera_name: create_virtual_camera(
235-
camera_info_file="test/data/lbr_med7/zed2i/left_camera_info.yaml",
236-
extrinsics_file="test/data/lbr_med7/zed2i/HT_hydra_robust.npy",
235+
camera_info_file="test/assets/lbr_med7/zed2i/left_camera_info.yaml",
236+
extrinsics_file="test/assets/lbr_med7/zed2i/HT_hydra_robust.npy",
237237
device=device,
238238
)
239239
}

test/differentiable/test_structs.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ def test_torch_mesh_container() -> None:
1515
# test load simple meshes
1616
torch_robot_mesh = TorchMeshContainer(
1717
mesh_paths={
18-
"link_0": "test/data/lbr_med7/mesh/link_0.stl",
19-
"link_1": "test/data/lbr_med7/mesh/link_1.stl",
18+
"link_0": "test/assets/lbr_med7/mesh/link_0.stl",
19+
"link_1": "test/assets/lbr_med7/mesh/link_1.stl",
2020
}
2121
)
2222
print(torch_robot_mesh.per_mesh_vertex_count)
@@ -28,8 +28,8 @@ def test_torch_mesh_container() -> None:
2828
# test load visual meshes
2929
torch_robot_mesh = TorchMeshContainer(
3030
mesh_paths={
31-
"link_0": "test/data/lbr_med7/mesh/link_0.dae",
32-
"link_1": "test/data/lbr_med7/mesh/link_1.dae",
31+
"link_0": "test/assets/lbr_med7/mesh/link_0.dae",
32+
"link_1": "test/assets/lbr_med7/mesh/link_1.dae",
3333
}
3434
)
3535
print(torch_robot_mesh.per_mesh_vertex_count)
@@ -45,8 +45,8 @@ def test_torch_mesh_container() -> None:
4545
target_reduction = 0.6
4646
torch_robot_mesh = TorchMeshContainer(
4747
mesh_paths={
48-
"link_0": "test/data/lbr_med7/mesh/link_0.dae",
49-
"link_1": "test/data/lbr_med7/mesh/link_1.dae",
48+
"link_0": "test/assets/lbr_med7/mesh/link_0.dae",
49+
"link_1": "test/assets/lbr_med7/mesh/link_1.dae",
5050
},
5151
target_reduction=target_reduction,
5252
)

test/test_detector.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def test_sample_parser_mixin() -> None:
1515
detector = OpenCVDetector()
1616
detector.positive_samples = [[1, 2], [3, 4]]
1717
detector.negative_samples = [[5, 6]]
18-
csv_file = "test/data/samples.csv"
18+
csv_file = "test/assets/samples.csv"
1919
detector.write(csv_file, samples=detector.samples, labels=detector.labels)
2020

2121
detector.clear()

test/test_hydra_icp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def test_hydra_icp():
103103
xacro_path = "urdf/med7/med7.xacro"
104104
root_link_name = "lbr_link_0"
105105
end_link_name = "lbr_link_7"
106-
path = "test/data/lbr_med7/zed2i"
106+
path = "test/assets/lbr_med7/zed2i"
107107
camera_info_file = "left_camera_info.yaml"
108108
joint_states_pattern = "joint_states_*.npy"
109109
mask_pattern = "mask_sam2_left_*.png"
@@ -226,7 +226,7 @@ def test_hydra_robust_icp() -> None:
226226
xacro_path = "urdf/med7/med7.xacro"
227227
root_link_name = "lbr_link_0"
228228
end_link_name = "lbr_link_7"
229-
path = "test/data/lbr_med7/zed2i"
229+
path = "test/assets/lbr_med7/zed2i"
230230
camera_info_file = "left_camera_info.yaml"
231231
joint_states_pattern = "joint_states_*.npy"
232232
mask_pattern = "mask_sam2_left_*.png"

test/test_io.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ def test_urdf_parser() -> None:
1818

1919

2020
def test_find_files() -> None:
21-
path = "test/data/lbr_med7/zed2i"
21+
path = "test/assets/lbr_med7/zed2i"
2222
for mask_file in find_files(path, "mask_sam2_left_*.png"):
2323
print(mask_file)
2424

2525

2626
def test_parse_camera_info() -> None:
27-
path = "test/data/lbr_med7/zed2i"
27+
path = "test/assets/lbr_med7/zed2i"
2828
file = "left_camera_info.yaml"
2929
height, width, intrinsic_matrix = parse_camera_info(os.path.join(path, file))
3030

@@ -35,7 +35,7 @@ def test_parse_camera_info() -> None:
3535

3636
def test_parse_hydra_data() -> None:
3737
joint_states, masks, depths = parse_hydra_data(
38-
"test/data/lbr_med7/zed2i",
38+
"test/assets/lbr_med7/zed2i",
3939
joint_states_pattern="joint_states_*.npy",
4040
mask_pattern="mask_sam2_left_*.png",
4141
depth_pattern="depth_*.npy",

test/test_segmentor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010

1111
def test_sam2_segmentor() -> None:
12-
img = cv2.imread("test/data/lbr_med7/zed2i/high_res/image_1.png")
12+
img = cv2.imread("test/assets/lbr_med7/zed2i/high_res/image_1.png")
1313

1414
# detect
1515
detector = OpenCVDetector(n_positive_samples=5) # number of detected samples
@@ -31,7 +31,7 @@ def test_sam2_segmentor() -> None:
3131

3232

3333
def test_sam_segmentor() -> None:
34-
img = cv2.imread("test/data/lbr_med7/zed2i/high_res/image_1.png")
34+
img = cv2.imread("test/assets/lbr_med7/zed2i/high_res/image_1.png")
3535

3636
# detect
3737
detector = OpenCVDetector(n_positive_samples=5) # number of detected samples

test/util/test_mask.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
def test_dilate_with_kernel() -> None:
2020
idx = 1
2121
mask = cv2.imread(
22-
f"test/data/lbr_med7/zed2i/mask_sam2_left_image_{idx}.png", cv2.IMREAD_GRAYSCALE
22+
f"test/assets/lbr_med7/zed2i/mask_sam2_left_image_{idx}.png",
23+
cv2.IMREAD_GRAYSCALE,
2324
)
2425
extended_mask = mask_dilate_with_kernel(mask)
2526
cv2.imshow("mask", mask)
@@ -31,7 +32,8 @@ def test_dilate_with_kernel() -> None:
3132
def test_erode_with_kernel() -> None:
3233
idx = 1
3334
mask = cv2.imread(
34-
f"test/data/lbr_med7/zed2i/mask_sam2_left_image_{idx}.png", cv2.IMREAD_GRAYSCALE
35+
f"test/assets/lbr_med7/zed2i/mask_sam2_left_image_{idx}.png",
36+
cv2.IMREAD_GRAYSCALE,
3537
)
3638
shrinked_mask = mask_erode_with_kernel(mask)
3739
cv2.imshow("mask", mask)
@@ -43,7 +45,8 @@ def test_erode_with_kernel() -> None:
4345
def test_exponential_distance_transform() -> None:
4446
idx = 1
4547
mask = cv2.imread(
46-
f"test/data/lbr_med7/zed2i/mask_sam2_left_image_{idx}.png", cv2.IMREAD_GRAYSCALE
48+
f"test/assets/lbr_med7/zed2i/mask_sam2_left_image_{idx}.png",
49+
cv2.IMREAD_GRAYSCALE,
4750
)
4851
exponential_distance_map = mask_exponential_distance_transform(mask)
4952
cv2.imshow("mask", mask)
@@ -54,9 +57,10 @@ def test_exponential_distance_transform() -> None:
5457

5558
def test_extract_boundary() -> None:
5659
idx = 1
57-
img = cv2.imread(f"test/data/lbr_med7/zed2i/left_image_{idx}.png")
60+
img = cv2.imread(f"test/assets/lbr_med7/zed2i/left_image_{idx}.png")
5861
mask = cv2.imread(
59-
f"test/data/lbr_med7/zed2i/mask_sam2_left_image_{idx}.png", cv2.IMREAD_GRAYSCALE
62+
f"test/assets/lbr_med7/zed2i/mask_sam2_left_image_{idx}.png",
63+
cv2.IMREAD_GRAYSCALE,
6064
)
6165
boundary_mask = mask_extract_boundary(mask)
6266
overlay = overlay_mask(img, boundary_mask, mode="b", alpha=1.0, scale=1.0)
@@ -69,9 +73,10 @@ def test_extract_boundary() -> None:
6973

7074
def test_extract_extended_boundary() -> None:
7175
idx = 1
72-
img = cv2.imread(f"test/data/lbr_med7/zed2i/left_image_{idx}.png")
76+
img = cv2.imread(f"test/assets/lbr_med7/zed2i/left_image_{idx}.png")
7377
mask = cv2.imread(
74-
f"test/data/lbr_med7/zed2i/mask_sam2_left_image_{idx}.png", cv2.IMREAD_GRAYSCALE
78+
f"test/assets/lbr_med7/zed2i/mask_sam2_left_image_{idx}.png",
79+
cv2.IMREAD_GRAYSCALE,
7580
)
7681
extended_boundary_mask = mask_extract_extended_boundary(
7782
mask, dilation_kernel=np.ones([2, 2]), erosion_kernel=np.ones([10, 10])

test/util/test_transform.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ def test_depth_to_xyz() -> None:
7474

7575
def test_realsense_depth_to_xyz() -> None:
7676
device = "cuda" if torch.cuda.is_available() else "cpu"
77-
path = "test/data/xarm/realsense"
77+
path = "test/assets/xarm/realsense"
7878
depth_files = find_files(path, "depth_*.npy")
7979
height, width, intrinsics = parse_camera_info(
80-
"test/data/xarm/realsense/camera_info.yaml"
80+
"test/assets/xarm/realsense/camera_info.yaml"
8181
)
8282
intrinsics = torch.tensor(intrinsics, dtype=torch.float32, device=device)
8383
depths = torch.tensor(

0 commit comments

Comments
 (0)