From c7168caadd4621c0176fae2351e119658f98d1ea Mon Sep 17 00:00:00 2001
From: Ibrahim Salihu Yusuf <sibrahim1396@gmail.com>
Date: Wed, 8 Jul 2020 12:33:51 +0200
Subject: [PATCH 1/2] Added code to fix Ubuntu issue

---
 docs/.carla_challenge_coil_baseline.md.swp | Bin 0 -> 1024 bytes
 docs/carla_challenge_coil_baseline.md      |  27 +++++++++------------
 2 files changed, 12 insertions(+), 15 deletions(-)
 create mode 100644 docs/.carla_challenge_coil_baseline.md.swp

diff --git a/docs/.carla_challenge_coil_baseline.md.swp b/docs/.carla_challenge_coil_baseline.md.swp
new file mode 100644
index 0000000000000000000000000000000000000000..dcb78cd8b9a75a8543869bc516365333628a0efd
GIT binary patch
literal 1024
zcmYc?$V<%2S1{HyVn6|2Tnr4ArNyObD5BUoj-I~3ey*OnJ^>-R21aJs6#+%{GxBp&
z^}(j<yW}UA=BDPA6zjWX<|XDR1Qg|Gr6!l?C+BD8loTaq=B4VV<R=&FCnpx=B*rIa
oB<AF#=B1~`gXH6r5{pxFfJ*doQ*c@~Dlr-YqalDE0-@*v09cqQ{{R30

literal 0
HcmV?d00001

diff --git a/docs/carla_challenge_coil_baseline.md b/docs/carla_challenge_coil_baseline.md
index 87126d42..42cf9192 100644
--- a/docs/carla_challenge_coil_baseline.md
+++ b/docs/carla_challenge_coil_baseline.md
@@ -26,7 +26,7 @@ Running the Baseline
 
 Clone the repository:
 
-    git clone https://github.com/felipecode/coiltraine.git 
+    git clone https://github.com/felipecode/coiltraine.git
     cd coiltraine
 
 We provide a conda environment requirements file, to
@@ -35,6 +35,12 @@ install and activate, just run:
     conda env create -f requirements.yaml
     conda activate coiltraine
 
+Should in case you get the error `CMake must be installed to build the following extensions: dlib` on Ubuntu, run the following:
+
+    sudo apt-get install build-essential cmake
+    sudo apt-get install libgtk-3-dev
+    sudo apt-get install libboost-all-dev
+
 Download the agent pytorch checkpoint by running the following script:
 
     python3 tools/download_sample_models.py
@@ -53,14 +59,14 @@ Install the latest CARLA API:
 Make sure you set the PYTHONPATH PythonAPI path:
 
      export PYTHONPATH=${CARLA_ROOT}/PythonAPI/carla:$PYTHONPATH
-     
 
-### Visualize the agent results 
+
+### Visualize the agent results
 
 First have the latest version of CARLA executing at some terminal at 40 fps (Recommend)
 
     sh CarlaUE4.sh Town03 -windowed -world-port=2000  -benchmark -fps=40
- 
+
 
 To run the and visualize the model run:
 
@@ -75,7 +81,7 @@ layers. You can command a destination for the agent by using the arrow keys from
 
 
 Clone the scenario  runner repository:
-    
+
     cd
     git clone -b carla_challenge  https://github.com/carla-simulator/scenario_runner.git
 
@@ -90,7 +96,7 @@ Export the coiltraine path to the PYTHONPATH:
 
     cd ~/coitraine
     export PYTHONPATH=`pwd`:$PYTHONPATH
-    
+
 Start the CARLA server on another terminal:
 
     ./CarlaUE4.sh -benchmark -fps=20 -quality-level=Epic
@@ -129,12 +135,3 @@ basic dataset:
 
 To check images and train curves there is also a tensorboard log
 being saved at "_logs" folder on the repository root.
-
-
-
-
-
-
-
-
-

From a1f90ae3d30fa2a8f592d3737f641292522e6941 Mon Sep 17 00:00:00 2001
From: Ibrahim Salihu Yusuf <sibrahim1396@gmail.com>
Date: Fri, 10 Jul 2020 11:44:14 +0200
Subject: [PATCH 2/2] added .sh to setup_environment.sh in
 carla_challenge_coil_baseline.md

---
 docs/.carla_challenge_coil_baseline.md.swp | Bin 1024 -> 0 bytes
 docs/carla_challenge_coil_baseline.md      |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 docs/.carla_challenge_coil_baseline.md.swp

diff --git a/docs/.carla_challenge_coil_baseline.md.swp b/docs/.carla_challenge_coil_baseline.md.swp
deleted file mode 100644
index dcb78cd8b9a75a8543869bc516365333628a0efd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1024
zcmYc?$V<%2S1{HyVn6|2Tnr4ArNyObD5BUoj-I~3ey*OnJ^>-R21aJs6#+%{GxBp&
z^}(j<yW}UA=BDPA6zjWX<|XDR1Qg|Gr6!l?C+BD8loTaq=B4VV<R=&FCnpx=B*rIa
oB<AF#=B1~`gXH6r5{pxFfJ*doQ*c@~Dlr-YqalDE0-@*v09cqQ{{R30

diff --git a/docs/carla_challenge_coil_baseline.md b/docs/carla_challenge_coil_baseline.md
index 42cf9192..f7a3b715 100644
--- a/docs/carla_challenge_coil_baseline.md
+++ b/docs/carla_challenge_coil_baseline.md
@@ -89,7 +89,7 @@ Setup the scenario runner challenge repository by setting the path to your CARLA
 folder.
 
     cd scenario_runner
-    bash setup_environment --carla-root <path_to_carla_root_folder>
+    bash setup_environment.sh --carla-root <path_to_carla_root_folder>
 
 
 Export the coiltraine path to the PYTHONPATH: