Skip to content

Commit 11722e4

Browse files
committed
some background stuff was popping up unexpectedly
1 parent 52a2d8f commit 11722e4

File tree

2 files changed

+25
-33
lines changed

2 files changed

+25
-33
lines changed

notebooks/explore_dset2.ipynb

+17-32
Original file line numberDiff line numberDiff line change
@@ -47,33 +47,6 @@
4747
")"
4848
]
4949
},
50-
{
51-
"cell_type": "code",
52-
"execution_count": null,
53-
"metadata": {},
54-
"outputs": [],
55-
"source": [
56-
"data = dset[0]"
57-
]
58-
},
59-
{
60-
"cell_type": "code",
61-
"execution_count": null,
62-
"metadata": {},
63-
"outputs": [],
64-
"source": [
65-
"data[\"ignore_collisions\"]"
66-
]
67-
},
68-
{
69-
"cell_type": "code",
70-
"execution_count": null,
71-
"metadata": {},
72-
"outputs": [],
73-
"source": [
74-
"data.keys()"
75-
]
76-
},
7750
{
7851
"cell_type": "code",
7952
"execution_count": null,
@@ -401,13 +374,23 @@
401374
"outputs": [],
402375
"source": [
403376
"# Get a mapping from handle id to handle name.\n",
404-
"handle_mapping = load_handle_mapping(\"/data/rlbench10/\", task_name, 0)\n",
377+
"task_name = \"put_money_in_safe\"\n",
378+
"handle_mapping = load_handle_mapping(\"/data/rlbench10_collisions/\", task_name, 0)\n",
405379
"rev_handle_mapping = {v: k for k, v in handle_mapping.items()}\n",
406380
"\n",
407381
"q_id = 100\n",
408382
"rev_handle_mapping[q_id]"
409383
]
410384
},
385+
{
386+
"cell_type": "code",
387+
"execution_count": null,
388+
"metadata": {},
389+
"outputs": [],
390+
"source": [
391+
"handle_mapping"
392+
]
393+
},
411394
{
412395
"cell_type": "code",
413396
"execution_count": null,
@@ -510,7 +493,7 @@
510493
"N_DEMOS = 10\n",
511494
"# Create a dataset for that phase.\n",
512495
"dset = RLBenchPlacementDataset(\n",
513-
" dataset_root=\"/data/rlbench10/\",\n",
496+
" dataset_root=\"/data/rlbench10_collisions/\",\n",
514497
" task_name=\"take_umbrella_out_of_umbrella_stand\",\n",
515498
" demos=range(N_DEMOS),\n",
516499
" phase=phase,\n",
@@ -571,12 +554,12 @@
571554
"\n",
572555
"# task_name = \"pick_and_lift\"\n",
573556
"# task_name = \"pick_up_cup\"\n",
574-
"# task_name = \"put_knife_on_chopping_board\"\n",
557+
"task_name = \"put_knife_on_chopping_board\"\n",
575558
"# task_name = \"put_money_in_safe\"\n",
576559
"# task_name = \"push_button\"\n",
577560
"# task_name = \"reach_target\"\n",
578561
"# task_name = \"slide_block_to_target\"\n",
579-
"task_name = \"stack_wine\"\n",
562+
"# task_name = \"stack_wine\"\n",
580563
"# task_name = \"take_money_out_safe\"\n",
581564
"# task_name = \"take_umbrella_out_of_umbrella_stand\"\n",
582565
"\n",
@@ -586,14 +569,16 @@
586569
"for ix, phase in enumerate(TASK_DICT[task_name][\"phase_order\"]):\n",
587570
" print(f\"Phase: {phase}\")\n",
588571
" dset = RLBenchPlacementDataset(\n",
589-
" dataset_root=\"/data/rlbench10/\",\n",
572+
" dataset_root=\"/data/rlbench10_collisions/\",\n",
590573
" task_name=task_name,\n",
591574
" demos=[0],\n",
592575
" phase=phase,\n",
593576
" debugging=False,\n",
594577
" use_first_as_init_keyframe=False,\n",
595578
" anchor_mode=\"background_robot_removed\",\n",
596579
" action_mode=\"gripper_and_object\",\n",
580+
" include_wrist_cam=True,\n",
581+
" gripper_in_first_phase=True,\n",
597582
" )\n",
598583
"\n",
599584
" data = dset[0]\n",

src/rpad/rlbench_utils/placement_dataset.py

+8-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,11 @@ def load_state_pos_dict(
141141

142142
BACKGROUND_NAMES = [
143143
"ResizableFloor_5_25_visibleElement",
144+
"Wall1",
145+
"Wall2",
144146
"Wall3",
147+
"Wall4",
148+
"Roof",
145149
"diningTable_visible",
146150
"workspace",
147151
]
@@ -213,7 +217,10 @@ def get_anchor_points(
213217
names = BACKGROUND_NAMES + ROBOT_NONGRIPPER_NAMES
214218

215219
# If it's the first phase, we also omit the gripper.
216-
if phase == TASK_DICT[task_name]["phase_order"][0] and gripper_in_first_phase:
220+
if (
221+
phase == TASK_DICT[task_name]["phase_order"][0]
222+
and not gripper_in_first_phase
223+
):
217224
names += GRIPPER_OBJ_NAMES
218225

219226
return filter_out_names(rgb, point_cloud, mask, handle_mapping, names)

0 commit comments

Comments
 (0)