Update sumo_setup files + Hardcode restart_instance=True

.coveragerc

@@ -19,4 +19,7 @@ exclude_lines =
     if __name__ == .__main__.:
     raise NotImplementedError
     @ray.remote
+    @abstractmethod
     def policy_mapping_fn*
+    def main(args)*
+    pragma: no cover

.gitignore

@@ -111,3 +111,5 @@ flow.ang
 *.ang.old
 *.sang
 
+# local configuration file for data pipeline
+**/data_pipeline_config

.travis.yml

@@ -38,22 +38,33 @@ before_install:
 
   # Set up requirements for flow
   - conda env create -f environment.yml
-  - source activate flow
+  - source activate circles
 
   # [sumo] dependencies and binaries
-  - pushd $HOME/build/flow-project
-  -     ./flow/scripts/setup_libsumo_ubuntu.sh
+  - pushd $HOME/build/CIRCLES-consortium
+  -     ./flow/scripts/setup_sumo_ubuntu1604.sh
   - popd
   - source ~/.bashrc
 
   # [aimsun] install the conda env and update the path to the env
-  - pushd $HOME/build/flow-project
+  - pushd $HOME/build/CIRCLES-consortium
   -     ./flow/scripts/setup_aimsun.sh
   - popd
   - source ~/.bashrc
   - export AIMSUN_SITEPACKAGES="/home/travis/miniconda/envs/aimsun_flow"
   - export AIMSUN_NEXT_PATH="/home/user/Aimsun_Next_XXX"
 
+  # Install stable-baselines
+  - pip install stable_baselines==2.7.0
+
+  # Install h-baselines
+  - pushd $HOME
+  - git clone https://github.com/AboudyKreidieh/h-baselines.git
+  - pushd h-baselines
+  - pip install -e .
+  - popd
+  - popd
+
   - ls ../
 
 install:
@@ -62,7 +73,6 @@ install:
   - pip install -e .
   - pip install coveralls
   - pip install jupyter
-  - pip install stable_baselines==2.7.0
 
 script:
   - nose2 --with-coverage

CODEOWNERS

@@ -2,7 +2,7 @@
 # Each line is a file pattern followed by one or more owners.
 
 # These owners will be the default owners for everything in the repo.
-*       @cathywu @eugenevinitsky @AboudyKreidieh @kanaadp
+*       @eugenevinitsky @AboudyKreidieh @kjang96
 
 # Order is important. The last matching pattern has the most precedence.
 # So if a pull request only touches javascript files, only these owners

docs/libsumo_mac.md

@@ -0,0 +1,23 @@
+# How to install Libsumo for Mac OS
+
+This is adapted from an email exchange with the SUMO staff.
+
+
+
+To install libsumo requires re-building and installing SUMO from source.
+
+## Steps
+
+- **Install swig:** ```brew install swig```
+- **Clone the repo:** ```git clone https://github.com/eclipse/sumo.git```
+- **Create a “cmake-build” directory inside sumo/build/ and navigate to it:** ```mkdir build/cmake-build && cd build/cmake-build```
+
+**The next 3 steps are inside that directory**
+
+- ```cmake ../..```
+- ```make```
+- ```make install```
+
+## Additional Notes
+- You can test if libsumo has been built looking at (./testlibsumo) inside the sumo/bin/ directory.
+- Bear in mind to use libsumo with the same Python version with which CMake built SUMO.

docs/source/flow_setup.rst

@@ -2,7 +2,7 @@
 .. contents:: Table of contents
 
 Local Installation of Flow
-==================
+==========================
 
 To get Flow running, you need three things: Flow,
 
@@ -61,10 +61,13 @@ install everything you will need from SUMO, run one of the below scripts from
 the Flow main directory. Choose the script that matches the operating system
 you are running.
 
+
 For Ubuntu 14.04:
 
-::
+**WARNING**:
+Libsumo is not supported on Ubuntu 14.04. This script will setup a sumo without libsumo.
 
+::
     scripts/setup_sumo_ubuntu1404.sh
 
 For Ubuntu 16.04:
