Skip to content

Commit 454a204

Browse files
interpret works!
1 parent 4838c0c commit 454a204

3 files changed

Lines changed: 22 additions & 15 deletions

File tree

predicators/datasets/generate_atom_trajs_with_vlm.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,10 +1126,10 @@ def create_ground_atom_data_from_generated_demos(
11261126
else:
11271127
# import pdb; pdb.set_trace()
11281128
generate_func = _generate_ground_atoms_with_vlm_pure_visual_preds
1129-
# ground_atoms_trajs = generate_func(img_option_trajs, env, train_tasks,
1130-
# known_predicates, all_task_objs, vlm)
1131-
# return Dataset(option_segmented_trajs, ground_atoms_trajs)
1132-
return Dataset(option_segmented_trajs, None)
1129+
ground_atoms_trajs = generate_func(img_option_trajs, env, train_tasks,
1130+
known_predicates, all_task_objs, vlm)
1131+
return Dataset(option_segmented_trajs, ground_atoms_trajs)
1132+
# return Dataset(option_segmented_trajs, None)
11331133

11341134

11351135
def create_ground_atom_data_from_labelled_txt(

predicators/envs/pybullet_coffee.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
create_single_arm_pybullet_robot
4949
from predicators.settings import CFG
5050
from predicators.structs import Action, Array, EnvironmentTask, Object, \
51-
Predicate, State, Observation, Task
51+
Predicate, State, Observation, Task, Type
5252

5353
class PyBulletCoffeeEnv(PyBulletEnv, CoffeeEnv):
5454
"""PyBullet Coffee domain.
@@ -214,6 +214,14 @@ def pour_z_offset(cls) -> float:
214214
_camera_pitch: ClassVar[float]
215215
_camera_target: ClassVar[Pose3D]
216216

217+
# Types
218+
_table_type = Type("table", [])
219+
_robot_type = Type("robot", ["x", "y", "z", "tilt", "wrist", "fingers"])
220+
_jug_type = Type("jug", ["x", "y", "z", "rot", "is_held", "is_filled"])
221+
_machine_type = Type("coffee_machine", ["is_on"])
222+
_cup_type = Type("cup", ["x", "y", "z", "capacity_liquid", "target_liquid", "current_liquid"])
223+
_plug_type = Type("plug", ["x", "y", "z", "plugged_in"])
224+
217225
def __init__(self, use_gui: bool = True) -> None:
218226
super().__init__(use_gui)
219227

@@ -626,7 +634,6 @@ def _get_state(self, render_obs: bool = False) -> State:
626634
assert set(state) == set(self._current_state), \
627635
(f"Reconstructed state has objects {set(state)}, but "
628636
f"self._current_state has objects {set(self._current_state)}.")
629-
630637
return state
631638

632639
def step(self, action: Action, render_obs: bool = False) -> State:

scripts/configs/pred_invention_vlm.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ APPROACHES:
3636
# FLAGS:
3737
# grammar_search_vlm_atom_proposal_prompt_type: demo_with_vlm_imgs
3838
# grammar_search_invent_geo_predicates_only: False
39-
# interpret:
40-
# NAME: "grammar_search_invention"
41-
# FLAGS:
42-
# offline_data_method: demo_with_vlm_imgs
43-
# vlm_predicate_vision_api_generate_ground_atoms: True
44-
vila-with-fewshot:
45-
NAME: "vlm_open_loop"
39+
interpret:
40+
NAME: "grammar_search_invention"
4641
FLAGS:
47-
vlm_open_loop_use_training_demos: True
48-
offline_data_method: geo_and_demo_with_vlm_imgs
42+
offline_data_method: demo_with_vlm_imgs
43+
vlm_predicate_vision_api_generate_ground_atoms: True
44+
# vila-with-fewshot:
45+
# NAME: "vlm_open_loop"
46+
# FLAGS:
47+
# vlm_open_loop_use_training_demos: True
48+
# offline_data_method: geo_and_demo_with_vlm_imgs
4949

5050

5151
ENVS:

0 commit comments

Comments
 (0)