Skip to content

Commit

Permalink
Pylot release 0.3.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
ICGog committed Nov 12, 2020
1 parent 948ba95 commit be7bf9c
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
* Added support for latest CARLA lidar type (CARLA >= 0.9.9.4).
* Updated CARLA challenge agent to support perfect perception.
* Added logic to close pygame window, and to shutdown on sigint.
* Updated traffic light data collection script to work with latest CARLA versions.
* Reduced dependency on CARLA throughout the code base.

## Pylot 0.3

Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ ENV PYLOT_HOME /home/erdos/workspace/pylot/
RUN cd /home/erdos/workspace/pylot/ && ./install.sh
# Install all the Python dependencies.
RUN cd /home/erdos/workspace/pylot/ && pip3 install -e ./
ENV CARLA_HOME /home/erdos/workspace/pylot/dependencies/CARLA_0.9.10
ENV CARLA_HOME /home/erdos/workspace/pylot/dependencies/CARLA_0.9.10.1
# Clone scenario_runner.
RUN cd /home/erdos/workspace && git clone https://github.com/erdos-project/scenario_runner.git
# Install scenario_runner's dependencies.
RUN pip3 install py-trees==0.8.3 networkx==2.2 Shapely==1.6.4 psutil xmlschema==1.0.18 ephem tabulate

RUN echo "export PYTHONPATH=/home/erdos/workspace/pylot/dependencies/:/home/erdos/workspace/pylot/dependencies/CARLA_0.9.10/PythonAPI/carla/dist/carla-0.9.10-py3.7-linux-x86_64.egg:/home/erdos/workspace/pylot/dependencies/CARLA_0.9.10/PythonAPI/carla/:/home/erdos/workspace/pylot/dependencies/CARLA_0.9.10/PythonAPI/carla/agents/:/home/erdos/workspace/pylot/dependencies/CARLA_0.9.10/PythonAPI/:/home/erdos/workspace/scenario_runner" >> ~/.bashrc
RUN echo "export PYTHONPATH=/home/erdos/workspace/pylot/dependencies/:/home/erdos/workspace/pylot/dependencies/CARLA_0.9.10.1/PythonAPI/carla/dist/carla-0.9.10-py3.7-linux-x86_64.egg:/home/erdos/workspace/pylot/dependencies/CARLA_0.9.10.1/PythonAPI/carla/:/home/erdos/workspace/pylot/dependencies/CARLA_0.9.10.1/PythonAPI/carla/agents/:/home/erdos/workspace/pylot/dependencies/CARLA_0.9.10.1/PythonAPI/:/home/erdos/workspace/scenario_runner" >> ~/.bashrc
RUN echo "export PYLOT_HOME=/home/erdos/workspace/pylot/" >> ~/.bashrc
RUN echo "export CARLA_HOME=/home/erdos/workspace/pylot/dependencies/CARLA_0.9.10" >> ~/.bashrc
RUN echo "export CARLA_HOME=/home/erdos/workspace/pylot/dependencies/CARLA_0.9.10.1" >> ~/.bashrc
RUN echo "if [ -f ~/.bashrc ]; then . ~/.bashrc ; fi" >> ~/.bash_profile

# Set up ssh access to the container.
Expand Down
14 changes: 7 additions & 7 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ unzip download.zip ; rm download.zip
###### Download the traffic light model ######
cd $PYLOT_HOME/dependencies/models
mkdir -p traffic_light_detection/faster-rcnn ; cd traffic_light_detection/faster-rcnn
wget https://www.dropbox.com/s/63ig79xrkubigpu/frozen_inference_graph.pb
wget https://www.dropbox.com/s/nfq93v3th0fnedu/frozen_inference_graph.pb

###### Download the Lanenet lane detection model ######
cd $PYLOT_HOME/dependencies/models
Expand Down Expand Up @@ -120,12 +120,12 @@ cd AnyNet/models/spn_t1/ ; python3 setup.py clean ; python3 setup.py build

cd $PYLOT_HOME/dependencies/
###### Download the Carla simulator ######
if [ "$1" != 'challenge' ] && [ ! -d "CARLA_0.9.10" ]; then
mkdir CARLA_0.9.10
cd CARLA_0.9.10
wget https://carla-releases.s3.eu-west-3.amazonaws.com/Linux/CARLA_0.9.10.tar.gz
tar -xvf CARLA_0.9.10.tar.gz
rm CARLA_0.9.10.tar.gz
if [ "$1" != 'challenge' ] && [ ! -d "CARLA_0.9.10.1" ]; then
mkdir CARLA_0.9.10.1
cd CARLA_0.9.10.1
wget https://carla-releases.s3.eu-west-3.amazonaws.com/Linux/CARLA_0.9.10.1.tar.gz
tar -xvf CARLA_0.9.10.1.tar.gz
rm CARLA_0.9.10.1.tar.gz
if [ "$1" == 'docker' ]; then
rm -r CarlaUE4; rm -r HDMaps
fi
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name="erdos-pylot",
version="0.3",
version="0.3.1",
author="Pylot Team",
description=("A platform for developing autonomous vehicles."),
long_description=open("README.md").read(),
Expand All @@ -13,7 +13,7 @@
install_requires=[
"absl-py",
"cvxpy",
"erdos>=0.3.0",
"erdos>=0.3.1",
"gdown",
"lapsolver",
"matplotlib==2.2.4",
Expand Down

0 comments on commit be7bf9c

Please sign in to comment.