@@ -108,7 +111,25 @@ Note that, if the above commands did not work, you may need to run
 ``source ~/.bashrc``  or open a new terminal to update your $PATH variable.
 
 *Troubleshooting*:
-If you are a Mac user and the above command gives you the error ``FXApp:openDisplay: unable to open display :0.0``, make sure to open the application XQuartz.
+If you are a Mac user and the above command gives you the error
+``FXApp:openDisplay: unable to open display :0.0``, make sure to open the
+application XQuartz.
+
+*Troubleshooting*:
+If you are a Mac user and the above command gives you the error
+``Segmentation fault: 11``, make sure to reinstall ``fox`` using brew.
+::
+
+  # Uninstall Catalina bottle of fox:
+  $ brew uninstall --ignore-dependencies fox
+
+  # Edit brew Formula of fox:
+  $ brew edit fox
+
+  # Comment out or delete the following line: sha256 "c6697be294c9a0458580564d59f8db32791beb5e67a05a6246e0b969ffc068bc" => :catalina
+  # Install Mojave bottle of fox:
+  $ brew install fox
+
 
 Testing your SUMO and Flow installation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -151,7 +172,10 @@ during the execution of various tasks. The path should look something like:
     export AIMSUN_NEXT_PATH="/home/user/Aimsun_Next_X_Y_Z/"                   # Linux
     export AIMSUN_NEXT_PATH="/Applications/Aimsun Next.app/Contents/MacOS/"   # OS X
 
-`Note for Mac users:` when you download Aimsun, you will get a folder named "Programming". You need to rename it to "programming" (all lowercase) and to move it inside the "Aimsun Next.app/Contents/MacOS/" directory so that the python API can work.
+`Note for Mac users:` when you download Aimsun, you will get a folder named
+"Programming". You need to rename it to "programming" (all lowercase) and to
+move it inside the "Aimsun Next.app/Contents/MacOS/" directory so that the
+python API can work.
 
 In addition, being that Aimsun's python API is written to support Python 2.7.4,
 we will need to create a Python 2.7.4 conda environment that Aimsun can refer
@@ -198,8 +222,11 @@ to activate the `flow` env. Type:
     source activate flow
     python examples/simulate.py ring --aimsun
 
-*Troubleshootig for Ubuntu users with Aimsun 8.4*: when you run the above example, you may get a subprocess.Popen error ``OSError: [Errno 8] Exec format error:``.  
-To fix this, go to the `Aimsun Next` main directory, open the `Aimsun_Next` binary with a text editor and add the shebang to the first line of the script ``#!/bin/sh``.
+*Troubleshootig for Ubuntu users with Aimsun 8.4*: when you run the above
+example, you may get a subprocess.Popen error ``OSError: [Errno 8] Exec format error:``.
+To fix this, go to the `Aimsun Next` main directory, open the `Aimsun_Next`
+binary with a text editor and add the shebang to the first line of the script
+``#!/bin/sh``.
 
 (Optional) Install Ray RLlib
 ----------------------------
@@ -211,10 +238,11 @@ RLlib is one such library.
 First visit <https://github.com/flow-project/ray/blob/master/doc/source/installation.rst> and
 install the required packages.
 
-If you are not intending to develop RL algorithms or customize rllib you don't need to do anything,
-Ray was installed when you created the conda environment.
+If you are not intending to develop RL algorithms or customize rllib you don't
+need to do anything, Ray was installed when you created the conda environment.
 
-If you are intending to modify Ray, the installation process for this library is as follows:
+If you are intending to modify Ray, the installation process for this library
+is as follows:
 
 ::
 
@@ -249,6 +277,34 @@ In order to test run an Flow experiment in RLlib, try the following command:
 If it does not fail, this means that you have Flow properly configured with
 RLlib.
 
+
+Visualizing with Tensorboard
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To visualize the training progress:
+
+::
+
+    tensorboard --logdir=~/ray_results
+
+If tensorboard is not installed, you can install with pip:
+
+::
+
+    pip install tensorboard
+
+For information on how to deploy a cluster, refer to the
+`Ray instructions <http://ray.readthedocs.io/en/latest/autoscaling.html>`_.
+The basic workflow is running the following locally, ssh-ing into the host
+machine, and starting jobs from there.
+
+::
+
+    pip install boto3
+    ray create-or-update scripts/ray_autoscale.yaml
+    ray teardown scripts/ray_autoscale.yaml
+
+
 (Optional) Install Stable Baselines
 -----------------------------------
 
