Merge branch 'master' into muti-develop

incognite-lab · Jan 6, 2023 · fa3adee · fa3adee
2 parents 3de7cdf + 16ca337
commit fa3adee
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/myGym/__init__.py b/myGym/__init__.py
@@ -1,3 +1,3 @@
 # This file was generated by the setup.py and will be rewritten at the next build
-__version__ = "2.1.2.dev22+g9e0c76a.d20220913"
+__version__ = "2.1.2.dev30+gff5384a.d20221128"
 __name__ = "myGym"
diff --git a/myGym/configs/train_push.json b/myGym/configs/train_push.json
@@ -10,7 +10,7 @@
 "visgym"    :0,
 #Robot
 "robot"         :"kuka_push",
-"robot_action"  :"joints",
+"robot_action"  :"step",
 "robot_init"    :[0, 0.42, 0.17],
 "robot_init"    :[0.0, 0.4, 0.6],
 "max_velocity"  :40,

diff --git a/myGym/train.py b/myGym/train.py
@@ -191,7 +191,7 @@ def train(env, implemented_combos, model_logdir, arg_dict, pretrained_model=None
 def get_parser():
     parser = argparse.ArgumentParser()
     #Envinronment
-    parser.add_argument("-cfg", "--config", default="./configs/debugdist.json", help="Can be passed instead of all arguments")
+    parser.add_argument("-cfg", "--config", default="./configs/train_reach.json", help="Can be passed instead of all arguments")
     parser.add_argument("-n", "--env_name", type=str, help="The name of environment")
     parser.add_argument("-ws", "--workspace", type=str, help="The name of workspace")
     parser.add_argument("-p", "--engine", type=str,  help="Name of the simulation engine you want to use")

diff --git a/requirements.txt b/requirements.txt
@@ -10,7 +10,7 @@ imageio==2.21.1
 jsonmerge==1.8.0
 matplotlib==3.1.3
 mujoco_py==2.1.2.14
-mpi4py==3.0.3
+mpi4py==3.1.4
 numpy==1.18.5
 opencv_python==4.2.0.34
 packaging==21.0