Skip to content

Commit fc12847

Browse files
Merge pull request #156 from JdeRobot/issue-155
Updated requirements and small error in import
2 parents 2564a7f + 4699b4d commit fc12847

5 files changed

Lines changed: 16 additions & 11 deletions

File tree

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,13 @@ cd RL-Studio
6969
pip install -r requirements.txt
7070
```
7171

72+
Add the project to `PYTHONPATH`:
73+
74+
```bash
75+
echo "export PYTHONPATH=$PYTHONPATH:~/PATH/TO/RL-Studio" >> ~/.bashrc
76+
source ~/.bashrc
77+
```
78+
7279
The commits follow the [gitmoji](https://gitmoji.dev/) convention and the code is formatted with [Black](https://black.readthedocs.io/en/stable/).
7380

7481

requirements.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ actionlib==1.14.0
33
alembic==1.9.2
44
angles==1.9.13
55
astunparse==1.6.3
6-
base_local_planner==1.17.2
76
bondpy==1.8.6
87
cachetools==5.2.0
98
camera-calibration==1.17.0
@@ -42,7 +41,6 @@ genlisp==0.4.18
4241
genmsg==0.6.0
4342
gennodejs==2.0.2
4443
genpy==0.6.15
45-
geodesy==0.5.6
4644
google-auth==2.14.1
4745
google-auth-oauthlib==0.4.6
4846
google-pasta==0.2.0
@@ -80,7 +78,6 @@ optuna==3.1.0
8078
packaging==21.3
8179
pandas==1.5.2
8280
Pillow==9.3.0
83-
pkg_resources==0.0.0
8481
platformdirs==2.5.4
8582
protobuf==3.19.6
8683
pyasn1==0.4.8
@@ -173,18 +170,14 @@ tensorflow-estimator==2.11.0
173170
tensorflow-io-gcs-filesystem==0.28.0
174171
tensorrt==0.0.1
175172
termcolor==2.1.1
176-
tf==1.13.2
177-
tf-conversions==1.13.2
178173
tf2-geometry-msgs==0.7.6
179174
tf2-kdl==0.7.6
180175
tf2-py==0.7.6
181176
tf2-ros==0.7.6
182-
tf2-sensor-msgs==0.7.6
183177
threadpoolctl==3.1.0
184178
topic-tools==1.15.15
185179
tqdm==4.64.1
186180
typing_extensions==4.4.0
187-
unique_id==1.0.6
188181
urllib3==1.26.13
189182
Werkzeug==2.2.2
190183
wrapt==1.14.1

rl_studio/README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,12 @@ python rl-studio.py -f config/<config.yaml>
6464
```
6565
where <config.yaml> can be any config you can create or previosly existed.
6666

67+
When launching Gazebo, if you found and error, try killing all possible previous ROS-Gazebo processes:
68+
69+
```
70+
killall gzserver
71+
killall gzclient
72+
```
6773

6874
## Config.yaml
6975
The config.yaml contains all project hyperparams and configuration needed to execute correctly. In case you want to train a Formula 1 agent in a Follow Lane task in Gazebo, with a PPO algorithm and Tensorflow Deep Learning framework, you can use next example from a config.yaml example file:
@@ -85,4 +91,4 @@ Remaining params should be adjusted too. There are many working yaml files in co
8591
> need extend the rl-studio.py to listen for inputs in a port and execute the loaded brain/algorithm to provide
8692
> outputs in the desired way.
8793
88-
More info about how to config and launch any task, please go to [agents](agents/README.md) section.
94+
More info about how to config and launch any task, please go to [agents](agents/README.md) section.

rl_studio/config/config_training_followline_qlearn_f1_gazebo.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
settings:
2-
mode: retraining # training, retraining
2+
mode: training # training, retraining
33
task: follow_line_gazebo # follow_line_gazebo
44
algorithm: qlearn # qlearn
55
simulator: gazebo # openai, carla, gazebo, sumo

rl_studio/envs/gazebo/gazebo_envs.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import numpy as np
1212
from rosgraph_msgs.msg import Clock
1313
import rospy
14-
from tf.transformations import quaternion_from_euler
14+
#from tf.transformations import quaternion_from_euler
1515

1616
from agents.utils import print_messages
1717

@@ -70,7 +70,6 @@ def __init__(self, config):
7070
]
7171
)
7272
# print("Gazebo launched!")
73-
7473
self.gzclient_pid = 0
7574

7675
# Launch the simulation with the given launchfile name

0 commit comments

Comments
 (0)