Skip to content

Commit d57082b

Browse files
committed
updated test data paths
1 parent bfb90e9 commit d57082b

File tree

10 files changed

+50
-46
lines changed

10 files changed

+50
-46
lines changed

README.md

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

137137
```shell
138138
rr-sam2 \
139-
--path test/assets/lbr_med7/zed2i \
139+
--path test/assets/lbr_med7_r800/samples \
140140
--pattern "left_image_*.png" \
141141
--n-positive-samples 5 \
142142
--n-negative-samples 5 \
@@ -148,8 +148,8 @@ The Hydra robust ICP implements a point-to-plane ICP registration on a Lie algeb
148148

149149
```shell
150150
rr-hydra \
151-
--camera-info-file test/assets/lbr_med7/zed2i/left_camera_info.yaml \
152-
--path test/assets/lbr_med7/zed2i \
151+
--camera-info-file test/assets/lbr_med7_r800/samples/left_camera_info.yaml \
152+
--path test/assets/lbr_med7_r800/samples \
153153
--mask-pattern mask_sam2_left_image_*.png \
154154
--depth-pattern depth_*.npy \
155155
--joint-states-pattern joint_states_*.npy \
@@ -188,8 +188,8 @@ rr-cam-swarm \
188188
--target-reduction 0.8 \
189189
--scale 0.1 \
190190
--n-samples 1 \
191-
--camera-info-file test/assets/lbr_med7/zed2i/left_camera_info.yaml \
192-
--path test/assets/lbr_med7/zed2i \
191+
--camera-info-file test/assets/lbr_med7_r800/samples/left_camera_info.yaml \
192+
--path test/assets/lbr_med7_r800/samples \
193193
--image-pattern left_image_*.png \
194194
--joint-states-pattern joint_states_*.npy \
195195
--mask-pattern mask_sam2_left_image_*.png \
@@ -214,9 +214,9 @@ rr-mono-dr \
214214
--xacro-path urdf/med7/med7.xacro \
215215
--root-link-name lbr_link_0 \
216216
--end-link-name lbr_link_7 \
217-
--camera-info-file test/assets/lbr_med7/zed2i/left_camera_info.yaml \
218-
--extrinsics-file test/assets/lbr_med7/zed2i/HT_hydra_robust.npy \
219-
--path test/assets/lbr_med7/zed2i \
217+
--camera-info-file test/assets/lbr_med7_r800/samples/left_camera_info.yaml \
218+
--extrinsics-file test/assets/lbr_med7_r800/samples/HT_hydra_robust.npy \
219+
--path test/assets/lbr_med7_r800/samples \
220220
--image-pattern left_image_*.png \
221221
--joint-states-pattern joint_states_*.npy \
222222
--mask-pattern mask_sam2_left_image_*.png \
@@ -241,11 +241,11 @@ rr-stereo-dr \
241241
--xacro-path urdf/med7/med7.xacro \
242242
--root-link-name lbr_link_0 \
243243
--end-link-name lbr_link_7 \
244-
--left-camera-info-file test/assets/lbr_med7/zed2i/left_camera_info.yaml \
245-
--right-camera-info-file test/assets/lbr_med7/zed2i/right_camera_info.yaml \
246-
--left-extrinsics-file test/assets/lbr_med7/zed2i/HT_hydra_robust.npy \
247-
--right-extrinsics-file test/assets/lbr_med7/zed2i/HT_right_to_left.npy \
248-
--path test/assets/lbr_med7/zed2i \
244+
--left-camera-info-file test/assets/lbr_med7_r800/samples/left_camera_info.yaml \
245+
--right-camera-info-file test/assets/lbr_med7_r800/samples/right_camera_info.yaml \
246+
--left-extrinsics-file test/assets/lbr_med7_r800/samples/HT_hydra_robust.npy \
247+
--right-extrinsics-file test/assets/lbr_med7_r800/samples/HT_right_to_left.npy \
248+
--path test/assets/lbr_med7_r800/samples \
249249
--left-image-pattern left_image_*.png \
250250
--right-image-pattern right_image_*.png \
251251
--joint-states-pattern joint_states_*.npy \
@@ -271,13 +271,13 @@ rr-render \
271271
--xacro-path urdf/med7/med7.xacro \
272272
--root-link-name lbr_link_0 \
273273
--end-link-name lbr_link_7 \
274-
--camera-info-file test/assets/lbr_med7/zed2i/left_camera_info.yaml \
275-
--extrinsics-file test/assets/lbr_med7/zed2i/HT_left_dr.npy \
276-
--images-path test/assets/lbr_med7/zed2i \
277-
--joint-states-path test/assets/lbr_med7/zed2i \
274+
--camera-info-file test/assets/lbr_med7_r800/samples/left_camera_info.yaml \
275+
--extrinsics-file test/assets/lbr_med7_r800/samples/HT_left_dr.npy \
276+
--images-path test/assets/lbr_med7_r800/samples \
277+
--joint-states-path test/assets/lbr_med7_r800/samples \
278278
--image-pattern left_image_*.png \
279279
--joint-states-pattern joint_states_*.npy \
280-
--output-path test/assets/lbr_med7/zed2i
280+
--output-path test/assets/lbr_med7_r800/samples
281281
```
282282

283283
## Testing

test/differentiable/test_rendering.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ def test_multi_camera_pose_rendering() -> None:
407407

408408
# load a sample mesh
409409
meshes = rrd.TorchMeshContainer(
410-
{"link_0": "test/assets/lbr_med7/mesh/link_0.stl"},
410+
{"link_0": "test/assets/lbr_med7_r800/description/meshes/collision/link_0.stl"},
411411
batch_size=batch_size,
412412
device=device,
413413
)

test/differentiable/test_scene.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,8 @@ def test_single_camera_multiple_poses() -> None:
236236
camera_name = "camera"
237237
camera = {
238238
camera_name: create_virtual_camera(
239-
camera_info_file="test/assets/lbr_med7/zed2i/left_camera_info.yaml",
240-
extrinsics_file="test/assets/lbr_med7/zed2i/HT_hydra_robust.npy",
239+
camera_info_file="test/assets/lbr_med7_r800/samples/left_camera_info.yaml",
240+
extrinsics_file="test/assets/lbr_med7_r800/samples/HT_hydra_robust.npy",
241241
device=device,
242242
)
243243
}

test/differentiable/test_structs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
def test_torch_mesh_container() -> None:
88
paths = {
9-
"link_0": "test/assets/lbr_med7/mesh/link_0.stl",
10-
"link_1": "test/assets/lbr_med7/mesh/link_1.stl",
9+
"link_0": "test/assets/lbr_med7_r800/description/meshes/collision/link_0.stl",
10+
"link_1": "test/assets/lbr_med7_r800/description/meshes/collision/link_1.stl",
1111
}
1212
device = "cpu"
1313
container = TorchMeshContainer(

test/io/test_meshes.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55

66
def test_load_mesh() -> None:
7-
path = "test/assets/lbr_med7/mesh/link_0.dae"
7+
path = "test/assets/lbr_med7_r800/description/meshes/visual/link_0.dae"
88
mesh = load_mesh(path=path)
99
assert mesh.vertices.shape[-1] == 3, "Expected vertices of shape Nx3."
1010
assert mesh.faces.shape[-1] == 3, "Expected faces of shape Nx3."
1111
assert type(mesh.vertices) == np.ndarray, "Expected vertices to be numpy ndarray."
1212
assert type(mesh.faces) == np.ndarray, "Expected faces to be numpy ndarray."
1313

14-
path = "test/assets/lbr_med7/mesh/link_0.stl"
14+
path = "test/assets/lbr_med7_r800/description/meshes/collision/link_0.stl"
1515
mesh = load_mesh(path=path)
1616
assert mesh.vertices.shape[-1] == 3, "Expected vertices of shape Nx3."
1717
assert mesh.faces.shape[-1] == 3, "Expected faces of shape Nx3."
@@ -27,8 +27,8 @@ def test_load_mesh() -> None:
2727

2828
def test_load_meshes() -> None:
2929
paths = {
30-
"link_0": "test/assets/lbr_med7/mesh/link_0.stl",
31-
"link_1": "test/assets/lbr_med7/mesh/link_1.stl",
30+
"link_0": "test/assets/lbr_med7_r800/description/meshes/collision/link_0.stl",
31+
"link_1": "test/assets/lbr_med7_r800/description/meshes/collision/link_1.stl",
3232
}
3333
meshes = load_meshes(paths=paths)
3434
assert paths.keys() == meshes.keys(), "Expected same keys."

test/io/test_parsers.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def test_urdf_parser() -> None:
2525

2626

2727
def test_find_files() -> None:
28-
path = "test/assets/lbr_med7/zed2i"
28+
path = "test/assets/lbr_med7_r800/samples"
2929
mask_files = find_files(path, "mask_sam2_left_*.png")
3030

3131
assert len(mask_files) > 0, "Should find at least one mask file."
@@ -37,7 +37,7 @@ def test_find_files() -> None:
3737

3838

3939
def test_parse_camera_info() -> None:
40-
path = Path("test/assets/lbr_med7/zed2i")
40+
path = Path("test/assets/lbr_med7_r800/samples")
4141
file = "left_camera_info.yaml"
4242
height, width, intrinsic_matrix = parse_camera_info(path / file)
4343

@@ -50,7 +50,7 @@ def test_parse_camera_info() -> None:
5050

5151

5252
def test_parse_hydra_data() -> None:
53-
path = "test/assets/lbr_med7/zed2i"
53+
path = "test/assets/lbr_med7_r800/samples"
5454
joint_states, masks, depths = parse_hydra_data(
5555
joint_states_files=find_files(path, "joint_states_*.npy"),
5656
mask_files=find_files(path, "mask_sam2_left_*.png"),
@@ -70,7 +70,7 @@ def test_parse_hydra_data() -> None:
7070

7171

7272
def test_parse_mono_data() -> None:
73-
path = "test/assets/lbr_med7/zed2i"
73+
path = "test/assets/lbr_med7_r800/samples"
7474
images, joint_states, masks = parse_mono_data(
7575
image_files=find_files(path, "left_image_*.png"),
7676
joint_states_files=find_files(path, "joint_states_*.npy"),
@@ -94,7 +94,7 @@ def test_parse_mono_data() -> None:
9494

9595

9696
def test_parse_stereo_data() -> None:
97-
path = "test/assets/lbr_med7/zed2i"
97+
path = "test/assets/lbr_med7_r800/samples"
9898
left_images, right_images, joint_states, left_masks, right_masks = (
9999
parse_stereo_data(
100100
left_image_files=find_files(path, "left_image_*.png"),

test/test_hydra_icp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def test_hydra_icp():
111111
xacro_path = "urdf/med7/med7.xacro"
112112
root_link_name = "lbr_link_0"
113113
end_link_name = "lbr_link_7"
114-
path = Path("test/assets/lbr_med7/zed2i")
114+
path = Path("test/assets/lbr_med7_r800/samples")
115115
camera_info_file = "left_camera_info.yaml"
116116
joint_states_pattern = "joint_states_*.npy"
117117
mask_pattern = "mask_sam2_left_*.png"
@@ -242,7 +242,7 @@ def test_hydra_robust_icp() -> None:
242242
xacro_path = "urdf/med7/med7.xacro"
243243
root_link_name = "lbr_link_0"
244244
end_link_name = "lbr_link_7"
245-
path = Path("test/assets/lbr_med7/zed2i")
245+
path = Path("test/assets/lbr_med7_r800/samples")
246246
camera_info_file = "left_camera_info.yaml"
247247
joint_states_pattern = "joint_states_*.npy"
248248
mask_pattern = "mask_sam2_left_*.png"

test/test_segmentor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
@pytest.mark.skip(reason="To be fixed.")
1111
def test_sam2_segmentor() -> None:
12-
img = cv2.imread("test/assets/lbr_med7/zed2i/high_res/image_1.png")
12+
img = cv2.imread("test/assets/lbr_med7_r800/samples/left_image_1.png")
1313

1414
# detect
1515
detector = OpenCVDetector(n_positive_samples=5) # number of detected samples

test/util/test_mask.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
def test_dilate_with_kernel() -> None:
2323
idx = 1
2424
mask = cv2.imread(
25-
f"test/assets/lbr_med7/zed2i/mask_sam2_left_image_{idx}.png",
25+
f"test/assets/lbr_med7_r800/samples/mask_sam2_left_image_{idx}.png",
2626
cv2.IMREAD_GRAYSCALE,
2727
)
2828
dilated_mask = mask_dilate_with_kernel(mask)
@@ -36,7 +36,7 @@ def test_dilate_with_kernel() -> None:
3636
def test_distance_transform() -> None:
3737
idx = 1
3838
mask = cv2.imread(
39-
f"test/assets/lbr_med7/zed2i/mask_sam2_left_image_{idx}.png",
39+
f"test/assets/lbr_med7_r800/samples/mask_sam2_left_image_{idx}.png",
4040
cv2.IMREAD_GRAYSCALE,
4141
)
4242

@@ -68,7 +68,7 @@ def test_distance_transform() -> None:
6868
def test_erode_with_kernel() -> None:
6969
idx = 1
7070
mask = cv2.imread(
71-
f"test/assets/lbr_med7/zed2i/mask_sam2_left_image_{idx}.png",
71+
f"test/assets/lbr_med7_r800/samples/mask_sam2_left_image_{idx}.png",
7272
cv2.IMREAD_GRAYSCALE,
7373
)
7474
eroded_mask = mask_erode_with_kernel(mask)
@@ -82,7 +82,7 @@ def test_erode_with_kernel() -> None:
8282
def test_exponential_decay() -> None:
8383
idx = 1
8484
mask = cv2.imread(
85-
f"test/assets/lbr_med7/zed2i/mask_sam2_left_image_{idx}.png",
85+
f"test/assets/lbr_med7_r800/samples/mask_sam2_left_image_{idx}.png",
8686
cv2.IMREAD_GRAYSCALE,
8787
)
8888
exponential_decay = mask_exponential_decay(mask)
@@ -95,9 +95,9 @@ def test_exponential_decay() -> None:
9595
@pytest.mark.skip(reason="To be fixed.")
9696
def test_extract_boundary() -> None:
9797
idx = 1
98-
img = cv2.imread(f"test/assets/lbr_med7/zed2i/left_image_{idx}.png")
98+
img = cv2.imread(f"test/assets/lbr_med7_r800/samples/left_image_{idx}.png")
9999
mask = cv2.imread(
100-
f"test/assets/lbr_med7/zed2i/mask_sam2_left_image_{idx}.png",
100+
f"test/assets/lbr_med7_r800/samples/mask_sam2_left_image_{idx}.png",
101101
cv2.IMREAD_GRAYSCALE,
102102
)
103103
boundary_mask = mask_extract_boundary(mask)
@@ -112,9 +112,9 @@ def test_extract_boundary() -> None:
112112
@pytest.mark.skip(reason="To be fixed.")
113113
def test_extract_extended_boundary() -> None:
114114
idx = 1
115-
img = cv2.imread(f"test/assets/lbr_med7/zed2i/left_image_{idx}.png")
115+
img = cv2.imread(f"test/assets/lbr_med7_r800/samples/left_image_{idx}.png")
116116
mask = cv2.imread(
117-
f"test/assets/lbr_med7/zed2i/mask_sam2_left_image_{idx}.png",
117+
f"test/assets/lbr_med7_r800/samples/mask_sam2_left_image_{idx}.png",
118118
cv2.IMREAD_GRAYSCALE,
119119
)
120120
extended_boundary_mask = mask_extract_extended_boundary(

test/util/test_viz.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010
@pytest.mark.skip(reason="To be fixed.")
1111
def test_visualize_point_cloud():
1212
meshes = rrd.TorchMeshContainer(
13-
meshes=load_meshes({"link_0": "test/assets/lbr_med7/mesh/link_0.stl"}),
13+
meshes=load_meshes(
14+
{
15+
"link_0": "test/assets/lbr_med7_r800/description/meshes/collision/link_0.stl"
16+
}
17+
),
1418
device="cpu",
1519
)
1620

@@ -32,8 +36,8 @@ def test_visalize_multi_color_point_cloud():
3236
meshes = rrd.TorchMeshContainer(
3337
meshes=load_meshes(
3438
{
35-
"link_0": "test/assets/lbr_med7/mesh/link_0.stl",
36-
"link_1": "test/assets/lbr_med7/mesh/link_1.stl",
39+
"link_0": "test/assets/lbr_med7_r800/description/meshes/collision/link_0.stl",
40+
"link_1": "test/assets/lbr_med7_r800/description/meshes/collision/link_1.stl",
3741
}
3842
),
3943
device="cpu",

0 commit comments

Comments
 (0)