Skip to content

Commit

Permalink
Merge pull request #9 from incognite-lab/muti-develop
Browse files Browse the repository at this point in the history
Muti develop
  • Loading branch information
michalvavrecka committed Jan 6, 2023
2 parents 16ca337 + fa3adee commit f8bfbab
Show file tree
Hide file tree
Showing 26 changed files with 1,180 additions and 148 deletions.
14 changes: 7 additions & 7 deletions myGym/configs/debug.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"engine" :"pybullet",
"render" :"opengl",
"camera" :0,
"gui" :0,
"gui" :1,
"visualize" :0,
"visgym" :0,
#Robot
Expand All @@ -17,8 +17,8 @@
"action_repeat" :1,
#Task
"task_type" :"pnp",
"task_objects" :[{"init":{"obj_name":"cube_holes","fixed":0,"rand_rot":0, "sampling_area":[-0.6,-0.2,0.40,0.7,0.1,0.1]},
"goal":{"obj_name":"cube_target","fixed":1,"rand_rot":0, "sampling_area":[0.1,0.4,0.4,0.7,0.1,0.1]}}],
"task_objects" :[{"init":{"obj_name":"cube_holes","fixed":0,"rand_rot":0, "sampling_area":[-0.4,-0.4,0.6,0.6,0.1,0.1]},
"goal":{"obj_name":"cube_target","fixed":1,"rand_rot":0, "sampling_area":[-0.3,-0.3,0.6,0.6,0.1,0.1]}}],
"color_dict" : {"cube_holes":[[0.2,0.5,0.2,1]], "target":[[0.3,0.3,0.3,1]]},
"used_objects" :{"num_range":[0,0], "obj_list":[]},
// Observation
Expand All @@ -41,13 +41,13 @@
"num_networks" :3,
"max_episode_steps" :512,
"algo_steps" :512,
"steps" :2000000,
"steps" :20000,
"pretrained_model" :null,
"multiprocessing" :false,
#Evaluation
"eval_freq" :50000,
"eval_episodes" :50,
"eval_freq" :5000,
"eval_episodes" :3,
#Saving and logging
"logdir" :"trained_models/debug",
"logdir" :"trained_models/debug3n",
"record" :0
}
53 changes: 53 additions & 0 deletions myGym/configs/debugdist.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
#Environment
"env_name" :"Gym-v0",
"workspace" :"collabtable",
"engine" :"pybullet",
"render" :"opengl",
"camera" :0,
"gui" :1,
"visualize" :0,
"visgym" :0,
#Robot
"robot" :"panda",
"robot_action" :"step",
"robot_init" :[-0.4, 0.6, 0.5],
"max_velocity" :3,
"max_force" :100,
"action_repeat" :1,
#Task
"task_type" :"pnprot",
"task_objects" :[{"init":{"obj_name":"bar","fixed":0,"rand_rot":0, "sampling_area":[-0.5,0.5,0.4,0.7,0.1,0.1]},
"goal":{"obj_name":"bar_target","fixed":1,"rand_rot":1, "sampling_area":[-0.3,0.3,0.4,0.6,0.3,0.3]}}],
"color_dict" : {"cube_holes":[[0.2,0.5,0.2,1]], "target":[[0.3,0.3,0.3,1]]},
"used_objects" :{"num_range":[0,0], "obj_list":[]},
// Observation
// actual_state options (pick one): "endeff_xyz", "endeff_6D" (robot end effector), "obj_xyz", "obj_6D", "vae", "yolact", "voxel" or "dope"
// goal_state options (pick one): "obj_xyz", "obj_6D", "vae", "yolact", "voxel" or "dope"
// additional_obs options (pick none/one/more): "joints_xyz", "joints_angles", "endeff_xyz", "endeff_6D", "touch", "distractor"
"observation" : {"actual_state":"obj_6D", "goal_state":"obj_6D", "additional_obs":["endeff_xyz"]},
#Distractor
"distractors" : {"list":null, "moveable":1, "constant_speed":0, "movement_dims":3,
"movement_endpoints":[-0.3, 0.3, 0.4, 0.7, 0.1, 0.3]},
#Reward
"reward" :"pnprot",
"distance_type" :"euclidean",
"vae_path" :null,
"yolact_path" :null,
"yolact_config" :null,
#Train
"train_framework" :"tensorflow",
"algo" :"multi",
"num_networks" :3,
"max_episode_steps" :512,
"algo_steps" :512,
"steps" :5000000,
"pretrained_model" :null,
"multiprocessing" :false,
#Evaluation
"eval_freq" :500000,
"eval_episodes" :100,
#Saving and logging
"logdir" :"trained_models/debug3rot",
"record" :0
}
53 changes: 53 additions & 0 deletions myGym/configs/pnr_easy.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
#Environment
"env_name" :"Gym-v0",
"workspace" :"table",
"engine" :"pybullet",
"render" :"opengl",
"camera" :0,
"gui" :0,
"visualize" :0,
"visgym" :0,
#Robot
"robot" :"panda",
"robot_action" :"joints",
"robot_init" :[-0.4, 0.6, 0.5],
"max_velocity" :3,
"max_force" :100,
"action_repeat" :1,
#Task
"task_type" :"pnprot",
"task_objects" :[{"init":{"obj_name":"bar","fixed":0,"rand_rot":0, "sampling_area":[-0.3,0.3,0.4,0.6,0.1,0.1]},
"goal":{"obj_name":"bar_target","fixed":1,"rand_rot":1, "sampling_area":[-0.3,0.3,0.4,0.6,0.2,0.2]}}],
"color_dict" : {"cube_holes":[[0.2,0.5,0.2,1]], "target":[[0.3,0.3,0.3,1]]},
"used_objects" :{"num_range":[0,0], "obj_list":[]},
// Observation
// actual_state options (pick one): "endeff_xyz", "endeff_6D" (robot end effector), "obj_xyz", "obj_6D", "vae", "yolact", "voxel" or "dope"
// goal_state options (pick one): "obj_xyz", "obj_6D", "vae", "yolact", "voxel" or "dope"
// additional_obs options (pick none/one/more): "joints_xyz", "joints_angles", "endeff_xyz", "endeff_6D", "touch", "distractor"
"observation" : {"actual_state":"obj_6D", "goal_state":"obj_6D", "additional_obs":["endeff_xyz"]},
#Distractor
"distractors" : {"list":null, "moveable":1, "constant_speed":0, "movement_dims":3,
"movement_endpoints":[-0.3, 0.3, 0.4, 0.7, 0.1, 0.3]},
#Reward
"reward" :"pnprot",
"distance_type" :"euclidean",
"vae_path" :null,
"yolact_path" :null,
"yolact_config" :null,
#Train
"train_framework" :"tensorflow",
"algo" :"multi",
"num_networks" :3,
"max_episode_steps" :512,
"algo_steps" :512,
"steps" :10000000,
"pretrained_model" :null,
"multiprocessing" :false,
#Evaluation
"eval_freq" :500000,
"eval_episodes" :50,
#Saving and logging
"logdir" :"trained_models/pnr_easy",
"record" :0
}
53 changes: 53 additions & 0 deletions myGym/configs/pnr_hard.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
#Environment
"env_name" :"Gym-v0",
"workspace" :"table",
"engine" :"pybullet",
"render" :"opengl",
"camera" :0,
"gui" :0,
"visualize" :0,
"visgym" :0,
#Robot
"robot" :"panda",
"robot_action" :"joints",
"robot_init" :[-0.4, 0.6, 0.5],
"max_velocity" :3,
"max_force" :100,
"action_repeat" :1,
#Task
"task_type" :"pnprot",
"task_objects" :[{"init":{"obj_name":"bar","fixed":0,"rand_rot":0, "sampling_area":[-0.7,0.7,0.3,0.8,0.1,0.1]},
"goal":{"obj_name":"bar_target","fixed":1,"rand_rot":1, "sampling_area":[-0.7,0.7,0.3,0.8,0.35,0.35]}}],
"color_dict" : {"cube_holes":[[0.2,0.5,0.2,1]], "target":[[0.3,0.3,0.3,1]]},
"used_objects" :{"num_range":[0,0], "obj_list":[]},
// Observation
// actual_state options (pick one): "endeff_xyz", "endeff_6D" (robot end effector), "obj_xyz", "obj_6D", "vae", "yolact", "voxel" or "dope"
// goal_state options (pick one): "obj_xyz", "obj_6D", "vae", "yolact", "voxel" or "dope"
// additional_obs options (pick none/one/more): "joints_xyz", "joints_angles", "endeff_xyz", "endeff_6D", "touch", "distractor"
"observation" : {"actual_state":"obj_6D", "goal_state":"obj_6D", "additional_obs":["endeff_xyz"]},
#Distractor
"distractors" : {"list":null, "moveable":1, "constant_speed":0, "movement_dims":3,
"movement_endpoints":[-0.3, 0.3, 0.4, 0.7, 0.1, 0.3]},
#Reward
"reward" :"pnprot",
"distance_type" :"euclidean",
"vae_path" :null,
"yolact_path" :null,
"yolact_config" :null,
#Train
"train_framework" :"tensorflow",
"algo" :"multi",
"num_networks" :3,
"max_episode_steps" :512,
"algo_steps" :512,
"steps" :10000000,
"pretrained_model" :null,
"multiprocessing" :false,
#Evaluation
"eval_freq" :500000,
"eval_episodes" :50,
#Saving and logging
"logdir" :"trained_models/pnr_hard",
"record" :0
}
53 changes: 53 additions & 0 deletions myGym/configs/pnr_medium.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
#Environment
"env_name" :"Gym-v0",
"workspace" :"table",
"engine" :"pybullet",
"render" :"opengl",
"camera" :0,
"gui" :0,
"visualize" :0,
"visgym" :0,
#Robot
"robot" :"panda",
"robot_action" :"joints",
"robot_init" :[-0.4, 0.6, 0.5],
"max_velocity" :3,
"max_force" :100,
"action_repeat" :1,
#Task
"task_type" :"pnprot",
"task_objects" :[{"init":{"obj_name":"bar","fixed":0,"rand_rot":0, "sampling_area":[-0.5,0.5,0.35,0.65,0.1,0.1]},
"goal":{"obj_name":"bar_target","fixed":1,"rand_rot":1, "sampling_area":[-0.5,0.5,0.35,0.65,0.3,0.3]}}],
"color_dict" : {"cube_holes":[[0.2,0.5,0.2,1]], "target":[[0.3,0.3,0.3,1]]},
"used_objects" :{"num_range":[0,0], "obj_list":[]},
// Observation
// actual_state options (pick one): "endeff_xyz", "endeff_6D" (robot end effector), "obj_xyz", "obj_6D", "vae", "yolact", "voxel" or "dope"
// goal_state options (pick one): "obj_xyz", "obj_6D", "vae", "yolact", "voxel" or "dope"
// additional_obs options (pick none/one/more): "joints_xyz", "joints_angles", "endeff_xyz", "endeff_6D", "touch", "distractor"
"observation" : {"actual_state":"obj_6D", "goal_state":"obj_6D", "additional_obs":["endeff_xyz"]},
#Distractor
"distractors" : {"list":null, "moveable":1, "constant_speed":0, "movement_dims":3,
"movement_endpoints":[-0.3, 0.3, 0.4, 0.7, 0.1, 0.3]},
#Reward
"reward" :"pnprot",
"distance_type" :"euclidean",
"vae_path" :null,
"yolact_path" :null,
"yolact_config" :null,
#Train
"train_framework" :"tensorflow",
"algo" :"multi",
"num_networks" :3,
"max_episode_steps" :512,
"algo_steps" :512,
"steps" :10000000,
"pretrained_model" :null,
"multiprocessing" :false,
#Evaluation
"eval_freq" :500000,
"eval_episodes" :50,
#Saving and logging
"logdir" :"trained_models/pnr_medium",
"record" :0
}
18 changes: 9 additions & 9 deletions myGym/configs/train_pnp_3n.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
"visualize" :0,
"visgym" :0,
#Robot
"robot" :"panda1",
"robot" :"kuka",
"robot_action" :"step",
"robot_init" :[-0.4, 0.4, 0.4],
"max_velocity" :1,
"max_force" :70,
"robot_init" :[-0.4, 0.6, 0.4],
"max_velocity" :3,
"max_force" :100,
"action_repeat" :1,
#Task
"task_type" :"pnp",
"task_objects" :[{"init":{"obj_name":"cube_holes","fixed":0,"rand_rot":0, "sampling_area":[-0.38,-0.38,0.42,0.42,0.1,0.1]},
"goal":{"obj_name":"cube_target","fixed":1,"rand_rot":0, "sampling_area":[0.3,-0.2,0.4,0.7,0.15,0.15]}}],
"task_objects" :[{"init":{"obj_name":"cube_holes","fixed":0,"rand_rot":0, "sampling_area":[-0.4,0.4,0.4,0.7,0.1,0.1]},
"goal":{"obj_name":"cube_target","fixed":1,"rand_rot":0, "sampling_area":[-0.3,0.5,0.7,0.4,0.15,0.15]}}],
"color_dict" : {"cube_holes":[[0.2,0.5,0.2,1]], "target":[[0.3,0.3,0.3,1]]},
"used_objects" :{"num_range":[0,0], "obj_list":[]},
// Observation
Expand All @@ -41,13 +41,13 @@
"num_networks" :3,
"max_episode_steps" :512,
"algo_steps" :512,
"steps" :50000,
"steps" :10000000,
"pretrained_model" :null,
"multiprocessing" :false,
#Evaluation
"eval_freq" :500000,
"eval_episodes" :100,
"eval_episodes" :50,
#Saving and logging
"logdir" :"trained_models/pnp2nmagnet",
"logdir" :"trained_models/pnp3new",
"record" :0
}
53 changes: 53 additions & 0 deletions myGym/configs/train_pnp_3n_debug.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
#Environment
"env_name" :"Gym-v0",
"workspace" :"table",
"engine" :"pybullet",
"render" :"opengl",
"camera" :0,
"gui" :0,
"visualize" :0,
"visgym" :0,
#Robot
"robot" :"kuka",
"robot_action" :"step",
"robot_init" :[-0.4, 0.6, 0.4],
"max_velocity" :3,
"max_force" :100,
"action_repeat" :1,
#Task
"task_type" :"pnp",
"task_objects" :[{"init":{"obj_name":"cube_holes","fixed":0,"rand_rot":0, "sampling_area":[-0.4,0.5,0.7,0.3,0.1,0.1]},
"goal":{"obj_name":"cube_target","fixed":1,"rand_rot":0, "sampling_area":[-0.3,0.5,0.7,0.4,0.15,0.15]}}],
"color_dict" : {"cube_holes":[[0.2,0.5,0.2,1]], "target":[[0.3,0.3,0.3,1]]},
"used_objects" :{"num_range":[0,0], "obj_list":[]},
// Observation
// actual_state options (pick one): "endeff_xyz", "endeff_6D" (robot end effector), "obj_xyz", "obj_6D", "vae", "yolact", "voxel" or "dope"
// goal_state options (pick one): "obj_xyz", "obj_6D", "vae", "yolact", "voxel" or "dope"
// additional_obs options (pick none/one/more): "joints_xyz", "joints_angles", "endeff_xyz", "endeff_6D", "touch", "distractor"
"observation" : {"actual_state":"obj_xyz", "goal_state":"obj_xyz", "additional_obs":["endeff_xyz","touch"]},
#Distractor
"distractors" : {"list":null, "moveable":1, "constant_speed":0, "movement_dims":3,
"movement_endpoints":[-0.3, 0.3, 0.4, 0.7, 0.1, 0.3]},
#Reward
"reward" :"pnp",
"distance_type" :"euclidean",
"vae_path" :null,
"yolact_path" :null,
"yolact_config" :null,
#Train
"train_framework" :"tensorflow",
"algo" :"multi",
"num_networks" :3,
"max_episode_steps" :512,
"algo_steps" :512,
"steps" :100000,
"pretrained_model" :null,
"multiprocessing" :false,
#Evaluation
"eval_freq" :5000,
"eval_episodes" :50,
#Saving and logging
"logdir" :"trained_models/pnp3debug",
"record" :0
}
8 changes: 4 additions & 4 deletions myGym/configs/train_pnp_3n_multitask2.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
"action_repeat" :1,
#Task
"task_type" :"pnp",
"task_objects" :[{"init":{"obj_name":"cube_holes","fixed":0,"rand_rot":0, "sampling_area":[-0.38,-0.38,0.62,0.62,0.1,0.1]},
"task_objects" :[{"init":{"obj_name":"cube_holes","fixed":0,"rand_rot":0, "sampling_area":[-0.4,0.4,0.4,0.7,0.1,0.1]},
"goal":{"obj_name":"cube_target","fixed":1,"rand_rot":0, "sampling_area":[0.0,0.0,0.5,0.5,0.1,0.1]}},
{"init":{"obj_name":"cube_holes","fixed":0,"rand_rot":0, "sampling_area":[-0.38,-0.38,0.42,0.42,0.1,0.1]},
{"init":{"obj_name":"cube_holes","fixed":0,"rand_rot":0, "sampling_area":[-0.4,0.4,0.4,0.7,0.1,0.1]},
"goal":{"obj_name":"cube_target","fixed":1,"rand_rot":0, "sampling_area":[0.0,0.0,0.5,0.5,0.2,0.2]}}],
"color_dict" : {"cube_holes":[[0.2,0.5,0.2,1]], "cube_target":[[0.3,0.3,0.3,1]]},
"used_objects" :{"num_range":[0,0], "obj_list":[]},
Expand All @@ -43,12 +43,12 @@
"num_networks" :3,
"max_episode_steps" :1024,
"algo_steps" :1024,
"steps" :5100000,
"steps" :10000000,
"pretrained_model" :null,
"multiprocessing" :false,
#Evaluation
"eval_freq" :500000,
"eval_episodes" :100,
"eval_episodes" :50,
#Saving and logging
"logdir" :"trained_models/pnp3multi2",
"record" :0
Expand Down
Loading

0 comments on commit f8bfbab

Please sign in to comment.