@@ -267,33 +323,29 @@ You can test your installation by running
     python examples/train.py singleagent_ring --rl_trainer Stable-Baselines
 
 
+(Optional) Install h-baselines
+------------------------------
 
-(Optional) Visualizing with Tensorboard
----------------------------------------
-
-To visualize the training progress:
+h-baselines is another variant of stable-baselines that support the use of
+single-agent, multiagent, and hierarchical policies. To install h-baselines,
+run the following commands:
 
 ::
 
-    tensorboard --logdir=~/ray_results
-
-If tensorboard is not installed, you can install with pip:
+    git clone https://github.com/AboudyKreidieh/h-baselines.git
+    cd h-baselines
+    source activate flow  # if using a Flow environment
+    pip install -e .
 
-::
 
-    pip install tensorboard
+Testing your h-baselines installation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-For information on how to deploy a cluster, refer to the `Ray instructions <http://ray.readthedocs.io/en/latest/autoscaling.html>`_.
-The basic workflow is running the following locally, ssh-ing into the host machine, and starting
-jobs from there.
+You can test your installation by running
 
 ::
 
-    pip install boto3
-    ray create-or-update scripts/ray_autoscale.yaml
-    ray teardown scripts/ray_autoscale.yaml
-
-
+    python examples/train.py singleagent_ring --rl_trainer h-baselines
 
 
 (Optional) Direct install of SUMO from GitHub
@@ -358,16 +410,22 @@ If you have Ubuntu 14.04+, run the following command
 
 
 Virtual installation of Flow (using docker containers)
-================================
+======================================================
 
 To install a containerized Flow stack, run:
+
 ::
+
     docker run -d -p 5901:5901 -p 6901:6901 fywu85/flow-desktop:latest
 
 To access the docker container, go to the following URL and enter the default password `password`:
+
 ::
+
     http://localhost:6901/vnc.html
 
 To use the Jupyter Notebook inside the container, run:
+
 ::
+
     jupyter notebook --ip=127.0.0.1

docs/sumo_wheels.md

@@ -62,7 +62,7 @@ repository is migrating to a new SUMO version.
         cd /path/to/sumo/bin
         mkdir data
         cp -r ../data/* data
-        tar -cJf binaries-<dist>.tar.xz !(Makefile*|start-command-line.bat)
+        tar -cJf binaries-<dist>.tar.gz !(Makefile*|start-command-line.bat)
 
 5. Create a `sumotools` wheel from the python-related packages. This only needs 
    to be done once for all Ubuntu and Mac, as the python tools are distribution 

environment.yml

@@ -1,18 +1,17 @@
-name: flow
+name: circles
 
 dependencies:
-    - python==3.6.8
-    - scipy==1.1.0
-    - lxml==4.4.1
-    - six==1.11.0
-    - path.py
-    - python-dateutil==2.7.3
-    - pip>=18.0
-    - tensorflow==1.9.0
-    - cloudpickle==1.2.1
-    - setuptools==41.0.0
-    - plotly==2.4.0
+    - python==3.7.3
     - pip:
+        - scipy==1.1.0
+        - lxml==4.4.1
+        - six==1.11.0
+        - path.py
+        - python-dateutil==2.7.3
+        - pip>=18.0
+        - tensorflow==1.15.2
+        - setuptools==41.0.0
+        - plotly==2.4.0
         - gym==0.14.0
         - pyprind==2.11.2
         - nose2==0.8.0
@@ -21,9 +20,11 @@ dependencies:
         - matplotlib==3.0.0
         - dill
         - lz4
-        - ray==0.7.3
+        - ray==0.8.0
         - setproctitle
         - psutil
         - opencv-python
-        - boto3==1.4.8
+        - boto3==1.10.45
         - redis~=2.10.6
+        - tabulate
+        - pytz